diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/ExtendedWPFToolkit.sln b/Release/v1.7.0/ExtendedWPFToolkitSolution/ExtendedWPFToolkit.sln
new file mode 100644
index 00000000..8b521022
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/ExtendedWPFToolkit.sln
@@ -0,0 +1,282 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WPFToolkit.Extended", "Src\WPFToolkit.Extended\WPFToolkit.Extended.csproj", "{72E591D6-8F83-4D8C-8F67-9C325E623234}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{01F2E61E-7F20-4F2E-8A3C-6604B18415B9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples", "Src\Samples\Samples\Samples.csproj", "{6EE69D18-F8AB-4CF9-AC3D-4719F36A8D99}"
+	ProjectSection(ProjectDependencies) = postProject
+		{1A9C0E21-DE3B-4B2D-9EF0-39AA1922CDA6} = {1A9C0E21-DE3B-4B2D-9EF0-39AA1922CDA6}
+		{44733C25-7F22-4B91-83C7-4E654063DFD6} = {44733C25-7F22-4B91-83C7-4E654063DFD6}
+		{22F36E4A-98E6-4A1C-96CA-52CA46F19274} = {22F36E4A-98E6-4A1C-96CA-52CA46F19274}
+		{511FB369-57D2-430B-9002-F367DF165E70} = {511FB369-57D2-430B-9002-F367DF165E70}
+		{CBED4977-79ED-4E46-AA00-0A4D83D333A6} = {CBED4977-79ED-4E46-AA00-0A4D83D333A6}
+		{CAB850B9-1D47-4F45-A6A5-07B48599B5D7} = {CAB850B9-1D47-4F45-A6A5-07B48599B5D7}
+		{10EFEFC6-F2CC-4C6E-955C-668B17F7F342} = {10EFEFC6-F2CC-4C6E-955C-668B17F7F342}
+		{A36AB9C9-D813-4018-B341-8729A9B5BD7D} = {A36AB9C9-D813-4018-B341-8729A9B5BD7D}
+		{EF6701CF-21C3-45B5-9C90-40BE6130BB7D} = {EF6701CF-21C3-45B5-9C90-40BE6130BB7D}
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{F927B3FE-820C-4EE1-921F-D10D3AE287AE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.BusyIndicator", "Src\Samples\Modules\Samples.Modules.BusyIndicator\Samples.Modules.BusyIndicator.csproj", "{1A9C0E21-DE3B-4B2D-9EF0-39AA1922CDA6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Infrastructure", "Src\Samples\Samples.Infrastructure\Samples.Infrastructure.csproj", "{A4A049A4-665A-4651-9046-7D06E9D0CCDC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.Calculator", "Src\Samples\Modules\Samples.Modules.Calculator\Samples.Modules.Calculator.csproj", "{EF6701CF-21C3-45B5-9C90-40BE6130BB7D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.ChildWindow", "Src\Samples\Modules\Samples.Modules.ChildWindow\Samples.Modules.ChildWindow.csproj", "{44733C25-7F22-4B91-83C7-4E654063DFD6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.Color", "Src\Samples\Modules\Samples.Modules.Color\Samples.Modules.Color.csproj", "{A36AB9C9-D813-4018-B341-8729A9B5BD7D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.DateTime", "Src\Samples\Modules\Samples.Modules.DateTime\Samples.Modules.DateTime.csproj", "{CAB850B9-1D47-4F45-A6A5-07B48599B5D7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.Numeric", "Src\Samples\Modules\Samples.Modules.Numeric\Samples.Modules.Numeric.csproj", "{CBED4977-79ED-4E46-AA00-0A4D83D333A6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.Text", "Src\Samples\Modules\Samples.Modules.Text\Samples.Modules.Text.csproj", "{10EFEFC6-F2CC-4C6E-955C-668B17F7F342}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.Button", "Src\Samples\Modules\Samples.Modules.Button\Samples.Modules.Button.csproj", "{22F36E4A-98E6-4A1C-96CA-52CA46F19274}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.PropertyGrid", "Src\Samples\Modules\Samples.Modules.PropertyGrid\Samples.Modules.PropertyGrid.csproj", "{511FB369-57D2-430B-9002-F367DF165E70}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.Wizard", "Src\Samples\Modules\Samples.Modules.Wizard\Samples.Modules.Wizard.csproj", "{DB0F7672-AFCC-4152-A231-7DCFDD5F219F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.TimelinePanel", "Src\Samples\Modules\Samples.Modules.TimelinePanel\Samples.Modules.TimelinePanel.csproj", "{9FCBCEF6-6E41-4CD5-A49B-456890A038BA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.Zoombox", "Src\Samples\Modules\Samples.Modules.Zoombox\Samples.Modules.Zoombox.csproj", "{D6581837-4158-4165-BE2F-35EBF9742A54}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.Pie", "Src\Samples\Modules\Samples.Modules.Pie\Samples.Modules.Pie.csproj", "{08E7A934-4991-4CFC-BE12-B43AC6713122}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.CheckLists", "Src\Samples\Modules\Samples.Modules.CheckLists\Samples.Modules.CheckLists.csproj", "{910A7A19-DD9F-4989-A001-BD7E5BAD2FE8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.Magnifier", "Src\Samples\Modules\Samples.Modules.Magnifier\Samples.Modules.Magnifier.csproj", "{C3D3FFAD-2DA3-4142-8DE8-7045E347B63A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.MessageBox", "Src\Samples\Modules\Samples.Modules.MessageBox\Samples.Modules.MessageBox.csproj", "{C324395B-C1D1-407B-8745-4AAC39B8BFD9}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{72E591D6-8F83-4D8C-8F67-9C325E623234}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{72E591D6-8F83-4D8C-8F67-9C325E623234}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{72E591D6-8F83-4D8C-8F67-9C325E623234}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{72E591D6-8F83-4D8C-8F67-9C325E623234}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{72E591D6-8F83-4D8C-8F67-9C325E623234}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{72E591D6-8F83-4D8C-8F67-9C325E623234}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{72E591D6-8F83-4D8C-8F67-9C325E623234}.Release|Any CPU.Build.0 = Release|Any CPU
+		{72E591D6-8F83-4D8C-8F67-9C325E623234}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{72E591D6-8F83-4D8C-8F67-9C325E623234}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{72E591D6-8F83-4D8C-8F67-9C325E623234}.Release|x86.ActiveCfg = Release|Any CPU
+		{6EE69D18-F8AB-4CF9-AC3D-4719F36A8D99}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{6EE69D18-F8AB-4CF9-AC3D-4719F36A8D99}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{6EE69D18-F8AB-4CF9-AC3D-4719F36A8D99}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{6EE69D18-F8AB-4CF9-AC3D-4719F36A8D99}.Debug|x86.ActiveCfg = Debug|x86
+		{6EE69D18-F8AB-4CF9-AC3D-4719F36A8D99}.Debug|x86.Build.0 = Debug|x86
+		{6EE69D18-F8AB-4CF9-AC3D-4719F36A8D99}.Release|Any CPU.ActiveCfg = Release|x86
+		{6EE69D18-F8AB-4CF9-AC3D-4719F36A8D99}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{6EE69D18-F8AB-4CF9-AC3D-4719F36A8D99}.Release|Mixed Platforms.Build.0 = Release|x86
+		{6EE69D18-F8AB-4CF9-AC3D-4719F36A8D99}.Release|x86.ActiveCfg = Release|x86
+		{6EE69D18-F8AB-4CF9-AC3D-4719F36A8D99}.Release|x86.Build.0 = Release|x86
+		{1A9C0E21-DE3B-4B2D-9EF0-39AA1922CDA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1A9C0E21-DE3B-4B2D-9EF0-39AA1922CDA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1A9C0E21-DE3B-4B2D-9EF0-39AA1922CDA6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1A9C0E21-DE3B-4B2D-9EF0-39AA1922CDA6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1A9C0E21-DE3B-4B2D-9EF0-39AA1922CDA6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1A9C0E21-DE3B-4B2D-9EF0-39AA1922CDA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1A9C0E21-DE3B-4B2D-9EF0-39AA1922CDA6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1A9C0E21-DE3B-4B2D-9EF0-39AA1922CDA6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{1A9C0E21-DE3B-4B2D-9EF0-39AA1922CDA6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{1A9C0E21-DE3B-4B2D-9EF0-39AA1922CDA6}.Release|x86.ActiveCfg = Release|Any CPU
+		{A4A049A4-665A-4651-9046-7D06E9D0CCDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A4A049A4-665A-4651-9046-7D06E9D0CCDC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A4A049A4-665A-4651-9046-7D06E9D0CCDC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A4A049A4-665A-4651-9046-7D06E9D0CCDC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A4A049A4-665A-4651-9046-7D06E9D0CCDC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A4A049A4-665A-4651-9046-7D06E9D0CCDC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A4A049A4-665A-4651-9046-7D06E9D0CCDC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A4A049A4-665A-4651-9046-7D06E9D0CCDC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{A4A049A4-665A-4651-9046-7D06E9D0CCDC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{A4A049A4-665A-4651-9046-7D06E9D0CCDC}.Release|x86.ActiveCfg = Release|Any CPU
+		{EF6701CF-21C3-45B5-9C90-40BE6130BB7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF6701CF-21C3-45B5-9C90-40BE6130BB7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EF6701CF-21C3-45B5-9C90-40BE6130BB7D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EF6701CF-21C3-45B5-9C90-40BE6130BB7D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EF6701CF-21C3-45B5-9C90-40BE6130BB7D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EF6701CF-21C3-45B5-9C90-40BE6130BB7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EF6701CF-21C3-45B5-9C90-40BE6130BB7D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EF6701CF-21C3-45B5-9C90-40BE6130BB7D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{EF6701CF-21C3-45B5-9C90-40BE6130BB7D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{EF6701CF-21C3-45B5-9C90-40BE6130BB7D}.Release|x86.ActiveCfg = Release|Any CPU
+		{44733C25-7F22-4B91-83C7-4E654063DFD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{44733C25-7F22-4B91-83C7-4E654063DFD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{44733C25-7F22-4B91-83C7-4E654063DFD6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{44733C25-7F22-4B91-83C7-4E654063DFD6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{44733C25-7F22-4B91-83C7-4E654063DFD6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{44733C25-7F22-4B91-83C7-4E654063DFD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{44733C25-7F22-4B91-83C7-4E654063DFD6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{44733C25-7F22-4B91-83C7-4E654063DFD6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{44733C25-7F22-4B91-83C7-4E654063DFD6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{44733C25-7F22-4B91-83C7-4E654063DFD6}.Release|x86.ActiveCfg = Release|Any CPU
+		{A36AB9C9-D813-4018-B341-8729A9B5BD7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A36AB9C9-D813-4018-B341-8729A9B5BD7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A36AB9C9-D813-4018-B341-8729A9B5BD7D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A36AB9C9-D813-4018-B341-8729A9B5BD7D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A36AB9C9-D813-4018-B341-8729A9B5BD7D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A36AB9C9-D813-4018-B341-8729A9B5BD7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A36AB9C9-D813-4018-B341-8729A9B5BD7D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A36AB9C9-D813-4018-B341-8729A9B5BD7D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{A36AB9C9-D813-4018-B341-8729A9B5BD7D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{A36AB9C9-D813-4018-B341-8729A9B5BD7D}.Release|x86.ActiveCfg = Release|Any CPU
+		{CAB850B9-1D47-4F45-A6A5-07B48599B5D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CAB850B9-1D47-4F45-A6A5-07B48599B5D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CAB850B9-1D47-4F45-A6A5-07B48599B5D7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CAB850B9-1D47-4F45-A6A5-07B48599B5D7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CAB850B9-1D47-4F45-A6A5-07B48599B5D7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CAB850B9-1D47-4F45-A6A5-07B48599B5D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CAB850B9-1D47-4F45-A6A5-07B48599B5D7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CAB850B9-1D47-4F45-A6A5-07B48599B5D7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{CAB850B9-1D47-4F45-A6A5-07B48599B5D7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{CAB850B9-1D47-4F45-A6A5-07B48599B5D7}.Release|x86.ActiveCfg = Release|Any CPU
+		{CBED4977-79ED-4E46-AA00-0A4D83D333A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CBED4977-79ED-4E46-AA00-0A4D83D333A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CBED4977-79ED-4E46-AA00-0A4D83D333A6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CBED4977-79ED-4E46-AA00-0A4D83D333A6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CBED4977-79ED-4E46-AA00-0A4D83D333A6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CBED4977-79ED-4E46-AA00-0A4D83D333A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CBED4977-79ED-4E46-AA00-0A4D83D333A6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CBED4977-79ED-4E46-AA00-0A4D83D333A6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{CBED4977-79ED-4E46-AA00-0A4D83D333A6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{CBED4977-79ED-4E46-AA00-0A4D83D333A6}.Release|x86.ActiveCfg = Release|Any CPU
+		{10EFEFC6-F2CC-4C6E-955C-668B17F7F342}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{10EFEFC6-F2CC-4C6E-955C-668B17F7F342}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{10EFEFC6-F2CC-4C6E-955C-668B17F7F342}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{10EFEFC6-F2CC-4C6E-955C-668B17F7F342}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{10EFEFC6-F2CC-4C6E-955C-668B17F7F342}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{10EFEFC6-F2CC-4C6E-955C-668B17F7F342}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{10EFEFC6-F2CC-4C6E-955C-668B17F7F342}.Release|Any CPU.Build.0 = Release|Any CPU
+		{10EFEFC6-F2CC-4C6E-955C-668B17F7F342}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{10EFEFC6-F2CC-4C6E-955C-668B17F7F342}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{10EFEFC6-F2CC-4C6E-955C-668B17F7F342}.Release|x86.ActiveCfg = Release|Any CPU
+		{22F36E4A-98E6-4A1C-96CA-52CA46F19274}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{22F36E4A-98E6-4A1C-96CA-52CA46F19274}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{22F36E4A-98E6-4A1C-96CA-52CA46F19274}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{22F36E4A-98E6-4A1C-96CA-52CA46F19274}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{22F36E4A-98E6-4A1C-96CA-52CA46F19274}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{22F36E4A-98E6-4A1C-96CA-52CA46F19274}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{22F36E4A-98E6-4A1C-96CA-52CA46F19274}.Release|Any CPU.Build.0 = Release|Any CPU
+		{22F36E4A-98E6-4A1C-96CA-52CA46F19274}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{22F36E4A-98E6-4A1C-96CA-52CA46F19274}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{22F36E4A-98E6-4A1C-96CA-52CA46F19274}.Release|x86.ActiveCfg = Release|Any CPU
+		{511FB369-57D2-430B-9002-F367DF165E70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{511FB369-57D2-430B-9002-F367DF165E70}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{511FB369-57D2-430B-9002-F367DF165E70}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{511FB369-57D2-430B-9002-F367DF165E70}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{511FB369-57D2-430B-9002-F367DF165E70}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{511FB369-57D2-430B-9002-F367DF165E70}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{511FB369-57D2-430B-9002-F367DF165E70}.Release|Any CPU.Build.0 = Release|Any CPU
+		{511FB369-57D2-430B-9002-F367DF165E70}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{511FB369-57D2-430B-9002-F367DF165E70}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{511FB369-57D2-430B-9002-F367DF165E70}.Release|x86.ActiveCfg = Release|Any CPU
+		{DB0F7672-AFCC-4152-A231-7DCFDD5F219F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DB0F7672-AFCC-4152-A231-7DCFDD5F219F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DB0F7672-AFCC-4152-A231-7DCFDD5F219F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DB0F7672-AFCC-4152-A231-7DCFDD5F219F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DB0F7672-AFCC-4152-A231-7DCFDD5F219F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DB0F7672-AFCC-4152-A231-7DCFDD5F219F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DB0F7672-AFCC-4152-A231-7DCFDD5F219F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DB0F7672-AFCC-4152-A231-7DCFDD5F219F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{DB0F7672-AFCC-4152-A231-7DCFDD5F219F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{DB0F7672-AFCC-4152-A231-7DCFDD5F219F}.Release|x86.ActiveCfg = Release|Any CPU
+		{9FCBCEF6-6E41-4CD5-A49B-456890A038BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9FCBCEF6-6E41-4CD5-A49B-456890A038BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9FCBCEF6-6E41-4CD5-A49B-456890A038BA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9FCBCEF6-6E41-4CD5-A49B-456890A038BA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9FCBCEF6-6E41-4CD5-A49B-456890A038BA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9FCBCEF6-6E41-4CD5-A49B-456890A038BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9FCBCEF6-6E41-4CD5-A49B-456890A038BA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9FCBCEF6-6E41-4CD5-A49B-456890A038BA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{9FCBCEF6-6E41-4CD5-A49B-456890A038BA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{9FCBCEF6-6E41-4CD5-A49B-456890A038BA}.Release|x86.ActiveCfg = Release|Any CPU
+		{D6581837-4158-4165-BE2F-35EBF9742A54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D6581837-4158-4165-BE2F-35EBF9742A54}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D6581837-4158-4165-BE2F-35EBF9742A54}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D6581837-4158-4165-BE2F-35EBF9742A54}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D6581837-4158-4165-BE2F-35EBF9742A54}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D6581837-4158-4165-BE2F-35EBF9742A54}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D6581837-4158-4165-BE2F-35EBF9742A54}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D6581837-4158-4165-BE2F-35EBF9742A54}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{D6581837-4158-4165-BE2F-35EBF9742A54}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{D6581837-4158-4165-BE2F-35EBF9742A54}.Release|x86.ActiveCfg = Release|Any CPU
+		{08E7A934-4991-4CFC-BE12-B43AC6713122}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{08E7A934-4991-4CFC-BE12-B43AC6713122}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{08E7A934-4991-4CFC-BE12-B43AC6713122}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{08E7A934-4991-4CFC-BE12-B43AC6713122}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{08E7A934-4991-4CFC-BE12-B43AC6713122}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{08E7A934-4991-4CFC-BE12-B43AC6713122}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{08E7A934-4991-4CFC-BE12-B43AC6713122}.Release|Any CPU.Build.0 = Release|Any CPU
+		{08E7A934-4991-4CFC-BE12-B43AC6713122}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{08E7A934-4991-4CFC-BE12-B43AC6713122}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{08E7A934-4991-4CFC-BE12-B43AC6713122}.Release|x86.ActiveCfg = Release|Any CPU
+		{910A7A19-DD9F-4989-A001-BD7E5BAD2FE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{910A7A19-DD9F-4989-A001-BD7E5BAD2FE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{910A7A19-DD9F-4989-A001-BD7E5BAD2FE8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{910A7A19-DD9F-4989-A001-BD7E5BAD2FE8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{910A7A19-DD9F-4989-A001-BD7E5BAD2FE8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{910A7A19-DD9F-4989-A001-BD7E5BAD2FE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{910A7A19-DD9F-4989-A001-BD7E5BAD2FE8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{910A7A19-DD9F-4989-A001-BD7E5BAD2FE8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{910A7A19-DD9F-4989-A001-BD7E5BAD2FE8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{910A7A19-DD9F-4989-A001-BD7E5BAD2FE8}.Release|x86.ActiveCfg = Release|Any CPU
+		{C3D3FFAD-2DA3-4142-8DE8-7045E347B63A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C3D3FFAD-2DA3-4142-8DE8-7045E347B63A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C3D3FFAD-2DA3-4142-8DE8-7045E347B63A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C3D3FFAD-2DA3-4142-8DE8-7045E347B63A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C3D3FFAD-2DA3-4142-8DE8-7045E347B63A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C3D3FFAD-2DA3-4142-8DE8-7045E347B63A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C3D3FFAD-2DA3-4142-8DE8-7045E347B63A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C3D3FFAD-2DA3-4142-8DE8-7045E347B63A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{C3D3FFAD-2DA3-4142-8DE8-7045E347B63A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{C3D3FFAD-2DA3-4142-8DE8-7045E347B63A}.Release|x86.ActiveCfg = Release|Any CPU
+		{C324395B-C1D1-407B-8745-4AAC39B8BFD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C324395B-C1D1-407B-8745-4AAC39B8BFD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C324395B-C1D1-407B-8745-4AAC39B8BFD9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C324395B-C1D1-407B-8745-4AAC39B8BFD9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C324395B-C1D1-407B-8745-4AAC39B8BFD9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C324395B-C1D1-407B-8745-4AAC39B8BFD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C324395B-C1D1-407B-8745-4AAC39B8BFD9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C324395B-C1D1-407B-8745-4AAC39B8BFD9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{C324395B-C1D1-407B-8745-4AAC39B8BFD9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{C324395B-C1D1-407B-8745-4AAC39B8BFD9}.Release|x86.ActiveCfg = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{6EE69D18-F8AB-4CF9-AC3D-4719F36A8D99} = {01F2E61E-7F20-4F2E-8A3C-6604B18415B9}
+		{F927B3FE-820C-4EE1-921F-D10D3AE287AE} = {01F2E61E-7F20-4F2E-8A3C-6604B18415B9}
+		{A4A049A4-665A-4651-9046-7D06E9D0CCDC} = {01F2E61E-7F20-4F2E-8A3C-6604B18415B9}
+		{1A9C0E21-DE3B-4B2D-9EF0-39AA1922CDA6} = {F927B3FE-820C-4EE1-921F-D10D3AE287AE}
+		{EF6701CF-21C3-45B5-9C90-40BE6130BB7D} = {F927B3FE-820C-4EE1-921F-D10D3AE287AE}
+		{44733C25-7F22-4B91-83C7-4E654063DFD6} = {F927B3FE-820C-4EE1-921F-D10D3AE287AE}
+		{A36AB9C9-D813-4018-B341-8729A9B5BD7D} = {F927B3FE-820C-4EE1-921F-D10D3AE287AE}
+		{CAB850B9-1D47-4F45-A6A5-07B48599B5D7} = {F927B3FE-820C-4EE1-921F-D10D3AE287AE}
+		{CBED4977-79ED-4E46-AA00-0A4D83D333A6} = {F927B3FE-820C-4EE1-921F-D10D3AE287AE}
+		{10EFEFC6-F2CC-4C6E-955C-668B17F7F342} = {F927B3FE-820C-4EE1-921F-D10D3AE287AE}
+		{22F36E4A-98E6-4A1C-96CA-52CA46F19274} = {F927B3FE-820C-4EE1-921F-D10D3AE287AE}
+		{511FB369-57D2-430B-9002-F367DF165E70} = {F927B3FE-820C-4EE1-921F-D10D3AE287AE}
+		{DB0F7672-AFCC-4152-A231-7DCFDD5F219F} = {F927B3FE-820C-4EE1-921F-D10D3AE287AE}
+		{9FCBCEF6-6E41-4CD5-A49B-456890A038BA} = {F927B3FE-820C-4EE1-921F-D10D3AE287AE}
+		{D6581837-4158-4165-BE2F-35EBF9742A54} = {F927B3FE-820C-4EE1-921F-D10D3AE287AE}
+		{08E7A934-4991-4CFC-BE12-B43AC6713122} = {F927B3FE-820C-4EE1-921F-D10D3AE287AE}
+		{910A7A19-DD9F-4989-A001-BD7E5BAD2FE8} = {F927B3FE-820C-4EE1-921F-D10D3AE287AE}
+		{C3D3FFAD-2DA3-4142-8DE8-7045E347B63A} = {F927B3FE-820C-4EE1-921F-D10D3AE287AE}
+		{C324395B-C1D1-407B-8745-4AAC39B8BFD9} = {F927B3FE-820C-4EE1-921F-D10D3AE287AE}
+	EndGlobalSection
+EndGlobal
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Libs/Prism/Microsoft.Practices.Prism.UnityExtensions.dll b/Release/v1.7.0/ExtendedWPFToolkitSolution/Libs/Prism/Microsoft.Practices.Prism.UnityExtensions.dll
new file mode 100644
index 00000000..99c42d6b
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution/Libs/Prism/Microsoft.Practices.Prism.UnityExtensions.dll differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Libs/Prism/Microsoft.Practices.Prism.dll b/Release/v1.7.0/ExtendedWPFToolkitSolution/Libs/Prism/Microsoft.Practices.Prism.dll
new file mode 100644
index 00000000..383c1f46
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution/Libs/Prism/Microsoft.Practices.Prism.dll differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Libs/Prism/Microsoft.Practices.ServiceLocation.dll b/Release/v1.7.0/ExtendedWPFToolkitSolution/Libs/Prism/Microsoft.Practices.ServiceLocation.dll
new file mode 100644
index 00000000..3f889547
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution/Libs/Prism/Microsoft.Practices.ServiceLocation.dll differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Libs/Prism/Microsoft.Practices.Unity.dll b/Release/v1.7.0/ExtendedWPFToolkitSolution/Libs/Prism/Microsoft.Practices.Unity.dll
new file mode 100644
index 00000000..84f1870d
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution/Libs/Prism/Microsoft.Practices.Unity.dll differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/BusyIndicatorModule.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/BusyIndicatorModule.cs
new file mode 100644
index 00000000..f557ccdd
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/BusyIndicatorModule.cs
@@ -0,0 +1,48 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using Microsoft.Practices.Prism.Regions;
+using Microsoft.Practices.Unity;
+using Samples.Infrastructure;
+using Samples.Infrastructure.Extensions;
+using Samples.Modules.BusyIndicator.NavigationItems;
+using Samples.Modules.BusyIndicator.Views;
+
+namespace Samples.Modules.BusyIndicator
+{
+  public class BusyIndicatorModule : ModuleBase
+  {
+    public BusyIndicatorModule( IUnityContainer container, IRegionManager regionManager )
+      : base( container, regionManager )
+    {
+    }
+
+    protected override void RegisterViewsAndTypes()
+    {
+      Container.RegisterNavigationType( typeof( BusyIndicatorView ) );
+      Container.RegisterNavigationType( typeof( BusyIndicatorCustomContentView ) );
+      Container.RegisterNavigationType( typeof( BusyIndicatorCustomContentTemplateView ) );
+    }
+
+    protected override void InitializeModule()
+    {
+      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( BusyIndicatorNavItem ) );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Images/CdBurning32.png b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Images/CdBurning32.png
new file mode 100644
index 00000000..2f6f4871
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Images/CdBurning32.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/NavigationItems/BusyIndicatorNavItem.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/NavigationItems/BusyIndicatorNavItem.xaml
new file mode 100644
index 00000000..75012fa2
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/NavigationItems/BusyIndicatorNavItem.xaml
@@ -0,0 +1,32 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<TreeViewItem x:Class="Samples.Modules.BusyIndicator.NavigationItems.BusyIndicatorNavItem"
+              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+              xmlns:navItems="clr-namespace:Samples.Modules.BusyIndicator.NavigationItems"
+              xmlns:views="clr-namespace:Samples.Modules.BusyIndicator.Views"
+              Header="BusyIndicator" Tag="{x:Type views:BusyIndicatorView}">
+   <TreeViewItem.Resources>
+      <Style TargetType="navItems:BusyIndicatorNavItem" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
+   </TreeViewItem.Resources>
+
+   <TreeViewItem Header="Custom Content" Tag="{x:Type views:BusyIndicatorCustomContentView}" />
+   <TreeViewItem Header="Custom Content Template" Tag="{x:Type views:BusyIndicatorCustomContentTemplateView}" />
+
+</TreeViewItem>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/NavigationItems/BusyIndicatorNavItem.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/NavigationItems/BusyIndicatorNavItem.xaml.cs
new file mode 100644
index 00000000..5206b62d
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/NavigationItems/BusyIndicatorNavItem.xaml.cs
@@ -0,0 +1,35 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows.Controls;
+
+namespace Samples.Modules.BusyIndicator.NavigationItems
+{
+  /// <summary>
+  /// Interaction logic for BusyIndicatorNavItem.xaml
+  /// </summary>
+  public partial class BusyIndicatorNavItem : TreeViewItem
+  {
+    public BusyIndicatorNavItem()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Properties/AssemblyInfo.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..bc2c5992
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Properties/AssemblyInfo.cs
@@ -0,0 +1,72 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle( "Extended WPF Toolkit BusyIndicator Sample" )]
+[assembly: AssemblyDescription( "" )]
+[assembly: AssemblyConfiguration( "" )]
+[assembly: AssemblyCompany( "Xceed Software Inc." )]
+[assembly: AssemblyProduct( "Extended WPF Toolkit BusyIndicator Sample" )]
+[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
+[assembly: AssemblyTrademark( "" )]
+[assembly: AssemblyCulture( "" )]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible( false )]
+
+//In order to begin building localizable applications, set 
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+  //(used if a resource is not found in the page, 
+  // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+  //(used if a resource is not found in the page, 
+  // app, or any theme specific resource dictionaries)
+)]
+
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion( "1.0.0.0" )]
+[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Resources/Common.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Resources/Common.xaml
new file mode 100644
index 00000000..5b338152
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Resources/Common.xaml
@@ -0,0 +1,60 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit">
+
+   <DataTemplate x:Key="SampleContent">
+      <Grid Margin="10">
+         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+         </Grid.RowDefinitions>
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="*" />
+         </Grid.ColumnDefinitions>
+
+         <TextBlock Grid.Row="0" Text="First Name:" Margin="2" VerticalAlignment="Center" />
+         <xctk:WatermarkTextBox Grid.Row="0" Grid.Column="1" Margin="2" VerticalAlignment="Center" Watermark="Enter First Name" />
+
+         <TextBlock Grid.Row="1" Text="Last Name:" Margin="2" VerticalAlignment="Center" />
+         <xctk:WatermarkTextBox Grid.Row="1" Grid.Column="1" Margin="2" VerticalAlignment="Center" Watermark="Enter Last Name" />
+
+         <TextBlock Grid.Row="2" Text="Date of Birth:" Margin="2" VerticalAlignment="Center" />
+         <xctk:DateTimeUpDown Grid.Row="2" Grid.Column="1" Format="ShortDate" Margin="2" VerticalAlignment="Center" Watermark="Enter Date of Birth" />
+
+         <TextBlock Grid.Row="3" Text="Salary:" Margin="2" VerticalAlignment="Center" />
+         <xctk:IntegerUpDown Grid.Row="3" Grid.Column="1" FormatString="C2" Margin="2" VerticalAlignment="Center" Watermark="Enter Salary" />
+
+         <TextBlock Grid.Row="4" Text="Favorite Color:" Margin="2" VerticalAlignment="Center" />
+         <xctk:ColorPicker Grid.Row="4" Grid.Column="1" Margin="2" VerticalAlignment="Center" />
+
+         <StackPanel Grid.Row="5" Grid.ColumnSpan="2" Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,10,0,0">
+            <Button Width="65" Margin="2">OK</Button>
+            <Button Width="65" Margin="2">Cancel</Button>
+         </StackPanel>
+      </Grid>
+   </DataTemplate>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Samples.Modules.BusyIndicator.csproj b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Samples.Modules.BusyIndicator.csproj
new file mode 100644
index 00000000..a491c78b
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Samples.Modules.BusyIndicator.csproj
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{1A9C0E21-DE3B-4B2D-9EF0-39AA1922CDA6}</ProjectGuid>
+    <OutputType>library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Samples.Modules.BusyIndicator</RootNamespace>
+    <AssemblyName>Samples.Modules.BusyIndicator</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.Practices.Prism, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Practices.Unity, Version=2.0.414.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
+    </Reference>
+    <ProjectReference Include="..\..\..\WPFToolkit.Extended\WPFToolkit.Extended.csproj">
+      <Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
+      <Name>WPFToolkit.Extended</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Samples.Infrastructure\Samples.Infrastructure.csproj">
+      <Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
+      <Name>Samples.Infrastructure</Name>
+    </ProjectReference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xaml" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="BusyIndicatorModule.cs" />
+    <Compile Include="NavigationItems\BusyIndicatorNavItem.xaml.cs">
+      <DependentUpon>BusyIndicatorNavItem.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\BusyIndicatorCustomContentTemplateView.xaml.cs">
+      <DependentUpon>BusyIndicatorCustomContentTemplateView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\BusyIndicatorCustomContentView.xaml.cs">
+      <DependentUpon>BusyIndicatorCustomContentView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\BusyIndicatorView.xaml.cs">
+      <DependentUpon>BusyIndicatorView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <AppDesigner Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="NavigationItems\BusyIndicatorNavItem.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Resources\Common.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\BusyIndicatorCustomContentTemplateView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\BusyIndicatorCustomContentView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\BusyIndicatorView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\CdBurning32.png" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y
+xcopy "$(ProjectDir)Views" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\Samples\$(ProjectName)\" /s /Y /I</PostBuildEvent>
+  </PropertyGroup>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.xaml
new file mode 100644
index 00000000..e3c86813
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.xaml
@@ -0,0 +1,72 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<sample:DemoView x:Class="Samples.Modules.BusyIndicator.Views.BusyIndicatorCustomContentTemplateView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 Title="BusyIndicator"
+                 Description="This example demonstrates how to create a custom content template by setting the BusyContentTemplate property to an instance of a custom DataTemplate. Take notice of how the default ProgressBar is being hidden by setting the PrgressBarStyle property.  The default OverlayStyle is also being set to a custom style.">
+
+   <sample:DemoView.Resources>
+      <ResourceDictionary>
+         <ResourceDictionary.MergedDictionaries>
+            <ResourceDictionary Source="/Samples.Modules.Busyindicator;component/Resources/Common.xaml" />
+         </ResourceDictionary.MergedDictionaries>
+      </ResourceDictionary>
+   </sample:DemoView.Resources>
+
+   <StackPanel Grid.Row="1" Margin="10">
+      <TextBlock Grid.Row="2" Text="Custom Content Template:" Style="{StaticResource Header}" />
+      <xctk:BusyIndicator IsBusy="True">
+         <xctk:BusyIndicator.BusyContentTemplate>
+            <DataTemplate>
+               <StackPanel Margin="4">
+                  <TextBlock Text="Downloading Email" FontWeight="Bold" HorizontalAlignment="Center" />
+                  <StackPanel Margin="4">
+                     <TextBlock Text="Downloading message 4/10..." />
+                     <ProgressBar Value="40" Height="15" />
+                  </StackPanel>
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition/>
+                        <ColumnDefinition/>
+                     </Grid.ColumnDefinitions>
+                     <Button Grid.Column="0" Content="Pause" HorizontalAlignment="Right" Margin="0 0 2 0" />
+                     <Button Grid.Column="1" Content="Cancel" HorizontalAlignment="Left" Margin="2 0 0 0" />
+                  </Grid>
+               </StackPanel>
+            </DataTemplate>
+         </xctk:BusyIndicator.BusyContentTemplate>
+         <xctk:BusyIndicator.OverlayStyle>
+            <Style TargetType="Rectangle">
+               <Setter Property="Fill" Value="#B1EB1D1D" />
+            </Style>
+         </xctk:BusyIndicator.OverlayStyle>
+         <xctk:BusyIndicator.ProgressBarStyle>
+            <Style TargetType="ProgressBar">
+               <Setter Property="Visibility" Value="Collapsed" />
+            </Style>
+         </xctk:BusyIndicator.ProgressBarStyle>
+
+         <ContentControl ContentTemplate="{StaticResource SampleContent}" />
+      </xctk:BusyIndicator>
+   </StackPanel>
+</sample:DemoView>
+
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.xaml.cs
new file mode 100644
index 00000000..b4c8f0f6
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.xaml.cs
@@ -0,0 +1,36 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
+
+namespace Samples.Modules.BusyIndicator.Views
+{
+  /// <summary>
+  /// Interaction logic for BusyIndicatorCustomContentTemplateView.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class BusyIndicatorCustomContentTemplateView : DemoView
+  {
+    public BusyIndicatorCustomContentTemplateView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorCustomContentView.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorCustomContentView.xaml
new file mode 100644
index 00000000..a2201786
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorCustomContentView.xaml
@@ -0,0 +1,49 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<sample:DemoView x:Class="Samples.Modules.BusyIndicator.Views.BusyIndicatorCustomContentView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 Title="BusyIndicator"
+                 Description="This example demonstrates how to define your own custom content. This is done by setting the BusyContent property.">
+   <sample:DemoView.Resources>
+      <ResourceDictionary>
+         <ResourceDictionary.MergedDictionaries>
+            <ResourceDictionary Source="/Samples.Modules.Busyindicator;component/Resources/Common.xaml" />
+         </ResourceDictionary.MergedDictionaries>
+      </ResourceDictionary>
+   </sample:DemoView.Resources>
+
+   <StackPanel Margin="10">
+      <TextBlock Text="Custom Content:" Style="{StaticResource Header}" />
+      <xctk:BusyIndicator IsBusy="True">
+         <xctk:BusyIndicator.BusyContent>
+            <StackPanel Orientation="Horizontal">
+               <Image Source="/Samples.Modules.BusyIndicator;component/Images/CdBurning32.png" />
+               <StackPanel Margin="5,0">
+                  <TextBlock Text="Burning CD..." VerticalAlignment="Center" />
+                  <TextBlock Text="Madonna - Like a Virgin" VerticalAlignment="Center" Margin="8,0" />
+               </StackPanel>
+            </StackPanel>
+         </xctk:BusyIndicator.BusyContent>
+         <ContentControl ContentTemplate="{StaticResource SampleContent}" />
+      </xctk:BusyIndicator>
+   </StackPanel>
+</sample:DemoView>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorCustomContentView.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorCustomContentView.xaml.cs
new file mode 100644
index 00000000..9f898a72
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorCustomContentView.xaml.cs
@@ -0,0 +1,36 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
+
+namespace Samples.Modules.BusyIndicator.Views
+{
+  /// <summary>
+  /// Interaction logic for BusyIndicatorCustomContentView.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class BusyIndicatorCustomContentView : DemoView
+  {
+    public BusyIndicatorCustomContentView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorView.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorView.xaml
new file mode 100644
index 00000000..43fc12c3
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorView.xaml
@@ -0,0 +1,74 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<sample:DemoView x:Class="Samples.Modules.BusyIndicator.Views.BusyIndicatorView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:local="clr-namespace:Samples.Modules.BusyIndicator.Views"
+                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 Title="BusyIndicator"
+                 Description="BusyIndicator makes it easy to let the user know when an application is busy. Simply wrap the relevant content in an instance of the BusyIndicator control and toggle its IsBusy property to True during any long-running process.">
+
+   <sample:DemoView.Resources>
+      <ResourceDictionary>
+         <ResourceDictionary.MergedDictionaries>
+            <ResourceDictionary Source="/Samples.Modules.Busyindicator;component/Resources/Common.xaml" />
+         </ResourceDictionary.MergedDictionaries>
+         <local:IntegerToTimespanConverter x:Key="TimeSpanConverter" />
+      </ResourceDictionary>
+   </sample:DemoView.Resources>
+
+   <Grid>
+
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+
+      <GroupBox Header="Features" Grid.Row="0" Margin="5">
+         <Grid Margin="5">
+            <Grid.RowDefinitions>
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="Auto" />
+               <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+
+            <TextBlock Text="IsBusy:" VerticalAlignment="Center" Margin="2" />
+            <CheckBox x:Name="_isBusy" Grid.Column="1" IsChecked="True" VerticalAlignment="Center" Margin="5" ToolTip="When true shows the BusyIndicator" />
+
+            <TextBlock Text="DisplayAfter:" Grid.Row="1" VerticalAlignment="Center" Margin="2" />
+            <StackPanel Grid.Row="1" Grid.Column="1" Margin="5" HorizontalAlignment="Left" Orientation="Horizontal">
+               <xctk:IntegerUpDown x:Name="_displayAfter" Width="65" VerticalAlignment="Center" Minimum="0" Increment="100" Value="0" ToolTip="Sets the TimeSpan to wait until the BusyIndicator is displayed." />
+               <TextBlock Text="milliseconds" Margin="5,0"  VerticalAlignment="Center" />
+            </StackPanel>
+         </Grid>
+      </GroupBox>
+
+      <StackPanel Grid.Row="1" Margin="10">
+         <TextBlock Text="Usage:" Style="{StaticResource Header}" />
+         <xctk:BusyIndicator IsBusy="{Binding IsChecked, ElementName=_isBusy}" DisplayAfter="{Binding Value, ElementName=_displayAfter, Converter={StaticResource TimeSpanConverter}}">
+            <ContentControl ContentTemplate="{StaticResource SampleContent}" />
+         </xctk:BusyIndicator>
+      </StackPanel>
+   </Grid>
+</sample:DemoView>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorView.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorView.xaml.cs
new file mode 100644
index 00000000..cad93d4c
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorView.xaml.cs
@@ -0,0 +1,51 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows.Data;
+using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
+
+namespace Samples.Modules.BusyIndicator.Views
+{
+  /// <summary>
+  /// Interaction logic for HomeView.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class BusyIndicatorView : DemoView
+  {
+    public BusyIndicatorView()
+    {
+      InitializeComponent();
+    }
+  }
+
+  public class IntegerToTimespanConverter : IValueConverter
+  {
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      return TimeSpan.FromMilliseconds( ( int )value );
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/ButtonModule.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/ButtonModule.cs
new file mode 100644
index 00000000..1927b06f
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/ButtonModule.cs
@@ -0,0 +1,50 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using Microsoft.Practices.Prism.Regions;
+using Microsoft.Practices.Unity;
+using Samples.Infrastructure;
+using Samples.Infrastructure.Extensions;
+using Samples.Modules.Button.NavigationItems;
+using Samples.Modules.Button.Views;
+
+namespace Samples.Modules.Button
+{
+  public class ButtonModule : ModuleBase
+  {
+    public ButtonModule( IUnityContainer container, IRegionManager regionManager )
+      : base( container, regionManager )
+    {
+    }
+
+    protected override void InitializeModule()
+    {
+      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( ButtonSpinnerNavItem ) );
+      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( DropDownButtonNavItem ) );
+      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( SplitButtonNavItem ) );
+    }
+
+    protected override void RegisterViewsAndTypes()
+    {
+      Container.RegisterNavigationType( typeof( ButtonSpinnerView ) );
+      Container.RegisterNavigationType( typeof( DropDownButtonView ) );
+      Container.RegisterNavigationType( typeof( SplitButtonView ) );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/ButtonSpinnerNavItem.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/ButtonSpinnerNavItem.xaml
new file mode 100644
index 00000000..beef61c2
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/ButtonSpinnerNavItem.xaml
@@ -0,0 +1,30 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<TreeViewItem x:Class="Samples.Modules.Button.NavigationItems.ButtonSpinnerNavItem"
+              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+              xmlns:navItems="clr-namespace:Samples.Modules.Button.NavigationItems"
+              xmlns:views="clr-namespace:Samples.Modules.Button.Views" 
+              Header="ButtonSpinner" Tag="{x:Type views:ButtonSpinnerView}" >
+
+   <TreeViewItem.Resources>
+      <Style TargetType="navItems:ButtonSpinnerNavItem" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
+   </TreeViewItem.Resources>
+
+</TreeViewItem>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/ButtonSpinnerNavItem.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/ButtonSpinnerNavItem.xaml.cs
new file mode 100644
index 00000000..90cbb114
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/ButtonSpinnerNavItem.xaml.cs
@@ -0,0 +1,34 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows.Controls;
+
+namespace Samples.Modules.Button.NavigationItems
+{
+  /// <summary>
+  /// Interaction logic for ButtonSpinnerNavItem.xaml
+  /// </summary>
+  public partial class ButtonSpinnerNavItem : TreeViewItem
+  {
+    public ButtonSpinnerNavItem()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/DropDownButtonNavItem.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/DropDownButtonNavItem.xaml
new file mode 100644
index 00000000..140035b2
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/DropDownButtonNavItem.xaml
@@ -0,0 +1,30 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<TreeViewItem x:Class="Samples.Modules.Button.NavigationItems.DropDownButtonNavItem"
+              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+              xmlns:navItems="clr-namespace:Samples.Modules.Button.NavigationItems"
+              xmlns:views="clr-namespace:Samples.Modules.Button.Views"
+              Header="DropDownButton" Tag="{x:Type views:DropDownButtonView}">
+
+   <TreeViewItem.Resources>
+      <Style TargetType="navItems:DropDownButtonNavItem" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
+   </TreeViewItem.Resources>
+
+</TreeViewItem>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/DropDownButtonNavItem.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/DropDownButtonNavItem.xaml.cs
new file mode 100644
index 00000000..36556aec
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/DropDownButtonNavItem.xaml.cs
@@ -0,0 +1,34 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows.Controls;
+
+namespace Samples.Modules.Button.NavigationItems
+{
+  /// <summary>
+  /// Interaction logic for DropDownButtonNavItem.xaml
+  /// </summary>
+  public partial class DropDownButtonNavItem : TreeViewItem
+  {
+    public DropDownButtonNavItem()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/SplitButtonNavItem.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/SplitButtonNavItem.xaml
new file mode 100644
index 00000000..0ddabf1e
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/SplitButtonNavItem.xaml
@@ -0,0 +1,30 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<TreeViewItem x:Class="Samples.Modules.Button.NavigationItems.SplitButtonNavItem"
+              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+              xmlns:navItems="clr-namespace:Samples.Modules.Button.NavigationItems"
+              xmlns:views="clr-namespace:Samples.Modules.Button.Views"
+              Header="SplitButton" Tag="{x:Type views:SplitButtonView}">
+
+   <TreeViewItem.Resources>
+      <Style TargetType="navItems:SplitButtonNavItem" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
+   </TreeViewItem.Resources>
+
+</TreeViewItem>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/SplitButtonNavItem.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/SplitButtonNavItem.xaml.cs
new file mode 100644
index 00000000..2a52efb8
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/SplitButtonNavItem.xaml.cs
@@ -0,0 +1,34 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows.Controls;
+
+namespace Samples.Modules.Button.NavigationItems
+{
+  /// <summary>
+  /// Interaction logic for SplitButtonNavItem.xaml
+  /// </summary>
+  public partial class SplitButtonNavItem : TreeViewItem
+  {
+    public SplitButtonNavItem()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Properties/AssemblyInfo.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..552e1b37
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Properties/AssemblyInfo.cs
@@ -0,0 +1,72 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle( "Extended WPF Toolkit Button Sample" )]
+[assembly: AssemblyDescription( "" )]
+[assembly: AssemblyConfiguration( "" )]
+[assembly: AssemblyCompany( "Xceed Software Inc." )]
+[assembly: AssemblyProduct( "Extended WPF Toolkit Button Sample" )]
+[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
+[assembly: AssemblyTrademark( "" )]
+[assembly: AssemblyCulture( "" )]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible( false )]
+
+//In order to begin building localizable applications, set 
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+  //(used if a resource is not found in the page, 
+  // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+  //(used if a resource is not found in the page, 
+  // app, or any theme specific resource dictionaries)
+)]
+
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion( "1.0.0.0" )]
+[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Samples.Modules.Button.csproj b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Samples.Modules.Button.csproj
new file mode 100644
index 00000000..07a30103
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Samples.Modules.Button.csproj
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{22F36E4A-98E6-4A1C-96CA-52CA46F19274}</ProjectGuid>
+    <OutputType>library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Samples.Modules.Button</RootNamespace>
+    <AssemblyName>Samples.Modules.Button</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.Practices.Prism, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Practices.Unity, Version=2.0.414.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
+    </Reference>
+    <ProjectReference Include="..\..\..\WPFToolkit.Extended\WPFToolkit.Extended.csproj">
+      <Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
+      <Name>WPFToolkit.Extended</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Samples.Infrastructure\Samples.Infrastructure.csproj">
+      <Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
+      <Name>Samples.Infrastructure</Name>
+    </ProjectReference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ButtonModule.cs" />
+    <Compile Include="NavigationItems\ButtonSpinnerNavItem.xaml.cs">
+      <DependentUpon>ButtonSpinnerNavItem.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="NavigationItems\DropDownButtonNavItem.xaml.cs">
+      <DependentUpon>DropDownButtonNavItem.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="NavigationItems\SplitButtonNavItem.xaml.cs">
+      <DependentUpon>SplitButtonNavItem.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\ButtonSpinnerView.xaml.cs">
+      <DependentUpon>ButtonSpinnerView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Views\DropDownButtonView.xaml.cs">
+      <DependentUpon>DropDownButtonView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\SplitButtonView.xaml.cs">
+      <DependentUpon>SplitButtonView.xaml</DependentUpon>
+    </Compile>
+    <AppDesigner Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="NavigationItems\ButtonSpinnerNavItem.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="NavigationItems\DropDownButtonNavItem.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="NavigationItems\SplitButtonNavItem.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\ButtonSpinnerView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\DropDownButtonView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\SplitButtonView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y
+xcopy "$(ProjectDir)Views" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\Samples\$(ProjectName)\" /s /Y /I</PostBuildEvent>
+  </PropertyGroup>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/ButtonSpinnerView.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/ButtonSpinnerView.xaml
new file mode 100644
index 00000000..19c8127e
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/ButtonSpinnerView.xaml
@@ -0,0 +1,80 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<sample:DemoView x:Class="Samples.Modules.Button.Views.ButtonSpinnerView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 xmlns:s="clr-namespace:System;assembly=mscorlib"
+                 Title="ButtonSpinner"
+                 Description="The ButtonSpinner control allows you to add button spinners to any element and then respond to the Spin event to manipulate that element. The Spin event lets the developer know which direction the buttons are spinning; SpinDirection.Increase indicates an increment, SpinDirection.Decrease indicates a decrement.">
+   <sample:DemoView.Resources>
+      <x:Array x:Key="names" Type="s:String">
+         <s:String>John Smith</s:String>
+         <s:String>Janel Leverling</s:String>
+         <s:String>Laura Callahan</s:String>
+         <s:String>Robert King</s:String>
+         <s:String>Margaret Peacock</s:String>
+         <s:String>Andrew Fuller</s:String>
+         <s:String>Anne Dodsworth</s:String>
+         <s:String>Nancy Davolio</s:String>
+         <s:String>Naomi Suyama</s:String>
+      </x:Array>
+   </sample:DemoView.Resources>
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+      <GroupBox Header="Features" Grid.Row="0" Margin="5">
+         <Grid Margin="5">
+            <Grid.RowDefinitions>
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="Auto" />
+               <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+
+            <TextBlock Text="AllowSpin:" VerticalAlignment="Center" />
+            <CheckBox x:Name="_allowSpin" Grid.Column="1" IsChecked="True" VerticalAlignment="Center" Margin="5" ToolTip="When true allows the ButtonSpinner to perform increment/decrement operations." />
+
+            <TextBlock Text="ShowButtonSpinner:" VerticalAlignment="Center" Grid.Row="1" />
+            <CheckBox x:Name="_showButtonSpinner" Grid.Row="1" Grid.Column="1" IsChecked="True" VerticalAlignment="Center" Margin="5" ToolTip="Gets/Sets the visibility of the button spinners." />
+         </Grid>
+      </GroupBox>
+
+      <StackPanel Grid.Row="1" Margin="10">
+         <TextBlock Text="Usage:" Style="{StaticResource Header}" />
+         <TextBlock Text="You can wrap any element by placing it inside the content area of the ButtonSpinner control."
+                    TextWrapping="Wrap" />
+
+         <xctk:ButtonSpinner Margin="10" 
+                             Width="150" 
+                             HorizontalAlignment="Left"
+                             AllowSpin="{Binding IsChecked, ElementName=_allowSpin}"
+                             ShowButtonSpinner="{Binding IsChecked, ElementName=_showButtonSpinner}"
+                             Spin="ButtonSpinner_Spin">
+            <TextBox Text="John Smith" IsReadOnly="True" BorderThickness="0" HorizontalContentAlignment="Right" />
+         </xctk:ButtonSpinner>
+      </StackPanel>
+   </Grid>
+</sample:DemoView>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/ButtonSpinnerView.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/ButtonSpinnerView.xaml.cs
new file mode 100644
index 00000000..a552f35a
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/ButtonSpinnerView.xaml.cs
@@ -0,0 +1,60 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows.Controls;
+using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
+using Xceed.Wpf.Toolkit;
+
+namespace Samples.Modules.Button.Views
+{
+  /// <summary>
+  /// Interaction logic for ButtonSpinnerView.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class ButtonSpinnerView : DemoView
+  {
+    public ButtonSpinnerView()
+    {
+      InitializeComponent();
+    }
+
+    private void ButtonSpinner_Spin( object sender, SpinEventArgs e )
+    {
+      String[] names = (String[])this.Resources[ "names" ];
+
+      ButtonSpinner spinner = ( ButtonSpinner )sender;
+      TextBox txtBox = ( TextBox )spinner.Content;
+
+      int value = Array.IndexOf( names, txtBox.Text );
+      if( e.Direction == SpinDirection.Increase )
+        value++;
+      else
+        value--;
+
+      if( value < 0 )
+        value = names.Length - 1;
+      else if( value >= names.Length )
+        value = 0;
+
+      txtBox.Text = names[ value ];
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/DropDownButtonView.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/DropDownButtonView.xaml
new file mode 100644
index 00000000..ef033ca7
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/DropDownButtonView.xaml
@@ -0,0 +1,66 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<sample:DemoView x:Class="Samples.Modules.Button.Views.DropDownButtonView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 Title="DropDownButton"
+                 Description="The DropDownButton control is a button that when clicked displays a drop down in which you can place any custom content within.">
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+      <GroupBox Header="Features" Grid.Row="0" Margin="5">
+         <Grid Margin="5">
+            <Grid.RowDefinitions>
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="Auto" />
+               <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+
+            <TextBlock Text="IsOpen: " VerticalAlignment="Center" />
+            <CheckBox x:Name="_isOpen" Grid.Column="1" IsChecked="False" VerticalAlignment="Center" Margin="5" ClickMode="Press" ToolTip="Get/Sets a value indicating whether or not the drop down is open." />
+         </Grid>
+      </GroupBox>
+
+      <StackPanel Grid.Row="1" Margin="10">
+         <TextBlock Text="Usage:" Style="{StaticResource Header}" />
+         <xctk:DropDownButton x:Name="_dropDownButton"
+                              Margin="10"
+                              Width="150"
+                              HorizontalAlignment="Left"
+                              Content="Click Me"
+                              IsOpen="{Binding IsChecked, ElementName=_isOpen, Mode=TwoWay}"
+                              Click="DropDownButton_Click">
+            <xctk:DropDownButton.DropDownContent>
+               <StackPanel>
+                  <xctk:ColorCanvas />
+                  <Button Click="Button_Click" Margin="10">OK</Button>
+               </StackPanel>
+            </xctk:DropDownButton.DropDownContent>
+         </xctk:DropDownButton>
+      </StackPanel>
+   </Grid>
+</sample:DemoView>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/DropDownButtonView.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/DropDownButtonView.xaml.cs
new file mode 100644
index 00000000..1a06cdd9
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/DropDownButtonView.xaml.cs
@@ -0,0 +1,46 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
+
+namespace Samples.Modules.Button.Views
+{
+  /// <summary>
+  /// Interaction logic for DropDownButtonView.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class DropDownButtonView : DemoView
+  {
+    public DropDownButtonView()
+    {
+      InitializeComponent();
+    }
+
+    private void DropDownButton_Click( object sender, System.Windows.RoutedEventArgs e )
+    {
+
+    }
+
+    private void Button_Click( object sender, System.Windows.RoutedEventArgs e )
+    {
+      _dropDownButton.IsOpen = false;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/SplitButtonView.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/SplitButtonView.xaml
new file mode 100644
index 00000000..a7812871
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/SplitButtonView.xaml
@@ -0,0 +1,66 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<sample:DemoView x:Class="Samples.Modules.Button.Views.SplitButtonView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 Title="SplitButton"
+                 Description="The SplitButton control is a button that can be clicked and also provides a drop down in which you can place any custom content within.">
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+      <GroupBox Header="Features" Grid.Row="0" Margin="5">
+         <Grid Margin="5">
+            <Grid.RowDefinitions>
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="Auto" />
+               <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+
+            <TextBlock Text="IsOpen: " VerticalAlignment="Center" />
+            <CheckBox x:Name="_isOpen" Grid.Column="1" IsChecked="False" VerticalAlignment="Center" Margin="5" ClickMode="Press" ToolTip="Get/Sets a value indicating whether or not the drop down is open." />
+         </Grid>
+      </GroupBox>
+
+      <StackPanel Grid.Row="1" Margin="10">
+         <TextBlock Text="Usage:" Style="{StaticResource Header}" />
+         <xctk:SplitButton x:Name="_splitButton"
+                           Margin="10"
+                           Width="150"
+                           HorizontalAlignment="Left"
+                           Content="Click Me"
+                           IsOpen="{Binding IsChecked, ElementName=_isOpen, Mode=TwoWay}"
+                           Click="SplitButton_Click">
+            <xctk:SplitButton.DropDownContent>
+               <StackPanel>
+                  <xctk:ColorCanvas />
+                  <Button Click="Button_Click" Margin="10">OK</Button>
+               </StackPanel>
+            </xctk:SplitButton.DropDownContent>
+         </xctk:SplitButton>
+      </StackPanel>
+   </Grid>
+</sample:DemoView>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/SplitButtonView.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/SplitButtonView.xaml.cs
new file mode 100644
index 00000000..21a44cd0
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/SplitButtonView.xaml.cs
@@ -0,0 +1,46 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
+
+namespace Samples.Modules.Button.Views
+{
+  /// <summary>
+  /// Interaction logic for SplitButtonView.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class SplitButtonView : DemoView
+  {
+    public SplitButtonView()
+    {
+      InitializeComponent();
+    }
+
+    private void SplitButton_Click( object sender, System.Windows.RoutedEventArgs e )
+    {
+      Xceed.Wpf.Toolkit.MessageBox.Show( "Thanks for clicking me!", "SplitButton Click" );
+    }
+
+    private void Button_Click( object sender, System.Windows.RoutedEventArgs e )
+    {
+      _splitButton.IsOpen = false;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/CalculatorModule.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/CalculatorModule.cs
new file mode 100644
index 00000000..e241e065
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/CalculatorModule.cs
@@ -0,0 +1,48 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using Microsoft.Practices.Prism.Regions;
+using Microsoft.Practices.Unity;
+using Samples.Infrastructure;
+using Samples.Infrastructure.Extensions;
+using Samples.Modules.Calculator.NavigationItems;
+using Samples.Modules.Calculator.Views;
+
+namespace Samples.Modules.Calculator
+{
+  public class CalculatorModule : ModuleBase
+  {
+    public CalculatorModule( IUnityContainer container, IRegionManager regionManager )
+      : base( container, regionManager )
+    {
+    }
+
+    protected override void InitializeModule()
+    {
+      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( CalculatorNavItem ) );
+      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( CalculatorUpDownNavItem ) );
+    }
+
+    protected override void RegisterViewsAndTypes()
+    {
+      Container.RegisterNavigationType( typeof( CalculatorView ) );
+      Container.RegisterNavigationType( typeof( CalculatorUpDownView ) );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/NavigationItems/CalculatorNavItem.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/NavigationItems/CalculatorNavItem.xaml
new file mode 100644
index 00000000..34c25893
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/NavigationItems/CalculatorNavItem.xaml
@@ -0,0 +1,30 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<TreeViewItem x:Class="Samples.Modules.Calculator.NavigationItems.CalculatorNavItem"
+              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+              xmlns:navItems="clr-namespace:Samples.Modules.Calculator.NavigationItems"
+              xmlns:views="clr-namespace:Samples.Modules.Calculator.Views" 
+              Header="Calculator" Tag="{x:Type views:CalculatorView}">
+
+   <TreeViewItem.Resources>
+      <Style TargetType="navItems:CalculatorNavItem" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
+   </TreeViewItem.Resources>
+
+</TreeViewItem>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/NavigationItems/CalculatorNavItem.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/NavigationItems/CalculatorNavItem.xaml.cs
new file mode 100644
index 00000000..7a9483e2
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/NavigationItems/CalculatorNavItem.xaml.cs
@@ -0,0 +1,34 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows.Controls;
+
+namespace Samples.Modules.Calculator.NavigationItems
+{
+  /// <summary>
+  /// Interaction logic for CalculatorNavItem.xaml
+  /// </summary>
+  public partial class CalculatorNavItem : TreeViewItem
+  {
+    public CalculatorNavItem()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/NavigationItems/CalculatorUpDownNavItem.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/NavigationItems/CalculatorUpDownNavItem.xaml
new file mode 100644
index 00000000..9cd7b8e7
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/NavigationItems/CalculatorUpDownNavItem.xaml
@@ -0,0 +1,30 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<TreeViewItem x:Class="Samples.Modules.Calculator.NavigationItems.CalculatorUpDownNavItem"
+              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+              xmlns:navItems="clr-namespace:Samples.Modules.Calculator.NavigationItems"
+              xmlns:views="clr-namespace:Samples.Modules.Calculator.Views" 
+              Header="CalculatorUpDown" Tag="{x:Type views:CalculatorUpDownView}">
+
+   <TreeViewItem.Resources>
+      <Style TargetType="navItems:CalculatorUpDownNavItem" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
+   </TreeViewItem.Resources>
+
+</TreeViewItem>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/NavigationItems/CalculatorUpDownNavItem.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/NavigationItems/CalculatorUpDownNavItem.xaml.cs
new file mode 100644
index 00000000..e31c2ece
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/NavigationItems/CalculatorUpDownNavItem.xaml.cs
@@ -0,0 +1,34 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows.Controls;
+
+namespace Samples.Modules.Calculator.NavigationItems
+{
+  /// <summary>
+  /// Interaction logic for CalculatorUpDownNavItem.xaml
+  /// </summary>
+  public partial class CalculatorUpDownNavItem : TreeViewItem
+  {
+    public CalculatorUpDownNavItem()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/Properties/AssemblyInfo.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..c5e9f3f6
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/Properties/AssemblyInfo.cs
@@ -0,0 +1,72 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle( "Extended WPF Toolkit Calculator Sample" )]
+[assembly: AssemblyDescription( "" )]
+[assembly: AssemblyConfiguration( "" )]
+[assembly: AssemblyCompany( "Xceed Software Inc." )]
+[assembly: AssemblyProduct( "Extended WPF Toolkit Calculator Sample" )]
+[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
+[assembly: AssemblyTrademark( "" )]
+[assembly: AssemblyCulture( "" )]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible( false )]
+
+//In order to begin building localizable applications, set 
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+  //(used if a resource is not found in the page, 
+  // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+  //(used if a resource is not found in the page, 
+  // app, or any theme specific resource dictionaries)
+)]
+
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion( "1.0.0.0" )]
+[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/Samples.Modules.Calculator.csproj b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/Samples.Modules.Calculator.csproj
new file mode 100644
index 00000000..afe7e919
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/Samples.Modules.Calculator.csproj
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{EF6701CF-21C3-45B5-9C90-40BE6130BB7D}</ProjectGuid>
+    <OutputType>library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Samples.Modules.Calculator</RootNamespace>
+    <AssemblyName>Samples.Modules.Calculator</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.Practices.Prism, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Practices.Unity, Version=2.0.414.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
+    </Reference>
+    <ProjectReference Include="..\..\..\WPFToolkit.Extended\WPFToolkit.Extended.csproj">
+      <Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
+      <Name>WPFToolkit.Extended</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Samples.Infrastructure\Samples.Infrastructure.csproj">
+      <Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
+      <Name>Samples.Infrastructure</Name>
+    </ProjectReference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="CalculatorModule.cs" />
+    <Compile Include="NavigationItems\CalculatorNavItem.xaml.cs">
+      <DependentUpon>CalculatorNavItem.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="NavigationItems\CalculatorUpDownNavItem.xaml.cs">
+      <DependentUpon>CalculatorUpDownNavItem.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Views\CalculatorUpDownView.xaml.cs">
+      <DependentUpon>CalculatorUpDownView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\CalculatorView.xaml.cs">
+      <DependentUpon>CalculatorView.xaml</DependentUpon>
+    </Compile>
+    <AppDesigner Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="NavigationItems\CalculatorNavItem.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="NavigationItems\CalculatorUpDownNavItem.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\CalculatorUpDownView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\CalculatorView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y
+xcopy "$(ProjectDir)Views" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\Samples\$(ProjectName)\" /s /Y /I</PostBuildEvent>
+  </PropertyGroup>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/Views/CalculatorUpDownView.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/Views/CalculatorUpDownView.xaml
new file mode 100644
index 00000000..bf17aecd
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/Views/CalculatorUpDownView.xaml
@@ -0,0 +1,77 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<sample:DemoView x:Class="Samples.Modules.Calculator.Views.CalculatorUpDownView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 Title="CalculatorUpDown"
+                 Description="The CalculatorUpDown provides a TextBox with button spinners that allow incrementing and decrementing numeric values by using the spinner buttons, keyboard up/down arrows, or mouse wheel. It also provides a Calculator dropdown which allows you to perform mathematical calculations.">
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+      <GroupBox Header="Features" Grid.Row="0" Margin="5">
+         <Grid Margin="5" HorizontalAlignment="Left">
+            <Grid.RowDefinitions>
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="Auto" />
+               <ColumnDefinition Width="*" />
+               <ColumnDefinition Width="*" />
+               <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+            <TextBlock Text="Precision: " VerticalAlignment="Center" />
+            <xctk:IntegerUpDown x:Name="_precision" Grid.Column="1" Width="75" HorizontalAlignment="Left"  VerticalAlignment="Center" Margin="5" Minimum="0" Value="2" ToolTip="Gets/Sets the maximum number of digits displayed to the right of the decimal point." />
+            <TextBlock Text="FormatString:" Grid.Row="1" VerticalAlignment="Center" />
+            <ComboBox x:Name="_formatString" SelectedIndex="0" Grid.Row="1" Grid.Column="1" Width="150" Margin="5">
+               <ComboBoxItem Tag="C2">Currency</ComboBoxItem>
+               <ComboBoxItem Tag="F2">Fixed Point</ComboBoxItem>
+               <ComboBoxItem Tag="G">General</ComboBoxItem>
+               <ComboBoxItem Tag="N">Number</ComboBoxItem>
+               <ComboBoxItem Tag="P2">Percent</ComboBoxItem>
+            </ComboBox>
+            <TextBlock Text="Watermakr:" Grid.Row="2" VerticalAlignment="Center" />
+            <TextBox x:Name="_watermark" Grid.Row="2" Grid.Column="1" Width="150" Margin="5" Text="Enter Value" />
+            <TextBlock Grid.Column="2" Text="Increment" VerticalAlignment="Center" />
+            <TextBlock Grid.Column="2" Grid.Row="1" Text="Minimum" VerticalAlignment="Center" />
+            <TextBlock Grid.Column="2" Grid.Row="2" Text="Maximum" VerticalAlignment="Center" />
+            <xctk:IntegerUpDown Grid.Column="3" Name="_increment" Minimum="0" Value="1" VerticalAlignment="Center" Margin="5" Width="150" />
+            <xctk:IntegerUpDown Grid.Column="3" Grid.Row="1" Name="_minimum" Value="-100" VerticalAlignment="Center" Margin="5" Width="150" />
+            <xctk:IntegerUpDown Grid.Column="3" Grid.Row="2" Name="_maximum" Value="5000" VerticalAlignment="Center" Margin="5" Width="150" />
+         </Grid>
+      </GroupBox>
+
+      <StackPanel Grid.Row="1" Margin="10" HorizontalAlignment="Left">
+         <TextBlock Text="Usage:" Style="{StaticResource Header}" />
+         <xctk:CalculatorUpDown Margin="10" Width="250" 
+                                Increment="{Binding Value, ElementName=_increment}"
+                                Maximum="{Binding Value, ElementName=_maximum}"
+                                Minimum="{Binding Value, ElementName=_minimum}"
+                                Precision="{Binding Value, ElementName=_precision}" 
+                                FormatString="{Binding SelectedItem.Tag, ElementName=_formatString}" 
+                                Watermark="{Binding Text, ElementName=_watermark}" />
+      </StackPanel>
+   </Grid>
+</sample:DemoView>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/Views/CalculatorUpDownView.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/Views/CalculatorUpDownView.xaml.cs
new file mode 100644
index 00000000..cb2028a8
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/Views/CalculatorUpDownView.xaml.cs
@@ -0,0 +1,36 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
+
+namespace Samples.Modules.Calculator.Views
+{
+  /// <summary>
+  /// Interaction logic for CalculatorUpDownView.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class CalculatorUpDownView : DemoView
+  {
+    public CalculatorUpDownView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/Views/CalculatorView.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/Views/CalculatorView.xaml
new file mode 100644
index 00000000..04c7104c
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/Views/CalculatorView.xaml
@@ -0,0 +1,55 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<sample:DemoView x:Class="Samples.Modules.Calculator.Views.CalculatorView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 Title="Calculator"
+                 Description="The Calculator is a control used for performing mathematical calculations.">
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+
+      <GroupBox Header="Features" Grid.Row="0" Margin="5">
+         <Grid Margin="5">
+            <Grid.RowDefinitions>
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="Auto" />
+               <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+
+            <TextBlock Text="Precision: " VerticalAlignment="Center" />
+            <xctk:IntegerUpDown x:Name="_precision" Grid.Column="1" Width="75" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" Minimum="0" Value="2" ToolTip="Gets/Sets the maximum number of digits displayed to the right of the decimal point." />
+         </Grid>
+      </GroupBox>
+
+      <StackPanel Grid.Row="1" Margin="10">
+         <TextBlock Text="Usage:" Style="{StaticResource Header}" />
+         <TextBlock Text="When the Calculator has focus, you can use the keyboard to interact with the key pad. Click the Calculator to give focus." Margin="10,0" />
+         <xctk:Calculator Margin="10" Width="250" Precision="{Binding Value, ElementName=_precision}" />
+      </StackPanel>
+   </Grid>
+</sample:DemoView>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/Views/CalculatorView.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/Views/CalculatorView.xaml.cs
new file mode 100644
index 00000000..15184e05
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/Views/CalculatorView.xaml.cs
@@ -0,0 +1,36 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
+
+namespace Samples.Modules.Calculator.Views
+{
+  /// <summary>
+  /// Interaction logic for CalculatorView.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class CalculatorView : DemoView
+  {
+    public CalculatorView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.CheckLists/CheckListsModule.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.CheckLists/CheckListsModule.cs
new file mode 100644
index 00000000..b61760cc
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.CheckLists/CheckListsModule.cs
@@ -0,0 +1,45 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using Microsoft.Practices.Prism.Regions;
+using Microsoft.Practices.Unity;
+using Samples.Infrastructure;
+using Samples.Infrastructure.Extensions;
+using Samples.Modules.CheckLists.Views;
+
+namespace Samples.Modules.CheckLists
+{
+  public class CheckListsModule : ModuleBase
+  {
+    public CheckListsModule( IUnityContainer container, IRegionManager regionManager )
+      : base( container, regionManager )
+    {
+    }
+
+    protected override void InitializeModule()
+    {
+      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( NavigationView ) );
+    }
+
+    protected override void RegisterViewsAndTypes()
+    {
+      Container.RegisterNavigationType( typeof( HomeView ) );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.CheckLists/Properties/AssemblyInfo.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.CheckLists/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..094cb011
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.CheckLists/Properties/AssemblyInfo.cs
@@ -0,0 +1,72 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle( "Extended WPF Toolkit CheckLists Sample" )]
+[assembly: AssemblyDescription( "" )]
+[assembly: AssemblyConfiguration( "" )]
+[assembly: AssemblyCompany( "Xceed Software Inc." )]
+[assembly: AssemblyProduct( "Extended WPF Toolkit CheckLists Sample" )]
+[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
+[assembly: AssemblyTrademark( "" )]
+[assembly: AssemblyCulture( "" )]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible( false )]
+
+//In order to begin building localizable applications, set 
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+  //(used if a resource is not found in the page, 
+  // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+  //(used if a resource is not found in the page, 
+  // app, or any theme specific resource dictionaries)
+)]
+
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion( "1.0.0.0" )]
+[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.CheckLists/Samples.Modules.CheckLists.csproj b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.CheckLists/Samples.Modules.CheckLists.csproj
new file mode 100644
index 00000000..1c1495ad
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.CheckLists/Samples.Modules.CheckLists.csproj
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{910A7A19-DD9F-4989-A001-BD7E5BAD2FE8}</ProjectGuid>
+    <OutputType>library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Samples.Modules.CheckLists</RootNamespace>
+    <AssemblyName>Samples.Modules.CheckLists</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.Practices.Prism">
+      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Practices.Unity">
+      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
+    </Reference>
+    <ProjectReference Include="..\..\..\WPFToolkit.Extended\WPFToolkit.Extended.csproj">
+      <Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
+      <Name>WPFToolkit.Extended</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Samples.Infrastructure\Samples.Infrastructure.csproj">
+      <Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
+      <Name>Samples.Infrastructure</Name>
+    </ProjectReference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Views\HomeView.xaml.cs">
+      <DependentUpon>HomeView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\NavigationView.xaml.cs">
+      <DependentUpon>NavigationView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="CheckListsModule.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Page Include="Views\HomeView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\NavigationView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <AppDesigner Include="Properties\" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y
+xcopy "$(ProjectDir)Views" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\Samples\$(ProjectName)\" /s /Y /I</PostBuildEvent>
+  </PropertyGroup>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.CheckLists/Views/HomeView.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.CheckLists/Views/HomeView.xaml
new file mode 100644
index 00000000..8ce4243c
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.CheckLists/Views/HomeView.xaml
@@ -0,0 +1,185 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<sample:DemoView x:Class="Samples.Modules.CheckLists.Views.HomeView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 xmlns:s="clr-namespace:System;assembly=mscorlib"
+                 x:Name="demo"
+                 Title="Check Lists"
+                 Description="The CheckListBox and CheckComboBox controls represent a list of selected items that are displayed as CheckBoxes. Besides the common SelectedItem and SelectedItems properties, these controls give developers more alternatives for managing and handling selections.">
+   <sample:DemoView.Resources>
+      <x:Array x:Key="personProperties" Type="s:String">
+         <s:String>ID</s:String>
+         <s:String>FirstName</s:String>
+         <s:String>LastName</s:String>
+      </x:Array>
+   </sample:DemoView.Resources>
+
+   <Grid >
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+      <GroupBox Header="Features" Grid.Row="0" Margin="5">
+         <Grid>
+            <Grid.RowDefinitions>
+               <RowDefinition />
+               <RowDefinition />
+               <RowDefinition />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition />
+               <ColumnDefinition />
+               <ColumnDefinition />
+               <ColumnDefinition />
+            </Grid.ColumnDefinitions>
+
+            <TextBlock Grid.Row="0" Grid.Column="0" 
+                       Text="Delimiter:" 
+                       Margin="2"/>
+            <TextBox x:Name="_delimiter" 
+                     Grid.Row="0" Grid.Column="1"
+                     Margin="5"
+                     HorizontalAlignment="Stretch"
+                     Text="," />
+
+            <TextBlock Grid.Row="1" Grid.Column="0" 
+                       Text="ValueMemberPath:" 
+                       Margin="2"/>
+            <ComboBox x:Name="_valueMemberPath" 
+                     Grid.Row="1" Grid.Column="1"
+                     HorizontalAlignment="Stretch"
+                     Margin="5"
+                     ItemsSource="{StaticResource personProperties}" 
+                     SelectedIndex="0"/>
+
+            <TextBlock Grid.Row="2" Grid.Column="0" 
+                       Text="SelectedValue:" 
+                       Margin="2"/>
+            <TextBox x:Name="_selectedValue" 
+                     Grid.Row="2" Grid.Column="1"
+                     Margin="5"
+                     HorizontalAlignment="Stretch"
+                     Text="{Binding ElementName=_checkListBox, Path=SelectedValue, Mode=TwoWay}"/>
+
+            <TextBlock Grid.Row="0" Grid.Column="2" 
+                       Text="SelectedMemberPath:" 
+                       Margin="2"/>
+            <TextBox x:Name="_selectedMemberPath" 
+                     Grid.Row="0" Grid.Column="3"
+                     Margin="5"
+                     HorizontalAlignment="Stretch"
+                     IsEnabled="False"
+                     Text="IsSelected" />
+
+            <TextBlock Grid.Row="1" Grid.Column="2" 
+                       Text="DisplayMemberPath:" 
+                       Margin="2"/>
+            <ComboBox x:Name="_displayMemberPath" 
+                     Grid.Row="1" Grid.Column="3"
+                     Margin="5"
+                     HorizontalAlignment="Stretch"
+                     ItemsSource="{StaticResource personProperties}"
+                     SelectedIndex="1"/>
+            <TextBlock Grid.Row="2" Grid.Column="2" 
+                       Text="IsDropDownOpen:" 
+                       Margin="2"/>
+            <CheckBox x:Name="_isDropDownOpen" 
+                     Grid.Row="2" Grid.Column="3"
+                     Margin="5"
+                     HorizontalAlignment="Stretch"
+                     Content="(CheckListBox only)"
+                     ClickMode="Press"
+                     IsChecked="false" />
+         </Grid>
+      </GroupBox>
+
+      <GroupBox Header="Item Models" Grid.Row="1" Margin="5">
+         <ListBox DisplayMemberPath="ModelDisplay" FontFamily="Global Monospace"
+                  ItemsSource="{Binding}"/>
+      </GroupBox>
+
+      <Grid Grid.Row="2">
+         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+         </Grid.RowDefinitions>
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+         </Grid.ColumnDefinitions>
+
+
+         <TextBlock Text="CheckListBox Usage:" Margin="5" Style="{StaticResource Header}" />
+         <xctk:CheckListBox x:Name="_checkListBox"
+                            Grid.Column="0"
+                            Grid.Row="1"
+                            Margin="5"
+                            VerticalAlignment="Stretch"
+                            ItemsSource="{Binding}"
+                            Delimiter="{Binding ElementName=_delimiter, Path=Text}"
+                            ValueMemberPath="{Binding ElementName=_valueMemberPath, Path=SelectedItem}"
+                            SelectedMemberPath="{Binding ElementName=_selectedMemberPath, Path=Text}"
+                            DisplayMemberPath="{Binding ElementName=_displayMemberPath, Path=SelectedItem}" />
+
+         <TextBlock Text="CheckComboBox Usage:" Grid.Column="1" Margin="5" Style="{StaticResource Header}"/>
+         <xctk:CheckComboBox Grid.Column="1"
+                             Grid.Row="1"
+                             Margin="5"
+                             VerticalAlignment="Top"
+                             ItemsSource="{Binding}"
+                             Delimiter="{Binding ElementName=_delimiter, Path=Text}"
+                             ValueMemberPath="{Binding ElementName=_valueMemberPath, Path=SelectedItem}"
+                             SelectedMemberPath="{Binding ElementName=_selectedMemberPath, Path=Text}"
+                             DisplayMemberPath="{Binding ElementName=_displayMemberPath, Path=SelectedItem}" 
+                              IsDropDownOpen="{Binding ElementName=_isDropDownOpen, Path=IsChecked, Mode=TwoWay}"
+                             />
+         <!---->
+      </Grid>
+
+
+      <!--<StackPanel>
+         <xctk:CheckComboBox x:Name="_combo" 
+                             HorizontalAlignment="Center" 
+                             VerticalAlignment="Center" 
+                             DisplayMemberPath="Color"
+                             ValueMemberPath="Level"
+                             SelectedItems="{Binding SelectedItems}"
+                             SelectedValue="{Binding SelectedValue}" />
+
+         <xctk:CheckListBox x:Name="_listBox" Visibility="Collapsed"
+                            Height="250"
+                            DisplayMemberPath="Color"
+                            ValueMemberPath="Level" 
+                            SelectedMemberPath="IsSelected"
+                            SelectedItems="{Binding SelectedItems}"
+                            SelectedValue="{Binding SelectedValue}" />
+
+         <TextBlock Text="{Binding SelectedValue}" />
+         <ListBox ItemsSource="{Binding SelectedItems}" Height="50" Visibility="Collapsed"/>
+
+         <Button Click="Button_Click">Set</Button>
+
+      </StackPanel>-->
+   </Grid>
+</sample:DemoView>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.CheckLists/Views/HomeView.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.CheckLists/Views/HomeView.xaml.cs
new file mode 100644
index 00000000..f25cd72e
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.CheckLists/Views/HomeView.xaml.cs
@@ -0,0 +1,135 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
+
+namespace Samples.Modules.CheckLists.Views
+{
+  /// <summary>
+  /// Interaction logic for HomeView.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class HomeView : DemoView
+  {
+    public HomeView()
+    {
+      InitializeComponent();
+      this.DataContext = new List<Person>()
+      {
+        new Person(){ID=101, FirstName="John", LastName="Smith"},
+        new Person(){ID=102, FirstName="Janel", LastName="Leverling"},
+        new Person(){ID=103, FirstName="Laura", LastName="Callahan"},
+        new Person(){ID=104, FirstName="Robert", LastName="King"},
+        new Person(){ID=105, FirstName="Margaret", LastName="Peacock"},
+        new Person(){ID=106, FirstName="Andrew", LastName="Fuller"},
+        new Person(){ID=107, FirstName="Anne", LastName="Dodsworth"},
+        new Person(){ID=108, FirstName="Nancy", LastName="Davolio"},
+        new Person(){ID=109, FirstName="Naomi", LastName="Suyama"},
+      };
+    }
+
+  }
+
+  public class Person : INotifyPropertyChanged
+  {
+    private bool _isSelected;
+    private int _ID;
+    private string _firstName;
+    private string _lastName;
+
+    public bool IsSelected
+    {
+      get
+      {
+        return _isSelected;
+      }
+      set
+      {
+        _isSelected = value;
+        OnPropertyChanged( "IsSelected" );
+      }
+    }
+
+    public int ID
+    {
+      get
+      {
+        return _ID;
+      }
+      set
+      {
+        _ID = value;
+        OnPropertyChanged( "ID" );
+      }
+    }
+
+    public string FirstName
+    {
+      get
+      {
+        return _firstName;
+      }
+      set
+      {
+        _firstName = value;
+        OnPropertyChanged( "FirstName" );
+      }
+    }
+
+    public string LastName
+    {
+      get
+      {
+        return _lastName;
+      }
+      set
+      {
+        _lastName = value;
+        OnPropertyChanged( "LastName" );
+      }
+    }
+
+    public string ModelDisplay
+    {
+      get
+      {
+        string completeName = string.Format("{0} {1}", FirstName, LastName).PadRight(20);
+        return string.Format(
+          "ID={0}: Name= {1}, IsSelected= {2}",
+          ID,
+          completeName,
+          IsSelected );
+      }
+    }
+
+    public event PropertyChangedEventHandler PropertyChanged;
+    protected void OnPropertyChanged( string propertyName )
+    {
+      if( PropertyChanged != null )
+      {
+        PropertyChanged( this, new PropertyChangedEventArgs( propertyName ) );
+        PropertyChanged( this, new PropertyChangedEventArgs( "ModelDisplay" ) );
+      }
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.CheckLists/Views/NavigationView.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.CheckLists/Views/NavigationView.xaml
new file mode 100644
index 00000000..fa613eb8
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.CheckLists/Views/NavigationView.xaml
@@ -0,0 +1,29 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<TreeViewItem x:Class="Samples.Modules.CheckLists.Views.NavigationView"
+              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+              xmlns:views="clr-namespace:Samples.Modules.CheckLists.Views"
+              Header="Check lists" Tag="{x:Type views:HomeView}">
+
+   <TreeViewItem.Resources>
+      <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
+   </TreeViewItem.Resources>
+
+</TreeViewItem>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.CheckLists/Views/NavigationView.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.CheckLists/Views/NavigationView.xaml.cs
new file mode 100644
index 00000000..6402721c
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.CheckLists/Views/NavigationView.xaml.cs
@@ -0,0 +1,34 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows.Controls;
+
+namespace Samples.Modules.CheckLists.Views
+{
+  /// <summary>
+  /// Interaction logic for NavigationView.xaml
+  /// </summary>
+  public partial class NavigationView : TreeViewItem
+  {
+    public NavigationView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/ChildWindowModule.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/ChildWindowModule.cs
new file mode 100644
index 00000000..5b998131
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/ChildWindowModule.cs
@@ -0,0 +1,45 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using Microsoft.Practices.Prism.Regions;
+using Microsoft.Practices.Unity;
+using Samples.Infrastructure;
+using Samples.Infrastructure.Extensions;
+using Samples.Modules.ChildWindow.Views;
+
+namespace Samples.Modules.ChildWindow
+{
+  public class ChildWindowModule : ModuleBase
+  {
+    public ChildWindowModule( IUnityContainer container, IRegionManager regionManager )
+      : base( container, regionManager )
+    {
+    }
+
+    protected override void InitializeModule()
+    {
+      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( NavigationView ) );
+    }
+
+    protected override void RegisterViewsAndTypes()
+    {
+      Container.RegisterNavigationType( typeof( HomeView ) );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Properties/AssemblyInfo.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..7ddc404a
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Properties/AssemblyInfo.cs
@@ -0,0 +1,72 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle( "Extended WPF Toolkit ChildWindow Sample" )]
+[assembly: AssemblyDescription( "" )]
+[assembly: AssemblyConfiguration( "" )]
+[assembly: AssemblyCompany( "Xceed Software Inc." )]
+[assembly: AssemblyProduct( "Extended WPF Toolkit ChildWindow Sample" )]
+[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
+[assembly: AssemblyTrademark( "" )]
+[assembly: AssemblyCulture( "" )]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible( false )]
+
+//In order to begin building localizable applications, set 
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+  //(used if a resource is not found in the page, 
+  // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+  //(used if a resource is not found in the page, 
+  // app, or any theme specific resource dictionaries)
+)]
+
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion( "1.0.0.0" )]
+[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Samples.Modules.ChildWindow.csproj b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Samples.Modules.ChildWindow.csproj
new file mode 100644
index 00000000..38ddac54
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Samples.Modules.ChildWindow.csproj
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{44733C25-7F22-4B91-83C7-4E654063DFD6}</ProjectGuid>
+    <OutputType>library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Samples.Modules.ChildWindow</RootNamespace>
+    <AssemblyName>Samples.Modules.ChildWindow</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.Practices.Prism, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Practices.Unity, Version=2.0.414.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
+    </Reference>
+    <ProjectReference Include="..\..\..\WPFToolkit.Extended\WPFToolkit.Extended.csproj">
+      <Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
+      <Name>WPFToolkit.Extended</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Samples.Infrastructure\Samples.Infrastructure.csproj">
+      <Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
+      <Name>Samples.Infrastructure</Name>
+    </ProjectReference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ChildWindowModule.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Views\HomeView.xaml.cs">
+      <DependentUpon>HomeView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\NavigationView.xaml.cs">
+      <DependentUpon>NavigationView.xaml</DependentUpon>
+    </Compile>
+    <AppDesigner Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="Views\HomeView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\NavigationView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y
+xcopy "$(ProjectDir)Views" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\Samples\$(ProjectName)\" /s /Y /I</PostBuildEvent>
+  </PropertyGroup>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/HomeView.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/HomeView.xaml
new file mode 100644
index 00000000..aabbdf21
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/HomeView.xaml
@@ -0,0 +1,130 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<sample:DemoView x:Class="Samples.Modules.ChildWindow.Views.HomeView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                 Title="ChildWindow"
+                 Description="The ChildWindow can be used to create a window that is displayed within the bounds of a specific parent container.">
+
+   <sample:DemoView.Resources>
+      <ObjectDataProvider x:Key="WindowStates" MethodName="GetValues"
+                          ObjectType="{x:Type sys:Enum}">
+         <ObjectDataProvider.MethodParameters>
+            <x:Type TypeName="xctk:WindowState" />
+         </ObjectDataProvider.MethodParameters>
+      </ObjectDataProvider>
+      <ObjectDataProvider x:Key="WindowStartupLocations" MethodName="GetValues"
+                          ObjectType="{x:Type sys:Enum}">
+         <ObjectDataProvider.MethodParameters>
+            <x:Type TypeName="xctk:WindowStartupLocation" />
+         </ObjectDataProvider.MethodParameters>
+      </ObjectDataProvider>
+   </sample:DemoView.Resources>
+
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+      <GroupBox Header="Features" Grid.Row="0" Margin="5">
+         <Grid Margin="5">
+            <Grid.RowDefinitions>
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="Auto" />
+               <ColumnDefinition Width="*" />
+               <ColumnDefinition Width="Auto" />
+               <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+
+            <TextBlock Text="Caption:" Margin="2" VerticalAlignment="Center" />
+            <TextBox Name="_txtCaption" Grid.Column="1" Margin="5" Text="ChildWindow" VerticalAlignment="Center" />
+
+            <TextBlock Grid.Row="1" Name="textBlock2" Text="Left:" Margin="2" VerticalAlignment="Center" />
+            <xctk:DoubleUpDown x:Name="_txtLeft" Grid.Column="1" Grid.Row="1" Value="0" VerticalAlignment="Center" Margin="5" />
+
+            <TextBlock Grid.Row="2" Name="textBlock3" Text="Top:" Margin="2" VerticalAlignment="Center" />
+            <xctk:DoubleUpDown x:Name="_txtTop" Grid.Column="1" Grid.Row="2" Value="0" VerticalAlignment="Center" Margin="5" />
+
+
+            <TextBlock Text="IsModal:" VerticalAlignment="Center" Margin="2" Grid.Column="2" />
+            <CheckBox x:Name="_chkIsModal" Grid.Column="3" VerticalAlignment="Center" Margin="5" IsChecked="True" />
+
+            <TextBlock Grid.Row="1" Text="WindowState:" VerticalAlignment="Center" Margin="2" Grid.Column="2" />
+            <ComboBox Grid.Column="3" Grid.Row="1" Name="_cboWindowState" ItemsSource="{Binding Source={StaticResource WindowStates}}" SelectedIndex="1" VerticalAlignment="Center" Margin="5" />
+
+            <TextBlock Grid.Row="2" Text="WindowStartupLocation:" VerticalAlignment="Center" Margin="2" Grid.Column="2" />
+            <ComboBox Grid.Column="3" Grid.Row="2" Name="_cboWindowStartupLocations" ItemsSource="{Binding Source={StaticResource WindowStartupLocations}}" SelectedIndex="0" VerticalAlignment="Center" Margin="5" />
+
+         </Grid>
+      </GroupBox>
+
+      <Grid Grid.Row="1" Margin="10">
+         <xctk:ChildWindow Width="350"
+                           Caption="{Binding Text, ElementName=_txtCaption}"
+                           IsModal="{Binding IsChecked, ElementName=_chkIsModal}"
+                           Left="{Binding Value, ElementName=_txtLeft, Mode=TwoWay}"
+                           Top="{Binding Value, ElementName=_txtTop, Mode=TwoWay}"
+                           WindowStartupLocation="{Binding SelectedItem, ElementName=_cboWindowStartupLocations}" 
+                           WindowState="{Binding SelectedItem, ElementName=_cboWindowState}">
+            <Grid Margin="10" >
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+               </Grid.RowDefinitions>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="*" />
+               </Grid.ColumnDefinitions>
+
+               <TextBlock Grid.Row="0" Text="First Name:" Margin="2" VerticalAlignment="Center" />
+               <xctk:WatermarkTextBox Grid.Row="0" Grid.Column="1" Margin="2" VerticalAlignment="Center" Watermark="Enter First Name" />
+
+               <TextBlock Grid.Row="1" Text="Last Name:" Margin="2" VerticalAlignment="Center" />
+               <xctk:WatermarkTextBox Grid.Row="1" Grid.Column="1" Margin="2" VerticalAlignment="Center" Watermark="Enter Last Name" />
+
+               <TextBlock Grid.Row="2" Text="Date of Birth:" Margin="2" VerticalAlignment="Center" />
+               <xctk:DateTimeUpDown Grid.Row="2" Grid.Column="1" Format="ShortDate" Margin="2" VerticalAlignment="Center" Watermark="Enter Date of Birth" />
+
+               <TextBlock Grid.Row="3" Text="Salary:" Margin="2" VerticalAlignment="Center" />
+               <xctk:IntegerUpDown Grid.Row="3" Grid.Column="1" FormatString="C2" Margin="2" VerticalAlignment="Center" Watermark="Enter Salary" />
+
+               <TextBlock Grid.Row="4" Text="Favorite Color:" Margin="2" VerticalAlignment="Center" />
+               <xctk:ColorPicker Grid.Row="4" Grid.Column="1" Margin="2" VerticalAlignment="Center" />
+
+               <StackPanel Grid.Row="5" Grid.ColumnSpan="2" Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,10,0,0">
+                  <Button Width="65" Margin="2">OK</Button>
+                  <Button Width="65" Margin="2">Cancel</Button>
+               </StackPanel>
+            </Grid>
+         </xctk:ChildWindow>
+      </Grid>
+   </Grid>
+</sample:DemoView>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/HomeView.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/HomeView.xaml.cs
new file mode 100644
index 00000000..aadc4e3e
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/HomeView.xaml.cs
@@ -0,0 +1,36 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
+
+namespace Samples.Modules.ChildWindow.Views
+{
+  /// <summary>
+  /// Interaction logic for HomeView.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class HomeView : DemoView
+  {
+    public HomeView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/NavigationView.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/NavigationView.xaml
new file mode 100644
index 00000000..c1ddcfd9
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/NavigationView.xaml
@@ -0,0 +1,29 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<TreeViewItem x:Class="Samples.Modules.ChildWindow.Views.NavigationView"
+              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+              xmlns:views="clr-namespace:Samples.Modules.ChildWindow.Views"
+              Header="ChildWindow" Tag="{x:Type views:HomeView}">
+
+   <TreeViewItem.Resources>
+      <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
+   </TreeViewItem.Resources>
+
+</TreeViewItem>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/NavigationView.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/NavigationView.xaml.cs
new file mode 100644
index 00000000..be23e1eb
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/NavigationView.xaml.cs
@@ -0,0 +1,34 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows.Controls;
+
+namespace Samples.Modules.ChildWindow.Views
+{
+  /// <summary>
+  /// Interaction logic for NavigationView.xaml
+  /// </summary>
+  public partial class NavigationView : TreeViewItem
+  {
+    public NavigationView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/ColorModule.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/ColorModule.cs
new file mode 100644
index 00000000..c8265cf6
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/ColorModule.cs
@@ -0,0 +1,45 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using Microsoft.Practices.Prism.Regions;
+using Microsoft.Practices.Unity;
+using Samples.Infrastructure;
+using Samples.Infrastructure.Extensions;
+using Samples.Modules.Color.Views;
+
+namespace Samples.Modules.Color
+{
+  public class ColorModule : ModuleBase
+  {
+    public ColorModule( IUnityContainer container, IRegionManager regionManager )
+      : base( container, regionManager )
+    {
+    }
+
+    protected override void InitializeModule()
+    {
+      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( NavigationView ) );
+    }
+
+    protected override void RegisterViewsAndTypes()
+    {
+      Container.RegisterNavigationType( typeof( HomeView ) );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Properties/AssemblyInfo.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..ab620f6f
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Properties/AssemblyInfo.cs
@@ -0,0 +1,72 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle( "Extended WPF Toolkit Color Sample" )]
+[assembly: AssemblyDescription( "" )]
+[assembly: AssemblyConfiguration( "" )]
+[assembly: AssemblyCompany( "Xceed Software Inc." )]
+[assembly: AssemblyProduct( "Extended WPF Toolkit Color Sample" )]
+[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
+[assembly: AssemblyTrademark( "" )]
+[assembly: AssemblyCulture( "" )]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible( false )]
+
+//In order to begin building localizable applications, set 
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+  //(used if a resource is not found in the page, 
+  // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+  //(used if a resource is not found in the page, 
+  // app, or any theme specific resource dictionaries)
+)]
+
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion( "1.0.0.0" )]
+[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Samples.Modules.Color.csproj b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Samples.Modules.Color.csproj
new file mode 100644
index 00000000..133f7118
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Samples.Modules.Color.csproj
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{A36AB9C9-D813-4018-B341-8729A9B5BD7D}</ProjectGuid>
+    <OutputType>library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Samples.Modules.Color</RootNamespace>
+    <AssemblyName>Samples.Modules.Color</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.Practices.Prism, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Practices.Unity, Version=2.0.414.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
+    </Reference>
+    <ProjectReference Include="..\..\..\WPFToolkit.Extended\WPFToolkit.Extended.csproj">
+      <Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
+      <Name>WPFToolkit.Extended</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Samples.Infrastructure\Samples.Infrastructure.csproj">
+      <Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
+      <Name>Samples.Infrastructure</Name>
+    </ProjectReference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ColorModule.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Views\HomeView.xaml.cs">
+      <DependentUpon>HomeView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\NavigationView.xaml.cs">
+      <DependentUpon>NavigationView.xaml</DependentUpon>
+    </Compile>
+    <AppDesigner Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="Views\HomeView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\NavigationView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y
+xcopy "$(ProjectDir)Views" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\Samples\$(ProjectName)\" /s /Y /I</PostBuildEvent>
+  </PropertyGroup>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/HomeView.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/HomeView.xaml
new file mode 100644
index 00000000..fd2e7bae
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/HomeView.xaml
@@ -0,0 +1,180 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<sample:DemoView x:Class="Samples.Modules.Color.Views.HomeView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 Title="Color Controls"
+                 Description="The ColorCanvas and ColorPicker controls allow the user to input a color. Not shown in the sample are the ColorPicker's Available, Standard and Recent color lists, which are entirely customizable.">
+   <Grid >
+      <Grid.ColumnDefinitions>
+         <ColumnDefinition Width="*"/>
+         <ColumnDefinition Width="*"/>
+      </Grid.ColumnDefinitions>
+
+      <Grid Grid.Column="0" Margin="5">
+         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+         </Grid.RowDefinitions>
+
+         <GroupBox Grid.Column="0" Grid.Row="0"
+            Header="ColorCanvas Features"
+            HorizontalAlignment="Stretch" >
+            <Grid>
+               <Grid.Resources>
+                  <Style x:Key="alignStyle" TargetType="{x:Type FrameworkElement}">
+                     <Setter Property="Margin" Value="5"/>
+                  </Style>
+
+                  <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource alignStyle}"/>
+                  <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource alignStyle}"/>
+                  <Style TargetType="{x:Type CheckBox}" BasedOn="{StaticResource alignStyle}" />                  
+                  <Style TargetType="{x:Type xctk:IntegerUpDown}" BasedOn="{StaticResource alignStyle}">
+                     <Setter Property="Width" Value="45"/>
+                     <Setter Property="Minimum" Value="0" />
+                     <Setter Property="Maximum" Value="255" />
+                  </Style>                     
+               </Grid.Resources>
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+               </Grid.RowDefinitions>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto"/>
+                  <ColumnDefinition Width="*"/>
+               </Grid.ColumnDefinitions>
+
+               <StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2"
+                           HorizontalAlignment="Stretch"
+                           Orientation="Horizontal" >
+                  <TextBlock Text="R:"/>
+                  <xctk:IntegerUpDown x:Name="_R" Value="{Binding ElementName=_colorCanvas, Path=R, Mode=TwoWay}" />
+                  <TextBlock Text="G:" Margin="5"/>
+                  <xctk:IntegerUpDown x:Name="_G" Value="{Binding ElementName=_colorCanvas, Path=G, Mode=TwoWay}"/>
+                  <TextBlock Text="B:" Margin="5"/>
+                  <xctk:IntegerUpDown x:Name="_B" Value="{Binding ElementName=_colorCanvas, Path=B, Mode=TwoWay}"/>
+                  <TextBlock Text="A:" Margin="5"/>
+                  <xctk:IntegerUpDown x:Name="_A" Value="{Binding ElementName=_colorCanvas, Path=A, Mode=TwoWay}"/>                  
+               </StackPanel>
+
+               <TextBlock Grid.Column="0" Grid.Row="1" Text="UsingAlphaChannel: " />
+               <CheckBox Grid.Column="1" Grid.Row="1" x:Name="_usingAlphaChannel" 
+                         IsChecked="{Binding ElementName=_colorCanvas, Path=UsingAlphaChannel, Mode=TwoWay}" />
+               <TextBlock Grid.Column="0" Grid.Row="2" Text="HexadecimalString: " />
+               <TextBox Grid.Column="1" Grid.Row="2"  IsEnabled="False" 
+                        Text="{Binding ElementName=_colorCanvas, Path=HexadecimalString}"/>
+            </Grid>
+         </GroupBox>
+
+         <TextBlock Text="ColorCanvas Usage: " Grid.Row="1" Margin="0,10,0,0" Style="{StaticResource Header}" />
+         <xctk:ColorCanvas x:Name="_colorCanvas" Grid.Row="2" 
+                           VerticalAlignment="Top"
+                           HorizontalAlignment="Stretch" />
+
+      </Grid>
+
+      <Grid Grid.Column="1" Margin="5">
+         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+         </Grid.RowDefinitions>
+
+         <GroupBox Grid.Column="0" Grid.Row="0"
+            Header="ColorPicker Features"
+            HorizontalAlignment="Stretch"
+            Margin="10">
+            <Grid>
+               <Grid.Resources>
+                  <Style TargetType="{x:Type TextBlock}">
+                     <Setter Property="Margin" Value="3" />
+                     <Setter Property="VerticalAlignment" Value="Center" />
+                  </Style>
+                  <Style TargetType="{x:Type TextBox}">
+                     <Setter Property="Margin" Value="3"/>
+                  </Style>
+                  <Style TargetType="{x:Type CheckBox}">
+                     <Setter Property="Margin" Value="3"/>
+                  </Style>
+               </Grid.Resources>
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+               </Grid.RowDefinitions>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto"/>
+                  <ColumnDefinition Width="*"/>
+               </Grid.ColumnDefinitions>
+
+               <TextBlock Grid.Column="0" Grid.Row="0" Text="AvailableColorsHeader:" />
+               <TextBox Grid.Column="1" Grid.Row="0" Text="{Binding ElementName=_colorPicker, Path=AvailableColorsHeader, Mode=TwoWay}" />
+               <TextBlock Grid.Column="0" Grid.Row="1" Text="RecentColorsHeader:" />
+               <TextBox Grid.Column="1" Grid.Row="1" Text="{Binding ElementName=_colorPicker, Path=RecentColorsHeader, Mode=TwoWay}" />
+               <TextBlock Grid.Column="0" Grid.Row="2" Text="StandardColorsHeader:" />
+               <TextBox Grid.Column="1" Grid.Row="2" Text="{Binding ElementName=_colorPicker, Path=StandardColorsHeader, Mode=TwoWay}" />
+
+               <CheckBox Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="2" 
+                         Content="DisplayColorAndName" 
+                         IsChecked="{Binding ElementName=_colorPicker, Path=DisplayColorAndName, Mode=TwoWay}"/>
+               <CheckBox Grid.Column="0" Grid.Row="4" Grid.ColumnSpan="2" 
+                         Content="IsOpen" 
+                         ClickMode="Press"
+                         IsChecked="{Binding ElementName=_colorPicker, Path=IsOpen, Mode=TwoWay}"/>
+               <CheckBox Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="2" 
+                         Content="ShowAdvancedButton" 
+                         IsChecked="{Binding ElementName=_colorPicker, Path=ShowAdvancedButton, Mode=TwoWay}"/>
+               <CheckBox Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="2" 
+                         Content="ShowAvailableColors" 
+                         IsChecked="{Binding ElementName=_colorPicker, Path=ShowAvailableColors, Mode=TwoWay}"/>
+               <CheckBox Grid.Column="0" Grid.Row="7" Grid.ColumnSpan="2" 
+                         Content="ShowDropDownButton" 
+                         IsChecked="{Binding ElementName=_colorPicker, Path=ShowDropDownButton, Mode=TwoWay}"/>
+               <CheckBox Grid.Column="0" Grid.Row="8" Grid.ColumnSpan="2" 
+                         Content="ShowRecentColors" 
+                         IsChecked="{Binding ElementName=_colorPicker, Path=ShowRecentColors, Mode=TwoWay}"/>
+               <CheckBox Grid.Column="0" Grid.Row="9" Grid.ColumnSpan="2" 
+                         Content="ShowStandardColors" 
+                         IsChecked="{Binding ElementName=_colorPicker, Path=ShowStandardColors, Mode=TwoWay}"/>
+               <CheckBox Grid.Column="0" Grid.Row="10" Grid.ColumnSpan="2" 
+                         Content="UsingAlphaChannel" 
+                         IsChecked="{Binding ElementName=_colorPicker, Path=UsingAlphaChannel, Mode=TwoWay}"/>
+               <TextBlock Grid.Column="0" Grid.Row="11" Text="SelectedColorText:" />
+               <TextBox Grid.Column="1" Grid.Row="11" IsEnabled="False" Text="{Binding ElementName=_colorPicker, Path=SelectedColorText}" />
+            </Grid>
+         </GroupBox>
+
+         <TextBlock Text="ColorPicker Usage: " Grid.Row="1"  Style="{StaticResource Header}" />
+         <xctk:ColorPicker x:Name="_colorPicker" Grid.Row="2" VerticalAlignment="Top"/>
+      </Grid>
+   </Grid>
+</sample:DemoView>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/HomeView.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/HomeView.xaml.cs
new file mode 100644
index 00000000..bd0cecf3
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/HomeView.xaml.cs
@@ -0,0 +1,40 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
+
+namespace Samples.Modules.Color.Views
+{
+  /// <summary>
+  /// Interaction logic for HomeView.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class HomeView : DemoView
+  {
+    public HomeView()
+    {
+      InitializeComponent();
+    }
+
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/NavigationView.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/NavigationView.xaml
new file mode 100644
index 00000000..d2428121
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/NavigationView.xaml
@@ -0,0 +1,29 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<TreeViewItem x:Class="Samples.Modules.Color.Views.NavigationView"
+              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+              xmlns:views="clr-namespace:Samples.Modules.Color.Views"
+              Header="Color" Tag="{x:Type views:HomeView}">
+
+   <TreeViewItem.Resources>
+      <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
+   </TreeViewItem.Resources>
+
+</TreeViewItem>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/NavigationView.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/NavigationView.xaml.cs
new file mode 100644
index 00000000..60ddd5a9
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/NavigationView.xaml.cs
@@ -0,0 +1,34 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows.Controls;
+
+namespace Samples.Modules.Color.Views
+{
+  /// <summary>
+  /// Interaction logic for NavigationView.xaml
+  /// </summary>
+  public partial class NavigationView : TreeViewItem
+  {
+    public NavigationView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Converters/DateTimeToTimeSpanConverter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Converters/DateTimeToTimeSpanConverter.cs
new file mode 100644
index 00000000..039ba8ce
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Converters/DateTimeToTimeSpanConverter.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Data;
+using System.Globalization;
+
+namespace Samples.Modules.DateTime.Converters
+{
+  public class DateTimeToTimeSpanConverter : IValueConverter
+  {
+    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
+    {
+      if( value is System.DateTime )
+      {
+        System.DateTime time = (System.DateTime)value;
+        return new TimeSpan( time.Hour, time.Minute, 0 );
+      }
+      return value;
+    }
+    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/DateTimeModule.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/DateTimeModule.cs
new file mode 100644
index 00000000..14119fad
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/DateTimeModule.cs
@@ -0,0 +1,45 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using Microsoft.Practices.Prism.Regions;
+using Microsoft.Practices.Unity;
+using Samples.Infrastructure;
+using Samples.Infrastructure.Extensions;
+using Samples.Modules.DateTime.Views;
+
+namespace Samples.Modules.DateTime
+{
+  public class DateTimeModule : ModuleBase
+  {
+    public DateTimeModule( IUnityContainer container, IRegionManager regionManager )
+      : base( container, regionManager )
+    {
+    }
+
+    protected override void InitializeModule()
+    {
+      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( NavigationView ) );
+    }
+
+    protected override void RegisterViewsAndTypes()
+    {
+      Container.RegisterNavigationType( typeof( HomeView ) );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Properties/AssemblyInfo.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..178cbedb
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Properties/AssemblyInfo.cs
@@ -0,0 +1,72 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle( "Extended WPF Toolkit DateTime Sample" )]
+[assembly: AssemblyDescription( "" )]
+[assembly: AssemblyConfiguration( "" )]
+[assembly: AssemblyCompany( "Xceed Software Inc." )]
+[assembly: AssemblyProduct( "Extended WPF Toolkit DateTime Sample" )]
+[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
+[assembly: AssemblyTrademark( "" )]
+[assembly: AssemblyCulture( "" )]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible( false )]
+
+//In order to begin building localizable applications, set 
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+  //(used if a resource is not found in the page, 
+  // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+  //(used if a resource is not found in the page, 
+  // app, or any theme specific resource dictionaries)
+)]
+
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion( "1.0.0.0" )]
+[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Samples.Modules.DateTime.csproj b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Samples.Modules.DateTime.csproj
new file mode 100644
index 00000000..24dd2df3
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Samples.Modules.DateTime.csproj
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{CAB850B9-1D47-4F45-A6A5-07B48599B5D7}</ProjectGuid>
+    <OutputType>library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Samples.Modules.DateTime</RootNamespace>
+    <AssemblyName>Samples.Modules.DateTime</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.Practices.Prism, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Practices.Unity, Version=2.0.414.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
+    </Reference>
+    <ProjectReference Include="..\..\..\WPFToolkit.Extended\WPFToolkit.Extended.csproj">
+      <Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
+      <Name>WPFToolkit.Extended</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Samples.Infrastructure\Samples.Infrastructure.csproj">
+      <Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
+      <Name>Samples.Infrastructure</Name>
+    </ProjectReference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Converters\DateTimeToTimeSpanConverter.cs" />
+    <Compile Include="DateTimeModule.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Views\HomeView.xaml.cs">
+      <DependentUpon>HomeView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\NavigationView.xaml.cs">
+      <DependentUpon>NavigationView.xaml</DependentUpon>
+    </Compile>
+    <AppDesigner Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="Views\HomeView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\NavigationView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y
+xcopy "$(ProjectDir)Views" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\Samples\$(ProjectName)\" /s /Y /I</PostBuildEvent>
+  </PropertyGroup>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/HomeView.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/HomeView.xaml
new file mode 100644
index 00000000..4f195aec
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/HomeView.xaml
@@ -0,0 +1,119 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+    <!--//#TODODOC for description -->
+<sample:DemoView x:Class="Samples.Modules.DateTime.Views.HomeView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                 xmlns:conv="clr-namespace:Samples.Modules.DateTime.Converters"
+                 Title="DateTime Controls"
+                 Description="DateTimePicker and TimePicker controls let you the date and time with many possibilities. The TimePicker is included in the DateTimePicker.">
+    <sample:DemoView.Resources>
+        <conv:DateTimeToTimeSpanConverter x:Key="dateTimeToTimeSpanConverter" />
+
+        <ObjectDataProvider x:Key="enumTimeFormatData" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
+            <ObjectDataProvider.MethodParameters>
+                <x:Type TypeName="xctk:TimeFormat"/>
+            </ObjectDataProvider.MethodParameters>
+        </ObjectDataProvider>
+    </sample:DemoView.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="*"/>
+        </Grid.ColumnDefinitions>
+
+        <!-- TODODOC: Common Features -->
+        <GroupBox Header="Features" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" >
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="*"/>
+                </Grid.ColumnDefinitions>
+
+                <StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2"
+                            Orientation="Horizontal" >
+                    <TextBlock Text="TimeFormat:" VerticalAlignment="Center" />
+                    <ComboBox x:Name="_timeFormat" SelectedIndex="1" Grid.Column="1" ItemsSource="{Binding Source={StaticResource enumTimeFormatData}}" Width="100" Margin="5"/>
+                    <TextBlock Text="TimeWatermark:" VerticalAlignment="Center"/>
+                    <TextBox x:Name="_timeWatermark" Grid.Row="1" Grid.Column="1" Text="Enter Text" Width="100" VerticalAlignment="Center" Margin="5"/>
+                </StackPanel>
+            </Grid>
+        </GroupBox>
+
+        <!--TODODOC: DateTimePicker -->
+        <StackPanel Grid.Row="1" Grid.Column="0" HorizontalAlignment="Left">
+            <TextBlock Text="DateTimePicker Usage: " Margin="0,10,0,0" Style="{StaticResource Header}" />
+            <xctk:DateTimePicker x:Name="_datetimePicker"
+                                 Width="300"
+                                 VerticalAlignment="Top"
+                                 IsReadOnly="False" 
+                                 BorderBrush="Black"
+                                 TimeFormat="{Binding Source={x:Reference _timeFormat}, Path=SelectedItem}"
+                                 TimeWatermark="{Binding  Source={x:Reference _timeWatermark}, Path=Text}"/>
+        </StackPanel>
+
+        <StackPanel Grid.Row="1" Grid.Column="1" HorizontalAlignment="Stretch">
+            <!-- TODODOC TimePicker Features-->
+            <GroupBox Header="TimePicker Features" Margin="0,15,0,0">
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="Auto"/>
+                    </Grid.ColumnDefinitions>
+
+                    <TextBlock Text="StartTime:" VerticalAlignment="Center" />
+                    <xctk:DateTimeUpDown x:Name="_startTime" Grid.Column="1" Format="ShortTime" Value="9:00" Width="100" Margin="5"/>
+                    <TextBlock Text="EndTime:" Grid.Row="1" VerticalAlignment="Center" />
+                    <xctk:DateTimeUpDown x:Name="_endTime" Grid.Row="1" Grid.Column="1" Format="ShortTime" Value="17:00" Width="100" Margin="5"/>
+                    <TextBlock Text="TimeInterval:" Grid.Row="2" VerticalAlignment="Center" />
+                    <xctk:DateTimeUpDown x:Name="_timeInterval" Grid.Row="2" Grid.Column="1" Format="Custom" FormatString="H:mm" Value="0:30" Width="100" Margin="5"/>
+                </Grid>
+            </GroupBox>
+
+            <!--TODODOC: TimePicker -->
+            <StackPanel>
+                <TextBlock Text="TimePicker Usage: " Style="{StaticResource Header}" />
+                <xctk:TimePicker x:Name="_timePicker"
+                                 VerticalAlignment="Top"
+                                 BorderBrush="Black"
+                                 Format="{Binding Source={x:Reference _timeFormat}, Path=SelectedItem}"
+                                 Watermark="{Binding Source={x:Reference _timeWatermark}, Path=Text}"
+                                 StartTime="{Binding Source={x:Reference _startTime}, Path=Value, Converter={StaticResource dateTimeToTimeSpanConverter}}"
+                                 EndTime="{Binding Source={x:Reference _endTime}, Path=Value, Converter={StaticResource dateTimeToTimeSpanConverter}}"
+                                 TimeInterval="{Binding Source={x:Reference _timeInterval}, Path=Value, Converter={StaticResource dateTimeToTimeSpanConverter}}"/>
+            </StackPanel>
+        </StackPanel>
+    </Grid>
+</sample:DemoView>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/HomeView.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/HomeView.xaml.cs
new file mode 100644
index 00000000..bcd2759b
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/HomeView.xaml.cs
@@ -0,0 +1,36 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
+
+namespace Samples.Modules.DateTime.Views
+{
+  /// <summary>
+  /// Interaction logic for HomeView.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class HomeView : DemoView
+  {
+    public HomeView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/NavigationView.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/NavigationView.xaml
new file mode 100644
index 00000000..2654e6dc
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/NavigationView.xaml
@@ -0,0 +1,29 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<TreeViewItem x:Class="Samples.Modules.DateTime.Views.NavigationView"
+              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+              xmlns:views="clr-namespace:Samples.Modules.DateTime.Views"
+              Header="DateTime" Tag="{x:Type views:HomeView}">
+
+   <TreeViewItem.Resources>
+      <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
+   </TreeViewItem.Resources>
+
+</TreeViewItem>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/NavigationView.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/NavigationView.xaml.cs
new file mode 100644
index 00000000..57156adf
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/NavigationView.xaml.cs
@@ -0,0 +1,34 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows.Controls;
+
+namespace Samples.Modules.DateTime.Views
+{
+  /// <summary>
+  /// Interaction logic for NavigationView.xaml
+  /// </summary>
+  public partial class NavigationView : TreeViewItem
+  {
+    public NavigationView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Converters/ColorConverter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Converters/ColorConverter.cs
new file mode 100644
index 00000000..49f2e619
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Converters/ColorConverter.cs
@@ -0,0 +1,48 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Data;
+using System.Windows.Media;
+
+namespace Samples.Modules.Magnifier.Converters
+{
+  class ColorConverter : IValueConverter
+  {
+    #region IValueConverter Members
+
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      if( (value != null) && value is Color )
+        return new SolidColorBrush( (Color)value );
+
+      return value;
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Converters/VisibilityConverter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Converters/VisibilityConverter.cs
new file mode 100644
index 00000000..a0afac5d
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Converters/VisibilityConverter.cs
@@ -0,0 +1,76 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Data;
+using System.Windows.Media;
+using Xceed.Wpf.Toolkit;
+using System.Windows;
+
+namespace Samples.Modules.Magnifier.Converters
+{
+  class VisibilityConverter : IValueConverter
+  {
+    #region IValueConverter Members
+
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      if( value is FrameType )
+      {
+        FrameType frameType = (FrameType)value;
+        int param = int.Parse((string)parameter);
+        switch( frameType )
+        {
+          case FrameType.Circle:
+            {
+              //For the radius
+              if( param == 0 )
+                return Visibility.Visible;
+              //For the rectangle
+              else if( param == 1 )
+                return Visibility.Collapsed;
+            }
+            break;
+          case FrameType.Rectangle:
+            {
+              //For the radius
+              if( param == 0 )
+                return Visibility.Collapsed;
+              //For the rectangle
+              else if( param == 1 )
+                return Visibility.Visible;
+            }
+            break;
+        }
+      }
+
+      return value;
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/MagnifierModule.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/MagnifierModule.cs
new file mode 100644
index 00000000..e44ea1ca
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/MagnifierModule.cs
@@ -0,0 +1,45 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using Microsoft.Practices.Prism.Regions;
+using Microsoft.Practices.Unity;
+using Samples.Infrastructure;
+using Samples.Infrastructure.Extensions;
+using Samples.Modules.Magnifier.Views;
+
+namespace Samples.Modules.Magnifier
+{
+  public class MagnifierModule : ModuleBase
+  {
+    public MagnifierModule( IUnityContainer container, IRegionManager regionManager )
+      : base( container, regionManager )
+    {
+    }
+
+    protected override void InitializeModule()
+    {
+      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( NavigationView ) );
+    }
+
+    protected override void RegisterViewsAndTypes()
+    {
+      Container.RegisterNavigationType( typeof( HomeView ) );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Properties/AssemblyInfo.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..aec6a383
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Properties/AssemblyInfo.cs
@@ -0,0 +1,55 @@
+using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle( "Extended WPF Toolkit Magnifier Sample" )]
+[assembly: AssemblyDescription( "" )]
+[assembly: AssemblyConfiguration( "" )]
+[assembly: AssemblyCompany( "Xceed Software Inc." )]
+[assembly: AssemblyProduct( "Extended WPF Toolkit Magnifier Sample" )]
+[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
+[assembly: AssemblyTrademark( "" )]
+[assembly: AssemblyCulture( "" )]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible( false )]
+
+//In order to begin building localizable applications, set 
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+  //(used if a resource is not found in the page, 
+  // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+  //(used if a resource is not found in the page, 
+  // app, or any theme specific resource dictionaries)
+)]
+
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion( "1.0.0.0" )]
+[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Resources/SampleText.rtf b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Resources/SampleText.rtf
new file mode 100644
index 00000000..fcd8739b
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Resources/SampleText.rtf
@@ -0,0 +1,9 @@
+{\rtf1\ansi\ansicpg1252\uc1\htmautsp\deff2{\fonttbl{\f0\fcharset0 Times New Roman;}{\f2\fcharset0 Segoe UI;}}{\colortbl\red0\green0\blue0;\red255\green255\blue255;}\loch\hich\dbch\pard\plain\ltrpar\itap0{\lang1033\fs18\f2\cf0 \cf0\ql{\fs15\f2 {\b\ltrch "Using Xceed DataGrid for WPF Professional Edition in Microsoft Visual Studio Team System 2010 helped us greatly reduce the time and resources necessary for developing all the data presentation features we needed. Working with Xceed has been a pleasure, and they update the product often and provide innovative new features such as 3D views for visualizing data. We will certainly continue to look at their technology in the future as a complement to our products."}\li0\ri0\sa0\sb0\fi0\ql\par}
+{\fs15\f2 {\ltrch }\li0\ri0\sa0\sb0\fi0\ql\par}
+{\fs15\f2 {\ltrch     - Norman Guadagno, director of product marketing for Microsoft Visual Studio Team System, October 27, 2008}\li0\ri0\sa0\sb0\fi0\ql\par}
+{\fs15\f2 {\ltrch }\li0\ri0\sa0\sb0\fi0\ql\par}
+{\fs15\f2 {\b\ltrch "IBM U2 researched existing third-party solutions and identified Xceed DataGrid for WPF as the most suitable tool. The datagrid\rquote s performance and solid foundation take true advantage of WPF and provide the extensibility required for IBM U2 customers to take their applications to the next level in presentation design and styling."}\li0\ri0\sa0\sb0\fi0\ql\par}
+{\fs15\f2 {\ltrch }\li0\ri0\sa0\sb0\fi0\ql\par}
+{\fs15\f2 {\ltrch     - Vinnie Smith, U2 Tools product manager at IBM, October 27, 2008}\li0\ri0\sa0\sb0\fi0\ql\par}
+}
+}
\ No newline at end of file
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Samples.Modules.Magnifier.csproj b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Samples.Modules.Magnifier.csproj
new file mode 100644
index 00000000..e5baed58
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Samples.Modules.Magnifier.csproj
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{C3D3FFAD-2DA3-4142-8DE8-7045E347B63A}</ProjectGuid>
+    <OutputType>library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Samples.Modules.Magnifier</RootNamespace>
+    <AssemblyName>Samples.Modules.Magnifier</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.Practices.Prism">
+      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Practices.Unity">
+      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
+    </Reference>
+    <ProjectReference Include="..\..\..\WPFToolkit.Extended\WPFToolkit.Extended.csproj">
+      <Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
+      <Name>WPFToolkit.Extended</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Samples.Infrastructure\Samples.Infrastructure.csproj">
+      <Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
+      <Name>Samples.Infrastructure</Name>
+    </ProjectReference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Converters\ColorConverter.cs" />
+    <Compile Include="Converters\VisibilityConverter.cs" />
+    <Compile Include="MagnifierModule.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Views\HomeView.xaml.cs">
+      <DependentUpon>HomeView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\NavigationView.xaml.cs">
+      <DependentUpon>NavigationView.xaml</DependentUpon>
+    </Compile>
+    <AppDesigner Include="Properties\" />
+    <Resource Include="Resources\SampleText.rtf" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="Views\HomeView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\NavigationView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y
+xcopy "$(ProjectDir)Views" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\Samples\$(ProjectName)\" /s /Y /I</PostBuildEvent>
+  </PropertyGroup>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Views/HomeView.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Views/HomeView.xaml
new file mode 100644
index 00000000..7873425c
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Views/HomeView.xaml
@@ -0,0 +1,99 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+    <!--//#TODODOC for description -->
+<sample:DemoView x:Class="Samples.Modules.Magnifier.Views.HomeView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                 xmlns:conv="clr-namespace:Samples.Modules.Magnifier.Converters"
+                 Title="Magnifier"
+                 Description="The Magnifier control allows the user to magnify parts of an application.">
+    <sample:DemoView.Resources>
+        <conv:ColorConverter x:Key="colorConverter" />
+        <conv:VisibilityConverter x:Key="visibilityConverter" />
+        <xctk:RtfFormatter x:Key="rtfFormatter" />
+
+        <ObjectDataProvider x:Key="enumData" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
+            <ObjectDataProvider.MethodParameters>
+                <x:Type TypeName="xctk:FrameType"/>
+            </ObjectDataProvider.MethodParameters>
+        </ObjectDataProvider>
+    </sample:DemoView.Resources>
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+
+        <GroupBox Header="Features" Grid.Row="0" Margin="5">
+            <Grid Margin="5" HorizontalAlignment="Left">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+                <TextBlock Text="Zoom Factor:" VerticalAlignment="Center" Margin="5" />
+                <xctk:DoubleUpDown x:Name="_zoomFactor" Grid.Column="1" Value="0.4" Minimum="0" Increment="0.1" Width="150" Margin="5" />
+                <TextBlock Text="Border Thickness:" Grid.Row="1" VerticalAlignment="Center" Margin="5" />
+                <xctk:IntegerUpDown x:Name="_borderThickness" Grid.Row="1" Grid.Column="1" Value="2" Minimum="0" Maximum="20" Width="150" Margin="5" />
+                <TextBlock Text="Border Brush:" Grid.Row="2" VerticalAlignment="Center" Margin="5"/>
+                <xctk:ColorPicker x:Name="_colorPicker" Grid.Row="2" Grid.Column="1" Width="150" Margin="5" SelectedColor="Green"/>
+                <TextBlock Grid.Column="2" Text="Frame Type:" VerticalAlignment="Center" />
+                <ComboBox x:Name="_frameType" SelectedIndex="0" ItemsSource="{Binding Source={StaticResource enumData}}" Grid.Column="3" Width="150" Margin="5" />
+                <TextBlock Text="Radius:" Grid.Row="1" Grid.Column="2" Visibility="{Binding ElementName=_frameType, Path=SelectedItem, Converter={StaticResource visibilityConverter}, ConverterParameter=0}" VerticalAlignment="Center" />
+                <xctk:DoubleUpDown x:Name="_radius" Visibility="{Binding ElementName=_frameType, Path=SelectedItem, Converter={StaticResource visibilityConverter}, ConverterParameter=0}" Grid.Row="1" Grid.Column="3" Value="80"  Minimum="0" Maximum="150" Width="150" Margin="5"  />
+                <TextBlock Text="RectangleWidth:" Grid.Row="1" Grid.Column="2" Visibility="{Binding ElementName=_frameType, Path=SelectedItem, Converter={StaticResource visibilityConverter}, ConverterParameter=1}" VerticalAlignment="Center" />
+                <xctk:DoubleUpDown x:Name="_width" Grid.Row="1" Grid.Column="3" Value="160"  Minimum="0" Maximum="300" Visibility="{Binding ElementName=_frameType, Path=SelectedItem, Converter={StaticResource visibilityConverter}, ConverterParameter=1}" Width="150" Margin="5"  />
+                <TextBlock Text="RectangleHeight:" Grid.Row="2" Grid.Column="2" Visibility="{Binding ElementName=_frameType, Path=SelectedItem, Converter={StaticResource visibilityConverter}, ConverterParameter=1}" VerticalAlignment="Center" />
+                <xctk:DoubleUpDown  x:Name="_height" Grid.Row="2" Grid.Column="3" Value="160"  Minimum="0" Maximum="300" Visibility="{Binding ElementName=_frameType, Path=SelectedItem, Converter={StaticResource visibilityConverter}, ConverterParameter=1}" Width="150" Margin="5"  />
+            </Grid>
+        </GroupBox>
+
+        <StackPanel Grid.Row="1" Margin="10" HorizontalAlignment="Left" >
+            <TextBlock Text="Usage:" Style="{StaticResource Header}"/>
+            <Grid>
+            <xctk:RichTextBox x:Name="_txtContent"
+                              IsReadOnly="True" 
+                              TextFormatter="{StaticResource rtfFormatter}" 
+                              FontSize="10" >
+                    <xctk:MagnifierManager.Magnifier>
+                        <xctk:Magnifier x:Name="_magnifier"
+                                        Background="White"
+                                        Radius="{Binding Source={x:Reference _radius}, Path=Value}"
+                                        ZoomFactor="{Binding Source={x:Reference _zoomFactor}, Path=Value}"
+                                        FrameType="{Binding Source={x:Reference _frameType}, Path=SelectedItem}"
+                                        BorderBrush="{Binding Source={x:Reference _colorPicker}, Path=SelectedColor, Converter={StaticResource colorConverter}}"
+                                        BorderThickness="{Binding Source={x:Reference _borderThickness}, Path=Value}"
+                                        Width="{Binding Source={x:Reference _width}, Path=Value, Mode=TwoWay}"
+                                        Height="{Binding Source={x:Reference _height}, Path=Value, Mode=TwoWay}" />
+                    </xctk:MagnifierManager.Magnifier>
+            </xctk:RichTextBox>
+            </Grid>
+        </StackPanel>
+    </Grid>
+</sample:DemoView>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Views/HomeView.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Views/HomeView.xaml.cs
new file mode 100644
index 00000000..2b196426
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Views/HomeView.xaml.cs
@@ -0,0 +1,49 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.IO;
+using System.Windows;
+using System.Windows.Resources;
+using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
+
+namespace Samples.Modules.Magnifier.Views
+{
+  /// <summary>
+  /// Interaction logic for HomeView.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class HomeView : DemoView
+  {
+    public HomeView()
+    {
+      InitializeComponent();
+
+      // Load and display the RTF file.
+      Uri uri = new Uri( "pack://application:,,,/Samples.Modules.Magnifier;component/Resources/SampleText.rtf" );
+      StreamResourceInfo info = Application.GetResourceStream( uri );
+      using( StreamReader txtReader = new StreamReader( info.Stream ) )
+      {
+        _txtContent.Text = txtReader.ReadToEnd();
+      }
+    }
+
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Views/NavigationView.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Views/NavigationView.xaml
new file mode 100644
index 00000000..cdb905c7
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Views/NavigationView.xaml
@@ -0,0 +1,28 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<TreeViewItem x:Class="Samples.Modules.Magnifier.Views.NavigationView"
+              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+              xmlns:views="clr-namespace:Samples.Modules.Magnifier.Views"
+              Header="Magnifier" Tag="{x:Type views:HomeView}">
+
+    <TreeViewItem.Resources>
+        <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
+    </TreeViewItem.Resources>
+</TreeViewItem>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Views/NavigationView.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Views/NavigationView.xaml.cs
new file mode 100644
index 00000000..636d9f6c
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Views/NavigationView.xaml.cs
@@ -0,0 +1,34 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows.Controls;
+
+namespace Samples.Modules.Magnifier.Views
+{
+  /// <summary>
+  /// Interaction logic for NavigationView.xaml
+  /// </summary>
+  public partial class NavigationView : TreeViewItem
+  {
+    public NavigationView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.MessageBox/MessageBoxModule.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.MessageBox/MessageBoxModule.cs
new file mode 100644
index 00000000..343a520d
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.MessageBox/MessageBoxModule.cs
@@ -0,0 +1,45 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using Microsoft.Practices.Prism.Regions;
+using Microsoft.Practices.Unity;
+using Samples.Infrastructure;
+using Samples.Infrastructure.Extensions;
+using Samples.Modules.MessageBox.Views;
+
+namespace Samples.Modules.MessageBox
+{
+  public class MessageBoxModule : ModuleBase
+  {
+    public MessageBoxModule( IUnityContainer container, IRegionManager regionManager )
+      : base( container, regionManager )
+    {
+    }
+
+    protected override void InitializeModule()
+    {
+      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( NavigationView ) );
+    }
+
+    protected override void RegisterViewsAndTypes()
+    {
+      Container.RegisterNavigationType( typeof( HomeView ) );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.MessageBox/Properties/AssemblyInfo.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.MessageBox/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..10a2a031
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.MessageBox/Properties/AssemblyInfo.cs
@@ -0,0 +1,72 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle( "Extended WPF Toolkit MessageBox Sample" )]
+[assembly: AssemblyDescription( "" )]
+[assembly: AssemblyConfiguration( "" )]
+[assembly: AssemblyCompany( "Xceed Software Inc." )]
+[assembly: AssemblyProduct( "Extended WPF Toolkit MessageBox Sample" )]
+[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
+[assembly: AssemblyTrademark( "" )]
+[assembly: AssemblyCulture( "" )]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible( false )]
+
+//In order to begin building localizable applications, set 
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+  //(used if a resource is not found in the page, 
+  // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+  //(used if a resource is not found in the page, 
+  // app, or any theme specific resource dictionaries)
+)]
+
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion( "1.0.0.0" )]
+[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.MessageBox/Samples.Modules.MessageBox.csproj b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.MessageBox/Samples.Modules.MessageBox.csproj
new file mode 100644
index 00000000..cb22cc89
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.MessageBox/Samples.Modules.MessageBox.csproj
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{C324395B-C1D1-407B-8745-4AAC39B8BFD9}</ProjectGuid>
+    <OutputType>library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Samples.Modules.MessageBox</RootNamespace>
+    <AssemblyName>Samples.Modules.MessageBox</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.Practices.Prism">
+      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Practices.Unity">
+      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
+    </Reference>
+    <ProjectReference Include="..\..\..\WPFToolkit.Extended\WPFToolkit.Extended.csproj">
+      <Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
+      <Name>WPFToolkit.Extended</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Samples.Infrastructure\Samples.Infrastructure.csproj">
+      <Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
+      <Name>Samples.Infrastructure</Name>
+    </ProjectReference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="MessageBoxModule.cs" />
+    <Compile Include="Views\NavigationView.xaml.cs">
+      <DependentUpon>NavigationView.xaml</DependentUpon>
+    </Compile>
+    <Page Include="Views\HomeView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Compile Include="Views\HomeView.xaml.cs">
+      <DependentUpon>HomeView.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Page Include="Views\NavigationView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <AppDesigner Include="Properties\" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y
+xcopy "$(ProjectDir)Views" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\Samples\$(ProjectName)\" /s /Y /I</PostBuildEvent>
+  </PropertyGroup>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.MessageBox/Views/HomeView.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.MessageBox/Views/HomeView.xaml
new file mode 100644
index 00000000..7733cac3
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.MessageBox/Views/HomeView.xaml
@@ -0,0 +1,90 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<sample:DemoView x:Class="Samples.Modules.MessageBox.Views.HomeView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 Title="MessageBox"
+                 Description="This extended MessageBox allows you to customize and style various aspects of the control.">
+   <sample:DemoView.Resources>
+      <SolidColorBrush x:Key="MyButtonHoverBrush" Color="YellowGreen" />
+      <SolidColorBrush x:Key="MyButtonPressedBrush" Color="Maroon" />
+
+      <Style x:Key="MyCloseButtonStyle" TargetType="Button">
+         <Setter Property="Template">
+            <Setter.Value>
+               <ControlTemplate TargetType="Button">
+                  <Grid>
+                     <VisualStateManager.VisualStateGroups>
+                        <VisualStateGroup x:Name="CommonStates">
+                           <VisualState x:Name="Normal"/>
+                           <VisualState x:Name="MouseOver">
+                              <Storyboard>
+                                 <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
+                                    <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource MyButtonHoverBrush}"></DiscreteObjectKeyFrame>
+                                 </ObjectAnimationUsingKeyFrames>
+                              </Storyboard>
+                           </VisualState>
+                           <VisualState x:Name="Pressed">
+                              <Storyboard>
+                                 <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
+                                    <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource MyButtonPressedBrush}"></DiscreteObjectKeyFrame>
+                                 </ObjectAnimationUsingKeyFrames>
+                              </Storyboard>
+                           </VisualState>
+                        </VisualStateGroup>
+                     </VisualStateManager.VisualStateGroups>
+                     <Border x:Name="Background" CornerRadius="0,0,2,0" Background="Green">
+                        <Border Margin="1,0,1,1" BorderBrush="#59FFFFFF" BorderThickness="1" CornerRadius="0,0,1,0"/>
+                     </Border>
+                     <ContentPresenter x:Name="contentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}"/>
+                     <Path x:Name="path" Fill="White" Margin="0,0,0,1" Visibility="Collapsed"
+	                Height="6"
+		Width="7"
+		Stretch="Fill"
+		Opacity="1"
+		Data="M 2,6 C2,6 3,6 3,6 3,6 3,5 3,5 3,5 4,5 4,5 4,5 4,6 4,6 4,6 5,6 5,6 5,6 7,6 7,6 7,6 7,5 7,5 7,5 6,5 6,5 6,5 6,4 6,4 6,4 5,4 5,4 5,4 5,2 5,2 5,2 6,2 6,2 6,2 6,1 6,1 6,1 7,1 7,1 7,1 7,0 7,0 7,0 5,0 5,0 5,0 4,0 4,0 4,0 4,1 4,1 4,1 3,1 3,1 3,1 3,0 3,0 3,0 2,0 2,0 2,0 0,0 0,0 0,0 0,1 0,1 0,1 1,1 1,1 1,1 1,2 1,2 1,2 2,2 2,2 2,2 2,4 2,4 2,4 1,4 1,4 1,4 1,5 1,5 1,5 0,5 0,5 0,5 0,6 0,6 0,6 2,6 2,6 z"/>
+                  </Grid>
+               </ControlTemplate>
+            </Setter.Value>
+         </Setter>
+      </Style>
+
+      <Style x:Key="messageBoxStyle" TargetType="{x:Type xctk:MessageBox}">
+         <Setter Property="Background" Value="Aquamarine" />
+         <Setter Property="BorderBrush" Value="Red" />
+         <Setter Property="CaptionForeground" Value="Orange" />
+         <Setter Property="WindowBorderBrush" Value="Blue" />
+         <Setter Property="WindowBackground" Value="Green" />
+         <Setter Property="WindowOpacity" Value="0.3" />
+         <Setter Property="Foreground" Value="Purple"/>
+         <Setter Property="CloseButtonStyle" Value="{StaticResource MyCloseButtonStyle}"/>
+      </Style>
+   </sample:DemoView.Resources>
+
+   <Grid >
+      <Button Width="300"
+              Height="100"
+              VerticalAlignment="Center" 
+              HorizontalAlignment="Center"
+              Content="Show me that ugly styled MessageBox!"
+              Click="Button_Click"/>
+   </Grid>
+</sample:DemoView>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.MessageBox/Views/HomeView.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.MessageBox/Views/HomeView.xaml.cs
new file mode 100644
index 00000000..7141903e
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.MessageBox/Views/HomeView.xaml.cs
@@ -0,0 +1,47 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
+using System.Windows;
+
+namespace Samples.Modules.MessageBox.Views
+{
+  /// <summary>
+  /// Interaction logic for HomeView.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class HomeView : DemoView
+  {
+    public HomeView()
+    {
+      InitializeComponent();
+    }
+
+    private void Button_Click( object sender, System.Windows.RoutedEventArgs e )
+    {
+      System.Windows.Style style = ( System.Windows.Style )this.Resources[ "messageBoxStyle" ];
+      Xceed.Wpf.Toolkit.MessageBox.Show( null, "Hello World!", "Extended WPF Toolkit MessageBox", style );
+    }
+
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.MessageBox/Views/NavigationView.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.MessageBox/Views/NavigationView.xaml
new file mode 100644
index 00000000..19ef4f60
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.MessageBox/Views/NavigationView.xaml
@@ -0,0 +1,29 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<TreeViewItem x:Class="Samples.Modules.MessageBox.Views.NavigationView"
+              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+              xmlns:views="clr-namespace:Samples.Modules.MessageBox.Views"
+              Header="MessageBox" Tag="{x:Type views:HomeView}">
+
+   <TreeViewItem.Resources>
+      <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
+   </TreeViewItem.Resources>
+
+</TreeViewItem>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.MessageBox/Views/NavigationView.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.MessageBox/Views/NavigationView.xaml.cs
new file mode 100644
index 00000000..d6a4b87c
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.MessageBox/Views/NavigationView.xaml.cs
@@ -0,0 +1,34 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows.Controls;
+
+namespace Samples.Modules.MessageBox.Views
+{
+  /// <summary>
+  /// Interaction logic for NavigationView.xaml
+  /// </summary>
+  public partial class NavigationView : TreeViewItem
+  {
+    public NavigationView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/NumericModule.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/NumericModule.cs
new file mode 100644
index 00000000..716ac43c
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/NumericModule.cs
@@ -0,0 +1,45 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using Microsoft.Practices.Prism.Regions;
+using Microsoft.Practices.Unity;
+using Samples.Infrastructure;
+using Samples.Infrastructure.Extensions;
+using Samples.Modules.Numeric.Views;
+
+namespace Samples.Modules.Numeric
+{
+  public class NumericModule : ModuleBase
+  {
+    public NumericModule( IUnityContainer container, IRegionManager regionManager )
+      : base( container, regionManager )
+    {
+    }
+
+    protected override void InitializeModule()
+    {
+      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( NavigationView ) );
+    }
+
+    protected override void RegisterViewsAndTypes()
+    {
+      Container.RegisterNavigationType( typeof( HomeView ) );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Properties/AssemblyInfo.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..914763a9
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Properties/AssemblyInfo.cs
@@ -0,0 +1,72 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle( "Extended WPF Toolkit Numeric Sample" )]
+[assembly: AssemblyDescription( "" )]
+[assembly: AssemblyConfiguration( "" )]
+[assembly: AssemblyCompany( "Xceed Software Inc." )]
+[assembly: AssemblyProduct( "Extended WPF Toolkit Numeric Sample" )]
+[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
+[assembly: AssemblyTrademark( "" )]
+[assembly: AssemblyCulture( "" )]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible( false )]
+
+//In order to begin building localizable applications, set 
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+  //(used if a resource is not found in the page, 
+  // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+  //(used if a resource is not found in the page, 
+  // app, or any theme specific resource dictionaries)
+)]
+
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion( "1.0.0.0" )]
+[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Samples.Modules.Numeric.csproj b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Samples.Modules.Numeric.csproj
new file mode 100644
index 00000000..c8047b8a
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Samples.Modules.Numeric.csproj
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{CBED4977-79ED-4E46-AA00-0A4D83D333A6}</ProjectGuid>
+    <OutputType>library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Samples.Modules.Numeric</RootNamespace>
+    <AssemblyName>Samples.Modules.Numeric</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.Practices.Prism, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Practices.Unity, Version=2.0.414.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
+    </Reference>
+    <ProjectReference Include="..\..\..\WPFToolkit.Extended\WPFToolkit.Extended.csproj">
+      <Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
+      <Name>WPFToolkit.Extended</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Samples.Infrastructure\Samples.Infrastructure.csproj">
+      <Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
+      <Name>Samples.Infrastructure</Name>
+    </ProjectReference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="NumericModule.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Views\HomeView.xaml.cs">
+      <DependentUpon>HomeView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\NavigationView.xaml.cs">
+      <DependentUpon>NavigationView.xaml</DependentUpon>
+    </Compile>
+    <AppDesigner Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="Views\HomeView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\NavigationView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y
+xcopy "$(ProjectDir)Views" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\Samples\$(ProjectName)\" /s /Y /I</PostBuildEvent>
+  </PropertyGroup>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/HomeView.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/HomeView.xaml
new file mode 100644
index 00000000..5e88b543
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/HomeView.xaml
@@ -0,0 +1,78 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<sample:DemoView x:Class="Samples.Modules.Numeric.Views.HomeView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 Title="Numeric Controls"
+                 Description="The DecimalUpDown, DoubleUpDown and IntegerUpDown provides a TextBox with button spinners that allow incrementing and decrementing numeric values by using the spinner buttons, keyboard up/down arrows, or mouse wheel.">
+   <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+
+        <GroupBox Header="Features" Grid.Row="0" Margin="5">
+            <Grid Margin="5" HorizontalAlignment="Left">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+                <TextBlock Text="FormatString:" VerticalAlignment="Center" />
+                <ComboBox x:Name="_formatString" SelectedIndex="0" Grid.Column="1" Width="150" Margin="5">
+                    <ComboBoxItem Tag="C2">Currency</ComboBoxItem>
+                    <ComboBoxItem Tag="F2">Fixed Point</ComboBoxItem>
+                    <ComboBoxItem Tag="G">General</ComboBoxItem>
+                    <ComboBoxItem Tag="N">Number</ComboBoxItem>
+                    <ComboBoxItem Tag="P2">Percent</ComboBoxItem>
+                </ComboBox>
+                <TextBlock Text="Watermark:" Grid.Row="1" VerticalAlignment="Center" />
+                <TextBox x:Name="_watermark" Grid.Row="1" Grid.Column="1" Width="150" Margin="5" Text="Enter Value" />
+                <TextBlock Text="Show Button Spinner:" Grid.Row="2" VerticalAlignment="Center" />
+                <CheckBox x:Name="_showButtonSpinner" Grid.Row="2" Grid.Column="1" IsChecked="True" ClickMode="Press" Margin="5" VerticalAlignment="Center" />
+                <TextBlock Grid.Column="2" Text="Increment" VerticalAlignment="Center" />
+                <TextBlock Grid.Column="2" Grid.Row="1" Text="Minimum" VerticalAlignment="Center" />
+                <TextBlock Grid.Column="2" Grid.Row="2" Text="Maximum" VerticalAlignment="Center" />
+                <xctk:DecimalUpDown Grid.Column="3" Name="_increment" Minimum="0" Value="0.5" VerticalAlignment="Center" Margin="5" Width="150" />
+                <xctk:DecimalUpDown Grid.Column="3" Grid.Row="1" Name="_minimum" Value="-100" VerticalAlignment="Center" Margin="5" Width="150" />
+                <xctk:DecimalUpDown Grid.Column="3" Grid.Row="2" Name="_maximum" Value="100" VerticalAlignment="Center" Margin="5" Width="150" />
+            </Grid>
+        </GroupBox>
+
+        <StackPanel Grid.Row="1" Margin="10" HorizontalAlignment="Left">
+            <TextBlock Text="Usage:" Style="{StaticResource Header}" />
+            <xctk:DecimalUpDown Margin="10" Width="250" 
+                                Increment="{Binding Value, ElementName=_increment}"
+                                Maximum="{Binding Value, ElementName=_maximum}"
+                                Minimum="{Binding Value, ElementName=_minimum}"
+                                FormatString="{Binding SelectedItem.Tag, ElementName=_formatString}" 
+                                Watermark="{Binding Text, ElementName=_watermark}"
+                                ShowButtonSpinner="{Binding IsChecked, ElementName=_showButtonSpinner, Mode=TwoWay}"/>
+        </StackPanel>
+
+    </Grid>
+</sample:DemoView>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/HomeView.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/HomeView.xaml.cs
new file mode 100644
index 00000000..7c085060
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/HomeView.xaml.cs
@@ -0,0 +1,36 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
+
+namespace Samples.Modules.Numeric.Views
+{
+  /// <summary>
+  /// Interaction logic for HomeView.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class HomeView : DemoView
+  {
+    public HomeView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/NavigationView.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/NavigationView.xaml
new file mode 100644
index 00000000..adf3ddeb
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/NavigationView.xaml
@@ -0,0 +1,29 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<TreeViewItem x:Class="Samples.Modules.Numeric.Views.NavigationView"
+              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+              xmlns:views="clr-namespace:Samples.Modules.Numeric.Views"
+              Header="Numeric" Tag="{x:Type views:HomeView}">
+
+   <TreeViewItem.Resources>
+      <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
+   </TreeViewItem.Resources>
+
+</TreeViewItem>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/NavigationView.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/NavigationView.xaml.cs
new file mode 100644
index 00000000..c07eb25f
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/NavigationView.xaml.cs
@@ -0,0 +1,34 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows.Controls;
+
+namespace Samples.Modules.Numeric.Views
+{
+  /// <summary>
+  /// Interaction logic for NavigationView.xaml
+  /// </summary>
+  public partial class NavigationView : TreeViewItem
+  {
+    public NavigationView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/PieModule.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/PieModule.cs
new file mode 100644
index 00000000..c86bb11f
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/PieModule.cs
@@ -0,0 +1,48 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using Microsoft.Practices.Prism.Regions;
+using Microsoft.Practices.Unity;
+using Samples.Infrastructure;
+using Samples.Infrastructure.Extensions;
+using Samples.Modules.Pie.Views;
+
+namespace Samples.Modules.Pie
+{
+  public class PieModule : ModuleBase
+  {
+    public PieModule( IUnityContainer container, IRegionManager regionManager )
+      : base( container, regionManager )
+    {
+    }
+
+    protected override void InitializeModule()
+    {
+      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( NavigationView ) );
+    }
+
+    protected override void RegisterViewsAndTypes()
+    {
+      Container.RegisterNavigationType( typeof( HomeView ) );
+      Container.RegisterNavigationType( typeof( PieChart ) );
+      Container.RegisterNavigationType( typeof( PieProgress ) );
+
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Properties/AssemblyInfo.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..8c93b58e
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Properties/AssemblyInfo.cs
@@ -0,0 +1,72 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle( "Extended WPF Toolkit Pie Sample" )]
+[assembly: AssemblyDescription( "" )]
+[assembly: AssemblyConfiguration( "" )]
+[assembly: AssemblyCompany( "Xceed Software Inc." )]
+[assembly: AssemblyProduct( "Extended WPF Toolkit Pie Sample" )]
+[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
+[assembly: AssemblyTrademark( "" )]
+[assembly: AssemblyCulture( "" )]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible( false )]
+
+//In order to begin building localizable applications, set 
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+  //(used if a resource is not found in the page, 
+  // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+  //(used if a resource is not found in the page, 
+  // app, or any theme specific resource dictionaries)
+)]
+
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion( "1.0.0.0" )]
+[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Samples.Modules.Pie.csproj b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Samples.Modules.Pie.csproj
new file mode 100644
index 00000000..88590113
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Samples.Modules.Pie.csproj
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{08E7A934-4991-4CFC-BE12-B43AC6713122}</ProjectGuid>
+    <OutputType>library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Samples.Modules.Pie</RootNamespace>
+    <AssemblyName>Samples.Modules.Pie</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.Practices.Prism">
+      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Practices.Unity">
+      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
+    </Reference>
+    <ProjectReference Include="..\..\..\WPFToolkit.Extended\WPFToolkit.Extended.csproj">
+      <Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
+      <Name>WPFToolkit.Extended</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Samples.Infrastructure\Samples.Infrastructure.csproj">
+      <Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
+      <Name>Samples.Infrastructure</Name>
+    </ProjectReference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="PieModule.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Views\HomeView.xaml.cs">
+      <DependentUpon>HomeView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\NavigationView.xaml.cs">
+      <DependentUpon>NavigationView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\PieChart.xaml.cs">
+      <DependentUpon>PieChart.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\PieProgress.xaml.cs">
+      <DependentUpon>PieProgress.xaml</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <AppDesigner Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="Views\HomeView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\NavigationView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\PieChart.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\PieProgress.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y
+xcopy "$(ProjectDir)Views" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\Samples\$(ProjectName)\" /s /Y /I</PostBuildEvent>
+  </PropertyGroup>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/HomeView.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/HomeView.xaml
new file mode 100644
index 00000000..285ac323
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/HomeView.xaml
@@ -0,0 +1,228 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<sample:DemoView x:Class="Samples.Modules.Pie.Views.HomeView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 xmlns:local="clr-namespace:Samples.Modules.Pie.Views"
+                 Title="Pie"
+                 Description="The Pie shape is a WPF shape that represents a portion of an ellipse.  It is in the same shape as a slice of pie (hence the name).  More precisely, the Pie shape is represented as either a full ellipse (Slice = 1.0), nothing (Slice = 0.0), or an arc of an ellipse joined to its center by two line segments."
+                 x:Name="demo">
+   <sample:DemoView.Resources>
+      <xctk:ColorToSolidColorBrushConverter x:Key="colorConverter" />
+   </sample:DemoView.Resources>
+
+   <Grid HorizontalAlignment="Stretch"
+         VerticalAlignment="Stretch">
+      <Grid.ColumnDefinitions>
+         <ColumnDefinition Width="Auto"/>
+         <ColumnDefinition Width="*"/>
+      </Grid.ColumnDefinitions>
+
+      <GroupBox Header="Features"
+                 HorizontalAlignment="Left"
+                 VerticalAlignment="Stretch"
+                 Margin="20,0,0,0">
+         <Grid DataContext="{Binding ElementName=pie}"
+            Width="337">
+
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="113" />
+               <ColumnDefinition Width="145" />
+               <ColumnDefinition Width="79" />
+            </Grid.ColumnDefinitions>
+
+            <Grid.RowDefinitions>
+               <RowDefinition Height="45" />
+               <RowDefinition Height="45" />
+               <RowDefinition Height="45" />
+               <RowDefinition Height="45" />
+               <RowDefinition Height="45" />
+               <RowDefinition Height="45" />
+               <RowDefinition Height="45" />
+            </Grid.RowDefinitions>
+
+            <TextBlock Grid.Row="0"
+                    Grid.Column="0"
+                    Text="Mode"
+                    VerticalAlignment="Center"
+                    Height="Auto"
+                    HorizontalAlignment="Left"
+                    Margin="20,0,0,0" 
+                    />
+            <ComboBox  Grid.Row="0"
+                    Grid.Column="1"
+                    Grid.ColumnSpan="1"
+                    HorizontalAlignment="Stretch"
+                    Height="26"
+                    Width="Auto"
+                    Margin="10,5,10,5"
+                    SelectedItem="{Binding Mode}"
+                    SelectionChanged="ComboBox_SelectionChanged">
+               <x:StaticExtension Member="xctk:PieMode.Manual" />
+               <x:StaticExtension Member="xctk:PieMode.EndAngle" />
+               <x:StaticExtension Member="xctk:PieMode.Slice" />
+            </ComboBox>
+
+            <TextBlock Grid.Row="1"
+                    Grid.Column="0"
+                    Text="Start Angle"
+                    VerticalAlignment="Center"
+                    Height="Auto"
+                    HorizontalAlignment="Left"
+                    Margin="20,0,0,0" />
+            <Slider    Grid.Row="1"
+                    Grid.Column="1"
+                    VerticalAlignment="Center"
+                    Minimum="0"
+                    Maximum="360"
+                    Width="Auto"
+                    Value="{Binding StartAngle}"
+                    Height="Auto"
+                    HorizontalAlignment="Stretch"
+                    Margin="10,5,10,5"
+                    Grid.ColumnSpan="1" />
+            <TextBlock Grid.Row="1"
+                    Grid.Column="2"
+                    Width="50"
+                    Text="{Binding StartAngle}"
+                    VerticalAlignment="Center"
+                    Height="Auto"
+                    TextTrimming="CharacterEllipsis" />
+
+            <TextBlock Grid.Row="2"
+                    Grid.Column="0"
+                    Text="End Angle"
+                    VerticalAlignment="Center"
+                    Height="Auto"
+                    HorizontalAlignment="Left"
+                    Margin="20,0,0,0" />
+            <Slider    x:Name="endAngleSlider"
+                    Grid.Row="2"
+                    Grid.Column="1"
+                    VerticalAlignment="Center"
+                    Minimum="0"
+                    Maximum="360"
+                    Width="Auto"
+                    Value="{Binding EndAngle}"
+                    Height="Auto"
+                    HorizontalAlignment="Stretch"
+                    Margin="10,5,10,5"
+                    Grid.ColumnSpan="1" />
+            <TextBlock Grid.Row="2"
+                    Grid.Column="2"
+                    Width="50"
+                    Text="{Binding EndAngle}"
+                    VerticalAlignment="Center"
+                    Height="Auto"
+                    TextTrimming="CharacterEllipsis" />
+
+            <TextBlock Grid.Row="3"
+                    Grid.Column="0"
+                    Text="Slice"
+                    VerticalAlignment="Center"
+                    Height="Auto"
+                    HorizontalAlignment="Left"
+                    Margin="20,0,0,0" />
+            <Slider x:Name="sliceSlider"
+                    Grid.Row="3"
+                    Grid.Column="1"
+                    VerticalAlignment="Center"
+                    Minimum="0"
+                    Maximum="1"
+                    Width="Auto"
+                    Value="{Binding Slice}"
+                    Height="Auto"
+                    HorizontalAlignment="Stretch"
+                    Margin="10,5,10,5"
+                    Grid.ColumnSpan="1" />
+            <TextBlock Grid.Row="3"
+                    Grid.Column="2"
+                    Width="50"
+                    Text="{Binding Slice}"
+                    VerticalAlignment="Center"
+                    Height="Auto"
+                    TextTrimming="CharacterEllipsis" />
+
+            <TextBlock Grid.Row="4"
+                    Grid.Column="0"
+                    Margin="20,5,0,5"
+                    Text="Sweep Direction"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center" />
+            <ComboBox  Grid.Row="4"
+                    Grid.Column="1"
+                    Grid.ColumnSpan="1"
+                    HorizontalAlignment="Stretch"
+                    Height="26"
+                    Width="Auto"
+                    Margin="10,5,10,5"
+                    SelectedValue="{Binding SweepDirection}"
+                    SelectedValuePath="Content">
+               <ComboBoxItem Content="{x:Static SweepDirection.Clockwise}" />
+               <ComboBoxItem Content="{x:Static SweepDirection.Counterclockwise}" />
+            </ComboBox>
+
+            <TextBlock Grid.Row="5"
+                    Grid.Column="0"
+                    Margin="20,5,0,5"
+                    Text="Fill Color"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center" />
+            <xctk:ColorPicker x:Name="FillSelector"
+                    Grid.Row="5"
+                    Grid.Column="1"
+                    Grid.ColumnSpan="1"
+                    HorizontalAlignment="Stretch"
+                    SelectedColor="#FF5318A5"
+                    Height="26"
+                    Margin="10,5,10,5"
+                    Width="Auto" />            
+            <TextBlock Grid.Row="6"
+                    Grid.Column="0"
+                    Margin="20,5,0,5"
+                    Text="Stroke Color"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center" />
+            <xctk:ColorPicker  x:Name="StrokeSelector"
+                    Grid.Row="6"
+                    Grid.Column="1"
+                    Grid.ColumnSpan="1"
+                    HorizontalAlignment="Stretch"
+                    SelectedColor="Black"
+                    Height="26"
+                    Margin="10,5,10,5"
+                    Width="Auto" />            
+         </Grid>
+      </GroupBox>
+      <xctk:Pie x:Name="pie"
+                Grid.Column="1"
+                Height="{Binding ElementName=pie, Path=ActualWidth}"
+                Fill="{Binding ElementName=FillSelector, Path=SelectedColor, Mode=OneWay, Converter={StaticResource colorConverter}}"
+                Stroke="{Binding ElementName=StrokeSelector, Path=SelectedColor, Mode=OneWay, Converter={StaticResource colorConverter}}"
+                StrokeThickness="2"
+                StartAngle="180"
+                SweepDirection="Clockwise"
+                Margin="20,0,0,0"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Center" />
+
+   </Grid>
+</sample:DemoView>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/HomeView.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/HomeView.xaml.cs
new file mode 100644
index 00000000..2e61e4aa
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/HomeView.xaml.cs
@@ -0,0 +1,52 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
+using System.Windows.Data;
+using System.Windows.Media;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Reflection;
+using System.Windows.Controls;
+using Xceed.Wpf.Toolkit;
+
+namespace Samples.Modules.Pie.Views
+{
+  /// <summary>
+  /// Interaction logic for HomeView.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class HomeView : DemoView
+  {
+    public HomeView()
+    {
+      InitializeComponent();
+    }
+
+    private void ComboBox_SelectionChanged( object sender, System.Windows.Controls.SelectionChangedEventArgs e )
+    {
+      ComboBox modeCombo = ( ComboBox )sender;
+      PieMode newMode = ( PieMode )modeCombo.SelectedItem;
+      this.endAngleSlider.IsEnabled = ( newMode != PieMode.Slice );
+      this.sliceSlider.IsEnabled = ( newMode != PieMode.EndAngle );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/NavigationView.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/NavigationView.xaml
new file mode 100644
index 00000000..bf731401
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/NavigationView.xaml
@@ -0,0 +1,32 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<TreeViewItem x:Class="Samples.Modules.Pie.Views.NavigationView"
+              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+              xmlns:views="clr-namespace:Samples.Modules.Pie.Views"
+              Header="Pie" Tag="{x:Type views:HomeView}" >
+
+   <TreeViewItem.Resources>
+      <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
+   </TreeViewItem.Resources>
+
+   <TreeViewItem Header="Chart" Tag="{x:Type views:PieChart}" />
+   <TreeViewItem Header="Progress" Tag="{x:Type views:PieProgress}" />
+
+</TreeViewItem>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/NavigationView.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/NavigationView.xaml.cs
new file mode 100644
index 00000000..02e303d5
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/NavigationView.xaml.cs
@@ -0,0 +1,34 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows.Controls;
+
+namespace Samples.Modules.Pie.Views
+{
+  /// <summary>
+  /// Interaction logic for NavigationView.xaml
+  /// </summary>
+  public partial class NavigationView : TreeViewItem
+  {
+    public NavigationView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/PieChart.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/PieChart.xaml
new file mode 100644
index 00000000..e8f7a093
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/PieChart.xaml
@@ -0,0 +1,239 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<sample:DemoView x:Class="Samples.Modules.Pie.Views.PieChart"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 xmlns:local="clr-namespace:Samples.Modules.Pie.Views"
+                 Title="Chart"
+                 Description="Obviously, the Pie control can be used to create a pie chart.">
+   <!--TODODOC See description above and remove this comment-->
+
+   <sample:DemoView.Resources>
+      <XmlDataProvider x:Key="XMLData">
+         <x:XData>
+            <Milks xmlns="">
+               <Milk Type="Human"
+                     Fat=".040"
+                     Protein=".011"
+                     Lactose=".068"
+                     Water=".88" />
+               <Milk Type="Cow"
+                     Fat=".037"
+                     Protein=".034"
+                     Lactose=".048"
+                     Water=".87" />
+               <Milk Type="Cow Holstein Friesian"
+                     Fat=".036"
+                     Protein=".034"
+                     Lactose=".049"
+                     Water=".87" />
+               <Milk Type="Cow Brown Swiss"
+                     Fat=".040"
+                     Protein=".036"
+                     Lactose=".047"
+                     Water=".87" />
+               <Milk Type="Cow Jersey"
+                     Fat=".052"
+                     Protein=".039"
+                     Lactose=".049"
+                     Water=".85" />
+               <Milk Type="Cow Zebu"
+                     Fat=".047"
+                     Protein=".033"
+                     Lactose=".049"
+                     Water=".86" />
+               <Milk Type="Water Buffalo"
+                     Fat=".069"
+                     Protein=".038"
+                     Lactose=".051"
+                     Water=".83" />
+               <Milk Type="Yak"
+                     Fat=".065"
+                     Protein=".058"
+                     Lactose=".046"
+                     Water=".82" />
+               <Milk Type="Goat"
+                     Fat=".040"
+                     Protein=".034"
+                     Lactose=".045"
+                     Water=".88" />
+               <Milk Type="Sheep"
+                     Fat=".075"
+                     Protein=".060"
+                     Lactose=".048"
+                     Water=".80" />
+               <Milk Type="Camel"
+                     Fat=".029"
+                     Protein=".039"
+                     Lactose=".054"
+                     Water=".87" />
+               <Milk Type="Reindeer"
+                     Fat=".017"
+                     Protein=".011"
+                     Lactose=".028"
+                     Water=".68" />
+               <Milk Type="Horse"
+                     Fat=".012"
+                     Protein=".020"
+                     Lactose=".063"
+                     Water=".90" />
+               <Milk Type="Fin Whale"
+                     Fat=".042"
+                     Protein=".012"
+                     Lactose=".013"
+                     Water=".43" />
+            </Milks>
+         </x:XData>
+      </XmlDataProvider>
+
+      <local:SliceLabelConverter x:Key="sliceLabelConverter" />
+
+      <DataTemplate x:Key="MilkTemplate">
+         <StackPanel Orientation="Horizontal">
+            <TextBlock Width="135"
+                       Text="{Binding XPath=@Type}" />
+            <TextBlock Width="100"
+                       Text="{Binding XPath=@Fat}" />
+            <TextBlock Width="100"
+                       Text="{Binding XPath=@Protein}" />
+            <TextBlock Width="100"
+                       Text="{Binding XPath=@Lactose}" />
+            <TextBlock Width="100"
+                       Text="{Binding XPath=@Water}" />
+         </StackPanel>
+      </DataTemplate>
+   </sample:DemoView.Resources>
+   <Grid x:Name="LayoutRoot"
+         DataContext="{Binding Source={StaticResource XMLData}, XPath=/Milks/Milk}"
+         HorizontalAlignment="Center"
+         VerticalAlignment="Center">
+      <Control />
+      <ListBox x:Name="PieDataListBox"
+               VerticalAlignment="Top"
+               Height="150"
+               ItemTemplate="{StaticResource MilkTemplate}"
+               ItemsSource="{Binding}"
+               IsSynchronizedWithCurrentItem="True"
+               HorizontalAlignment="Center"
+               Width="503"
+               ScrollViewer.HorizontalScrollBarVisibility="Disabled" />
+      <Viewbox x:Name="PiesViewbox"
+               HorizontalAlignment="Center"
+               Margin="20,270,20,0"
+               VerticalAlignment="Top"
+               Width="300"
+               Height="300"
+               Stretch="Fill">
+         <Grid Width="192"
+               x:Name="PiesGrid"
+               Height="192">
+
+            <xctk:Pie x:Name="WaterPie"
+                      Fill="#FFCFDCFA"
+                      Stroke="#FF000000"
+                      Opacity="0.5"
+                      Slice="{Binding XPath=@Water}" />
+
+            <xctk:Pie x:Name="LactosePie"
+                      Fill="#FFEBFF68"
+                      Stroke="#FF000000"
+                      Opacity="0.5"
+                      StartAngle="{Binding EndAngle, ElementName=WaterPie, Mode=OneWay}"
+                      Slice="{Binding XPath=@Lactose}" />
+
+            <xctk:Pie x:Name="FatPie"
+                      Fill="#FF6EFA6E"
+                      Stroke="#FF000000"
+                      Opacity="0.5"
+                      StartAngle="{Binding EndAngle, ElementName=LactosePie, Mode=OneWay}"
+                      Slice="{Binding XPath=@Fat}" />
+
+            <xctk:Pie x:Name="ProteinPie"
+                      Fill="#FFFF8676"
+                      Stroke="#FF000000"
+                      Opacity="0.5"
+                      StartAngle="{Binding EndAngle, ElementName=FatPie, Mode=OneWay}"
+                      Slice="{Binding XPath=@Protein}" />
+
+            <TextBlock RenderTransformOrigin="0.5,0.5"
+                       VerticalAlignment="Center"
+                       Text="{Binding ElementName=WaterPie, Path=Slice, Converter={StaticResource sliceLabelConverter}, ConverterParameter=Water}"
+                       HorizontalAlignment="Left"
+                       Margin="60,0,0,0"
+                       FontFamily="Segoe UI"
+                       FontSize="9">
+					<TextBlock.RenderTransform>
+						<TransformGroup>
+							<TranslateTransform X="135" Y="0" />
+							<RotateTransform Angle="{Binding EndAngle, ElementName=WaterPie}" />
+						</TransformGroup>
+					</TextBlock.RenderTransform>
+            </TextBlock>
+
+            <TextBlock RenderTransformOrigin="0.5,0.5"
+                       VerticalAlignment="Center"
+                       Text="{Binding ElementName=LactosePie, Path=Slice, Converter={StaticResource sliceLabelConverter}, ConverterParameter=Lactose}"
+                       HorizontalAlignment="Left"
+                       Margin="60,0,0,0"
+                       FontFamily="Segoe UI"
+                       FontSize="9">
+					<TextBlock.RenderTransform>
+						<TransformGroup>
+							<TranslateTransform X="135" Y="0" />
+							<RotateTransform Angle="{Binding EndAngle, ElementName=LactosePie}" />
+						</TransformGroup>
+					</TextBlock.RenderTransform>
+            </TextBlock>
+
+            <TextBlock RenderTransformOrigin="0.5,0.5"
+                       VerticalAlignment="Center"
+                       Text="{Binding ElementName=FatPie, Path=Slice, Converter={StaticResource sliceLabelConverter}, ConverterParameter=Fat}"
+                       HorizontalAlignment="Left"
+                       Margin="60,0,0,0"
+                       FontFamily="Segoe UI"
+                       FontSize="9">
+					<TextBlock.RenderTransform>
+						<TransformGroup>
+							<TranslateTransform X="135" Y="0" />
+							<RotateTransform Angle="{Binding EndAngle, ElementName=FatPie}" />
+						</TransformGroup>
+					</TextBlock.RenderTransform>
+            </TextBlock>
+
+            <TextBlock RenderTransformOrigin="0.5,0.5"
+                       VerticalAlignment="Center"
+                       Text="{Binding ElementName=ProteinPie, Path=Slice, Converter={StaticResource sliceLabelConverter}, ConverterParameter=Protein}"
+                       HorizontalAlignment="Left"
+                       Margin="60,0,0,0"
+                       FontFamily="Segoe UI"
+                       FontSize="9">
+					<TextBlock.RenderTransform>
+						<TransformGroup>
+							<TranslateTransform X="135" Y="0" />
+							<RotateTransform Angle="{Binding EndAngle, ElementName=ProteinPie}" />
+						</TransformGroup>
+					</TextBlock.RenderTransform>
+            </TextBlock>
+
+         </Grid>
+      </Viewbox>
+   </Grid>
+</sample:DemoView>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/PieChart.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/PieChart.xaml.cs
new file mode 100644
index 00000000..fa37486e
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/PieChart.xaml.cs
@@ -0,0 +1,50 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
+using System.Windows.Data;
+
+namespace Samples.Modules.Pie.Views
+{
+  /// <summary>
+  /// Interaction logic for PieChart.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class PieChart : DemoView
+  {
+    public PieChart()
+    {
+      InitializeComponent();
+    }
+  }
+
+  public class SliceLabelConverter : IValueConverter
+  {
+    public object Convert( object value, System.Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      return ( ( double )value ).ToString( "#.#% " + parameter );
+    }
+
+    public object ConvertBack( object value, System.Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      throw new System.NotImplementedException();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/PieProgress.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/PieProgress.xaml
new file mode 100644
index 00000000..5fcc9dbd
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/PieProgress.xaml
@@ -0,0 +1,104 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<sample:DemoView x:Class="Samples.Modules.Pie.Views.PieProgress"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 xmlns:local="clr-namespace:Samples.Modules.Pie.Views"
+                 Title="Progress"
+                 Description="The Pie control properties can be animated to create various effects and controls like this circular progress bar">
+   <!--TODODOC See description above and remove this comment-->
+
+   <sample:DemoView.Resources>
+      <ControlTemplate x:Key="PieProgressTemplate"
+                       TargetType="{x:Type ProgressBar}">
+         <Grid>
+            <xctk:Pie x:Name="Pie"
+                      Fill="#FF3F4A7F"
+                      HorizontalAlignment="Stretch"
+                      Width="Auto"
+                      StrokeThickness="4"
+                      Slice="{TemplateBinding Value}"
+                      RenderTransformOrigin="0.5,0.5">
+               <xctk:Pie.RenderTransform>
+                  <RotateTransform Angle="-90" />
+               </xctk:Pie.RenderTransform>
+            </xctk:Pie>
+            <Ellipse Fill="White"
+                     HorizontalAlignment="Center"
+                     VerticalAlignment="Center"
+                     Width="100"
+                     Height="100" />
+            <StackPanel HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Orientation="Horizontal">
+               <TextBlock  FontSize="24"
+                           FontWeight="Bold"
+                           Foreground="Black"
+                           Text="{Binding ElementName=Pie, Path=Slice, StringFormat=#%}" />
+            </StackPanel>
+         </Grid>
+      </ControlTemplate>
+      <Storyboard x:Key="SimulateProgressStoryboard"
+                  Duration="00:00:04"
+                  AccelerationRatio="0.5"
+                  DecelerationRatio="0.5">
+         <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
+                                        Storyboard.TargetName="progressBar"
+                                        Storyboard.TargetProperty="(RangeBase.Value)">
+            <SplineDoubleKeyFrame KeyTime="00:00:00"
+                                  Value="0" />
+            <SplineDoubleKeyFrame KeyTime="00:00:04"
+                                  Value="1" />
+         </DoubleAnimationUsingKeyFrames>
+      </Storyboard>
+   </sample:DemoView.Resources>
+
+   <sample:DemoView.Triggers>
+      <EventTrigger RoutedEvent="ButtonBase.Click"
+                    SourceName="SimulateProgressButton">
+         <BeginStoryboard Storyboard="{StaticResource SimulateProgressStoryboard}" />
+      </EventTrigger>
+   </sample:DemoView.Triggers>
+
+   <Grid x:Name="LayoutRoot"
+         HorizontalAlignment="Center"
+         VerticalAlignment="Center">
+      <Grid.RowDefinitions>
+         <RowDefinition Height="0.66*" />
+         <RowDefinition Height="Auto" />
+      </Grid.RowDefinitions>
+      <ProgressBar x:Name="progressBar"
+                   Template="{StaticResource PieProgressTemplate}"
+                   Value="0"
+                   Height="200"
+                   Width="200"
+                   Minimum="0"
+                   Maximum="1" />
+      <Button x:Name="SimulateProgressButton"
+              Content="Simulate Progress"
+              HorizontalAlignment="Center"
+              Margin="0,20,0,0"
+              VerticalAlignment="Center"
+              Width="200"
+              Height="50"
+              Grid.Row="1" />
+   </Grid>
+</sample:DemoView>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/PieProgress.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/PieProgress.xaml.cs
new file mode 100644
index 00000000..c040608f
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/PieProgress.xaml.cs
@@ -0,0 +1,38 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
+using System.Windows.Data;
+
+namespace Samples.Modules.Pie.Views
+{
+  /// <summary>
+  /// Interaction logic for PieProgress.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class PieProgress : DemoView
+  {
+    public PieProgress()
+    {
+      InitializeComponent();
+    }
+  }
+
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Properties/AssemblyInfo.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..403de9db
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Properties/AssemblyInfo.cs
@@ -0,0 +1,72 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle( "Extended WPF Toolkit PropertyGrid Sample" )]
+[assembly: AssemblyDescription( "" )]
+[assembly: AssemblyConfiguration( "" )]
+[assembly: AssemblyCompany( "Xceed Software Inc." )]
+[assembly: AssemblyProduct( "Extended WPF Toolkit PropertyGrid Sample" )]
+[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
+[assembly: AssemblyTrademark( "" )]
+[assembly: AssemblyCulture( "" )]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible( false )]
+
+//In order to begin building localizable applications, set 
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+  //(used if a resource is not found in the page, 
+  // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+  //(used if a resource is not found in the page, 
+  // app, or any theme specific resource dictionaries)
+)]
+
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion( "1.0.0.0" )]
+[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/PropertyGridModule.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/PropertyGridModule.cs
new file mode 100644
index 00000000..c705731a
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/PropertyGridModule.cs
@@ -0,0 +1,51 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using Microsoft.Practices.Prism.Regions;
+using Microsoft.Practices.Unity;
+using Samples.Infrastructure;
+using Samples.Infrastructure.Extensions;
+using Samples.Modules.PropertyGrid.Views;
+
+namespace Samples.Modules.PropertyGrid
+{
+  public class PropertyGridModule : ModuleBase
+  {
+    public PropertyGridModule( IUnityContainer container, IRegionManager regionManager )
+      : base( container, regionManager )
+    {
+    }
+
+    protected override void InitializeModule()
+    {
+      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( NavigationView ) );
+    }
+
+    protected override void RegisterViewsAndTypes()
+    {
+      Container.RegisterNavigationType( typeof( HomeView ) );
+      Container.RegisterNavigationType( typeof( CustomEditors ) );
+      Container.RegisterNavigationType( typeof( CustomItemsSource ) );
+      Container.RegisterNavigationType( typeof( DefaultEditors ) );
+      Container.RegisterNavigationType( typeof( ExpandableProperties ) );
+      Container.RegisterNavigationType( typeof( SpecifyingProperties ) );
+      Container.RegisterNavigationType( typeof( BindingToStructs ) );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Resources/LastNameUserControlEditor.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Resources/LastNameUserControlEditor.xaml
new file mode 100644
index 00000000..449352bd
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Resources/LastNameUserControlEditor.xaml
@@ -0,0 +1,27 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<UserControl x:Class="Samples.Modules.PropertyGrid.LastNameUserControlEditor"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Name="_uc">
+   <StackPanel>
+      <TextBox Text="{Binding Value, ElementName=_uc}" Background="YellowGreen" />
+      <Button Click="Button_Click">Clear</Button>
+   </StackPanel>
+</UserControl>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Resources/LastNameUserControlEditor.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Resources/LastNameUserControlEditor.xaml.cs
new file mode 100644
index 00000000..4f0f9eb9
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Resources/LastNameUserControlEditor.xaml.cs
@@ -0,0 +1,64 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
+
+namespace Samples.Modules.PropertyGrid
+{
+  /// <summary>
+  /// Interaction logic for LastNameUserControlEditor.xaml
+  /// </summary>
+  public partial class LastNameUserControlEditor : UserControl, ITypeEditor
+  {
+    public LastNameUserControlEditor()
+    {
+      InitializeComponent();
+    }
+
+    public static readonly DependencyProperty ValueProperty = DependencyProperty.Register( "Value", typeof( string ), typeof( LastNameUserControlEditor ), new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault ) );
+    public string Value
+    {
+      get
+      {
+        return ( string )GetValue( ValueProperty );
+      }
+      set
+      {
+        SetValue( ValueProperty, value );
+      }
+    }
+
+    private void Button_Click( object sender, RoutedEventArgs e )
+    {
+      Value = string.Empty;
+    }
+
+    public FrameworkElement ResolveEditor( Xceed.Wpf.Toolkit.PropertyGrid.PropertyItem propertyItem )
+    {
+      Binding binding = new Binding( "Value" );
+      binding.Source = propertyItem;
+      binding.Mode = propertyItem.IsReadOnly ? BindingMode.OneWay : BindingMode.TwoWay;
+      BindingOperations.SetBinding( this, LastNameUserControlEditor.ValueProperty, binding );
+      return this;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Samples.Modules.PropertyGrid.csproj b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Samples.Modules.PropertyGrid.csproj
new file mode 100644
index 00000000..e97616e1
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Samples.Modules.PropertyGrid.csproj
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{511FB369-57D2-430B-9002-F367DF165E70}</ProjectGuid>
+    <OutputType>library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Samples.Modules.PropertyGrid</RootNamespace>
+    <AssemblyName>Samples.Modules.PropertyGrid</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.Practices.Prism, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Practices.Unity, Version=2.0.414.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
+    </Reference>
+    <ProjectReference Include="..\..\..\WPFToolkit.Extended\WPFToolkit.Extended.csproj">
+      <Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
+      <Name>WPFToolkit.Extended</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Samples.Infrastructure\Samples.Infrastructure.csproj">
+      <Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
+      <Name>Samples.Infrastructure</Name>
+    </ProjectReference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Resources\LastNameUserControlEditor.xaml.cs">
+      <DependentUpon>LastNameUserControlEditor.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="PropertyGridModule.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Views\BindingToStructs.xaml.cs">
+      <DependentUpon>BindingToStructs.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\CustomEditors.xaml.cs">
+      <DependentUpon>CustomEditors.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\CustomItemsSource.xaml.cs">
+      <DependentUpon>CustomItemsSource.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DefaultEditors.xaml.cs">
+      <DependentUpon>DefaultEditors.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\ExpandableProperties.xaml.cs">
+      <DependentUpon>ExpandableProperties.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\HomeView.xaml.cs">
+      <DependentUpon>HomeView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\NavigationView.xaml.cs">
+      <DependentUpon>NavigationView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\SpecifyingProperties.xaml.cs">
+      <DependentUpon>SpecifyingProperties.xaml</DependentUpon>
+    </Compile>
+    <AppDesigner Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="Resources\LastNameUserControlEditor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\BindingToStructs.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\CustomEditors.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\CustomItemsSource.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\DefaultEditors.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\ExpandableProperties.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\HomeView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\NavigationView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\SpecifyingProperties.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y
+xcopy "$(ProjectDir)Views" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\Samples\$(ProjectName)\" /s /Y /I</PostBuildEvent>
+  </PropertyGroup>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/BindingToStructs.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/BindingToStructs.xaml
new file mode 100644
index 00000000..9842048f
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/BindingToStructs.xaml
@@ -0,0 +1,59 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<sample:DemoView x:Class="Samples.Modules.PropertyGrid.Views.BindingToStructs"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 xmlns:local="clr-namespace:Samples.Modules.PropertyGrid.Views"
+                 Title="Binding to Structs"
+                 Description="When the SelectedObject contains properties of type Struct youmay find that edits performed in the PropertyGrid do not function properly.  This is because Structs are passed by value.  Meaning that the PropertyGrid receives a copy of the Struct and not a reference.  When this happens, the data binding expressions end up binding to and modifying that copy rather than the original values.">
+
+   <sample:DemoView.Resources>
+      <local:DimensionsConverter x:Key="DimensionsConverter" />
+   </sample:DemoView.Resources>
+   <StackPanel Grid.Row="1" Margin="10">
+      <TextBlock Text="Binding to Structs:" Style="{StaticResource Header}" />
+      <TextBlock Text="The solution to this problem is to create a custom editor and provide an IValueConverter to handle the proper conversion of the Struct values." TextWrapping="Wrap" />
+      <xctk:PropertyGrid x:Name="_propertyGrid" Width="450" Margin="10">
+         <xctk:PropertyGrid.EditorDefinitions>
+            <xctk:EditorDefinition TargetType="{x:Type local:Dimension}">
+               <xctk:EditorDefinition.EditorTemplate>
+                  <DataTemplate>
+                     <Grid Margin="5">
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="Auto" />
+                           <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="Auto" />
+                           <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <TextBlock Text="Height: " />
+                        <TextBox Grid.Column="1" Text="{Binding Path=Value, Converter={StaticResource DimensionsConverter},ConverterParameter=Height}" />
+                        <TextBlock Grid.Row="1" Text="Weight: " />
+                        <TextBox Grid.Row="1" Grid.Column="1" Text="{Binding Path=Value, Converter={StaticResource DimensionsConverter},ConverterParameter=Weight}" />
+                     </Grid>
+                  </DataTemplate>
+               </xctk:EditorDefinition.EditorTemplate>
+            </xctk:EditorDefinition>
+         </xctk:PropertyGrid.EditorDefinitions>
+      </xctk:PropertyGrid>
+   </StackPanel>
+</sample:DemoView>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/BindingToStructs.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/BindingToStructs.xaml.cs
new file mode 100644
index 00000000..4fc03c8a
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/BindingToStructs.xaml.cs
@@ -0,0 +1,119 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.ComponentModel;
+using System.Windows.Data;
+using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
+
+namespace Samples.Modules.PropertyGrid.Views
+{
+  /// <summary>
+  /// Interaction logic for BindingToStructs.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class BindingToStructs : DemoView
+  {
+    public BindingToStructs()
+    {
+      InitializeComponent();
+      _propertyGrid.SelectedObject = Person.CreatePerson();
+    }
+
+    public class Person
+    {
+      [Category( "Information" )]
+      [DisplayName( "First Name" )]
+      [Description( "This property uses a TextBox as the default editor." )]
+      public string FirstName
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [DisplayName( "Last Name" )]
+      [Description( "This property uses a TextBox as the default editor." )]
+      public string LastName
+      {
+        get;
+        set;
+      }
+
+      public Dimension Dimensions
+      {
+        get;
+        set;
+      }
+
+      public static Person CreatePerson()
+      {
+        var person = new Person();
+        person.FirstName = "John";
+        person.LastName = "Doe";
+        person.Dimensions = new Dimension()
+        {
+          Height = 75.0,
+          Weight = 185.76
+        };
+        return person;
+      }
+    }
+  }
+
+  public struct Dimension
+  {
+    public double Height;
+    public double Weight;
+
+    public Dimension( double height, double weight )
+    {
+      this.Height = height;
+      this.Weight = weight;
+    }
+  }
+
+  public class DimensionsConverter : IValueConverter
+  {
+    static Dimension _originalValue; // the static struct that stores original value at the start of editing
+
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      _originalValue = ( ( Dimension )value );
+
+      if( parameter.ToString() == "Height" )
+        return ( ( Dimension )value ).Height;
+      if( parameter.ToString() == "Weight" )
+        return ( ( Dimension )value ).Weight;
+
+      return _originalValue;
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      if( parameter.ToString() == "Height" )
+        _originalValue = new Dimension( double.Parse( value.ToString() ), _originalValue.Weight );
+      if( parameter.ToString() == "Weight" )
+        _originalValue = new Dimension( _originalValue.Height, double.Parse( value.ToString() ) );
+
+      return _originalValue;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/CustomEditors.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/CustomEditors.xaml
new file mode 100644
index 00000000..c07118ce
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/CustomEditors.xaml
@@ -0,0 +1,86 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<sample:DemoView x:Class="Samples.Modules.PropertyGrid.Views.CustomEditors"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                 Title="Custom Editors"
+                 Description="This example demonstrates the various methods of creating and using custom editors.  You can supply your own editor based on a Type, a property name, or both.  To supply your own editor for a property you have to create an EditorDefinition for the PropertyGrid.">
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="*" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+      <StackPanel Grid.Row="0" Margin="10">
+         <TextBlock Text="Custom Editors with a DataTemplate:" Style="{StaticResource Header}" />
+         <TextBlock Text="You can override the default editors with your own custom editors with a DataTemplate.  Simply define an EditorDefinition that either targets a Type, property name, or both and set the EditorDefinition.EditorTemplate to an instance of a DataTemplate.  Be sure to bind your custom editor to the bound property item's Value property." TextWrapping="Wrap" />
+         <xctk:PropertyGrid x:Name="_propertyGrid1" Width="450"  Margin="10">
+            <xctk:PropertyGrid.EditorDefinitions>
+
+               <!-- This EditorDefinition will provide a TextBox to any property that is of type HorizontalAlignment, replacing the default ComboBox editor. -->
+               <xctk:EditorDefinition TargetType="{x:Type HorizontalAlignment}">
+                  <xctk:EditorDefinition.EditorTemplate>
+                     <DataTemplate>
+                        <TextBox Background="Green"  Text="{Binding Value}" />
+                        <!-- Always bind your editor's value to the bound property's Value -->
+                     </DataTemplate>
+                  </xctk:EditorDefinition.EditorTemplate>
+               </xctk:EditorDefinition>
+
+               <!-- This EditorDefinition will provide a TextBlock to any property that has any of the defined property names, replacing the default editor. -->
+               <xctk:EditorDefinition>
+                  <xctk:EditorDefinition.PropertiesDefinitions>
+                     <xctk:PropertyDefinition Name="Age" />
+                     <xctk:PropertyDefinition Name="WritingFont" />
+                     <xctk:PropertyDefinition Name="Spouse" />
+                  </xctk:EditorDefinition.PropertiesDefinitions>
+                  <xctk:EditorDefinition.EditorTemplate>
+                     <DataTemplate>
+                        <TextBlock Background="Yellow" Text="{Binding Value}" />
+                     </DataTemplate>
+                  </xctk:EditorDefinition.EditorTemplate>
+               </xctk:EditorDefinition>
+
+               <!-- This EditorDefinition will provide a TextBox to any property that is of type Boolean or that has any of the defined property names, replacing the default editor. -->
+               <xctk:EditorDefinition TargetType="{x:Type sys:Boolean}">
+                  <xctk:EditorDefinition.PropertiesDefinitions>
+                     <xctk:PropertyDefinition Name="DateOfBirth" />
+                     <xctk:PropertyDefinition Name="LastName" />
+                  </xctk:EditorDefinition.PropertiesDefinitions>
+                  <xctk:EditorDefinition.EditorTemplate>
+                     <DataTemplate>
+                        <TextBox Background="Red" Text="{Binding Value}" />
+                     </DataTemplate>
+                  </xctk:EditorDefinition.EditorTemplate>
+               </xctk:EditorDefinition>
+
+            </xctk:PropertyGrid.EditorDefinitions>
+         </xctk:PropertyGrid>
+      </StackPanel>
+
+      <StackPanel Grid.Row="1" Margin="10">
+         <TextBlock Text="Custom Editors with an Attribute:" Style="{StaticResource Header}" />
+         <TextBlock Text="You can supply editors for a property by using the System.ComponentModel.EditorAttribute.  In order to provide an editor with an attribute, the editor MUST implement the ITypeEditor interface.  Your editor can be a simple class or a complex UserControl." TextWrapping="Wrap" />
+         <xctk:PropertyGrid x:Name="_propertyGrid2" Width="450" Margin="10" />
+      </StackPanel>
+   </Grid>
+</sample:DemoView>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/CustomEditors.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/CustomEditors.xaml.cs
new file mode 100644
index 00000000..89127833
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/CustomEditors.xaml.cs
@@ -0,0 +1,246 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Media;
+using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
+
+namespace Samples.Modules.PropertyGrid.Views
+{
+  /// <summary>
+  /// Interaction logic for CustomEditors.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class CustomEditors : DemoView
+  {
+    public CustomEditors()
+    {
+      InitializeComponent();
+      _propertyGrid1.SelectedObject = Person.CreatePerson();
+      _propertyGrid2.SelectedObject = CustomAttributEditorPerson.CreateCustomAttributEditorPerson();
+    }
+
+    public class Person
+    {
+      [Category( "Information" )]
+      [DisplayName( "First Name" )]
+      [Description( "This property uses a TextBox as the default editor." )]
+      public string FirstName
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [DisplayName( "Last Name" )]
+      [Description( "This property uses a TextBox as the default editor." )]
+      public string LastName
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [DisplayName( "Date of Birth" )]
+      [Description( "This property uses the DateTimeUpDown as the default editor." )]
+      public DateTime DateOfBirth
+      {
+        get;
+        set;
+      }
+
+      [DisplayName( "Grade Point Average" )]
+      [Description( "This property uses the DoubleUpDown as the default editor." )]
+      public double GradePointAvg
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [Description( "This property uses the IntegerUpDown as the default editor." )]
+      public int Age
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [DisplayName( "Is Male" )]
+      [Description( "This property uses a CheckBox as the default editor." )]
+      public bool IsMale
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [DisplayName( "Favorite Color" )]
+      [Description( "This property uses the ColorPicker as the default editor." )]
+      public Color FavoriteColor
+      {
+        get;
+        set;
+      }
+
+      [Category( "Writing" )]
+      [DisplayName( "Writing Hand" )]
+      [Description( "This property uses a ComboBox as the default editor.  The ComboBox is auto populated with the enum values" )]
+      public HorizontalAlignment WritingHand
+      {
+        get;
+        set;
+      }
+
+      [Category( "Writing" )]
+      [DisplayName( "Writing Font" )]
+      [Description( "This property uses a ComboBox as the default editor.  The ComboBox is auto populated with the enum values" )]
+      public FontFamily WritingFont
+      {
+        get;
+        set;
+      }
+
+      [Category( "Writing" )]
+      [DisplayName( "Writing Font Size" )]
+      [Description( "This property uses the DoubleUpDown as the default editor." )]
+      public double WritingFontSize
+      {
+        get;
+        set;
+      }
+
+      [Category( "Conections" )]
+      [DisplayName( "Pet Names" )]
+      [Description( "This property uses the PrimitiveTypeCollectionEditor as the default editor." )]
+      public List<String> PetNames
+      {
+        get;
+        set;
+      }
+
+      [Category( "Conections" )]
+      [Description( "This property uses the CollectionEditor as the default editor." )]
+      public List<Person> Friends
+      {
+        get;
+        set;
+      }
+
+      [Category( "Conections" )]
+      [Description( "This property is a complex property and has no default editor." )]
+      public Person Spouse
+      {
+        get;
+        set;
+      }
+
+      public static Person CreatePerson()
+      {
+        var person = new Person();
+        person.FirstName = "John";
+        person.LastName = "Doe";
+        person.DateOfBirth = new DateTime( 1975, 1, 23 );
+        person.Age = DateTime.Today.Year - person.DateOfBirth.Year;
+        person.GradePointAvg = 3.98;
+        person.IsMale = true;
+        person.FavoriteColor = Colors.Blue;
+        person.WritingHand = System.Windows.HorizontalAlignment.Right;
+        person.WritingFont = new FontFamily( "Arial" );
+        person.WritingFontSize = 12.5;
+        person.PetNames = new List<string>() { "Pet 1", "Pet 2", "Pet 3" };
+        person.Friends = new List<Person>() { new Person() { FirstName = "First", LastName = "Friend" }, new Person() { FirstName = "Second", LastName = "Friend" } };
+        person.Spouse = new Person()
+        {
+          FirstName = "Jane",
+          LastName = "Doe"
+        };
+        return person;
+      }
+    }
+
+    public class CustomAttributEditorPerson
+    {
+      [Category( "Information" )]
+      [DisplayName( "First Name" )]
+      [Description( "This property uses a TextBox as the default editor." )]
+      //This custom editor is a Class that implements the ITypeEditor interface
+      [Editor( typeof( FirstNameEditor ), typeof( FirstNameEditor ) )]
+      public string FirstName
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [DisplayName( "Last Name" )]
+      [Description( "This property uses a TextBox as the default editor." )]
+      //This custom editor is a UserControl that implements the ITypeEditor interface
+      [Editor( typeof( LastNameUserControlEditor ), typeof( LastNameUserControlEditor ) )]
+      public string LastName
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [DisplayName( "Date of Birth" )]
+      [Description( "This property uses the DateTimeUpDown as the default editor." )]
+      public DateTime DateOfBirth
+      {
+        get;
+        set;
+      }
+
+      public static CustomAttributEditorPerson CreateCustomAttributEditorPerson()
+      {
+        var person = new CustomAttributEditorPerson();
+        person.FirstName = "John";
+        person.LastName = "Doe";
+        person.DateOfBirth = new DateTime( 1975, 1, 23 );
+        return person;
+      }
+    }
+  }
+
+  //Custom editors that are used as attributes MUST implement the ITypeEditor interface.
+  public class FirstNameEditor : Xceed.Wpf.Toolkit.PropertyGrid.Editors.ITypeEditor
+  {
+    public FrameworkElement ResolveEditor( Xceed.Wpf.Toolkit.PropertyGrid.PropertyItem propertyItem )
+    {
+      TextBox textBox = new TextBox();
+      textBox.Background = new SolidColorBrush( Colors.Red );
+
+      //create the binding from the bound property item to the editor
+      var _binding = new Binding( "Value" ); //bind to the Value property of the PropertyItem
+      _binding.Source = propertyItem;
+      _binding.ValidatesOnExceptions = true;
+      _binding.ValidatesOnDataErrors = true;
+      _binding.Mode = propertyItem.IsReadOnly ? BindingMode.OneWay : BindingMode.TwoWay;
+      BindingOperations.SetBinding( textBox, TextBox.TextProperty, _binding );
+      return textBox;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/CustomItemsSource.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/CustomItemsSource.xaml
new file mode 100644
index 00000000..18bbf862
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/CustomItemsSource.xaml
@@ -0,0 +1,31 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<sample:DemoView x:Class="Samples.Modules.PropertyGrid.Views.CustomItemsSource"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 Title="Custom ItemsSource"
+                 Description="Sometimes it is desirable to want to provide a collection of values represented by a ComboBox for a given property.  The PropertyGrid supports this scenario by create a class that implements IItemsSource and decorating your property with the ItemsSourceAttribute.">
+   <StackPanel Margin="10">
+      <TextBlock Text="Providing a Custom ItemsSource:" Style="{StaticResource Header}" />
+      <TextBlock Text="This example uses a collection of Doubles to represent the available options for the WritingFontSize property." TextWrapping="Wrap" />
+      <xctk:PropertyGrid x:Name="_propertyGrid" Width="450" Margin="10" />
+   </StackPanel>
+</sample:DemoView>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/CustomItemsSource.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/CustomItemsSource.xaml.cs
new file mode 100644
index 00000000..09ab7b2b
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/CustomItemsSource.xaml.cs
@@ -0,0 +1,137 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Media;
+using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
+using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
+
+namespace Samples.Modules.PropertyGrid.Views
+{
+  /// <summary>
+  /// Interaction logic for CustomItemsSource.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class CustomItemsSource : DemoView
+  {
+    public CustomItemsSource()
+    {
+      InitializeComponent();
+      _propertyGrid.SelectedObject = Person.CreatePerson();
+    }
+
+    public class Person
+    {
+      [Category( "Information" )]
+      [DisplayName( "First Name" )]
+      [Description( "This property uses a TextBox as the default editor." )]
+      public string FirstName
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [DisplayName( "Last Name" )]
+      [Description( "This property uses a TextBox as the default editor." )]
+      public string LastName
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [DisplayName( "Date of Birth" )]
+      [Description( "This property uses the DateTimeUpDown as the default editor." )]
+      public DateTime DateOfBirth
+      {
+        get;
+        set;
+      }
+
+      [Category( "Writing" )]
+      [DisplayName( "Writing Hand" )]
+      [Description( "This property uses a ComboBox as the default editor.  The ComboBox is auto populated with the enum values" )]
+      public HorizontalAlignment WritingHand
+      {
+        get;
+        set;
+      }
+
+      [Category( "Writing" )]
+      [DisplayName( "Writing Font" )]
+      [Description( "This property uses a ComboBox as the default editor.  The ComboBox is auto populated with the enum values" )]
+      public FontFamily WritingFont
+      {
+        get;
+        set;
+      }
+
+      [Category( "Writing" )]
+      [DisplayName( "Writing Font Size" )]
+      [Description( "This property uses the DoubleUpDown as the default editor." )]
+      [ItemsSource( typeof( FontSizeItemsSource ) )]
+      public double WritingFontSize
+      {
+        get;
+        set;
+      }
+
+      public static Person CreatePerson()
+      {
+        var person = new Person();
+        person.FirstName = "John";
+        person.LastName = "Doe";
+        person.DateOfBirth = new DateTime( 1975, 1, 23 );
+        person.WritingHand = System.Windows.HorizontalAlignment.Right;
+        person.WritingFont = new FontFamily( "Arial" );
+        person.WritingFontSize = 12.0;
+        return person;
+      }
+    }
+  }
+
+  public class FontSizeItemsSource : IItemsSource
+  {
+    public ItemCollection GetValues()
+    {
+      ItemCollection sizes = new ItemCollection();
+      sizes.Add( 5.0, "Five" );
+      sizes.Add( 5.5 );
+      sizes.Add( 6.0, "Six" );
+      sizes.Add( 6.5 );
+      sizes.Add( 7.0, "Seven" );
+      sizes.Add( 7.5 );
+      sizes.Add( 8.0, "Eight" );
+      sizes.Add( 8.5 );
+      sizes.Add( 9.0, "Nine" );
+      sizes.Add( 9.5 );
+      sizes.Add( 10.0 );
+      sizes.Add( 12.0, "Twelve" );
+      sizes.Add( 14.0 );
+      sizes.Add( 16.0 );
+      sizes.Add( 18.0 );
+      sizes.Add( 20.0 );
+      return sizes;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/DefaultEditors.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/DefaultEditors.xaml
new file mode 100644
index 00000000..3c638868
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/DefaultEditors.xaml
@@ -0,0 +1,30 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<sample:DemoView x:Class="Samples.Modules.PropertyGrid.Views.DefaultEditors"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 Title="Default Editors"
+                 Description="This example demonstrates the default editors provided by the PropertyGrid.">
+   <StackPanel Margin="10">
+      <TextBlock Text="Default Editors:" Style="{StaticResource Header}" />
+      <xctk:PropertyGrid x:Name="_propertyGrid" Width="450" Margin="10" />
+   </StackPanel>
+</sample:DemoView>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/DefaultEditors.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/DefaultEditors.xaml.cs
new file mode 100644
index 00000000..7f5bb609
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/DefaultEditors.xaml.cs
@@ -0,0 +1,181 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Media;
+using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
+
+namespace Samples.Modules.PropertyGrid.Views
+{
+  /// <summary>
+  /// Interaction logic for DefaultEditors.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class DefaultEditors : DemoView
+  {
+    public DefaultEditors()
+    {
+      InitializeComponent();
+      _propertyGrid.SelectedObject = Person.CreatePerson();
+    }
+
+    public class Person
+    {
+      [Category( "Information" )]
+      [DisplayName( "First Name" )]
+      [Description( "This property uses a TextBox as the default editor." )]
+      public string FirstName
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [DisplayName( "Last Name" )]
+      [Description( "This property uses a TextBox as the default editor." )]
+      public string LastName
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [DisplayName( "Date of Birth" )]
+      [Description( "This property uses the DateTimeUpDown as the default editor." )]
+      public DateTime DateOfBirth
+      {
+        get;
+        set;
+      }
+
+      [DisplayName( "Grade Point Average" )]
+      [Description( "This property uses the DoubleUpDown as the default editor." )]
+      public double GradePointAvg
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [Description( "This property uses the IntegerUpDown as the default editor." )]
+      public int Age
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [DisplayName( "Is Male" )]
+      [Description( "This property uses a CheckBox as the default editor." )]
+      public bool IsMale
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [DisplayName( "Favorite Color" )]
+      [Description( "This property uses the ColorPicker as the default editor." )]
+      public Color FavoriteColor
+      {
+        get;
+        set;
+      }
+
+      [Category( "Writing" )]
+      [DisplayName( "Writing Hand" )]
+      [Description( "This property uses a ComboBox as the default editor.  The ComboBox is auto populated with the enum values" )]
+      public HorizontalAlignment WritingHand
+      {
+        get;
+        set;
+      }
+
+      [Category( "Writing" )]
+      [DisplayName( "Writing Font" )]
+      [Description( "This property uses a ComboBox as the default editor.  The ComboBox is auto populated with the enum values" )]
+      public FontFamily WritingFont
+      {
+        get;
+        set;
+      }
+
+      [Category( "Writing" )]
+      [DisplayName( "Writing Font Size" )]
+      [Description( "This property uses the DoubleUpDown as the default editor." )]
+      public double WritingFontSize
+      {
+        get;
+        set;
+      }
+
+      [Category( "Conections" )]
+      [DisplayName( "Pet Names" )]
+      [Description( "This property uses the PrimitiveTypeCollectionEditor as the default editor." )]
+      public List<String> PetNames
+      {
+        get;
+        set;
+      }
+
+      [Category( "Conections" )]
+      [Description( "This property uses the CollectionEditor as the default editor." )]
+      public List<Person> Friends
+      {
+        get;
+        set;
+      }
+
+      [Category( "Conections" )]
+      [Description( "This property is a complex property and has no default editor." )]
+      public Person Spouse
+      {
+        get;
+        set;
+      }
+
+      public static Person CreatePerson()
+      {
+        var person = new Person();
+        person.FirstName = "John";
+        person.LastName = "Doe";
+        person.DateOfBirth = new DateTime( 1975, 1, 23 );
+        person.Age = DateTime.Today.Year - person.DateOfBirth.Year;
+        person.GradePointAvg = 3.98;
+        person.IsMale = true;
+        person.FavoriteColor = Colors.Blue;
+        person.WritingHand = System.Windows.HorizontalAlignment.Right;
+        person.WritingFont = new FontFamily( "Arial" );
+        person.WritingFontSize = 12.5;
+        person.PetNames = new List<string>() { "Pet 1", "Pet 2", "Pet 3" };
+        person.Friends = new List<Person>() { new Person() { FirstName = "First", LastName = "Friend" }, new Person() { FirstName = "Second", LastName = "Friend" } };
+        person.Spouse = new Person()
+        {
+          FirstName = "Jane",
+          LastName = "Doe"
+        };
+        return person;
+      }
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/ExpandableProperties.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/ExpandableProperties.xaml
new file mode 100644
index 00000000..d968f69c
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/ExpandableProperties.xaml
@@ -0,0 +1,31 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<sample:DemoView x:Class="Samples.Modules.PropertyGrid.Views.ExpandableProperties"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 Title="Exandable Properties"
+                 Description="Sometimes it is neccessary to show the properties of a complex object.  The PropertyGrid supports this scenario and allows you to drill down into a property's heirarchy.  To enable this behavior you must decorate your property with the ExpandableObject attribute.">
+   <StackPanel Margin="10">
+      <TextBlock Text="Expandable Properties:" Style="{StaticResource Header}" />
+      <TextBlock Text="In this example the Spouse property has been decorated with the ExpandableObject attribute.  Notice how you can drill down into the Spouse properties." TextWrapping="Wrap" />
+      <xctk:PropertyGrid x:Name="_propertyGrid" Width="450" Margin="10"  />
+   </StackPanel>
+</sample:DemoView>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/ExpandableProperties.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/ExpandableProperties.xaml.cs
new file mode 100644
index 00000000..063a6603
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/ExpandableProperties.xaml.cs
@@ -0,0 +1,102 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.ComponentModel;
+using System.Windows.Media;
+using Samples.Infrastructure.Controls;
+using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
+
+namespace Samples.Modules.PropertyGrid.Views
+{
+  /// <summary>
+  /// Interaction logic for ExpandableProperties.xaml
+  /// </summary>
+  public partial class ExpandableProperties : DemoView
+  {
+    public ExpandableProperties()
+    {
+      InitializeComponent();
+      _propertyGrid.SelectedObject = Person.CreatePerson();
+    }
+
+    public class Person
+    {
+      [Category( "Information" )]
+      [DisplayName( "First Name" )]
+      [Description( "This property uses a TextBox as the default editor." )]
+      public string FirstName
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [DisplayName( "Last Name" )]
+      [Description( "This property uses a TextBox as the default editor." )]
+      public string LastName
+      {
+        get;
+        set;
+      }
+
+      [Category( "Writing" )]
+      [DisplayName( "Writing Font" )]
+      [Description( "This property uses a ComboBox as the default editor.  The ComboBox is auto populated with the enum values" )]
+      public FontFamily WritingFont
+      {
+        get;
+        set;
+      }
+
+      [Category( "Writing" )]
+      [DisplayName( "Writing Font Size" )]
+      [Description( "This property uses the DoubleUpDown as the default editor." )]
+      public double WritingFontSize
+      {
+        get;
+        set;
+      }
+
+
+      [Category( "Conections" )]
+      [Description( "This property is a complex property and has no default editor." )]
+      [ExpandableObject]
+      public Person Spouse
+      {
+        get;
+        set;
+      }
+
+      public static Person CreatePerson()
+      {
+        var person = new Person();
+        person.FirstName = "John";
+        person.LastName = "Doe";
+        person.WritingFont = new FontFamily( "Arial" );
+        person.WritingFontSize = 12.5;
+        person.Spouse = new Person()
+        {
+          FirstName = "Jane",
+          LastName = "Doe"
+        };
+        return person;
+      }
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/HomeView.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/HomeView.xaml
new file mode 100644
index 00000000..5ebd63ec
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/HomeView.xaml
@@ -0,0 +1,84 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<sample:DemoView x:Class="Samples.Modules.PropertyGrid.Views.HomeView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"  
+                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 Title="PropertyGrid" 
+                 Description="The PropertyGrid control allows you inspect and edit properties of an object.  This PropertyGrid allows you do autogenerate all properties or specify the specific properties you want to display.  You can use the standard editors that are provided with the PropertyGrid or you can use custom editors that target a Type, specific properties, or both.  The PropertyGrid also supports complex properties, which allows you to drill down into a nested property hierarchy.">
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*"/>
+      </Grid.RowDefinitions>
+
+      <GroupBox Header="Features" Grid.Row="0" Margin="5">
+         <Grid Margin="5">
+            <Grid.RowDefinitions>
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="Auto" />
+               <ColumnDefinition Width="*" />
+               <ColumnDefinition Width="Auto" />
+               <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+
+            <TextBlock Text="Show Sumary:" VerticalAlignment="Center" />
+            <CheckBox x:Name="_showSummary" Grid.Column="1" IsChecked="True" VerticalAlignment="Center" Margin="5" ToolTip="Shows/Hides the summary panel of the PropertyGrid." />
+
+            <TextBlock Text="Filter:" VerticalAlignment="Center" Grid.Row="1" />
+            <xctk:WatermarkTextBox x:Name="_filter" 
+                                   Grid.Row="1" 
+                                   Grid.Column="1"
+                                   Watermark="Search" 
+                                   VerticalAlignment="Center" Margin="5" ToolTip="Filters the properties within the PropertyGrid." />
+
+            <TextBlock Text="Is Categorized:" VerticalAlignment="Center" Grid.Column="2" />
+            <CheckBox x:Name="_isCategorized" Grid.Column="3" IsChecked="True" VerticalAlignment="Center" Margin="5" ToolTip="Gets/Sets the layout of the PropertyGrid." />
+
+            <TextBlock Text="Show Advanced Options:" VerticalAlignment="Center" Grid.Row="1" Grid.Column="2" />
+            <CheckBox x:Name="_showAdvancedOptions" Grid.Row="1" Grid.Column="3" IsChecked="True" VerticalAlignment="Center" Margin="5" ToolTip="Shows/Hides the advanced options menu next to a property." />
+         </Grid>
+      </GroupBox>
+
+      <StackPanel Grid.Row="1" Margin="10">
+         <TextBlock Text="Usage:" Style="{StaticResource Header}" />
+         <TextBlock Text="To inspect an object simply set the PropertyGrid.SelectedObject property to an instance of the object you want to inspect."
+                       TextWrapping="Wrap" />
+         <Grid Height="400" Margin="10">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition />
+               <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+
+            <Button x:Name="_button" Height="200" Width="200" Margin="25" HorizontalAlignment="Center" VerticalAlignment="Center">Inspect Me</Button>
+
+            <xctk:PropertyGrid Grid.Column="1"
+                               ShowSummary="{Binding IsChecked, ElementName=_showSummary}"
+                               Filter="{Binding Text, ElementName=_filter, Mode=TwoWay}"
+                               IsCategorized="{Binding IsChecked, ElementName=_isCategorized, Mode=TwoWay}"
+                               ShowAdvancedOptions="{Binding IsChecked, ElementName=_showAdvancedOptions}"
+                               SelectedObject="{Binding ElementName=_button}" />
+         </Grid>
+      </StackPanel>
+   </Grid>
+</sample:DemoView>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/HomeView.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/HomeView.xaml.cs
new file mode 100644
index 00000000..3745fa8f
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/HomeView.xaml.cs
@@ -0,0 +1,36 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
+
+namespace Samples.Modules.PropertyGrid.Views
+{
+  /// <summary>
+  /// Interaction logic for HomeView.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class HomeView : DemoView
+  {
+    public HomeView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/NavigationView.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/NavigationView.xaml
new file mode 100644
index 00000000..15411768
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/NavigationView.xaml
@@ -0,0 +1,40 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<TreeViewItem x:Class="Samples.Modules.PropertyGrid.Views.NavigationView"
+              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+              xmlns:views="clr-namespace:Samples.Modules.PropertyGrid.Views"
+              Header="PropertyGrid" Tag="{x:Type views:HomeView}">
+
+   <TreeViewItem.Resources>
+      <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
+   </TreeViewItem.Resources>
+
+   <TreeViewItem Header="Editors">
+      <TreeViewItem Header="Default Editors" Tag="{x:Type views:DefaultEditors}" />
+      <TreeViewItem Header="Custom Editors" Tag="{x:Type views:CustomEditors}" />
+   </TreeViewItem>
+   <TreeViewItem Header="Properties">
+      <TreeViewItem Header="Binding to Structs" Tag="{x:Type views:BindingToStructs}" />
+      <TreeViewItem Header="Expandable Properties" Tag="{x:Type views:ExpandableProperties}" />
+      <TreeViewItem Header="Providing an ItemsSource" Tag="{x:Type views:CustomItemsSource}" />
+      <TreeViewItem Header="Specifying Properties" Tag="{x:Type views:SpecifyingProperties}" />
+   </TreeViewItem>
+
+</TreeViewItem>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/NavigationView.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/NavigationView.xaml.cs
new file mode 100644
index 00000000..34eaf909
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/NavigationView.xaml.cs
@@ -0,0 +1,34 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows.Controls;
+
+namespace Samples.Modules.PropertyGrid.Views
+{
+  /// <summary>
+  /// Interaction logic for NavigationView.xaml
+  /// </summary>
+  public partial class NavigationView : TreeViewItem
+  {
+    public NavigationView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/SpecifyingProperties.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/SpecifyingProperties.xaml
new file mode 100644
index 00000000..c3bfbaa4
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/SpecifyingProperties.xaml
@@ -0,0 +1,40 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<sample:DemoView x:Class="Samples.Modules.PropertyGrid.Views.SpecifyingProperties"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 Title="Specifying Properties"
+                 Description="By default the propertyGrid will autogenerate all the properties for a given object.  You can override this behavior by setting the AutoGenerateProperties property to False, and then provide a collection of PropertyDefinitions of the properties you would like to show.">
+   <StackPanel Grid.Row="1" Margin="10">
+      <TextBlock Text="Specifying Properties:" Style="{StaticResource Header}" />
+      <xctk:PropertyGrid x:Name="_propertyGrid" 
+                            Width="450" 
+                            Margin="10"
+                            AutoGenerateProperties="False">
+         <!-- Only the following properties will be displayed in the PropertyGrid -->
+         <xctk:PropertyGrid.PropertyDefinitions>
+            <xctk:PropertyDefinition Name="FirstName" />
+            <xctk:PropertyDefinition Name="FavoriteColor" />
+            <xctk:PropertyDefinition Name="PetNames" />
+         </xctk:PropertyGrid.PropertyDefinitions>
+      </xctk:PropertyGrid>
+   </StackPanel>
+</sample:DemoView>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/SpecifyingProperties.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/SpecifyingProperties.xaml.cs
new file mode 100644
index 00000000..374164d2
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/SpecifyingProperties.xaml.cs
@@ -0,0 +1,181 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Media;
+using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
+
+namespace Samples.Modules.PropertyGrid.Views
+{
+  /// <summary>
+  /// Interaction logic for SpecifyingProperties.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class SpecifyingProperties : DemoView
+  {
+    public SpecifyingProperties()
+    {
+      InitializeComponent();
+      _propertyGrid.SelectedObject = Person.CreatePerson();
+    }
+
+    public class Person
+    {
+      [Category( "Information" )]
+      [DisplayName( "First Name" )]
+      [Description( "This property uses a TextBox as the default editor." )]
+      public string FirstName
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [DisplayName( "Last Name" )]
+      [Description( "This property uses a TextBox as the default editor." )]
+      public string LastName
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [DisplayName( "Date of Birth" )]
+      [Description( "This property uses the DateTimeUpDown as the default editor." )]
+      public DateTime DateOfBirth
+      {
+        get;
+        set;
+      }
+
+      [DisplayName( "Grade Point Average" )]
+      [Description( "This property uses the DoubleUpDown as the default editor." )]
+      public double GradePointAvg
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [Description( "This property uses the IntegerUpDown as the default editor." )]
+      public int Age
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [DisplayName( "Is Male" )]
+      [Description( "This property uses a CheckBox as the default editor." )]
+      public bool IsMale
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [DisplayName( "Favorite Color" )]
+      [Description( "This property uses the ColorPicker as the default editor." )]
+      public Color FavoriteColor
+      {
+        get;
+        set;
+      }
+
+      [Category( "Writing" )]
+      [DisplayName( "Writing Hand" )]
+      [Description( "This property uses a ComboBox as the default editor.  The ComboBox is auto populated with the enum values" )]
+      public HorizontalAlignment WritingHand
+      {
+        get;
+        set;
+      }
+
+      [Category( "Writing" )]
+      [DisplayName( "Writing Font" )]
+      [Description( "This property uses a ComboBox as the default editor.  The ComboBox is auto populated with the enum values" )]
+      public FontFamily WritingFont
+      {
+        get;
+        set;
+      }
+
+      [Category( "Writing" )]
+      [DisplayName( "Writing Font Size" )]
+      [Description( "This property uses the DoubleUpDown as the default editor." )]
+      public double WritingFontSize
+      {
+        get;
+        set;
+      }
+
+      [Category( "Conections" )]
+      [DisplayName( "Pet Names" )]
+      [Description( "This property uses the PrimitiveTypeCollectionEditor as the default editor." )]
+      public List<String> PetNames
+      {
+        get;
+        set;
+      }
+
+      [Category( "Conections" )]
+      [Description( "This property uses the CollectionEditor as the default editor." )]
+      public List<Person> Friends
+      {
+        get;
+        set;
+      }
+
+      [Category( "Conections" )]
+      [Description( "This property is a complex property and has no default editor." )]
+      public Person Spouse
+      {
+        get;
+        set;
+      }
+
+      public static Person CreatePerson()
+      {
+        var person = new Person();
+        person.FirstName = "John";
+        person.LastName = "Doe";
+        person.DateOfBirth = new DateTime( 1975, 1, 23 );
+        person.Age = DateTime.Today.Year - person.DateOfBirth.Year;
+        person.GradePointAvg = 3.98;
+        person.IsMale = true;
+        person.FavoriteColor = Colors.Blue;
+        person.WritingHand = System.Windows.HorizontalAlignment.Right;
+        person.WritingFont = new FontFamily( "Arial" );
+        person.WritingFontSize = 12.5;
+        person.PetNames = new List<string>() { "Pet 1", "Pet 2", "Pet 3" };
+        person.Friends = new List<Person>() { new Person() { FirstName = "First", LastName = "Friend" }, new Person() { FirstName = "Second", LastName = "Friend" } };
+        person.Spouse = new Person()
+        {
+          FirstName = "Jane",
+          LastName = "Doe"
+        };
+        return person;
+      }
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Images/PencilTool16.png b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Images/PencilTool16.png
new file mode 100644
index 00000000..df0970c4
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Images/PencilTool16.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Properties/AssemblyInfo.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..264e54b6
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Properties/AssemblyInfo.cs
@@ -0,0 +1,72 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle( "Extended WPF Toolkit Text Sample" )]
+[assembly: AssemblyDescription( "" )]
+[assembly: AssemblyConfiguration( "" )]
+[assembly: AssemblyCompany( "Xceed Software Inc." )]
+[assembly: AssemblyProduct( "Extended WPF Toolkit Text Sample" )]
+[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
+[assembly: AssemblyTrademark( "" )]
+[assembly: AssemblyCulture( "" )]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible( false )]
+
+//In order to begin building localizable applications, set 
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+  //(used if a resource is not found in the page, 
+  // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+  //(used if a resource is not found in the page, 
+  // app, or any theme specific resource dictionaries)
+)]
+
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion( "1.0.0.0" )]
+[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Resources/PlainData.txt b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Resources/PlainData.txt
new file mode 100644
index 00000000..72443a9f
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Resources/PlainData.txt
@@ -0,0 +1,2 @@
+This is the RichTextBox
+in Plain Format
\ No newline at end of file
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Resources/RtfData.txt b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Resources/RtfData.txt
new file mode 100644
index 00000000..3d527eb9
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Resources/RtfData.txt
@@ -0,0 +1 @@
+ {\rtf1\ansi\ansicpg1252\uc1\htmautsp\deff2{\fonttbl{\f0\fcharset0 Times New Roman;}{\f2\fcharset0 Segoe UI;}}{\colortbl\red0\green0\blue0;\red255\green255\blue255;}\loch\hich\dbch\pard\plain\ltrpar\itap0{\lang1033\fs18\f2\cf0 \cf0\ql{\f2 {\ltrch This is the }{\b\ltrch RichTextBox}{\ltrch  in Rtf Format }\li0\ri0\sa0\sb0\fi0\ql\par}}}
\ No newline at end of file
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Resources/XamlData.txt b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Resources/XamlData.txt
new file mode 100644
index 00000000..baa76946
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Resources/XamlData.txt
@@ -0,0 +1 @@
+<Section xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xml:space="preserve" TextAlignment="Left" LineHeight="Auto" IsHyphenationEnabled="False" xml:lang="en-us" FlowDirection="LeftToRight" NumberSubstitution.CultureSource="User" NumberSubstitution.Substitution="AsCulture" FontFamily="Segoe UI" FontStyle="Normal" FontWeight="Normal" FontStretch="Normal" FontSize="12" Foreground="#FF000000" Typography.StandardLigatures="True" Typography.ContextualLigatures="True" Typography.DiscretionaryLigatures="False" Typography.HistoricalLigatures="False" Typography.AnnotationAlternates="0" Typography.ContextualAlternates="True" Typography.HistoricalForms="False" Typography.Kerning="True" Typography.CapitalSpacing="False" Typography.CaseSensitiveForms="False" Typography.StylisticSet1="False" Typography.StylisticSet2="False" Typography.StylisticSet3="False" Typography.StylisticSet4="False" Typography.StylisticSet5="False" Typography.StylisticSet6="False" Typography.StylisticSet7="False" Typography.StylisticSet8="False" Typography.StylisticSet9="False" Typography.StylisticSet10="False" Typography.StylisticSet11="False" Typography.StylisticSet12="False" Typography.StylisticSet13="False" Typography.StylisticSet14="False" Typography.StylisticSet15="False" Typography.StylisticSet16="False" Typography.StylisticSet17="False" Typography.StylisticSet18="False" Typography.StylisticSet19="False" Typography.StylisticSet20="False" Typography.Fraction="Normal" Typography.SlashedZero="False" Typography.MathematicalGreek="False" Typography.EastAsianExpertForms="False" Typography.Variants="Normal" Typography.Capitals="Normal" Typography.NumeralStyle="Normal" Typography.NumeralAlignment="Normal" Typography.EastAsianWidths="Normal" Typography.EastAsianLanguage="Normal" Typography.StandardSwashes="0" Typography.ContextualSwashes="0" Typography.StylisticAlternates="0"><Paragraph><Run>This is the </Run><LineBreak/><Run FontWeight="Bold">RichTextBox</Run><LineBreak/><Run>in XAML Format</Run></Paragraph></Section>
\ No newline at end of file
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Samples.Modules.Text.csproj b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Samples.Modules.Text.csproj
new file mode 100644
index 00000000..33091a37
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Samples.Modules.Text.csproj
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{10EFEFC6-F2CC-4C6E-955C-668B17F7F342}</ProjectGuid>
+    <OutputType>library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Samples.Modules.Text</RootNamespace>
+    <AssemblyName>Samples.Modules.Text</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.Practices.Prism, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Practices.Unity, Version=2.0.414.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
+    </Reference>
+    <ProjectReference Include="..\..\..\WPFToolkit.Extended\WPFToolkit.Extended.csproj">
+      <Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
+      <Name>WPFToolkit.Extended</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Samples.Infrastructure\Samples.Infrastructure.csproj">
+      <Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
+      <Name>Samples.Infrastructure</Name>
+    </ProjectReference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="TextModule.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Views\HomeView.xaml.cs">
+      <DependentUpon>HomeView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\MaskedTextBoxView.xaml.cs">
+      <DependentUpon>MaskedTextBoxView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\MultiLineTextEditor.xaml.cs">
+      <DependentUpon>MultiLineTextEditor.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\NavigationView.xaml.cs">
+      <DependentUpon>NavigationView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\RichTextBoxView.xaml.cs">
+      <DependentUpon>RichTextBoxView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\WatermarkTextBoxView.xaml.cs">
+      <DependentUpon>WatermarkTextBoxView.xaml</DependentUpon>
+    </Compile>
+    <AppDesigner Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="Views\HomeView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\MaskedTextBoxView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\MultiLineTextEditor.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\NavigationView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\RichTextBoxView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\WatermarkTextBoxView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\PlainData.txt" />
+    <Resource Include="Resources\RtfData.txt" />
+    <Resource Include="Resources\XamlData.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\PencilTool16.png" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y
+xcopy "$(ProjectDir)Views" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\Samples\$(ProjectName)\" /s /Y /I</PostBuildEvent>
+  </PropertyGroup>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/TextModule.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/TextModule.cs
new file mode 100644
index 00000000..5f056680
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/TextModule.cs
@@ -0,0 +1,49 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using Microsoft.Practices.Prism.Regions;
+using Microsoft.Practices.Unity;
+using Samples.Infrastructure;
+using Samples.Infrastructure.Extensions;
+using Samples.Modules.Text.Views;
+
+namespace Samples.Modules.Text
+{
+  public class TextModule : ModuleBase
+  {
+    public TextModule( IUnityContainer container, IRegionManager regionManager )
+      : base( container, regionManager )
+    {
+    }
+
+    protected override void InitializeModule()
+    {
+      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( NavigationView ) );
+    }
+
+    protected override void RegisterViewsAndTypes()
+    {
+      Container.RegisterNavigationType( typeof( HomeView ) );
+      Container.RegisterNavigationType( typeof( MaskedTextBoxView ) );
+      Container.RegisterNavigationType( typeof( MultiLineTextEditorView ) );
+      Container.RegisterNavigationType( typeof( RichTextBoxView ) );
+      Container.RegisterNavigationType( typeof( WatermarkTextBoxView ) );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/HomeView.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/HomeView.xaml
new file mode 100644
index 00000000..6ed815c2
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/HomeView.xaml
@@ -0,0 +1,27 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<sample:DemoView x:Class="Samples.Modules.Text.Views.HomeView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 Title="Text Controls">
+   <Grid x:Name="layoutRoot">
+   </Grid>
+</sample:DemoView>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/HomeView.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/HomeView.xaml.cs
new file mode 100644
index 00000000..310095f4
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/HomeView.xaml.cs
@@ -0,0 +1,70 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
+
+namespace Samples.Modules.Text.Views
+{
+  /// <summary>
+  /// Interaction logic for HomeView.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class HomeView : DemoView
+  {
+    public HomeView()
+    {
+      InitializeComponent();
+    }
+
+    public class Email
+    {
+      public int Id
+      {
+        get;
+        set;
+      }
+      public string FirstName
+      {
+        get;
+        set;
+      }
+      public string LastName
+      {
+        get;
+        set;
+      }
+      public string EmailAddress
+      {
+        get;
+        set;
+      }
+
+      public string FullName
+      {
+        get
+        {
+          return String.Format( "{0}, {1}", LastName, FirstName );
+        }
+      }
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/MaskedTextBoxView.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/MaskedTextBoxView.xaml
new file mode 100644
index 00000000..b1171869
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/MaskedTextBoxView.xaml
@@ -0,0 +1,82 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<sample:DemoView x:Class="Samples.Modules.Text.Views.MaskedTextBoxView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 Title="MaskedTextBox"
+                 Description="The MaskedTextBox control lets you display and edit values based on a mask.">
+   <Grid>
+
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+      <GroupBox Header="Features" Grid.Row="0" Margin="5">
+         <StackPanel Margin="5">
+            <Grid>
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+               </Grid.RowDefinitions>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="*" />
+               </Grid.ColumnDefinitions>
+
+               <TextBlock Text="Include literals:" VerticalAlignment="Center" Margin="2" />
+               <CheckBox x:Name="_literals" Grid.Column="1" VerticalAlignment="Center" Margin="5" />
+
+               <TextBlock Text="Include prompt:" Grid.Row="1" VerticalAlignment="Center" Margin="2" />
+               <CheckBox x:Name="_prompt" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" Margin="5" />
+            </Grid>
+            <Grid Margin="0,5,0,0">
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+               </Grid.RowDefinitions>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="*" />
+               </Grid.ColumnDefinitions>
+
+               <TextBlock Text="Mask:" VerticalAlignment="Center" Margin="2" />
+               <TextBox x:Name="_mask" Grid.Column="1" VerticalAlignment="Center" Margin="5" Text="(000) 000-0000" />
+
+               <TextBlock Text="Value:" Grid.Row="1" VerticalAlignment="Center" Margin="2" />
+               <TextBox x:Name="_value" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" Margin="5" Text="1234567890" />
+
+               <TextBlock Text="Text:" Grid.Row="2" VerticalAlignment="Center" Margin="2" />
+               <TextBox x:Name="_text" Grid.Row="2" Grid.Column="1" VerticalAlignment="Center" Margin="5" />
+            </Grid>
+         </StackPanel>
+      </GroupBox>
+
+      <StackPanel Grid.Row="1" Margin="10">
+         <xctk:MaskedTextBox IncludeLiterals="{Binding IsChecked, ElementName=_literals, Mode=TwoWay}"
+                             IncludePrompt="{Binding IsChecked, ElementName=_prompt, Mode=TwoWay}"
+                             Mask="{Binding Text, ElementName=_mask}"
+                             Value="{Binding Text, ElementName=_value, Mode=TwoWay}"
+                             Text="{Binding Text, ElementName=_text, Mode=TwoWay}" />
+      </StackPanel>
+   </Grid>
+</sample:DemoView>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/MaskedTextBoxView.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/MaskedTextBoxView.xaml.cs
new file mode 100644
index 00000000..8663bd8e
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/MaskedTextBoxView.xaml.cs
@@ -0,0 +1,36 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
+
+namespace Samples.Modules.Text.Views
+{
+  /// <summary>
+  /// Interaction logic for MaskedTextBoxView.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class MaskedTextBoxView : DemoView
+  {
+    public MaskedTextBoxView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/MultiLineTextEditor.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/MultiLineTextEditor.xaml
new file mode 100644
index 00000000..3ef1a469
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/MultiLineTextEditor.xaml
@@ -0,0 +1,52 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<sample:DemoView x:Class="Samples.Modules.Text.Views.MultiLineTextEditorView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 Title="MultiLineTextEditor"
+                 Description="The MultiLineTextEditor is a TextBox that allows you to edit text that is too long to display in a regular TextBox. The popup is resizable to accommodates any text.">
+    <sample:DemoView.Resources>
+        <DataTemplate x:Key="multiLineTextEditorStyle" >
+            <xctk:MultiLineTextEditor TextWrapping="Wrap" Text="{Binding Path=Review}" Content="{Binding Text, RelativeSource={RelativeSource Self}}" Height="24" />
+        </DataTemplate>
+    </sample:DemoView.Resources>
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+        </Grid.ColumnDefinitions>
+        <StackPanel Grid.Row="1" Margin="10">
+            <TextBlock Text="Usage:" Style="{StaticResource Header}" />
+            <DataGrid x:Name="_dataGrid" ItemsSource="{Binding}" AutoGenerateColumns="False" CanUserAddRows="False">
+                <DataGrid.Columns>
+                    <DataGridTextColumn Header="Title" Binding="{Binding Path=Title}" IsReadOnly="True"/>
+                    <DataGridTemplateColumn Header="Review" Width="150" CellTemplate ="{StaticResource multiLineTextEditorStyle}"/>
+                    <DataGridTextColumn Header="Rating" Binding="{Binding Path=Rating}" IsReadOnly="True"/>
+                </DataGrid.Columns>
+            </DataGrid>
+         </StackPanel>
+    </Grid>
+</sample:DemoView>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/MultiLineTextEditor.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/MultiLineTextEditor.xaml.cs
new file mode 100644
index 00000000..bfa458c4
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/MultiLineTextEditor.xaml.cs
@@ -0,0 +1,90 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+
+using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
+using System.Collections.Generic;
+namespace Samples.Modules.Text.Views
+{
+  public class Movie
+  {
+    public string Title
+    {
+      get;
+      set;
+    }
+
+    public string Review
+    {
+      get;
+      set;
+    }
+
+    public double Rating
+    {
+      get;
+      set;
+    }
+  }
+
+  /// <summary>
+  /// Interaction logic for MultiLineTextEditor.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class MultiLineTextEditorView : DemoView
+  {
+    public MultiLineTextEditorView()
+    {
+      InitializeComponent();
+      _dataGrid.DataContext = InitMovieList();
+    }
+
+    private List<Movie> InitMovieList()
+    {
+      List<Movie> movieList = new List<Movie>();
+      movieList.Add( new Movie()
+      {
+        Title = "Lords Of The Ring",
+        Review = "A great movie with many special effects.",
+        Rating = 9
+      } );
+      movieList.Add( new Movie()
+      {
+        Title = "Pirates Of The Caribbean",
+        Review = "An epic pirate movie with ships, swords, explosion and a treasure.",
+        Rating = 9.5
+      } );
+      movieList.Add( new Movie()
+      {
+        Title = "Batman",
+        Review = "Batman returns after 8 years, stronger than ever, to deliver Gotham City from a new criminel.",
+        Rating = 7.8
+      } );
+      movieList.Add( new Movie()
+      {
+        Title = "Indiana Jones",
+        Review = "Harrison Ford strikes back for full-pack action movie in the jungle to uncover a mysterious Crystal skull.",
+        Rating = 6.4
+      } );
+
+      return movieList;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/NavigationView.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/NavigationView.xaml
new file mode 100644
index 00000000..37538b50
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/NavigationView.xaml
@@ -0,0 +1,34 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<TreeViewItem x:Class="Samples.Modules.Text.Views.NavigationView"
+              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+              xmlns:views="clr-namespace:Samples.Modules.Text.Views"
+              Header="Text" Tag="{x:Type views:HomeView}">
+
+   <TreeViewItem.Resources>
+      <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
+   </TreeViewItem.Resources>
+
+   <TreeViewItem Header="MaskedTextBox" Tag="{x:Type views:MaskedTextBoxView}" />
+    <TreeViewItem Header="MultiLineTextEditor" Tag="{x:Type views:MultiLineTextEditorView}" />
+   <TreeViewItem Header="RichTextBox" Tag="{x:Type views:RichTextBoxView}"/>
+   <TreeViewItem Header="WatermarkTextBox" Tag="{x:Type views:WatermarkTextBoxView}" />
+
+</TreeViewItem>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/NavigationView.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/NavigationView.xaml.cs
new file mode 100644
index 00000000..8a2d584f
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/NavigationView.xaml.cs
@@ -0,0 +1,34 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows.Controls;
+
+namespace Samples.Modules.Text.Views
+{
+  /// <summary>
+  /// Interaction logic for NavigationView.xaml
+  /// </summary>
+  public partial class NavigationView : TreeViewItem
+  {
+    public NavigationView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/RichTextBoxView.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/RichTextBoxView.xaml
new file mode 100644
index 00000000..aaca4a79
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/RichTextBoxView.xaml
@@ -0,0 +1,64 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<sample:DemoView x:Class="Samples.Modules.Text.Views.RichTextBoxView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 xmlns:local="clr-namespace:Samples.Modules.Text.Views"
+                 Title="RichTextBox"
+                 Description="The RichTextBox is a TextBox that allows you to edits formated text based on TextFormatters. The RichTextBoxFormatBar is a contextual formatting toolbar that mimics the behavior of the Microsoft Office 2010 formatting bar on selection.">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+
+        <GroupBox Header="Features" Grid.Row="0" Margin="5">
+            <Grid Margin="5" HorizontalAlignment="Left">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+                <TextBlock Text="TextFormatter:" VerticalAlignment="Center" />
+                <ComboBox x:Name="_textFormatter" SelectedIndex="0" SelectionChanged="OnTextFormatterChanged" Grid.Column="1" Width="150" Margin="5" HorizontalAlignment="Left">
+                    <ComboBoxItem Tag="{x:Static local:TextFormatterEnum.PlainText}">Plain Text</ComboBoxItem>
+                    <ComboBoxItem Tag="{x:Static local:TextFormatterEnum.Rtf}">RTF</ComboBoxItem>
+                    <ComboBoxItem Tag="{x:Static local:TextFormatterEnum.Xaml}">Xaml</ComboBoxItem>
+                </ComboBox>
+                <TextBlock Text="Text:" Grid.Row="1" VerticalAlignment="Center"/>
+                <TextBox x:Name="_text" Grid.Row="1" Grid.Column="1" TextWrapping="Wrap" IsReadOnly="True" Width="500" Height="70" Margin="5" ScrollViewer.VerticalScrollBarVisibility="Auto"/>
+             </Grid>
+        </GroupBox>
+
+        <StackPanel Grid.Row="1" Margin="10">
+            <TextBlock Text="Usage:" Style="{StaticResource Header}" />
+            <xctk:RichTextBox x:Name="_richTextBox" Grid.Column="1" Margin="5" BorderBrush="Gray" Padding="10" Width="350" Text="{Binding ElementName=_text, Path=Text, UpdateSourceTrigger=PropertyChanged}">
+                <xctk:RichTextBoxFormatBarManager.FormatBar>
+                    <xctk:RichTextBoxFormatBar />
+                </xctk:RichTextBoxFormatBarManager.FormatBar>
+            </xctk:RichTextBox>
+        </StackPanel>
+    </Grid>
+</sample:DemoView>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/RichTextBoxView.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/RichTextBoxView.xaml.cs
new file mode 100644
index 00000000..38b98ab6
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/RichTextBoxView.xaml.cs
@@ -0,0 +1,96 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
+using System.Windows.Controls;
+using Xceed.Wpf.Toolkit;
+using System;
+using System.Windows.Resources;
+using System.Windows;
+using System.IO;
+namespace Samples.Modules.Text.Views
+{
+  public enum TextFormatterEnum
+  {
+    PlainText,
+    Rtf,
+    Xaml
+  };
+
+  /// <summary>
+  /// Interaction logic for RichTextBox.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class RichTextBoxView : DemoView
+  {
+    public RichTextBoxView()
+    {
+      InitializeComponent();
+    }
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+
+      UpdateValues( _textFormatter );
+    }
+
+    private void OnTextFormatterChanged( object sender, SelectionChangedEventArgs args )
+    {
+      ComboBox comboBox = sender as ComboBox;
+      UpdateValues( comboBox );
+    }
+
+    private void UpdateValues( ComboBox comboBox )
+    {
+      if( ( comboBox != null ) && ( _text != null ) && ( _richTextBox != null ) )
+      {
+        object tagValue = ( ( ComboBoxItem )comboBox.SelectedItem ).Tag;
+        if( object.Equals( TextFormatterEnum.PlainText, tagValue ) )
+        {
+          _text.Text = GetDataFromResource( "/Samples.Modules.Text;component/Resources/PlainData.txt" );
+          _richTextBox.TextFormatter = new PlainTextFormatter();
+        }
+        else if( object.Equals( TextFormatterEnum.Rtf, tagValue ) )
+        {
+          _text.Text = GetDataFromResource( "/Samples.Modules.Text;component/Resources/RtfData.txt" );
+          _richTextBox.TextFormatter = new RtfFormatter();
+        }
+        else if( object.Equals( TextFormatterEnum.Xaml, tagValue ) )
+        {
+          _text.Text = GetDataFromResource( "/Samples.Modules.Text;component/Resources/XamlData.txt" );
+          _richTextBox.TextFormatter = new XamlFormatter();
+        }
+      }
+    }
+
+    private string GetDataFromResource( string uriString )
+    {
+      Uri uri = new Uri( uriString, UriKind.Relative );
+      StreamResourceInfo info = Application.GetResourceStream( uri );
+
+      StreamReader reader = new StreamReader( info.Stream );
+      string data = reader.ReadToEnd();
+      reader.Close();
+
+      return data;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/WatermarkTextBoxView.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/WatermarkTextBoxView.xaml
new file mode 100644
index 00000000..114c1b27
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/WatermarkTextBoxView.xaml
@@ -0,0 +1,64 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<sample:DemoView x:Class="Samples.Modules.Text.Views.WatermarkTextBoxView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 Title="WatermarkTextBox"
+                 Description="The WatermarkTextBox is simply a TextBox that allows you to sepcify an object, usually a String, to represent null or missing text.">
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+      <GroupBox Header="Features" Grid.Row="0">
+         <Grid Margin="5">
+            <CheckBox x:Name="_selectAll" Content="SelectAllOnGotFocus" VerticalAlignment="Center" Margin="5" ToolTip="Selects all text in the WatermarkTextBox when it receives focus." />
+         </Grid>
+      </GroupBox>
+
+      <StackPanel Grid.Row="2" Margin="10">
+         <TextBlock Text="Default:" Style="{StaticResource Header}" />
+         <xctk:WatermarkTextBox Grid.Column="1" Margin="5" MinWidth="200" Watermark="Enter Text" SelectAllOnGotFocus="{Binding IsChecked, ElementName=_selectAll}" />
+
+         <TextBlock Text="Image Watermark:" Style="{StaticResource Header}" />
+         <xctk:WatermarkTextBox Grid.Column="1" Margin="5" SelectAllOnGotFocus="{Binding IsChecked, ElementName=_selectAll}">
+            <xctk:WatermarkTextBox.Watermark>
+               <StackPanel Orientation="Horizontal">
+                  <Image Source="/Samples.Modules.Text;component/Images/PencilTool16.png" Stretch="None" />
+                  <TextBlock Text="Enter Text" Margin="4,0,0,0" />
+               </StackPanel>
+            </xctk:WatermarkTextBox.Watermark>
+         </xctk:WatermarkTextBox>
+
+         <TextBlock Grid.Row="1" Text="Custom WatermarkTemplate:" Style="{StaticResource Header}" />
+         <xctk:WatermarkTextBox Grid.Row="2" Grid.Column="1" Margin="5" Watermark="Enter Text" SelectAllOnGotFocus="{Binding IsChecked, ElementName=_selectAll}">
+            <xctk:WatermarkTextBox.WatermarkTemplate>
+               <DataTemplate>
+                  <Border BorderBrush="Green" BorderThickness="1" Padding="5">
+                     <ContentControl Content="{Binding}" Foreground="DarkRed" FontWeight="Bold" Focusable="False" />
+                  </Border>
+               </DataTemplate>
+            </xctk:WatermarkTextBox.WatermarkTemplate>
+         </xctk:WatermarkTextBox>
+      </StackPanel>
+   </Grid>
+</sample:DemoView>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/WatermarkTextBoxView.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/WatermarkTextBoxView.xaml.cs
new file mode 100644
index 00000000..aba00c23
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/WatermarkTextBoxView.xaml.cs
@@ -0,0 +1,36 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
+
+namespace Samples.Modules.Text.Views
+{
+  /// <summary>
+  /// Interaction logic for WatermarkTextBoxView.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class WatermarkTextBoxView : DemoView
+  {
+    public WatermarkTextBoxView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Properties/AssemblyInfo.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..e541620f
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Properties/AssemblyInfo.cs
@@ -0,0 +1,72 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle( "Extended WPF Toolkit TimelinePanel Sample" )]
+[assembly: AssemblyDescription( "" )]
+[assembly: AssemblyConfiguration( "" )]
+[assembly: AssemblyCompany( "Xceed Software Inc." )]
+[assembly: AssemblyProduct( "Extended WPF Toolkit TimelinePanel Sample" )]
+[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
+[assembly: AssemblyTrademark( "" )]
+[assembly: AssemblyCulture( "" )]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible( false )]
+
+//In order to begin building localizable applications, set 
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+  //(used if a resource is not found in the page, 
+  // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+  //(used if a resource is not found in the page, 
+  // app, or any theme specific resource dictionaries)
+)]
+
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion( "1.0.0.0" )]
+[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Samples.Modules.TimelinePanel.csproj b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Samples.Modules.TimelinePanel.csproj
new file mode 100644
index 00000000..3a727ab2
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Samples.Modules.TimelinePanel.csproj
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{9FCBCEF6-6E41-4CD5-A49B-456890A038BA}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Samples.Modules.TimelinePanel</RootNamespace>
+    <AssemblyName>Samples.Modules.TimelinePanel</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.Practices.Prism">
+      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Practices.Unity">
+      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
+    </Reference>
+    <ProjectReference Include="..\..\..\WPFToolkit.Extended\WPFToolkit.Extended.csproj">
+      <Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
+      <Name>WPFToolkit.Extended</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Samples.Infrastructure\Samples.Infrastructure.csproj">
+      <Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
+      <Name>Samples.Infrastructure</Name>
+    </ProjectReference>
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xaml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="TimelinePanelModule.cs" />
+    <Compile Include="Views\HomeView.xaml.cs">
+      <DependentUpon>HomeView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\NavigationView.xaml.cs">
+      <DependentUpon>NavigationView.xaml</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="Views\HomeView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\NavigationView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y
+xcopy "$(ProjectDir)Views" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\Samples\$(ProjectName)\" /s /Y /I</PostBuildEvent>
+  </PropertyGroup>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/TimelinePanelModule.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/TimelinePanelModule.cs
new file mode 100644
index 00000000..571de28d
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/TimelinePanelModule.cs
@@ -0,0 +1,45 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using Microsoft.Practices.Prism.Regions;
+using Microsoft.Practices.Unity;
+using Samples.Infrastructure;
+using Samples.Infrastructure.Extensions;
+using Samples.Modules.TimelinePanel.Views;
+
+namespace Samples.Modules.TimelinePanel
+{
+  public class TimelinePanelModule : ModuleBase
+  {
+    public TimelinePanelModule( IUnityContainer container, IRegionManager regionManager )
+      : base( container, regionManager )
+    {
+    }
+
+    protected override void InitializeModule()
+    {
+      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( NavigationView ) );
+    }
+
+    protected override void RegisterViewsAndTypes()
+    {
+      Container.RegisterNavigationType( typeof( HomeView ) );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Views/HomeView.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Views/HomeView.xaml
new file mode 100644
index 00000000..86a02fdd
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Views/HomeView.xaml
@@ -0,0 +1,181 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<sample:DemoView x:Class="Samples.Modules.TimelinePanel.Views.HomeView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 xmlns:pf="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                 Title="TimelinePanel"
+                 Description="TimelinePanel is a WPF panel at arranges it's children along a timeline.  Items are placed along the timeline based on the Date attached property, which is set on each item.">
+   <sample:DemoView.Resources>
+      <ObjectDataProvider x:Key="Orientations" MethodName="GetValues"
+                          ObjectType="{x:Type sys:Enum}">
+         <ObjectDataProvider.MethodParameters>
+            <x:Type TypeName="Orientation" />
+         </ObjectDataProvider.MethodParameters>
+      </ObjectDataProvider>
+      <ObjectDataProvider x:Key="OverlapBehaviors" MethodName="GetValues"
+                          ObjectType="{x:Type sys:Enum}">
+         <ObjectDataProvider.MethodParameters>
+            <x:Type TypeName="xctk:OverlapBehavior" />
+         </ObjectDataProvider.MethodParameters>
+      </ObjectDataProvider>
+
+      <ControlTemplate x:Key="TimelineItemTemplate"
+                       TargetType="ContentControl">
+         <xctk:DropDownButton DataContext="{Binding ., RelativeSource={RelativeSource TemplatedParent}}"
+                              Content="{TemplateBinding Content}">
+            <xctk:DropDownButton.ContentTemplate>
+               <DataTemplate>
+                  <TextBlock Text="{TemplateBinding Content}" 
+                             TextTrimming="WordEllipsis" 
+                             VerticalAlignment="Center" />
+               </DataTemplate>
+            </xctk:DropDownButton.ContentTemplate>
+
+            <xctk:DropDownButton.DropDownContent>
+               <Border Background="Lavender"
+                       Padding="5">
+                  <Grid>
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                     </Grid.RowDefinitions>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                     </Grid.ColumnDefinitions>
+
+                     <TextBox Text="{Binding Content, Mode=TwoWay}"
+                           Grid.Row="0"
+                           Grid.Column="0"
+                           Grid.ColumnSpan="2"
+                           VerticalAlignment="Center"
+                           HorizontalContentAlignment="Center" />
+
+                     <TextBlock Text="From"
+                                Grid.Row="1"
+                                Grid.Column="0"
+                                VerticalAlignment="Center"
+                                Margin="0,0,5,0" />
+                     <xctk:DateTimePicker Value="{Binding (xctk:TimelinePanel.Date), Mode=TwoWay}"
+                                          Grid.Row="1"
+                                          Grid.Column="1"
+                                          VerticalAlignment="Center"
+                                          Format="ShortDate" />
+
+                     <TextBlock Text="To"
+                                Grid.Row="2"
+                                Grid.Column="0"
+                                VerticalAlignment="Center"
+                                Margin="0,0,5,0" />
+                     <xctk:DateTimePicker Value="{Binding (xctk:TimelinePanel.DateEnd), Mode=TwoWay}"
+                                          Grid.Row="2"
+                                          Grid.Column="1"
+                                          VerticalAlignment="Center"
+                                          Format="ShortDate" />
+                  </Grid>
+               </Border>
+            </xctk:DropDownButton.DropDownContent>
+         </xctk:DropDownButton>
+      </ControlTemplate>
+   </sample:DemoView.Resources>
+
+   <Grid>
+
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+      <GroupBox Header="Features" Grid.Row="0" Margin="5">
+         <Grid>
+            <Grid.RowDefinitions>
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="Auto" />
+               <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+
+            <TextBlock Text="Orientation:" VerticalAlignment="Center" Margin="2" />
+            <ComboBox Name="_cboOrientation" Grid.Column="1" ItemsSource="{Binding Source={StaticResource Orientations}}" SelectedIndex="0" VerticalAlignment="Center" Margin="5" />
+
+            <TextBlock Text="Overlap behavior:" Grid.Row="1" VerticalAlignment="Center" Margin="2" />
+            <ComboBox Name="_cboOverlap" Grid.Row="1" Grid.Column="1" ItemsSource="{Binding Source={StaticResource OverlapBehaviors}}" SelectedIndex="0" VerticalAlignment="Center" Margin="5" />
+
+            <TextBlock Text="Keep original order:" Grid.Row="2" VerticalAlignment="Center" Margin="2" />
+            <CheckBox x:Name="_keepOrder" Grid.Row="2" Grid.Column="1" VerticalAlignment="Center" Margin="5" IsChecked="True" />
+         </Grid>
+      </GroupBox>
+
+      <xctk:TimelinePanel x:Name="_panel"
+                          Grid.Row="1"
+                          Orientation="{Binding SelectedItem, ElementName=_cboOrientation}"
+                          OverlapBehavior="{Binding SelectedItem, ElementName=_cboOverlap}"
+                          KeepOriginalOrderForOverlap="{Binding IsChecked, ElementName=_keepOrder}">
+
+         <ContentControl xctk:TimelinePanel.Date="2012-01-01T00:00:00"
+                         xctk:TimelinePanel.DateEnd="2012-01-16T00:00:00"
+                         Content="Event #1"
+                         Template="{StaticResource TimelineItemTemplate}" />
+
+         <ContentControl xctk:TimelinePanel.Date="2012-02-02T00:00:00"
+                         xctk:TimelinePanel.DateEnd="2012-02-26T00:00:00"
+                         Content="Event #2"
+                         Template="{StaticResource TimelineItemTemplate}" />
+
+         <ContentControl xctk:TimelinePanel.Date="2012-02-14T00:00:00"
+                         xctk:TimelinePanel.DateEnd="2012-03-14T00:00:00"
+                         Content="Event #3"
+                         Template="{StaticResource TimelineItemTemplate}" />
+
+         <ContentControl xctk:TimelinePanel.Date="2012-02-21T00:00:00"
+                         xctk:TimelinePanel.DateEnd="2012-03-10T00:00:00"
+                         Content="Event #4"
+                         Template="{StaticResource TimelineItemTemplate}" />
+
+         <ContentControl xctk:TimelinePanel.Date="2012-05-17T00:00:00"
+                         xctk:TimelinePanel.DateEnd="2012-06-23T00:00:00"
+                         Content="Event #5"
+                         Template="{StaticResource TimelineItemTemplate}" />
+
+         <ContentControl xctk:TimelinePanel.Date="2012-06-06T00:00:00"
+                         xctk:TimelinePanel.DateEnd="2012-08-13T00:00:00"
+                         Content="Event #6"
+                         Template="{StaticResource TimelineItemTemplate}" />
+
+         <ContentControl xctk:TimelinePanel.Date="2012-08-13T00:00:00"
+                         xctk:TimelinePanel.DateEnd="2012-09-29T00:00:00"
+                         Content="Event #7"
+                         Template="{StaticResource TimelineItemTemplate}" />
+
+         <ContentControl xctk:TimelinePanel.Date="2012-11-01T00:00:00"
+                         xctk:TimelinePanel.DateEnd="2012-12-01T00:00:00"
+                         Content="Event #8"
+                         Template="{StaticResource TimelineItemTemplate}" />
+
+      </xctk:TimelinePanel>
+   </Grid>
+</sample:DemoView>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Views/HomeView.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Views/HomeView.xaml.cs
new file mode 100644
index 00000000..1a3833e0
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Views/HomeView.xaml.cs
@@ -0,0 +1,36 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
+
+namespace Samples.Modules.TimelinePanel.Views
+{
+  /// <summary>
+  /// Interaction logic for HomeView.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class HomeView : DemoView
+  {
+    public HomeView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Views/NavigationView.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Views/NavigationView.xaml
new file mode 100644
index 00000000..4adeedfb
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Views/NavigationView.xaml
@@ -0,0 +1,29 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<TreeViewItem x:Class="Samples.Modules.TimelinePanel.Views.NavigationView"
+              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+              xmlns:views="clr-namespace:Samples.Modules.TimelinePanel.Views"
+              Header="TimelinePanel" Tag="{x:Type views:HomeView}">
+
+   <TreeViewItem.Resources>
+      <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
+   </TreeViewItem.Resources>
+
+</TreeViewItem>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Views/NavigationView.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Views/NavigationView.xaml.cs
new file mode 100644
index 00000000..2205a82b
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Views/NavigationView.xaml.cs
@@ -0,0 +1,34 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows.Controls;
+
+namespace Samples.Modules.TimelinePanel.Views
+{
+  /// <summary>
+  /// Interaction logic for NavigationView.xaml
+  /// </summary>
+  public partial class NavigationView : TreeViewItem
+  {
+    public NavigationView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Properties/AssemblyInfo.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..bd30d9b8
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Properties/AssemblyInfo.cs
@@ -0,0 +1,72 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle( "Extended WPF Toolkit Wizard Sample" )]
+[assembly: AssemblyDescription( "" )]
+[assembly: AssemblyConfiguration( "" )]
+[assembly: AssemblyCompany( "Xceed Software Inc." )]
+[assembly: AssemblyProduct( "Extended WPF Toolkit Wizard Sample" )]
+[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
+[assembly: AssemblyTrademark( "" )]
+[assembly: AssemblyCulture( "" )]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible( false )]
+
+//In order to begin building localizable applications, set 
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+  //(used if a resource is not found in the page, 
+  // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+  //(used if a resource is not found in the page, 
+  // app, or any theme specific resource dictionaries)
+)]
+
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion( "1.0.0.0" )]
+[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Samples.Modules.Wizard.csproj b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Samples.Modules.Wizard.csproj
new file mode 100644
index 00000000..227a858b
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Samples.Modules.Wizard.csproj
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{DB0F7672-AFCC-4152-A231-7DCFDD5F219F}</ProjectGuid>
+    <OutputType>library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Samples.Modules.Wizard</RootNamespace>
+    <AssemblyName>Samples.Modules.Wizard</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.Practices.Prism">
+      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Practices.Unity, Version=2.0.414.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
+    </Reference>
+    <ProjectReference Include="..\..\..\WPFToolkit.Extended\WPFToolkit.Extended.csproj">
+      <Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
+      <Name>WPFToolkit.Extended</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Samples.Infrastructure\Samples.Infrastructure.csproj">
+      <Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
+      <Name>Samples.Infrastructure</Name>
+    </ProjectReference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Views\HomeView.xaml.cs">
+      <DependentUpon>HomeView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\NavigationView.xaml.cs">
+      <DependentUpon>NavigationView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="WizardModule.cs" />
+    <AppDesigner Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup />
+  <ItemGroup>
+    <Page Include="Views\HomeView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\NavigationView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y
+xcopy "$(ProjectDir)Views" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\Samples\$(ProjectName)\" /s /Y /I</PostBuildEvent>
+  </PropertyGroup>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Views/HomeView.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Views/HomeView.xaml
new file mode 100644
index 00000000..9daa021d
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Views/HomeView.xaml
@@ -0,0 +1,42 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<sample:DemoView x:Class="Samples.Modules.Wizard.Views.HomeView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 Title="Wizard">
+   <Grid>
+      <xctk:Wizard FinishButtonClosesWindow="True">
+         <xctk:WizardPage x:Name="IntroPage" 
+                          Title="Welcome to my Wizard"
+                          Description="This Wizard will walk you though how to do something." />
+         <xctk:WizardPage x:Name="Page1" PageType="Interior"
+                          Title="Page 1"
+                          Description="This is the first page in the process." />
+         <xctk:WizardPage x:Name="Page2" PageType="Interior"
+                          Title="Page 2"
+                          Description="This is the second page in the process" />
+         <xctk:WizardPage x:Name="LastPage" PageType="Interior"
+                          Title="Last Page"
+                          Description="This is the last page in the process"
+                          CanFinish="True" />
+      </xctk:Wizard>
+   </Grid>
+</sample:DemoView>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Views/HomeView.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Views/HomeView.xaml.cs
new file mode 100644
index 00000000..468cbaf6
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Views/HomeView.xaml.cs
@@ -0,0 +1,36 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
+
+namespace Samples.Modules.Wizard.Views
+{
+  /// <summary>
+  /// Interaction logic for HomeView.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class HomeView : DemoView
+  {
+    public HomeView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Views/NavigationView.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Views/NavigationView.xaml
new file mode 100644
index 00000000..482508e4
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Views/NavigationView.xaml
@@ -0,0 +1,29 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<TreeViewItem x:Class="Samples.Modules.Wizard.Views.NavigationView"
+              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+              xmlns:views="clr-namespace:Samples.Modules.Wizard.Views"
+              Header="Wizard" Tag="{x:Type views:HomeView}" >
+
+   <TreeViewItem.Resources>
+      <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
+   </TreeViewItem.Resources>
+
+</TreeViewItem>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Views/NavigationView.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Views/NavigationView.xaml.cs
new file mode 100644
index 00000000..997dab4f
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Views/NavigationView.xaml.cs
@@ -0,0 +1,34 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows.Controls;
+
+namespace Samples.Modules.Wizard.Views
+{
+  /// <summary>
+  /// Interaction logic for NavigationView.xaml
+  /// </summary>
+  public partial class NavigationView : TreeViewItem
+  {
+    public NavigationView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/WizardModule.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/WizardModule.cs
new file mode 100644
index 00000000..b60bfffe
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/WizardModule.cs
@@ -0,0 +1,45 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using Microsoft.Practices.Prism.Regions;
+using Microsoft.Practices.Unity;
+using Samples.Infrastructure;
+using Samples.Infrastructure.Extensions;
+using Samples.Modules.Wizard.Views;
+
+namespace Samples.Modules.Wizard
+{
+  public class WizardModule : ModuleBase
+  {
+    public WizardModule( IUnityContainer container, IRegionManager regionManager )
+      : base( container, regionManager )
+    {
+    }
+
+    protected override void InitializeModule()
+    {
+      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( NavigationView ) );
+    }
+
+    protected override void RegisterViewsAndTypes()
+    {
+      Container.RegisterNavigationType( typeof( HomeView ) );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Properties/AssemblyInfo.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..61d5d37a
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Properties/AssemblyInfo.cs
@@ -0,0 +1,72 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle( "Extended WPF Toolkit Zoombox Sample" )]
+[assembly: AssemblyDescription( "" )]
+[assembly: AssemblyConfiguration( "" )]
+[assembly: AssemblyCompany( "Xceed Software Inc." )]
+[assembly: AssemblyProduct( "Extended WPF Toolkit Zoombox Sample" )]
+[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
+[assembly: AssemblyTrademark( "" )]
+[assembly: AssemblyCulture( "" )]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible( false )]
+
+//In order to begin building localizable applications, set 
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+  //(used if a resource is not found in the page, 
+  // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+  //(used if a resource is not found in the page, 
+  // app, or any theme specific resource dictionaries)
+)]
+
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion( "1.0.0.0" )]
+[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Resources/Default.jpg b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Resources/Default.jpg
new file mode 100644
index 00000000..112ce2a5
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Resources/Default.jpg differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Resources/ZoomboxProperties.xml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Resources/ZoomboxProperties.xml
new file mode 100644
index 00000000..0f7dae6a
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Resources/ZoomboxProperties.xml
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Properties xmlns="">
+<AnimationAccelerationRatio>Gets or sets the acceleration ratio used for scale and pan animations.
+
+By default, transitions from one view to another are animated. This property determines the acceleration ratio of that animation.</AnimationAccelerationRatio>
+<AnimationDecelerationRatio>Gets or sets the deceleration ratio used for scale and pan animations.
+
+By default, transitions from one view to another are animated. This property determines the deceleration ratio of that animation.</AnimationDecelerationRatio>
+<AnimationDuration>Gets or sets the duration used for scale and pan animations.
+
+By default, transitions from one view to another are animated. This property determines the duration of that animation.</AnimationDuration>
+<AreDragModifiersActive>Gets a Boolean value that specifies whether the keys in the DragModifiers collection are currently pressed. It is updated only when the Zoombox has keyboard or cursor focus.
+
+This value is intended for use as a trigger within the Zoombox style. It can be used to change the appearance of the cursor to show that it’s possible to drag (or pan) the content.
+
+This value is not updated in partial trust.</AreDragModifiersActive>
+<AreRelativeZoomModifiersActive>Gets a Boolean value that specifies whether the keys in the RelativeZoomModifiers collection are currently pressed. It is updated only when the Zoombox has keyboard or cursor focus.
+
+This value is intended for use as a trigger within the Zoombox style. It can be used to change the appearance of the cursor to show that it’s possible to scale the content relative to the cursor position. This allows the user to zoom in on a specific point within the content.
+
+This value is not updated in partial trust.</AreRelativeZoomModifiersActive>
+<AreZoomModifiersActive>Gets a Boolean value that specifies whether the keys in the ZoomModifiers collection are currently pressed. It is updated only when the Zoombox has keyboard or cursor focus.
+
+This value is intended for use as a trigger within the Zoombox style. It can be used within the Zoombox control’s style to change the appearance of the cursor to show that it’s possible to zoom in or out using the mouse wheel. The zoom operation occurs relative to the ZoomOrigin point (by default, the center of the content).
+
+This value is not updated in partial trust.</AreZoomModifiersActive>
+<AreZoomToSelectionModifiersActive>Gets a Boolean value that specifies whether the keys in the ZoomToSelectionModifiers collection are currently pressed. It is updated only when the Zoombox has keyboard or cursor focus.
+
+This value is intended for use as a trigger within the Zoombox style. It can be used to show that it’s possible to select a zoom region by pressing the left mouse button and dragging the mouse. Upon release of the mouse button, the Zoombox control will zoom in to the selected region.
+
+By default, the selected region will be centered within the Zoombox control, but this can be changed by altering the HorizontalContentAlignment and VerticalContentAlignment properties.
+
+This value is not updated in partial trust.</AreZoomToSelectionModifiersActive>
+<AutoWrapContentWithViewbox>Gets or sets a Boolean value that determines if the content of the Zoombox is wrapped in a Viewbox.
+
+By default, the content of the Zoombox control will be wrapped within a Viewbox element (unless the content is already a Viewbox). The viewbox ensures that the content does not get clipped by its parent and that it renders correctly within the visual brush used in the view finder.
+
+Some elements, like Image, have built-in viewbox behaviors. This property can be set to False for such elements to prevent the extra wrapping layer. However, if this causes the content to appear incorrectly in the view finder, try setting this property back to True.</AutoWrapContentWithViewbox>
+<CurrentView>Gets the current view for the Zoombox. This is an object of type ZoomboxView.
+
+This property may return an absolute view (given by a position and/or scale value), a region-based view (given by a Rect within the content), or a predefined view, given by one of the static ZoomboxView properties: Center, Empty, Fill, or Fit.</CurrentView>
+<CurrentViewIndex>Gets the index of the current view (see the CurrentView property) within the Zoombox control's view stack (see the ViewStack property).
+
+If the current view is not a member of the view stack, the CurrentViewIndex property returns -1. This will happen if the Zoombox control has a manual view stack (see the ViewStackMode property) and the control has been zoomed or panned away from the selected view. In this case, the ViewStackIndex property can be used to get the index of the selected view. Also, the RefocusView() method can be used to zoom back to the selected view.
+
+If the view stack is disabled, the CurrentViewIndex property always returns -1.</CurrentViewIndex>
+<DragModifiers>Gets or sets a collection of KeyModifier values representing keys that must be pressed to pan the content by dragging it.
+
+All keys must be pressed in order for the operation to occur. If None is specified, the content will be dragged without any modifier keys. If the collection includes Blocked, the content cannot be dragged.
+
+The default value includes only the Ctrl key.</DragModifiers>
+<DragOnPreview>Gets or sets a Boolean value that specifies whether the Zoombox responds to tunneled mouse events (PreviewMouseDown, PreviewMouseMove, and PreviewMouseUp) to pan the content via a mouse drag. If false, panning occurs in response to the bubbled events (MouseDown, MouseMove, and MouseUp).
+
+The default value is false.</DragOnPreview>
+<EffectiveViewStackMode>Gets a ZoomboxViewStackMode value representing the mode that is currently in effect for the view stack. The effective mode will be either Auto, Manual, or Disabled.
+
+For more information, see the ViewStackMode property.</EffectiveViewStackMode>
+<HasBackStack>Gets a Boolean value that specifies whether there are views on the back side of the view stack (see the ViewStack property).</HasBackStack>
+<HasForwardStack>Gets a Boolean value that specifies whether there are views on the forward side of the view stack (see the ViewStack property).</HasForwardStack>
+<IsAnimated>Gets or sets a Boolean value specifying whether transitions between views (scale and pan operations) are animated.
+
+The default value is true.</IsAnimated>
+<IsDraggingContent>Gets a Boolean value that specifies whether the content is currently being panned via a drag operation.</IsDraggingContent>
+<IsSelectingRegion>Gets a Boolean value that specifies whether a zoom region is currently being selected.</IsSelectingRegion>
+<MaxScale>Gets or sets a Double value representing the maximum scale factor (or zoom level) that can be applied to the content.</MaxScale>
+<MinScale>Gets or sets a Double value representing the minimum scale factor (or zoom level) that can be applied to the content.</MinScale>
+<NavigateOnPreview>Gets or sets a Boolean value that specifies whether the Zoombox responds to tunneled mouse events (PreviewMouseDown) to navigate through the view stack. If false, navigation occurs in response to bubbled mouse events (MouseDown).
+
+The default value is false.
+
+This setting only impacts the control's response to the forward (XButton2) and back (XButton1) mouse buttons. Note that the control will also navigate in response to the forward (BrowserForward) and back (BrowserBack or Backspace) keyboard keys, but this is enabled via key bindings in an InputBindingCollection within the Resources section of the Zoombox template.</NavigateOnPreview>
+<PanDistance>Gets or sets a Double value that is used to determine how many pixels the content will pan using the PanLeft, PanUp, PanRight, or PanDown Zoombox commands.
+
+The pan commands are hooked up to key strokes using an InputBindingCollection within the Resources section of the Zoombox template. The default key bindings map Shift+Ctrl+Left, Shift+Ctrl+Up, Shift+Ctrl+Right, and Shift+Ctrl+Down to their respective Pan commands.
+
+The keyboard focus must be within the Zoombox to pan the content via the key bindings.
+
+The default value is 5 pixels.</PanDistance>
+<Position>Gets or sets the top-left point of the content within the Zoombox control.
+
+The Position is expressed as a Point within the coordinate space of the Zoombox control.</Position>
+<RelativeZoomModifiers>Gets or sets a collection of KeyModifier values representing keys that must be pressed to zoom the content relative to the current mouse position using the mouse wheel.
+
+All keys must be pressed in order for the operation to occur. If None is specified, the content will be zoomed without any modifier keys. If the collection includes Blocked, the content cannot be zoomed.
+
+The default value is the Ctrl+Alt combination.</RelativeZoomModifiers>
+<Scale>Gets or sets a Double value representing the scale factor (or zoom level) for the content.
+
+A scale value of 1.0 represents the actual content size.</Scale>
+<ViewFinder>Gets a reference to the view finder element within the visual tree of the Zoombox.
+
+The view finder element typically serves as the root of a subtree that contains a ViewFinderDisplay element and several command buttons for changing views. The ViewFinderDisplay element is the element that renders the thumbnail image of the Zoombox content.
+
+The view finder element, if present in the control template, must be named "ViewFinder". The visibility of the view finder element is typically bound to the ViewFinderVisibility attached property.</ViewFinder>
+<ViewFinderVisibility>Gets a Visibility value for the ViewFinder.
+
+This property is typically leveraged by the Zoombox template to control the visibility of the view finder element. In the default Zoombox template, this property is also bound to a toggle button that is used to show and hide the view finder.
+
+This is an attached property because the Zoombox control, itself, does not directly use the property.</ViewFinderVisibility>
+<Viewport>Gets a Rect identifying the portion of the content that is visible in the Zoombox. The viewport is expressed in the coordinate space of the content.</Viewport>
+<ViewStack>Gets the view stack for the Zoombox. This stack can be manually specified, automatically maintained, or disabled entirely, depending on the ViewStackMode property.
+
+The view stack is maintained in an instance of the ZoomboxViewStack class.</ViewStack>
+<ViewStackCount>Gets an integer value representing the number of views in the view stack.</ViewStackCount>
+<ViewStackIndex>Gets or sets the index of the selected view within the view stack.
+
+For a manual stack, a positive ViewStackIndex value does not necessarily indicate that the specified view is the current view. The user may have zoomed or panned away from the view represented by the ViewStackIndex property. The CurrentView property can be used to determine the actual current view. In this case, the CurrentViewIndex will be -1 but the ViewStackIndex will be a positive value. The Refocus command or the RefocusView() method can be used to refocus the selected view on the stack.</ViewStackIndex>
+<ViewStackMode>Gets or sets the mode for the view stack.
+
+The ViewStackMode property determines how the Zoombox will maintain its stack of views for back and forward view navigation. It can be set to any of the following values from the ZoomboxViewStackMode enumeration:
+
+Auto: The control automatically tracks view changes and adds them to the view stack. In this case, every view selected is added to the view stack (in the same manner that visited URLs are added to a browser stack).
+
+Manual: The control uses a manually specified view stack. The views can be directly added to the ViewStack in markup or programmatically. They can also be bound to the Zoombox using the ViewStackSource property.
+
+Default: The control will use one of the other ZoomboxViewStackMode values at runtime. The EffectiveViewStackMode property can be used to determine which mode is actually in effect. If the views in the stack come from a ViewStackSource, then the default mode is Manual; otherwise, the default mode is Auto.
+
+Disabled: The view stack is disabled altogether. In this mode, the ViewStack property will return null. An attempt to add views manually will result in an exception.</ViewStackMode>
+<ViewStackSource>Gets or sets an IEnumerable value representing a collection used to generate a view stack for the Zoombox.
+
+The view stack of a Zoombox is either explicitly set using the ViewStack property or auto-generated based on members of the ViewStackSource collection. In this sense, the ViewStackSource property is analogous to the ItemsSource property for an ItemsControl.
+
+This property can be used to bind the view stack to an observable collection of ZoomboxView objects (or a collection of objects of type string, Point, double, or Rect, which can be directly converted to ZoomboxView objects via the ZoomboxViewConverter class).
+
+When the ViewStackSource property is in use, the ViewStack property is effectively read-only. An attempt to directly modify the ViewStack will result in an exception.
+
+When the ViewStackSource property is set to a non-null collection, the contents of the ViewStack collection is replaced with the views generated from the ViewStackSource.
+
+If the ViewStackSource property is already set, explicitly setting it to null will remove the auto-generated collection of views and the Zoombox will have an empty ViewStack collection. If ViewStackSource is already null, setting it to null has no effect.</ViewStackSource>
+<ZoomModifiers>Gets or sets a collection of KeyModifier values representing keys that must be pressed to zoom the content relative to its ZoomOrigin (by default, the center of the content) using the mouse wheel.
+
+All specified keys must be pressed in order for the operation to occur. If None is specified, the relative zoom will occur without any modifier keys. If the collection includes Blocked, a zoom cannot be performed.
+
+The default value includes only the Ctrl key.</ZoomModifiers>
+<ZoomOnPreview>Gets or sets a Boolean value that specifies whether the Zoombox responds to tunneled mouse events (PreviewMouseWheel) to zoom the content via the mouse wheel. If false, zooming occurs in response to the bubbled events (MouseWheel).
+
+The default value is true.</ZoomOnPreview>
+<ZoomOrigin>Gets or sets the relative position within the content around which Zoom operations occur by default.
+
+This value is used when zooming via the mouse wheel, ZoomIn or ZoomOut commands, or the Zoom() method.</ZoomOrigin>
+<ZoomPercentage>Gets or sets a Double value that is used to determine how much the content will zoom when using the ZoomIn or ZoomOut commands or when zooming via the mouse wheel.
+
+The zoom commands are hooked up to key strokes using an InputBindingCollection within the Resources section of the Zoombox template. The default key bindings map Ctrl+Left and Ctrl+Up to the ZoomOut command and Ctrl+Right and Ctrl+Down to the ZoomIn command.
+
+Keyboard focus must be within the Zoombox to scale the content via the key bindings.
+
+The default value is 5%.</ZoomPercentage>
+<ZoomToSelectionModifiers>Gets or sets a collection of KeyModifier values representing keys that must be pressed to select and zoom to a location of the content using the mouse.
+
+All specified keys must be pressed in order for the operation to occur. If None is specified, the zoom operation will occur without any modifier keys. If the collection includes Blocked, the zoom operation cannot be performed.
+
+The default value includes only the Alt key.</ZoomToSelectionModifiers>
+</Properties>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Samples.Modules.Zoombox.csproj b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Samples.Modules.Zoombox.csproj
new file mode 100644
index 00000000..bea8ae89
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Samples.Modules.Zoombox.csproj
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{D6581837-4158-4165-BE2F-35EBF9742A54}</ProjectGuid>
+    <OutputType>library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Samples.Modules.Zoombox</RootNamespace>
+    <AssemblyName>Samples.Modules.Zoombox</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.Practices.Prism">
+      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Practices.Unity, Version=2.0.414.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
+    </Reference>
+    <ProjectReference Include="..\..\..\WPFToolkit.Extended\WPFToolkit.Extended.csproj">
+      <Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
+      <Name>WPFToolkit.Extended</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Samples.Infrastructure\Samples.Infrastructure.csproj">
+      <Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
+      <Name>Samples.Infrastructure</Name>
+    </ProjectReference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ZoomboxModule.cs" />
+    <Compile Include="Views\HomeView.xaml.cs">
+      <DependentUpon>HomeView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\NavigationView.xaml.cs">
+      <DependentUpon>NavigationView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <AppDesigner Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Default.jpg" />
+    <Resource Include="Resources\ZoomboxProperties.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="Views\HomeView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\NavigationView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y
+xcopy "$(ProjectDir)Views" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\Samples\$(ProjectName)\" /s /Y /I
+</PostBuildEvent>
+  </PropertyGroup>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Views/HomeView.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Views/HomeView.xaml
new file mode 100644
index 00000000..88690f8c
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Views/HomeView.xaml
@@ -0,0 +1,489 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<sample:DemoView x:Class="Samples.Modules.Zoombox.Views.HomeView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+                 xmlns:local="clr-namespace:Samples.Modules.Zoombox.Views"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 Title="Zoombox"
+                 Description="The Zoombox control provides zoom and pan functionality for any UIElement (its content) that has a discrete size. It allows the content to be scaled up (zoomed in) or scaled down (zoomed out) using the mouse wheel, key bindings, or programmatically through methods and properties exposed by the control. Similarly, the content can be panned (translated) in any direction by dragging it with the mouse, using key bindings, or programmatically through methods and properties exposed by the control.&#x0a;&#x0a;The Zoombox control also provides a view finder that acts as a reduced-scale map of the contained element, showing exactly which portion of the content is visible within the Zoombox's viewport.">
+
+   <Grid Grid.Row="1" 
+         HorizontalAlignment="Stretch"
+         VerticalAlignment="Stretch">
+      <Grid.ColumnDefinitions>
+         <ColumnDefinition Width="Auto" />
+         <ColumnDefinition Width="*" />
+      </Grid.ColumnDefinitions>
+
+      <TabControl Margin="20,20,0,20"
+                  Width="360"
+                  Grid.Column="0"
+                  Background="White"
+                  DataContext="{Binding ElementName=zoombox}">
+         <TabControl.Resources>
+            <xctk:RoundedValueConverter x:Key="Round"
+                                        Precision="2" />
+
+            <local:RectConverter x:Key="rectConverter" />
+            <local:PointConverter x:Key="pointConverter" />
+            <local:ViewNameConverter x:Key="viewNameConverter" />
+            <local:ViewFinderConverter x:Key="viewFinderConverter" />
+            <local:ViewStackCountConverter x:Key="viewStackCountConverter" />
+
+            <XmlDataProvider x:Key="Props"
+                             Source="pack://application:,,,/Samples.Modules.Zoombox;component/Resources/ZoomboxProperties.xml"
+                             XPath="Properties" />
+            <Style x:Key="PropertyList"
+                   TargetType="{x:Type ItemsControl}">
+               <Setter Property="IsTabStop"
+                       Value="False" />
+               <Setter Property="Template">
+                  <Setter.Value>
+                     <ControlTemplate TargetType="{x:Type ItemsControl}">
+                        <ScrollViewer HorizontalScrollBarVisibility="Disabled"
+                                      VerticalScrollBarVisibility="Auto">
+                           <StackPanel IsItemsHost="True" />
+                        </ScrollViewer>
+                     </ControlTemplate>
+                  </Setter.Value>
+               </Setter>
+            </Style>
+
+            <Style x:Key="{x:Type ItemsControl}"
+                   TargetType="{x:Type ItemsControl}">
+               <Setter Property="IsTabStop"
+                       Value="False" />
+               <Setter Property="Template">
+                  <Setter.Value>
+                     <ControlTemplate TargetType="{x:Type ItemsControl}">
+                        <Grid MinHeight="45"
+                              x:Name="ItemGrid">
+                           <Popup AllowsTransparency="True"
+                                  Placement="Bottom"
+                                  PlacementTarget="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                                  HorizontalOffset="75"
+                                  IsOpen="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=IsMouseOver, Mode=OneWay}">
+                              <Border Name="Border"
+                                      Background="Black"
+                                      BorderBrush="White"
+                                      Margin="0"
+                                      BorderThickness="1"
+                                      CornerRadius="10">
+                                 <TextBlock Margin="7"
+                                            MaxWidth="500"
+                                            TextWrapping="Wrap"
+                                            Foreground="White"
+                                            Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Tag.InnerText}" />
+                              </Border>
+                           </Popup>
+                           <Rectangle Grid.ColumnSpan="3"
+                                      Fill="White"
+                                      Stroke="{x:Null}"
+                                      StrokeThickness="0"
+                                      RadiusX="0"
+                                      RadiusY="0"
+                                      Margin="5,5,5,5" />
+                           <Grid IsItemsHost="True"
+                                 Margin="15,0">
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="160" />
+                                 <ColumnDefinition Width="100" />
+                                 <ColumnDefinition Width="100" />
+                              </Grid.ColumnDefinitions>
+                           </Grid>
+                        </Grid>
+                     </ControlTemplate>
+                  </Setter.Value>
+               </Setter>
+            </Style>
+
+            <Style x:Key="{x:Type TextBlock}"
+                   BasedOn="{StaticResource {x:Type TextBlock}}"
+                   TargetType="{x:Type TextBlock}">
+               <Setter Property="HorizontalAlignment"
+                       Value="Left" />
+               <Setter Property="VerticalAlignment"
+                       Value="Center" />
+               <Setter Property="Height"
+                       Value="Auto" />
+            </Style>
+
+            <Style x:Key="{x:Type Slider}"
+                   BasedOn="{StaticResource {x:Type Slider}}"
+                   TargetType="{x:Type Slider}">
+               <Setter Property="HorizontalAlignment"
+                       Value="Stretch" />
+               <Setter Property="VerticalAlignment"
+                       Value="Center" />
+               <Setter Property="Height"
+                       Value="Auto" />
+               <Setter Property="Width"
+                       Value="Auto" />
+               <Setter Property="Margin"
+                       Value="5" />
+               <Setter Property="Grid.Column"
+                       Value="1" />
+            </Style>
+
+            <Style x:Key="{x:Type CheckBox}"
+                   BasedOn="{StaticResource {x:Type CheckBox}}"
+                   TargetType="{x:Type CheckBox}">
+               <Setter Property="HorizontalAlignment"
+                       Value="Center" />
+               <Setter Property="VerticalAlignment"
+                       Value="Center" />
+               <Setter Property="Margin"
+                       Value="5" />
+               <Setter Property="Grid.Column"
+                       Value="1" />
+            </Style>
+
+            <Style x:Key="{x:Type TextBox}"
+                   BasedOn="{StaticResource {x:Type TextBox}}"
+                   TargetType="{x:Type TextBox}">
+               <Setter Property="HorizontalAlignment"
+                       Value="Stretch" />
+               <Setter Property="VerticalAlignment"
+                       Value="Center" />
+               <Setter Property="Height"
+                       Value="Auto" />
+               <Setter Property="Margin"
+                       Value="5" />
+               <Setter Property="Grid.Column"
+                       Value="1" />
+            </Style>
+
+            <Style x:Key="{x:Type ComboBox}"
+                   BasedOn="{StaticResource {x:Type ComboBox}}"
+                   TargetType="{x:Type ComboBox}">
+               <Setter Property="HorizontalAlignment"
+                       Value="Stretch" />
+               <Setter Property="VerticalAlignment"
+                       Value="Center" />
+               <Setter Property="Height"
+                       Value="26" />
+               <Setter Property="Width"
+                       Value="Auto" />
+               <Setter Property="Margin"
+                       Value="10,5" />
+               <Setter Property="Grid.Column"
+                       Value="1" />
+               <Setter Property="SelectedValuePath"
+                       Value="Content" />
+            </Style>
+
+         </TabControl.Resources>
+
+         <TabItem Header="Animation">
+            <ItemsControl Style="{StaticResource PropertyList}">
+
+               <TextBlock Margin="5,10,5,5"
+                          FontWeight="Bold"
+                          FontSize="12"
+                          Text="Animation Properties" />
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=AnimationAccelerationRatio}">
+                  <TextBlock Text="AnimationAccelerationRatio" />
+                  <Slider Name="AccelerationSlider"
+                          Maximum="1.0"
+                          Minimum="0.0"
+                          Value="{Binding AnimationAccelerationRatio}"
+                          ValueChanged="CoerceAnimationRatios" />
+                  <TextBlock Grid.Column="2"
+                             Width="50"
+                             Text="{Binding AnimationAccelerationRatio}"
+                             TextTrimming="CharacterEllipsis" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=AnimationDecelerationRatio}">
+                  <TextBlock Text="AnimationDecelerationRatio" />
+                  <Slider Name="DecelerationSlider"
+                          Maximum="1.0"
+                          Minimum="0.0"
+                          Value="{Binding AnimationDecelerationRatio}"
+                          ValueChanged="CoerceAnimationRatios" />
+                  <TextBlock Grid.Column="2"
+                             Width="50"
+                             Text="{Binding AnimationDecelerationRatio}"
+                             TextTrimming="CharacterEllipsis" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=AnimationDuration}">
+                  <TextBlock Text="AnimationDuration" />
+                  <Slider IsSnapToTickEnabled="True"
+                          TickFrequency="50"
+                          Minimum="0"
+                          Maximum="2000"
+                          Value="{Binding AnimationDuration.TimeSpan.TotalMilliseconds, Mode=OneWay}"
+                          ValueChanged="AdjustAnimationDuration" />
+                  <TextBlock Grid.Column="2"
+                             Text="{Binding AnimationDuration}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=IsAnimated}">
+                  <TextBlock Text="IsAnimated" />
+                  <CheckBox IsChecked="{Binding IsAnimated}" />
+               </ItemsControl>
+
+            </ItemsControl>
+         </TabItem>
+
+         <TabItem Header="Keyboard">
+            <ItemsControl Style="{StaticResource PropertyList}">
+
+               <TextBlock Margin="5"
+                          FontWeight="Bold"
+                          FontSize="12"
+                          Text="KeyModifier Collections" />
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=DragModifiers}">
+                  <TextBlock Text="DragModifiers" />
+                  <TextBox Text="{Binding DragModifiers, UpdateSourceTrigger=PropertyChanged}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=RelativeZoomModifiers}">
+                  <TextBlock Text="RelativeZoomModifiers" />
+                  <TextBox Text="{Binding RelativeZoomModifiers, UpdateSourceTrigger=PropertyChanged}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=ZoomModifiers}">
+                  <TextBlock Text="ZoomModifiers" />
+                  <TextBox Text="{Binding ZoomModifiers, UpdateSourceTrigger=PropertyChanged}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=ZoomToSelectionModifiers}">
+                  <TextBlock Text="ZoomToSelectionModifiers" />
+                  <TextBox Text="{Binding ZoomToSelectionModifiers, UpdateSourceTrigger=PropertyChanged}" />
+               </ItemsControl>
+
+               <TextBlock Margin="5"
+                          FontWeight="Bold"
+                          FontSize="12"
+                          Text="Response to Preview Events" />
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=DragOnPreview}">
+                  <TextBlock Text="DragOnPreview" />
+                  <CheckBox IsChecked="{Binding DragOnPreview}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=NavigateOnPreview}">
+                  <TextBlock Text="NavigateOnPreview" />
+                  <CheckBox IsChecked="{Binding NavigateOnPreview}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=ZoomOnPreview}">
+                  <TextBlock Text="ZoomOnPreview" />
+                  <CheckBox IsChecked="{Binding ZoomOnPreview}" />
+               </ItemsControl>
+
+               <TextBlock Margin="5,10,5,5"
+                          FontWeight="Bold"
+                          FontSize="12"
+                          Text="Input States" />
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=AreDragModifiersActive}">
+                  <TextBlock Text="AreDragModifiersActive"
+                             Grid.ColumnSpan="2" />
+                  <CheckBox IsEnabled="False"
+                            IsChecked="{Binding AreDragModifiersActive, Mode=OneWay}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=AreRelativeZoomModifiersActive}">
+                  <TextBlock Text="AreRelativeZoomModifiersActive"
+                             Grid.ColumnSpan="2" />
+                  <CheckBox IsEnabled="False"
+                            IsChecked="{Binding AreRelativeZoomModifiersActive, Mode=OneWay}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=AreZoomModifiersActive}">
+                  <TextBlock Text="AreZoomModifiersActive"
+                             Grid.ColumnSpan="2" />
+                  <CheckBox IsEnabled="False"
+                            IsChecked="{Binding AreZoomModifiersActive, Mode=OneWay}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=AreZoomToSelectionModifiersActive}">
+                  <TextBlock Text="AreZoomToSelectionModifiersActive"
+                             Grid.ColumnSpan="2" />
+                  <CheckBox IsEnabled="False"
+                            IsChecked="{Binding AreZoomToSelectionModifiersActive, Mode=OneWay}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=IsDraggingContent}">
+                  <TextBlock Text="IsDraggingContent"
+                             Grid.ColumnSpan="2" />
+                  <CheckBox IsEnabled="False"
+                            IsChecked="{Binding IsDraggingContent, Mode=OneWay}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=IsSelectingRegion}">
+                  <TextBlock Text="IsSelectingRegion"
+                             Grid.ColumnSpan="2" />
+                  <CheckBox IsEnabled="False"
+                            IsChecked="{Binding IsSelectingRegion, Mode=OneWay}" />
+               </ItemsControl>
+
+            </ItemsControl>
+         </TabItem>
+
+         <TabItem Header="Position &amp; Scale">
+            <ItemsControl Style="{StaticResource PropertyList}">
+
+               <TextBlock Margin="5,10,5,5"
+                          FontWeight="Bold"
+                          FontSize="12"
+                          Text="Position Properties" />
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=PanDistance}">
+                  <TextBlock Text="PanDistance" />
+                  <TextBox Text="{Binding PanDistance, UpdateSourceTrigger=PropertyChanged}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=Position}">
+                  <TextBlock Text="Position" />
+                  <TextBox IsEnabled="False" 
+                           Text="{Binding Position, Mode=OneWay, Converter={StaticResource pointConverter}}" />
+               </ItemsControl>
+
+               <TextBlock Margin="5,10,5,5"
+                          FontWeight="Bold"
+                          FontSize="12"
+                          Text="Scale Properties" />
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=AutoWrapContentWithViewbox}">
+                  <TextBlock Text="AutoWrapContentWithViewbox"
+                             Grid.ColumnSpan="2" />
+                  <CheckBox IsChecked="{Binding AutoWrapContentWithViewbox}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=MaxScale}">
+                  <TextBlock Text="MaxScale" />
+                  <TextBox Text="{Binding MaxScale, UpdateSourceTrigger=PropertyChanged}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=MinScale}">
+                  <TextBlock Text="MinScale" />
+                  <TextBox Text="{Binding MinScale, UpdateSourceTrigger=PropertyChanged}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=Scale}">
+                  <TextBlock Text="Scale" />
+                  <TextBox Text="{Binding Scale, UpdateSourceTrigger=PropertyChanged}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=ZoomOrigin}">
+                  <TextBlock Text="ZoomOrigin" />
+                  <TextBox Text="{Binding ZoomOrigin, UpdateSourceTrigger=PropertyChanged}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=ZoomPercentage}">
+                  <TextBlock Text="ZoomPercentage" />
+                  <TextBox Text="{Binding ZoomPercentage, UpdateSourceTrigger=PropertyChanged}" />
+               </ItemsControl>
+
+            </ItemsControl>
+         </TabItem>
+
+         <TabItem Header="View">
+            <ItemsControl Style="{StaticResource PropertyList}">
+
+               <TextBlock Margin="5,10,5,5"
+                          FontWeight="Bold"
+                          FontSize="12"
+                          Text="View Properties" />
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=CurrentView}">
+                  <TextBlock Text="CurrentView" />
+                  <TextBox IsEnabled="False"
+                           Text="{Binding CurrentView, Converter={StaticResource viewNameConverter}, Mode=OneWay}"
+                           Grid.ColumnSpan="2"
+                           Height="Auto"
+                           Width="155"
+                           Margin="5,10"
+                           HorizontalAlignment="Left"
+                           TextWrapping="WrapWithOverflow" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=CurrentViewIndex}">
+                  <TextBlock Text="CurrentViewIndex" />
+                  <TextBox IsEnabled="False"
+                           Text="{Binding CurrentViewIndex, Mode=OneWay}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=EffectiveViewStackMode}">
+                  <TextBlock Text="EffectiveViewStackMode" />
+                  <TextBox IsEnabled="False"
+                           Text="{Binding EffectiveViewStackMode, Mode=OneWay}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=HasBackStack}">
+                  <TextBlock Text="HasBackStack" />
+                  <CheckBox IsEnabled="False"
+                            IsChecked="{Binding HasBackStack, Mode=OneWay}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=HasForwardStack}">
+                  <TextBlock Text="HasForwardStack" />
+                  <CheckBox IsEnabled="False"
+                            IsChecked="{Binding HasForwardStack, Mode=OneWay}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=ViewFinder}">
+                  <TextBlock Text="ViewFinder" />
+                  <TextBox IsEnabled="False"
+                           Text="{Binding ViewFinder, Converter={StaticResource viewFinderConverter}, Mode=OneWay}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=ViewFinderVisibility}">
+                  <TextBlock Text="ViewFinderVisibility" />
+                  <ComboBox  SelectedValue="{Binding ViewFinderVisibility}">
+                     <ComboBoxItem Content="{x:Static Visibility.Collapsed}" />
+                     <ComboBoxItem Content="{x:Static Visibility.Hidden}" />
+                     <ComboBoxItem Content="{x:Static Visibility.Visible}" />
+                  </ComboBox>
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=Viewport}">
+                  <TextBlock Text="Viewport" />
+                  <TextBox IsEnabled="False"
+                           Text="{Binding Viewport, Converter={StaticResource rectConverter}, Mode=OneWay}"
+                           Grid.ColumnSpan="2"
+                           Width="155"
+                           Margin="5,10"
+                           HorizontalAlignment="Left" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=ViewStack}">
+                  <TextBlock Text="ViewStack" />
+                  <TextBox IsEnabled="False"
+                           Text="{Binding ViewStack, Mode=OneWay}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=ViewStackCount}">
+                  <TextBlock Text="ViewStackCount" />
+                  <TextBox IsEnabled="False"
+                           Text="{Binding ViewStackCount, Mode=OneWay}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=ViewStackIndex}">
+                  <TextBlock Text="ViewStackIndex" />
+                  <Slider Minimum="0"
+                          Maximum="{Binding ViewStackCount, Converter={StaticResource viewStackCountConverter}}"
+                          Value="{Binding ViewStackIndex}" />
+                  <TextBlock Grid.Column="2"
+                             Width="50"
+                             Text="{Binding ViewStackIndex}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=ViewStackMode}">
+                  <TextBlock Text="ViewStackMode" />
+                  <ComboBox  SelectedValue="{Binding ViewStackMode}">
+                     <ComboBoxItem Content="{x:Static xctk:ZoomboxViewStackMode.Auto}" />
+                     <ComboBoxItem Content="{x:Static xctk:ZoomboxViewStackMode.Default}" />
+                     <ComboBoxItem Content="{x:Static xctk:ZoomboxViewStackMode.Disabled}" />
+                     <ComboBoxItem Content="{x:Static xctk:ZoomboxViewStackMode.Manual}" />
+                  </ComboBox>
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=ViewStackSource}">
+                  <TextBlock Text="ViewStackSource" />
+                  <TextBox IsEnabled="False"
+                           Text="{Binding ViewStackSource}" />
+               </ItemsControl>
+            </ItemsControl>
+         </TabItem>
+      </TabControl>
+      <xctk:Zoombox x:Name="zoombox"
+                    ViewStackIndex="0"
+                    Grid.Column="1"
+                    Margin="20"
+                    Focusable="True"
+                    IsTabStop="True">
+         <xctk:Zoombox.ViewStack>
+            <xctk:ZoomboxView>Fit</xctk:ZoomboxView>
+         </xctk:Zoombox.ViewStack>
+         <Image Source="pack://application:,,,/Samples.Modules.Zoombox;component/Resources/Default.jpg" />
+
+      </xctk:Zoombox>
+   </Grid>
+</sample:DemoView>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Views/HomeView.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Views/HomeView.xaml.cs
new file mode 100644
index 00000000..bd6b8f1a
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Views/HomeView.xaml.cs
@@ -0,0 +1,129 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System;
+using System.Windows;
+
+namespace Samples.Modules.Zoombox.Views
+{
+  /// <summary>
+  /// Interaction logic for HomeView.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class HomeView : DemoView
+  {
+    public HomeView()
+    {
+      InitializeComponent();
+    }
+
+    private void AdjustAnimationDuration( object sender, RoutedPropertyChangedEventArgs<double> e )
+    {
+      Slider slider = sender as Slider;
+      if( slider == null )
+        return;
+
+      zoombox.AnimationDuration = TimeSpan.FromMilliseconds( slider.Value );
+    }
+
+    private void CoerceAnimationRatios( object sender, RoutedPropertyChangedEventArgs<double> e )
+    {
+      Slider slider = sender as Slider;
+      if( slider == null )
+        return;
+
+      Slider otherRatio = ( sender == this.AccelerationSlider ) ? this.DecelerationSlider : this.AccelerationSlider;
+
+      if( slider.Value + otherRatio.Value > 1 )
+      {
+        otherRatio.Value = 1 - slider.Value;
+      }
+    }
+  }
+
+  public abstract class SimpleConverter : IValueConverter
+  {
+    protected abstract object Convert( object value );
+
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      return this.Convert( value );
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+  }
+
+  public class ViewNameConverter : SimpleConverter
+  {
+    protected override object Convert( object value )
+    {
+      return value.ToString().Remove( 0, 13 );
+    }
+  }
+
+
+  public class ViewFinderConverter : SimpleConverter
+  {
+    protected override object Convert( object value )
+    {
+      return ( value != null ) ? value.GetType().Name : null;
+    }
+  }
+
+  public class RectConverter : SimpleConverter
+  {
+    protected override object Convert( object value )
+    {
+      return string.Format( "({0}),({1})",
+        PointConverter.ConvertPoint( ( ( Rect )value ).TopLeft ),
+        PointConverter.ConvertPoint( ( ( Rect )value ).BottomRight ) );
+    }
+  }
+
+  public class PointConverter : SimpleConverter
+  {
+    protected override object Convert( object value )
+    {
+      return PointConverter.ConvertPoint( ( Point )value );
+    }
+
+    public static string ConvertPoint( Point point )
+    {
+      return string.Format( "{0},{1}",
+        Math.Round( point.X ), Math.Round( point.Y ) );
+    }
+  }
+
+  public class ViewStackCountConverter : SimpleConverter
+  {
+    protected override object Convert( object value )
+    {
+      return ( ( int )value ) - 1;
+    }
+  }  
+
+
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Views/NavigationView.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Views/NavigationView.xaml
new file mode 100644
index 00000000..7b9b5955
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Views/NavigationView.xaml
@@ -0,0 +1,29 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<TreeViewItem x:Class="Samples.Modules.Zoombox.Views.NavigationView"
+              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+              xmlns:views="clr-namespace:Samples.Modules.Zoombox.Views"
+              Header="Zoombox" Tag="{x:Type views:HomeView}" >
+
+   <TreeViewItem.Resources>
+      <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
+   </TreeViewItem.Resources>
+
+</TreeViewItem>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Views/NavigationView.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Views/NavigationView.xaml.cs
new file mode 100644
index 00000000..81dd13cd
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Views/NavigationView.xaml.cs
@@ -0,0 +1,34 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows.Controls;
+
+namespace Samples.Modules.Zoombox.Views
+{
+  /// <summary>
+  /// Interaction logic for NavigationView.xaml
+  /// </summary>
+  public partial class NavigationView : TreeViewItem
+  {
+    public NavigationView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/ZoomboxModule.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/ZoomboxModule.cs
new file mode 100644
index 00000000..70c7343c
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/ZoomboxModule.cs
@@ -0,0 +1,45 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using Microsoft.Practices.Prism.Regions;
+using Microsoft.Practices.Unity;
+using Samples.Infrastructure;
+using Samples.Infrastructure.Extensions;
+using Samples.Modules.Zoombox.Views;
+
+namespace Samples.Modules.Zoombox
+{
+  public class ZoomboxModule : ModuleBase
+  {
+    public ZoomboxModule( IUnityContainer container, IRegionManager regionManager )
+      : base( container, regionManager )
+    {
+    }
+
+    protected override void InitializeModule()
+    {
+      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( NavigationView ) );
+    }
+
+    protected override void RegisterViewsAndTypes()
+    {
+      Container.RegisterNavigationType( typeof( HomeView ) );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Commands/TreeViewCommandBehavior.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Commands/TreeViewCommandBehavior.cs
new file mode 100644
index 00000000..30e88361
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Commands/TreeViewCommandBehavior.cs
@@ -0,0 +1,45 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using Microsoft.Practices.Prism.Commands;
+
+namespace Samples.Infrastructure.Commands
+{
+  public class TreeViewCommandBehavior : CommandBehaviorBase<TreeView>
+  {
+    public TreeViewCommandBehavior( TreeView treeView )
+      : base( treeView )
+    {
+      treeView.SelectedItemChanged += SelectedItemChanged;
+    }
+
+    void SelectedItemChanged( object sender, RoutedPropertyChangedEventArgs<object> e )
+    {
+      //This treeview command is specfic to the navigation region, 
+      //so I always want to pass the tag of the selected treeviewitem
+      //because it will conatin the Type of view to navigate to.
+      var type = ( e.NewValue as FrameworkElement ).Tag as Type;
+      CommandParameter = type != null ? type.FullName : null;
+      ExecuteCommand();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Commands/TreeViewSelected.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Commands/TreeViewSelected.cs
new file mode 100644
index 00000000..927af6ef
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Commands/TreeViewSelected.cs
@@ -0,0 +1,82 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace Samples.Infrastructure.Commands
+{
+  public class TreeViewSelected
+  {
+    private static readonly DependencyProperty SelectedCommandBehaviorProperty = DependencyProperty.RegisterAttached( "SelectedCommandBehavior", typeof( TreeViewCommandBehavior ), typeof( TreeViewSelected ), null );
+
+    public static readonly DependencyProperty CommandProperty = DependencyProperty.RegisterAttached( "Command", typeof( ICommand ), typeof( TreeViewSelected ), new PropertyMetadata( OnSetCommandCallback ) );
+    public static void SetCommand( TreeView menuItem, ICommand command )
+    {
+      menuItem.SetValue( CommandProperty, command );
+    }
+    public static ICommand GetCommand( TreeView menuItem )
+    {
+      return menuItem.GetValue( CommandProperty ) as ICommand;
+    }
+
+    public static readonly DependencyProperty CommandParameterProperty = DependencyProperty.RegisterAttached( "CommandParameter", typeof( object ), typeof( TreeViewSelected ), new PropertyMetadata( OnSetCommandParameterCallback ) );
+    public static void SetCommandParameter( TreeView menuItem, object parameter )
+    {
+      menuItem.SetValue( CommandParameterProperty, parameter );
+    }
+    public static object GetCommandParameter( TreeView menuItem )
+    {
+      return menuItem.GetValue( CommandParameterProperty );
+    }
+
+    private static void OnSetCommandCallback( DependencyObject dependencyObject, DependencyPropertyChangedEventArgs e )
+    {
+      TreeView menuItem = dependencyObject as TreeView;
+      if( menuItem != null )
+      {
+        TreeViewCommandBehavior behavior = GetOrCreateBehavior( menuItem );
+        behavior.Command = e.NewValue as ICommand;
+      }
+    }
+
+    private static void OnSetCommandParameterCallback( DependencyObject dependencyObject, DependencyPropertyChangedEventArgs e )
+    {
+      TreeView menuItem = dependencyObject as TreeView;
+      if( menuItem != null )
+      {
+        TreeViewCommandBehavior behavior = GetOrCreateBehavior( menuItem );
+        behavior.CommandParameter = e.NewValue;
+      }
+    }
+
+    private static TreeViewCommandBehavior GetOrCreateBehavior( TreeView menuItem )
+    {
+      TreeViewCommandBehavior behavior = menuItem.GetValue( SelectedCommandBehaviorProperty ) as TreeViewCommandBehavior;
+      if( behavior == null )
+      {
+        behavior = new TreeViewCommandBehavior( menuItem );
+        menuItem.SetValue( SelectedCommandBehaviorProperty, behavior );
+      }
+
+      return behavior;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Controls/DemoView.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Controls/DemoView.cs
new file mode 100644
index 00000000..8816daad
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Controls/DemoView.cs
@@ -0,0 +1,171 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.IO;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Samples.Infrastructure.Controls
+{
+  public class DemoView : ContentControl
+  {
+    #region Members
+
+    readonly string _applicationPath = String.Empty;
+    const string _samplesFolderName = "Samples";
+
+    #endregion //Members
+
+    #region Properties
+
+
+
+    public static readonly DependencyProperty DescriptionProperty = DependencyProperty.Register( "Description", typeof( string ), typeof( DemoView ), new UIPropertyMetadata( String.Empty ) );
+    public string Description
+    {
+      get
+      {
+        return ( string )GetValue( DescriptionProperty );
+      }
+      set
+      {
+        SetValue( DescriptionProperty, value );
+      }
+    }
+
+
+    public static readonly DependencyProperty CSharpTextProperty = DependencyProperty.Register( "CSharpText", typeof( string ), typeof( DemoView ), new UIPropertyMetadata( null ) );
+    public string CSharpText
+    {
+      get
+      {
+        return ( string )GetValue( CSharpTextProperty );
+      }
+      set
+      {
+        SetValue( CSharpTextProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty TitleProperty = DependencyProperty.Register( "Title", typeof( string ), typeof( DemoView ), new UIPropertyMetadata( null ) );
+    public string Title
+    {
+      get
+      {
+        return ( string )GetValue( TitleProperty );
+      }
+      set
+      {
+        SetValue( TitleProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty XamlTextProperty = DependencyProperty.Register( "XamlText", typeof( string ), typeof( DemoView ), new UIPropertyMetadata( null ) );
+    public string XamlText
+    {
+      get
+      {
+        return ( string )GetValue( XamlTextProperty );
+      }
+      set
+      {
+        SetValue( XamlTextProperty, value );
+      }
+    }
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static DemoView()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( DemoView ), new FrameworkPropertyMetadata( typeof( DemoView ) ) );
+    }
+
+    public DemoView()
+    {
+      _applicationPath = Path.GetDirectoryName( System.Reflection.Assembly.GetExecutingAssembly().Location );
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    protected override void OnContentChanged( object oldContent, object newContent )
+    {
+      base.OnContentChanged( oldContent, newContent );
+      //the parent of the content will be the View
+      ResolveContentCode( ( newContent as FrameworkElement ).Parent );
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Methods
+
+    private void ResolveContentCode( object newContent )
+    {
+      //get the type of the content loaded in the ContentRegion
+      var type = newContent.GetType();
+      //grab only the name of the content which will correspond to the name of the file to load
+      var viewName = type.FullName.Substring( type.FullName.LastIndexOf( "." ) + 1 );
+      //get the module name
+      var moduleName = type.Module.Name.Replace( ".dll", String.Empty );
+
+      SetText( viewName, moduleName );
+    }
+
+    private void SetText( string viewName, string moduleName )
+    {
+      SetCSharpText( viewName, moduleName );
+      SetXamlText( viewName, moduleName );
+    }
+
+    private void SetCSharpText( string viewName, string moduleName )
+    {
+      //now we need to append the file extension
+      string fileName = String.Format( "{0}.xaml", viewName );
+      string filePath = GetFilePath( moduleName, fileName );
+      XamlText = ReadFileText( filePath );
+    }
+
+    private void SetXamlText( string viewName, string moduleName )
+    {
+      //now we need to append the file extension
+      string fileName = String.Format( "{0}.xaml.cs", viewName );
+      string filePath = GetFilePath( moduleName, fileName );
+      CSharpText = ReadFileText( filePath );
+    }
+
+    private string GetFilePath( string moduleName, string fileName )
+    {
+      return Path.Combine( _applicationPath, _samplesFolderName, moduleName, fileName );
+    }
+
+    private static string ReadFileText( string filePath )
+    {
+      string text = String.Empty;
+      if( File.Exists( filePath ) )
+        text = File.ReadAllText( filePath );
+      return text;
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Converters/CSharpColorConverter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Converters/CSharpColorConverter.cs
new file mode 100644
index 00000000..b30d175d
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Converters/CSharpColorConverter.cs
@@ -0,0 +1,59 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Media;
+using Samples.Infrastructure.Core.CodeFormatting;
+
+namespace Samples.Infrastructure.Converters
+{
+  public class CSharpColorConverter : IValueConverter
+  {
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      if( value == null )
+        return value;
+
+      String val = ( String )value;
+
+      CSharpFormat cSharpFormat = new CSharpFormat();
+      FlowDocument doc = new FlowDocument();
+      Paragraph p = new Paragraph();
+      p = cSharpFormat.FormatCode( val );
+      doc.Blocks.Add( p );
+
+      RichTextBox rtb = new RichTextBox();
+      rtb.IsReadOnly = true;
+      rtb.Document = doc;
+      rtb.Document.PageWidth = 2500.0;
+      rtb.HorizontalScrollBarVisibility = ScrollBarVisibility.Auto;
+      rtb.VerticalScrollBarVisibility = ScrollBarVisibility.Auto;
+      rtb.FontFamily = new FontFamily( "Courier New" );
+      return rtb;
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Converters/XamlColorConverter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Converters/XamlColorConverter.cs
new file mode 100644
index 00000000..9365b59d
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Converters/XamlColorConverter.cs
@@ -0,0 +1,140 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Media;
+using Samples.Infrastructure.Core.CodeFormatting;
+
+namespace Samples.Infrastructure.Converters
+{
+  public class XamlColorConverter : IValueConverter
+  {
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      if( value == null )
+        return value;
+
+      string xaml = value as string;
+
+      FlowDocument doc = new FlowDocument();
+      ColorizeXAML( xaml, doc );
+
+      RichTextBox rtb = new RichTextBox();
+      rtb.IsReadOnly = true;
+      rtb.Document = doc;
+      rtb.Document.PageWidth = 2500.0;
+      rtb.HorizontalScrollBarVisibility = ScrollBarVisibility.Auto;
+      rtb.VerticalScrollBarVisibility = ScrollBarVisibility.Auto;
+      rtb.FontFamily = new FontFamily( "Courier New" );
+      return rtb;
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+
+    #region SyntaxColoring
+
+    #region ColorizeXAML
+
+    public void ColorizeXAML( string xamlText, FlowDocument targetDoc )
+    {
+      XmlTokenizer tokenizer = new XmlTokenizer();
+      XmlTokenizerMode mode = XmlTokenizerMode.OutsideElement;
+
+      List<XmlToken> tokens = tokenizer.Tokenize( xamlText, ref mode );
+      List<string> tokenTexts = new List<string>( tokens.Count );
+      List<Color> colors = new List<Color>( tokens.Count );
+      int position = 0;
+      foreach( XmlToken token in tokens )
+      {
+        string tokenText = xamlText.Substring( position, token.Length );
+        tokenTexts.Add( tokenText );
+        Color color = ColorForToken( token, tokenText );
+        colors.Add( color );
+        position += token.Length;
+      }
+
+      Paragraph p = new Paragraph();
+
+      // Loop through tokens
+      for( int i = 0; i < tokenTexts.Count; i++ )
+      {
+        Run r = new Run( tokenTexts[ i ] );
+        r.Foreground = new SolidColorBrush( colors[ i ] );
+        p.Inlines.Add( r );
+      }
+
+      targetDoc.Blocks.Add( p );
+    }
+
+    #endregion //ColorizeXAML
+
+    static Color ColorForToken( XmlToken token, string tokenText )
+    {
+      Color color = Color.FromRgb( 0, 0, 0 );
+      switch( token.Kind )
+      {
+        case XmlTokenKind.Open:
+        case XmlTokenKind.OpenClose:
+        case XmlTokenKind.Close:
+        case XmlTokenKind.SelfClose:
+        case XmlTokenKind.CommentBegin:
+        case XmlTokenKind.CommentEnd:
+        case XmlTokenKind.CDataBegin:
+        case XmlTokenKind.CDataEnd:
+        case XmlTokenKind.Equals:
+        case XmlTokenKind.OpenProcessingInstruction:
+        case XmlTokenKind.CloseProcessingInstruction:
+        case XmlTokenKind.AttributeValue:
+          color = Color.FromRgb( 0, 0, 255 );
+          // color = "blue";
+          break;
+        case XmlTokenKind.ElementName:
+          color = Color.FromRgb( 163, 21, 21 );
+          // color = "brown";
+          break;
+        case XmlTokenKind.TextContent:
+          // color = "black";
+          break;
+        case XmlTokenKind.AttributeName:
+        case XmlTokenKind.Entity:
+          color = Color.FromRgb( 255, 0, 0 );
+          // color = "red";
+          break;
+        case XmlTokenKind.CommentText:
+          color = Color.FromRgb( 0, 128, 0 );
+          // color = "green";
+          break;
+      }
+      if( token.Kind == XmlTokenKind.ElementWhitespace
+          || ( token.Kind == XmlTokenKind.TextContent && tokenText.Trim() == "" ) )
+      {
+        // color = null;
+      }
+      return color;
+    }
+    #endregion SyntaxColoring
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Core/CodeFormatting/CSharpFormat.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Core/CodeFormatting/CSharpFormat.cs
new file mode 100644
index 00000000..d0480e3f
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Core/CodeFormatting/CSharpFormat.cs
@@ -0,0 +1,448 @@
+#region Copyright © 2001-2003 Jean-Claude Manoli [jc@manoli.net]
+/*
+ * This software is provided 'as-is', without any express or implied warranty.
+ * In no event will the author(s) be held liable for any damages arising from
+ * the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ *   1. The origin of this software must not be misrepresented; you must not
+ *      claim that you wrote the original software. If you use this software
+ *      in a product, an acknowledgment in the product documentation would be
+ *      appreciated but is not required.
+ * 
+ *   2. Altered source versions must be plainly marked as such, and must not
+ *      be misrepresented as being the original software.
+ * 
+ *   3. This notice may not be removed or altered from any source distribution.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Windows.Documents;
+using System.Windows.Media;
+
+namespace Samples.Infrastructure.Core.CodeFormatting
+{
+  public class CSharpFormat : CLikeFormat
+  {
+    /// <summary>
+    /// The list of C# keywords.
+    /// </summary>
+    protected override string Keywords
+    {
+      get
+      {
+        return "abstract as base bool break byte case catch char "
+        + "checked class const continue decimal default delegate do double else "
+        + "enum event explicit extern false finally fixed float for foreach goto "
+        + "if implicit in int interface internal is lock long namespace new null "
+        + "object operator out override partial params private protected public readonly "
+        + "ref return sbyte sealed short sizeof stackalloc static string struct "
+        + "switch this throw true try typeof uint ulong unchecked unsafe ushort "
+        + "using value virtual void volatile where while yield";
+      }
+    }
+
+    /// <summary>
+    /// The list of C# preprocessors.
+    /// </summary>
+    protected override string Preprocessors
+    {
+      get
+      {
+        return "#if #else #elif #endif #define #undef #warning "
+            + "#error #line #region #endregion #pragma";
+      }
+    }
+  }
+
+  /// <summary>
+  /// Provides a base class for formatting languages similar to C.
+  /// </summary>
+  public abstract class CLikeFormat : CodeFormat
+  {
+    /// <summary>
+    /// Regular expression string to match single line and multi-line 
+    /// comments (// and /* */). 
+    /// </summary>
+    protected override string CommentRegEx
+    {
+      get
+      {
+        return @"/\*.*?\*/|//.*?(?=\r|\n)";
+      }
+    }
+
+    /// <summary>
+    /// Regular expression string to match string and character literals. 
+    /// </summary>
+    protected override string StringRegEx
+    {
+      get
+      {
+        return @"@?""""|@?"".*?(?!\\).""|''|'.*?(?!\\).'";
+      }
+    }
+  }
+
+  /// <summary>
+  /// Provides a base class for formatting most programming languages.
+  /// </summary>
+  public abstract class CodeFormat : SourceFormat
+  {
+    /// <summary>
+    /// Must be overridden to provide a list of keywords defined in 
+    /// each language.
+    /// </summary>
+    /// <remarks>
+    /// Keywords must be separated with spaces.
+    /// </remarks>
+    protected abstract string Keywords
+    {
+      get;
+    }
+
+    /// <summary>
+    /// Can be overridden to provide a list of preprocessors defined in 
+    /// each language.
+    /// </summary>
+    /// <remarks>
+    /// Preprocessors must be separated with spaces.
+    /// </remarks>
+    protected virtual string Preprocessors
+    {
+      get
+      {
+        return "";
+      }
+    }
+
+    /// <summary>
+    /// Must be overridden to provide a regular expression string
+    /// to match strings literals. 
+    /// </summary>
+    protected abstract string StringRegEx
+    {
+      get;
+    }
+
+    /// <summary>
+    /// Must be overridden to provide a regular expression string
+    /// to match comments. 
+    /// </summary>
+    protected abstract string CommentRegEx
+    {
+      get;
+    }
+
+    /// <summary>
+    /// Determines if the language is case sensitive.
+    /// </summary>
+    /// <value><b>true</b> if the language is case sensitive, <b>false</b> 
+    /// otherwise. The default is true.</value>
+    /// <remarks>
+    /// A case-insensitive language formatter must override this 
+    /// property to return false.
+    /// </remarks>
+    public virtual bool CaseSensitive
+    {
+      get
+      {
+        return true;
+      }
+    }
+
+    /// <summary/>
+    protected CodeFormat()
+    {
+      //generate the keyword and preprocessor regexes from the keyword lists
+      Regex r;
+      r = new Regex( @"\w+|-\w+|#\w+|@@\w+|#(?:\\(?:s|w)(?:\*|\+)?\w+)+|@\\w\*+" );
+      string regKeyword = r.Replace( Keywords, @"(?<=^|\W)$0(?=\W)" );
+      string regPreproc = r.Replace( Preprocessors, @"(?<=^|\s)$0(?=\s|$)" );
+      r = new Regex( @" +" );
+      regKeyword = r.Replace( regKeyword, @"|" );
+      regPreproc = r.Replace( regPreproc, @"|" );
+
+      if( regPreproc.Length == 0 )
+      {
+        regPreproc = "(?!.*)_{37}(?<!.*)"; //use something quite impossible...
+      }
+
+      //build a master regex with capturing groups
+      StringBuilder regAll = new StringBuilder();
+      regAll.Append( "(" );
+      regAll.Append( CommentRegEx );
+      regAll.Append( ")|(" );
+      regAll.Append( StringRegEx );
+      if( regPreproc.Length > 0 )
+      {
+        regAll.Append( ")|(" );
+        regAll.Append( regPreproc );
+      }
+      regAll.Append( ")|(" );
+      regAll.Append( regKeyword );
+      regAll.Append( ")" );
+
+      RegexOptions caseInsensitive = CaseSensitive ? 0 : RegexOptions.IgnoreCase;
+      CodeRegex = new Regex( regAll.ToString(), RegexOptions.Singleline | caseInsensitive );
+
+      CodeParagraphGlobal = new List<Run>();
+    }
+
+    /// <summary>
+    /// Called to evaluate the HTML fragment corresponding to each 
+    /// matching token in the code.
+    /// </summary>
+    /// <param name="match">The <see cref="Match"/> resulting from a 
+    /// single regular expression match.</param>
+    /// <returns>A string containing the HTML code fragment.</returns>
+    protected override string MatchEval( Match match ) //protected override
+    {
+      if( match.Groups[ 1 ].Success ) //comment
+      {
+        StringReader reader = new StringReader( match.ToString() );
+        StringBuilder sb = new StringBuilder();
+        string line;
+        bool firstLineRead = false;
+        while( ( line = reader.ReadLine() ) != null )
+        {
+          if( firstLineRead )
+            sb.Append( "\r" );
+
+          sb.Append( line );
+          firstLineRead = true;
+        }
+
+        if( !string.IsNullOrEmpty( sb.ToString() ) )
+        {
+          Run r = new Run( sb.ToString() );
+          r.Foreground = new SolidColorBrush( Color.FromRgb( 0, 128, 0 ) );
+          CodeParagraphGlobal.Add( r );
+        }
+        return "::::::";
+      }
+      else if( match.Groups[ 2 ].Success ) //string literal
+      {
+        Run r = new Run( match.ToString() );
+        r.Foreground = new SolidColorBrush( Color.FromRgb( 0, 96, 128 ) );
+
+        CodeParagraphGlobal.Add( r );
+        return "::::::";
+      }
+      else if( match.Groups[ 3 ].Success ) //preprocessor keyword
+      {
+        Run r = new Run( match.ToString() );
+        r.Foreground = new SolidColorBrush( Color.FromRgb( 204, 102, 51 ) );
+
+        CodeParagraphGlobal.Add( r );
+        return "::::::";
+      }
+      else if( match.Groups[ 4 ].Success ) //keyword
+      {
+        Run r = new Run( match.ToString() );
+        r.Foreground = new SolidColorBrush( Color.FromRgb( 0, 0, 255 ) );
+
+        CodeParagraphGlobal.Add( r );
+        return "::::::";
+      }
+      else
+      {
+        return "";
+      }
+    }
+  }
+
+  /// <summary>
+  ///	Provides a base implementation for all code formatters.
+  /// </summary>
+  /// <remarks>
+  /// <para>
+  /// To display the formatted code on your web site, the web page must 
+  /// refer to a stylesheet that defines the formatting for the different 
+  /// CSS classes generated by CSharpFormat:
+  /// .csharpcode, pre, .rem, .kwrd, .str, .op, .preproc, .alt, .lnum.
+  /// </para>
+  /// <para>
+  /// Note that if you have multi-line comments in your source code
+  /// (like /* ... */), the "line numbers" or "alternate line background" 
+  /// options will generate code that is not strictly HTML 4.01 compliant. 
+  /// The code will still look good with IE5+ or Mozilla 0.8+. 
+  /// </para>
+  /// </remarks>
+  public abstract class SourceFormat
+  {
+    /// <summary/>
+    protected SourceFormat()
+    {
+      _tabSpaces = 4;
+      _lineNumbers = false;
+      _alternate = false;
+      _embedStyleSheet = false;
+    }
+
+    private byte _tabSpaces;
+
+    /// <summary>
+    /// Gets or sets the tabs width.
+    /// </summary>
+    /// <value>The number of space characters to substitute for tab 
+    /// characters. The default is <b>4</b>, unless overridden is a 
+    /// derived class.</value>
+    public byte TabSpaces
+    {
+      get
+      {
+        return _tabSpaces;
+      }
+      set
+      {
+        _tabSpaces = value;
+      }
+    }
+
+    private bool _lineNumbers;
+
+    /// <summary>
+    /// Enables or disables line numbers in output.
+    /// </summary>
+    /// <value>When <b>true</b>, line numbers are generated. 
+    /// The default is <b>false</b>.</value>
+    public bool LineNumbers
+    {
+      get
+      {
+        return _lineNumbers;
+      }
+      set
+      {
+        _lineNumbers = value;
+      }
+    }
+
+    private bool _alternate;
+
+    /// <summary>
+    /// Enables or disables alternating line background.
+    /// </summary>
+    /// <value>When <b>true</b>, lines background is alternated. 
+    /// The default is <b>false</b>.</value>
+    public bool Alternate
+    {
+      get
+      {
+        return _alternate;
+      }
+      set
+      {
+        _alternate = value;
+      }
+    }
+
+    private bool _embedStyleSheet;
+
+    /// <summary>
+    /// Enables or disables the embedded CSS style sheet.
+    /// </summary>
+    /// <value>When <b>true</b>, the CSS &lt;style&gt; element is included 
+    /// in the HTML output. The default is <b>false</b>.</value>
+    public bool EmbedStyleSheet
+    {
+      get
+      {
+        return _embedStyleSheet;
+      }
+      set
+      {
+        _embedStyleSheet = value;
+      }
+    }
+
+    /// <summary>
+    /// Transforms a source code string to HTML 4.01.
+    /// </summary>
+    /// <returns>A string containing the HTML formatted code.</returns>
+    public Paragraph FormatCode( string source )
+    {
+      return FormatCode( source, _lineNumbers, _alternate, _embedStyleSheet, false );
+    }
+
+    private Regex codeRegex;
+
+    /// <summary>
+    /// The regular expression used to capture language tokens.
+    /// </summary>
+    protected Regex CodeRegex
+    {
+      get
+      {
+        return codeRegex;
+      }
+      set
+      {
+        codeRegex = value;
+      }
+    }
+
+    private List<Run> codeParagraphGlobal;
+    /// <summary>
+    /// This is a List of Run's that can be added later to the string of code
+    /// </summary>
+    protected List<Run> CodeParagraphGlobal
+    {
+      get
+      {
+        return codeParagraphGlobal;
+      }
+      set
+      {
+        codeParagraphGlobal = value;
+      }
+    }
+
+    /// <summary>
+    /// Called to evaluate the HTML fragment corresponding to each 
+    /// matching token in the code.
+    /// </summary>
+    /// <param name="match">The <see cref="Match"/> resulting from a 
+    /// single regular expression match.</param>
+    /// <returns>A string containing the HTML code fragment.</returns>
+    protected abstract string MatchEval( Match match ); //protected abstract
+
+    //does the formatting job
+    private Paragraph FormatCode( string source, bool lineNumbers,
+        bool alternate, bool embedStyleSheet, bool subCode )
+    {
+      Paragraph codeParagraph = new Paragraph();
+      //replace special characters
+      StringBuilder sb = new StringBuilder( source );
+      //color the code
+      source = codeRegex.Replace( sb.ToString(), new MatchEvaluator( this.MatchEval ) );
+      //codeRegex.Replace(
+      string[] characters = { "::::::" };
+
+      string[] split = source.Split( characters, new StringSplitOptions() );
+      int currentChunk = 0;
+      foreach( string code in split )
+      {
+        currentChunk++;
+        Run r = new Run( code );
+        codeParagraph.Inlines.Add( r );
+        if( ( currentChunk - 1 ) < codeParagraphGlobal.Count )
+        {
+          codeParagraph.Inlines.Add( codeParagraphGlobal[ currentChunk - 1 ] );
+        }
+      }
+
+      return codeParagraph;
+    }
+
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Core/CodeFormatting/XamlFormat.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Core/CodeFormatting/XamlFormat.cs
new file mode 100644
index 00000000..8e71b297
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Core/CodeFormatting/XamlFormat.cs
@@ -0,0 +1,350 @@
+//Author: Nick Kramer [MSFT]
+//Source: http://blogs.msdn.com/b/nickkramer/archive/2006/09/22/766934.aspx
+
+using System.Collections.Generic;
+using System.Diagnostics;
+
+namespace Samples.Infrastructure.Core.CodeFormatting
+{
+  // XML tokenizer, tokens are designed to match Visual Studio syntax highlighting
+  class XmlTokenizer
+  {
+    private string input;
+    private int position = 0;
+    private XmlTokenizerMode mode = XmlTokenizerMode.OutsideElement;
+    public static List<XmlToken> Tokenize( string input )
+    {
+      XmlTokenizerMode mode = XmlTokenizerMode.OutsideElement;
+      XmlTokenizer tokenizer = new XmlTokenizer();
+      return tokenizer.Tokenize( input, ref mode );
+    }
+    public List<XmlToken> Tokenize( string input, ref XmlTokenizerMode _mode )
+    {
+      this.input = input;
+      this.mode = _mode;
+      this.position = 0;
+      List<XmlToken> result = Tokenize();
+      _mode = this.mode;
+      return result;
+    }
+    private List<XmlToken> Tokenize()
+    {
+      List<XmlToken> list = new List<XmlToken>();
+      XmlToken token;
+      do
+      {
+        int previousPosition = position;
+        token = NextToken();
+        string tokenText = input.Substring( previousPosition, token.Length );
+        list.Add( token );
+      }
+      while( token.Kind != XmlTokenKind.EOF );
+      List<string> strings = TokensToStrings( list, input );
+      return list;
+    }
+    private List<string> TokensToStrings( List<XmlToken> list, string input )
+    {
+      List<string> output = new List<string>();
+      int position = 0;
+      foreach( XmlToken token in list )
+      {
+        output.Add( input.Substring( position, token.Length ) );
+        position += token.Length;
+      }
+      return output;
+    }
+    // debugging function
+    public string RemainingText
+    {
+      get
+      {
+        return input.Substring( position );
+      }
+    }
+    private XmlToken NextToken()
+    {
+      if( position >= input.Length )
+        return new XmlToken( XmlTokenKind.EOF, 0 );
+      XmlToken token;
+      switch( mode )
+      {
+        case XmlTokenizerMode.AfterAttributeEquals:
+          token = TokenizeAttributeValue();
+          break;
+        case XmlTokenizerMode.AfterAttributeName:
+          token = TokenizeSimple( "=", XmlTokenKind.Equals, XmlTokenizerMode.AfterAttributeEquals );
+          break;
+        case XmlTokenizerMode.AfterOpen:
+          token = TokenizeName( XmlTokenKind.ElementName, XmlTokenizerMode.InsideElement );
+          break;
+        case XmlTokenizerMode.InsideCData:
+          token = TokenizeInsideCData();
+          break;
+        case XmlTokenizerMode.InsideComment:
+          token = TokenizeInsideComment();
+          break;
+        case XmlTokenizerMode.InsideElement:
+          token = TokenizeInsideElement();
+          break;
+        case XmlTokenizerMode.InsideProcessingInstruction:
+          token = TokenizeInsideProcessingInstruction();
+          break;
+        case XmlTokenizerMode.OutsideElement:
+          token = TokenizeOutsideElement();
+          break;
+        default:
+          token = new XmlToken( XmlTokenKind.EOF, 0 );
+          Debug.Fail( "missing case" );
+          break;
+      }
+      return token;
+    }
+    private bool IsNameCharacter( char character )
+    {
+      // XML rule: Letter | Digit | '.' | '-' | '_' | ':' | CombiningChar | Extender
+      bool result = char.IsLetterOrDigit( character ) || character == '.' | character == '-' | character == '_' | character == ':';
+      return result;
+    }
+    private XmlToken TokenizeAttributeValue()
+    {
+      Debug.Assert( mode == XmlTokenizerMode.AfterAttributeEquals );
+      int closePosition = input.IndexOf( input[ position ], position + 1 );
+      XmlToken token = new XmlToken( XmlTokenKind.AttributeValue, closePosition + 1 - position );
+      position = closePosition + 1;
+      mode = XmlTokenizerMode.InsideElement;
+      return token;
+    }
+    private XmlToken TokenizeName( XmlTokenKind kind, XmlTokenizerMode nextMode )
+    {
+      Debug.Assert( mode == XmlTokenizerMode.AfterOpen || mode == XmlTokenizerMode.InsideElement );
+      int i;
+      for( i = position; i < input.Length; i++ )
+        if( !IsNameCharacter( input[ i ] ) )
+          break;
+      XmlToken token = new XmlToken( kind, i - position );
+      mode = nextMode;
+      position = i;
+      return token;
+    }
+    private XmlToken TokenizeElementWhitespace()
+    {
+      int i;
+      for( i = position; i < input.Length; i++ )
+        if( !char.IsWhiteSpace( input[ i ] ) )
+          break;
+      XmlToken token = new XmlToken( XmlTokenKind.ElementWhitespace, i - position );
+      position = i;
+      return token;
+    }
+    private bool StartsWith( string text )
+    {
+      if( position + text.Length > input.Length )
+        return false;
+      else
+        return input.Substring( position, text.Length ) == text;
+    }
+    private XmlToken TokenizeInsideElement()
+    {
+      if( char.IsWhiteSpace( input[ position ] ) )
+        return TokenizeElementWhitespace();
+      else
+        if( StartsWith( "/>" ) )
+          return TokenizeSimple( "/>", XmlTokenKind.SelfClose, XmlTokenizerMode.OutsideElement );
+        else
+          if( StartsWith( ">" ) )
+            return TokenizeSimple( ">", XmlTokenKind.Close, XmlTokenizerMode.OutsideElement );
+          else
+            return TokenizeName( XmlTokenKind.AttributeName, XmlTokenizerMode.AfterAttributeName );
+    }
+    private XmlToken TokenizeText()
+    {
+      Debug.Assert( input[ position ] != '<' );
+      Debug.Assert( input[ position ] != '&' );
+      Debug.Assert( mode == XmlTokenizerMode.OutsideElement );
+      int i;
+      for( i = position; i < input.Length; i++ )
+        if( input[ i ] == '<' || input[ i ] == '&' )
+          break;
+      XmlToken token = new XmlToken( XmlTokenKind.TextContent, i - position );
+      position = i;
+      return token;
+    }
+    private XmlToken TokenizeOutsideElement()
+    {
+      Debug.Assert( mode == XmlTokenizerMode.OutsideElement );
+      if( position >= input.Length )
+        return new XmlToken( XmlTokenKind.EOF, 0 );
+      switch( input[ position ] )
+      {
+        case '<':
+          return TokenizeOpen();
+        case '&':
+          return TokenizeEntity();
+        default:
+          return TokenizeText();
+      }
+    }
+    private XmlToken TokenizeSimple( string text, XmlTokenKind kind, XmlTokenizerMode nextMode )
+    {
+      XmlToken token = new XmlToken( kind, text.Length );
+      position += text.Length;
+      mode = nextMode;
+      return token;
+    }
+    private XmlToken TokenizeOpen()
+    {
+      Debug.Assert( input[ position ] == '<' );
+      if( StartsWith( "<!--" ) )
+        return TokenizeSimple( "<!--", XmlTokenKind.CommentBegin, XmlTokenizerMode.InsideComment );
+      else
+        if( StartsWith( "<![CDATA[" ) )
+          return TokenizeSimple( "<![CDATA[", XmlTokenKind.CDataBegin, XmlTokenizerMode.InsideCData );
+        else
+          if( StartsWith( "<?" ) )
+            return TokenizeSimple( "<?", XmlTokenKind.OpenProcessingInstruction, XmlTokenizerMode.InsideProcessingInstruction );
+          else
+            if( StartsWith( "</" ) )
+              return TokenizeSimple( "</", XmlTokenKind.OpenClose, XmlTokenizerMode.AfterOpen );
+            else
+              return TokenizeSimple( "<", XmlTokenKind.Open, XmlTokenizerMode.AfterOpen );
+    }
+    private XmlToken TokenizeEntity()
+    {
+      Debug.Assert( mode == XmlTokenizerMode.OutsideElement );
+      Debug.Assert( input[ position ] == '&' );
+      XmlToken token = new XmlToken( XmlTokenKind.Entity, input.IndexOf( ';', position ) - position );
+      position += token.Length;
+      return token;
+    }
+    private XmlToken TokenizeInsideProcessingInstruction()
+    {
+      Debug.Assert( mode == XmlTokenizerMode.InsideProcessingInstruction );
+      int tokenend = input.IndexOf( "?>", position );
+      if( position == tokenend )
+      {
+        position += "?>".Length;
+        mode = XmlTokenizerMode.OutsideElement;
+        return new XmlToken( XmlTokenKind.CloseProcessingInstruction, "?>".Length );
+      }
+      else
+      {
+        XmlToken token = new XmlToken( XmlTokenKind.TextContent, tokenend - position );
+        position = tokenend;
+        return token;
+      }
+    }
+    private XmlToken TokenizeInsideCData()
+    {
+      Debug.Assert( mode == XmlTokenizerMode.InsideCData );
+      int tokenend = input.IndexOf( "]]>", position );
+      if( position == tokenend )
+      {
+        position += "]]>".Length;
+        mode = XmlTokenizerMode.OutsideElement;
+        return new XmlToken( XmlTokenKind.CDataEnd, "]]>".Length );
+      }
+      else
+      {
+        XmlToken token = new XmlToken( XmlTokenKind.TextContent, tokenend - position );
+        position = tokenend;
+        return token;
+      }
+    }
+    private XmlToken TokenizeInsideComment()
+    {
+      Debug.Assert( mode == XmlTokenizerMode.InsideComment );
+      int tokenend = input.IndexOf( "-->", position );
+      if( position == tokenend )
+      {
+        position += "-->".Length;
+        mode = XmlTokenizerMode.OutsideElement;
+        return new XmlToken( XmlTokenKind.CommentEnd, "-->".Length );
+      }
+      else
+      {
+        XmlToken token = new XmlToken( XmlTokenKind.CommentText, tokenend - position );
+        position = tokenend;
+        return token;
+      }
+    }
+  }
+
+  // Used so you can restart the tokenizer for the next line of XML
+  enum XmlTokenizerMode
+  {
+    InsideComment,
+    InsideProcessingInstruction,
+    AfterOpen,
+    AfterAttributeName,
+    AfterAttributeEquals,
+    InsideElement,
+    // after element name, before attribute or />
+    OutsideElement,
+    InsideCData
+  }
+
+  struct XmlToken
+  {
+    public XmlTokenKind Kind;
+    public short Length;
+    public XmlToken( XmlTokenKind kind, int length )
+    {
+      Kind = kind;
+      Length = ( short )length;
+    }
+  }
+
+  /*
+      * this file implements a mostly correct XML tokenizer.  The token boundaries
+      * have been chosen to match Visual Studio syntax highlighting, so a few of 
+      * the boundaries are little weird.  (Especially comments) known issues:
+      * 
+      * Doesn't handle DTD's
+      * mediocre handling of processing instructions <? ?> -- it won't crash, 
+      *      but the token boundaries are wrong
+      * Doesn't enforce correct XML
+      * there's probably a few cases where it will die if given in valid XML
+      * 
+      * 
+      * This tokenizer has been designed to be restartable, so you can tokenize
+      * one line of XML at a time.
+      */
+  enum XmlTokenKind
+  {
+    Open,
+    // <
+    Close,
+    //>
+    SelfClose,
+    // />
+    OpenClose,
+    // </
+    ElementName,
+    ElementWhitespace,
+    //whitespace between attributes
+    AttributeName,
+    Equals,
+    // inside attribute
+    AttributeValue,
+    // attribute value
+    CommentBegin,
+    // <!--
+    CommentText,
+    CommentEnd,
+    // -->
+    Entity,
+    // &gt;
+    OpenProcessingInstruction,
+    // <?
+    CloseProcessingInstruction,
+    // ?>
+    CDataBegin,
+    // <![CDATA[
+    CDataEnd,
+    // ]]>
+    TextContent,
+    //WhitespaceContent, // text content that's whitespace.  Space is embedded inside
+    EOF,
+    // end of file
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Extensions/UnityContainerExtensions.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Extensions/UnityContainerExtensions.cs
new file mode 100644
index 00000000..bed76b99
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Extensions/UnityContainerExtensions.cs
@@ -0,0 +1,32 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using Microsoft.Practices.Unity;
+
+namespace Samples.Infrastructure.Extensions
+{
+  public static class UnityContainerExtensions
+  {
+    public static void RegisterNavigationType( this IUnityContainer container, Type type )
+    {
+      container.RegisterType( typeof( Object ), type, type.FullName );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/ModuleBase.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/ModuleBase.cs
new file mode 100644
index 00000000..e6413821
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/ModuleBase.cs
@@ -0,0 +1,56 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using Microsoft.Practices.Prism.Modularity;
+using Microsoft.Practices.Prism.Regions;
+using Microsoft.Practices.Unity;
+
+namespace Samples.Infrastructure
+{
+  public abstract class ModuleBase : IModule
+  {
+    protected IRegionManager RegionManager
+    {
+      get;
+      private set;
+    }
+    protected IUnityContainer Container
+    {
+      get;
+      private set;
+    }
+
+    protected ModuleBase( IUnityContainer container, IRegionManager regionManager )
+    {
+      Container = container;
+      RegionManager = regionManager;
+    }
+
+    public void Initialize()
+    {
+      //types must be registered first
+      RegisterViewsAndTypes();
+      //now initialize the module
+      InitializeModule();
+    }
+
+    protected abstract void InitializeModule();
+    protected abstract void RegisterViewsAndTypes();
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Properties/AssemblyInfo.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..05df1b54
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Properties/AssemblyInfo.cs
@@ -0,0 +1,72 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle( "Extended WPF Toolkit Samples" )]
+[assembly: AssemblyDescription( "" )]
+[assembly: AssemblyConfiguration( "" )]
+[assembly: AssemblyCompany( "Xceed Software Inc." )]
+[assembly: AssemblyProduct( "Extended WPF Toolkit Samples" )]
+[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
+[assembly: AssemblyTrademark( "" )]
+[assembly: AssemblyCulture( "" )]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible( false )]
+
+//In order to begin building localizable applications, set 
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+  //(used if a resource is not found in the page, 
+  // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+  //(used if a resource is not found in the page, 
+  // app, or any theme specific resource dictionaries)
+)]
+
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion( "1.0.0.0" )]
+[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/RegionNames.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/RegionNames.cs
new file mode 100644
index 00000000..bbd08ec1
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/RegionNames.cs
@@ -0,0 +1,27 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Samples.Infrastructure
+{
+  public static class RegionNames
+  {
+    public static readonly string NavigationRegion = "NavigationRegion";
+    public static readonly string ContentRegion = "ContentRegion";
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Samples.Infrastructure.csproj b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Samples.Infrastructure.csproj
new file mode 100644
index 00000000..843f384c
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Samples.Infrastructure.csproj
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</ProjectGuid>
+    <OutputType>library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Samples.Infrastructure</RootNamespace>
+    <AssemblyName>Samples.Infrastructure</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.Practices.Prism, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Practices.Unity, Version=2.0.414.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Commands\TreeViewCommandBehavior.cs" />
+    <Compile Include="Commands\TreeViewSelected.cs" />
+    <Compile Include="Controls\DemoView.cs" />
+    <Compile Include="Converters\CSharpColorConverter.cs" />
+    <Compile Include="Converters\XamlColorConverter.cs" />
+    <Compile Include="Core\CodeFormatting\CSharpFormat.cs" />
+    <Compile Include="Core\CodeFormatting\XamlFormat.cs" />
+    <Compile Include="Extensions\UnityContainerExtensions.cs" />
+    <Compile Include="ModuleBase.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="RegionNames.cs" />
+    <Compile Include="ViewModelBase.cs" />
+    <AppDesigner Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="Themes\Generic.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Themes/Generic.xaml
new file mode 100644
index 00000000..7c3a5685
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Themes/Generic.xaml
@@ -0,0 +1,186 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="clr-namespace:Samples.Infrastructure.Controls"
+    xmlns:infConverters="clr-namespace:Samples.Infrastructure.Converters">
+
+   <infConverters:XamlColorConverter x:Key="XamlColorConverter" />
+   <infConverters:CSharpColorConverter x:Key="CSharpColorConverter" />
+
+   <LinearGradientBrush x:Key="TabBackgroundDefault" EndPoint="0.330810546875,1" StartPoint="0.330810546875,0">
+      <GradientStop Color="#FF100311" Offset="1"/>
+      <GradientStop Color="#FF666666" Offset="0"/>
+   </LinearGradientBrush>
+
+   <Style x:Key="TabItemStyle" TargetType="{x:Type TabItem}">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type TabItem}">
+               <Grid Width="Auto" Height="29" Margin="0">
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="0.565*" />
+                     <RowDefinition Height="0.435*" />
+                  </Grid.RowDefinitions>
+                  <Border Grid.RowSpan="2" CornerRadius="0" Margin="0,0,0,1" Opacity="1" SnapsToDevicePixels="True">
+                     <Border.Background>
+                        <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                           <GradientStop Color="#FF333333" Offset="0" />
+                           <GradientStop Color="#FF9F9F9F" Offset="1" />
+                        </LinearGradientBrush>
+                     </Border.Background>
+                  </Border>
+                  <Border Background="{StaticResource TabBackgroundDefault}" CornerRadius="0" Margin="1,0,0,1" Grid.RowSpan="2" x:Name="border" SnapsToDevicePixels="True" />
+                  <TextBlock HorizontalAlignment="Center" Margin="15,0,15,0" VerticalAlignment="Center" Grid.RowSpan="2" FontFamily="Segoe UI" FontSize="11" FontWeight="Bold" Foreground="#4CFFFFFF" Text="{TemplateBinding Header}" TextWrapping="Wrap" x:Name="textBlock" />
+                  <Rectangle x:Name="rectangle" Grid.RowSpan="2" Height="1" VerticalAlignment="Top" Margin="1,1,0,0" Visibility="Collapsed" SnapsToDevicePixels="True">
+                     <Rectangle.Fill>
+                        <LinearGradientBrush EndPoint="0.966,0.5" StartPoint="0.045,0.479">
+                           <GradientStop Color="#FFF8EDED" Offset="0.504" />
+                           <GradientStop Color="#00111010" Offset="1" />
+                           <GradientStop Color="#00000000" />
+                        </LinearGradientBrush>
+                     </Rectangle.Fill>
+                  </Rectangle>
+                  <Rectangle Grid.RowSpan="2" Width="1" HorizontalAlignment="Right" Margin="0,0,-1,1" SnapsToDevicePixels="True">
+                     <Rectangle.Fill>
+                        <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                           <GradientStop Color="#FF2B2B2B" Offset="0" />
+                           <GradientStop Color="#99FFFFFF" Offset="1" />
+                        </LinearGradientBrush>
+                     </Rectangle.Fill>
+                  </Rectangle>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsMouseOver" Value="True">
+                     <Setter Property="Foreground" TargetName="textBlock" Value="#FFF2EDF4" />
+                  </Trigger>
+                  <Trigger Property="IsSelected" Value="True">
+                     <Setter Property="Panel.ZIndex" Value="100" />
+                     <Setter Property="Background" TargetName="border">
+                        <Setter.Value>
+                           <LinearGradientBrush EndPoint="-0.003,1.107" StartPoint="0,0">
+                              <GradientStop Color="#FF9305CF" Offset="0" />
+                              <GradientStop Color="Black" Offset="1" />
+                           </LinearGradientBrush>
+                        </Setter.Value>
+                     </Setter>
+                     <Setter Property="Foreground" TargetName="textBlock" Value="#FFFFFFFF" />
+                     <Setter Property="Visibility" TargetName="rectangle" Value="Visible" />
+                     <Setter Property="Fill" TargetName="rectangle">
+                        <Setter.Value>
+                           <LinearGradientBrush EndPoint="0.966,0.5" StartPoint="0.045,0.479">
+                              <GradientStop Color="#FFF8EDED" Offset="0.504" />
+                              <GradientStop Color="#00BD2FD5" Offset="1" />
+                              <GradientStop Color="#00BD2FD5" />
+                           </LinearGradientBrush>
+                        </Setter.Value>
+                     </Setter>
+                     <Setter Property="Margin" TargetName="border" Value="1,0,0,0" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="Margin" Value="0,0,1,0" />
+   </Style>
+
+   <Style x:Key="TabControlStyle" TargetType="{x:Type TabControl}">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type TabControl}">
+               <Grid KeyboardNavigation.TabNavigation="Local">
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="Auto" />
+                     <RowDefinition Height="*" />
+                  </Grid.RowDefinitions>
+                  <TabPanel Grid.Row="0" Margin="0,0,7,-1" x:Name="HeaderPanel" Background="Transparent" IsItemsHost="True" Panel.ZIndex="1" KeyboardNavigation.TabIndex="1" HorizontalAlignment="Right" />
+                  <Border Grid.Row="1" x:Name="Border" Background="White" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1" CornerRadius="0" KeyboardNavigation.DirectionalNavigation="Contained" KeyboardNavigation.TabNavigation="Local" KeyboardNavigation.TabIndex="2" SnapsToDevicePixels="True">
+                     <ContentPresenter Margin="4" x:Name="PART_SelectedContentHost" ContentSource="SelectedContent" />
+                  </Border>
+                  <Rectangle HorizontalAlignment="Stretch" Margin="1,1,1,0" VerticalAlignment="Top" Width="Auto" Height="8" Grid.Row="1" SnapsToDevicePixels="True">
+                     <Rectangle.Fill>
+                        <LinearGradientBrush EndPoint="0.5,0.861" StartPoint="0.5,0">
+                           <GradientStop Color="#FF13011B" Offset="0.014" />
+                           <GradientStop Color="#FF8D05C7" Offset="0.97" />
+                        </LinearGradientBrush>
+                     </Rectangle.Fill>
+                  </Rectangle>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style TargetType="{x:Type local:DemoView}">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:DemoView}">
+               <Border Background="{TemplateBinding Background}"
+                       BorderBrush="{TemplateBinding BorderBrush}"
+                       BorderThickness="{TemplateBinding BorderThickness}">
+                  <Grid>
+                     <TabControl TabStripPlacement="Top" Style="{StaticResource TabControlStyle}" >
+                        <TabItem Header="Sample" Style="{StaticResource TabItemStyle}">
+                           <ScrollViewer VerticalScrollBarVisibility="Auto">
+                              <Grid>
+                                 <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto"/>
+                                    <RowDefinition Height="*"/>
+                                 </Grid.RowDefinitions>
+                                 <TextBlock Grid.Row="0" TextWrapping="Wrap" Margin="10,10,10,0" Text="{TemplateBinding Description}"/>
+                                 <ContentPresenter Grid.Row="1"  Margin="10" ScrollViewer.CanContentScroll="True" />
+                              </Grid>
+                           </ScrollViewer>
+                        </TabItem>
+                        <TabItem Header="XAML" Style="{StaticResource TabItemStyle}">
+                           <ContentPresenter x:Name="_xamlCode" 
+                                             Content="{Binding XamlText, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource XamlColorConverter}}"
+                                             HorizontalAlignment="Stretch"
+                                             VerticalAlignment="Stretch"
+                                             ScrollViewer.CanContentScroll="True" 
+                                             Margin="5,10,5,5" />
+                        </TabItem>
+                        <TabItem Header="Code" Style="{StaticResource TabItemStyle}">
+                           <ContentPresenter x:Name="_cSharpCode" 
+                                             Content="{Binding CSharpText, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CSharpColorConverter}}"
+                                             HorizontalAlignment="Stretch"
+                                             VerticalAlignment="Stretch"
+                                             ScrollViewer.CanContentScroll="True"
+                                             Margin="5,10,5,5" />
+                        </TabItem>
+                     </TabControl>
+                     <TextBlock Opacity="1" 
+                                HorizontalAlignment="Left" 
+                                Margin="12,5,0,0" 
+                                VerticalAlignment="Top"
+                                TextWrapping="Wrap" 
+                                FontSize="18" 
+                                FontFamily="Segoe UI" 
+                                TextAlignment="right" 
+                                Foreground="#FFFFFFFF" 
+                                FontWeight="Bold" 
+                                Text="{TemplateBinding Title}" />
+                  </Grid>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/ViewModelBase.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/ViewModelBase.cs
new file mode 100644
index 00000000..11ec9b42
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/ViewModelBase.cs
@@ -0,0 +1,37 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.ComponentModel;
+
+namespace Samples.Infrastructure
+{
+  public interface IViewModel
+  {
+  }
+
+  public class ViewModelBase : IViewModel, INotifyPropertyChanged
+  {
+    public event PropertyChangedEventHandler PropertyChanged;
+    protected virtual void OnPropertyChanged( string propertyName )
+    {
+      if( PropertyChanged != null )
+        PropertyChanged( this, new PropertyChangedEventArgs( propertyName ) );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples/App.config b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples/App.config
new file mode 100644
index 00000000..69603068
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples/App.config
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+   <configSections>
+      <section name="modules" type="Microsoft.Practices.Prism.Modularity.ModulesConfigurationSection, Microsoft.Practices.Prism"/>
+   </configSections>
+
+   <modules>
+      <module assemblyFile="Samples.Modules.BusyIndicator.dll" moduleType="Samples.Modules.BusyIndicator.BusyIndicatorModule, Samples.Modules.BusyIndicator" moduleName="BusyIndicatorModule" />
+      <module assemblyFile="Samples.Modules.Button.dll" moduleType="Samples.Modules.Button.ButtonModule, Samples.Modules.Button" moduleName="ButtonModule" />
+      <module assemblyFile="Samples.Modules.Calculator.dll" moduleType="Samples.Modules.Calculator.CalculatorModule, Samples.Modules.Calculator" moduleName="CalculatorModule" />
+      <module assemblyFile="Samples.Modules.CheckLists.dll" moduleType="Samples.Modules.CheckLists.CheckListsModule, Samples.Modules.CheckLists" moduleName="CheckListsModule" />
+      <module assemblyFile="Samples.Modules.ChildWindow.dll" moduleType="Samples.Modules.ChildWindow.ChildWindowModule, Samples.Modules.ChildWindow" moduleName="ChildWindowModule" />
+      <module assemblyFile="Samples.Modules.Color.dll" moduleType="Samples.Modules.Color.ColorModule, Samples.Modules.Color" moduleName="ColorModule" />
+      <module assemblyFile="Samples.Modules.DateTime.dll" moduleType="Samples.Modules.DateTime.DateTimeModule, Samples.Modules.DateTime" moduleName="DateTimeModule" />
+      <module assemblyFile="Samples.Modules.Magnifier.dll" moduleType="Samples.Modules.Magnifier.MagnifierModule, Samples.Modules.Magnifier" moduleName="MagnifierModule" />
+      <module assemblyFile="Samples.Modules.Numeric.dll" moduleType="Samples.Modules.Numeric.NumericModule, Samples.Modules.Numeric" moduleName="NumericModule" />
+      <module assemblyFile="Samples.Modules.MessageBox.dll" moduleType="Samples.Modules.MessageBox.MessageBoxModule, Samples.Modules.MessageBox" moduleName="MessageBoxModule" />
+      <module assemblyFile="Samples.Modules.Pie.dll" moduleType="Samples.Modules.Pie.PieModule, Samples.Modules.Pie" moduleName="PieModule" />
+      <module assemblyFile="Samples.Modules.PropertyGrid.dll" moduleType="Samples.Modules.PropertyGrid.PropertyGridModule, Samples.Modules.PropertyGrid" moduleName="PropertyGridModule" />
+      <module assemblyFile="Samples.Modules.Text.dll" moduleType="Samples.Modules.Text.TextModule, Samples.Modules.Text" moduleName="TextModule" />
+      <module assemblyFile="Samples.Modules.TimelinePanel.dll" moduleType="Samples.Modules.TimelinePanel.TimelinePanelModule, Samples.Modules.TimelinePanel" moduleName="TimelinePanelModule" />
+      <module assemblyFile="Samples.Modules.Wizard.dll" moduleType="Samples.Modules.Wizard.WizardModule, Samples.Modules.Wizard" moduleName="WizardModule" />
+      <module assemblyFile="Samples.Modules.Zoombox.dll" moduleType="Samples.Modules.Zoombox.ZoomboxModule, Samples.Modules.Zoombox" moduleName="ZoomboxModule" />
+   </modules>
+</configuration>
\ No newline at end of file
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples/App.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples/App.xaml
new file mode 100644
index 00000000..4b472be0
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples/App.xaml
@@ -0,0 +1,32 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<Application x:Class="Samples.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+   <Application.Resources>
+
+      <ResourceDictionary>
+         <ResourceDictionary.MergedDictionaries>
+            <ResourceDictionary Source="/Resources/TextBlockStyles.xaml" />
+            <ResourceDictionary Source="/Resources/TreeViewStyles.xaml" />
+         </ResourceDictionary.MergedDictionaries>
+      </ResourceDictionary>
+
+   </Application.Resources>
+</Application>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples/App.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples/App.xaml.cs
new file mode 100644
index 00000000..149d71cb
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples/App.xaml.cs
@@ -0,0 +1,42 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows;
+
+namespace Samples
+{
+  /// <summary>
+  /// Interaction logic for App.xaml
+  /// </summary>
+  public partial class App : Application
+  {
+    protected override void OnStartup( StartupEventArgs e )
+    {
+      // Put the following code before InitializeComponent()
+      // Sets the culture to French (France)
+      //Thread.CurrentThread.CurrentCulture = new CultureInfo("da-DK");
+      // Sets the UI culture to French (France)
+      //Thread.CurrentThread.CurrentUICulture = new CultureInfo("da-DK");
+
+      base.OnStartup( e );
+      Bootstrapper bootstrapper = new Bootstrapper();
+      bootstrapper.Run();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples/Bootstrapper.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples/Bootstrapper.cs
new file mode 100644
index 00000000..d5394276
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples/Bootstrapper.cs
@@ -0,0 +1,48 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows;
+using Microsoft.Practices.Prism.Modularity;
+using Microsoft.Practices.Prism.UnityExtensions;
+using Microsoft.Practices.Unity;
+
+namespace Samples
+{
+  public class Bootstrapper : UnityBootstrapper
+  {
+    protected override DependencyObject CreateShell()
+    {
+      Container.RegisterType<IShellViewModel, ShellViewModel>();
+      return Container.Resolve<Shell>();
+    }
+
+    protected override void InitializeShell()
+    {
+      base.InitializeShell();
+
+      App.Current.MainWindow = ( Shell )Shell;
+      App.Current.MainWindow.Show();
+    }
+
+    protected override Microsoft.Practices.Prism.Modularity.IModuleCatalog CreateModuleCatalog()
+    {
+      return new ConfigurationModuleCatalog();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples/IShellViewModel.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples/IShellViewModel.cs
new file mode 100644
index 00000000..b931c87e
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples/IShellViewModel.cs
@@ -0,0 +1,25 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Samples
+{
+  public interface IShellViewModel
+  {
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples/Images/Background.png b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples/Images/Background.png
new file mode 100644
index 00000000..ea52078d
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples/Images/Background.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples/Properties/AssemblyInfo.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..05df1b54
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples/Properties/AssemblyInfo.cs
@@ -0,0 +1,72 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle( "Extended WPF Toolkit Samples" )]
+[assembly: AssemblyDescription( "" )]
+[assembly: AssemblyConfiguration( "" )]
+[assembly: AssemblyCompany( "Xceed Software Inc." )]
+[assembly: AssemblyProduct( "Extended WPF Toolkit Samples" )]
+[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
+[assembly: AssemblyTrademark( "" )]
+[assembly: AssemblyCulture( "" )]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible( false )]
+
+//In order to begin building localizable applications, set 
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+  //(used if a resource is not found in the page, 
+  // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+  //(used if a resource is not found in the page, 
+  // app, or any theme specific resource dictionaries)
+)]
+
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion( "1.0.0.0" )]
+[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples/Resources/TextBlockStyles.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples/Resources/TextBlockStyles.xaml
new file mode 100644
index 00000000..1aa25218
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples/Resources/TextBlockStyles.xaml
@@ -0,0 +1,29 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+   <Style x:Key="Header" TargetType="TextBlock">
+      <Setter Property="FontSize" Value="18" />
+      <Setter Property="FontWeight" Value="Bold" />
+      <Setter Property="Foreground" Value="#FF8605BD" />
+      <Setter Property="Margin" Value="0,5" />
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples/Resources/TreeViewStyles.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples/Resources/TreeViewStyles.xaml
new file mode 100644
index 00000000..f9e870fe
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples/Resources/TreeViewStyles.xaml
@@ -0,0 +1,249 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+   <SolidColorBrush x:Key="HighlightFill" Color="#59FFFFFF" />
+   <LinearGradientBrush x:Key="SelectedFill" EndPoint="0,1" StartPoint="0,0">
+      <GradientStop Color="#59FFFFFF" Offset="0" />
+      <GradientStop Color="#33FFFFFF" Offset="1" />
+      <GradientStop Color="#19FFFFFF" Offset="0.5" />
+   </LinearGradientBrush>
+   <SolidColorBrush x:Key="ForegroundHighlightFill" Color="#FFFFFFFF" />
+   <SolidColorBrush x:Key="ForegroundFill" Color="#FFFFFFFF" />
+   <LinearGradientBrush x:Key="GlyphFill" EndPoint="0,1" StartPoint="0,0">
+      <GradientStop Color="#FFFFFFFF" Offset="0" />
+      <GradientStop Color="#FF959595" Offset="1" />
+   </LinearGradientBrush>
+   <SolidColorBrush x:Key="ControlFill" Color="#00FFFFFF" />
+   <SolidColorBrush x:Key="CommonFill" Color="#00FFFFFF" />
+
+   <Style x:Key="TreeViewItemToggleButton" TargetType="{x:Type ToggleButton}">
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ToggleButton}">
+               <ControlTemplate.Resources>
+                  <Storyboard x:Key="ExpandIndicatorIsChecked">
+                     <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="path" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)">
+                        <SplineDoubleKeyFrame KeyTime="00:00:00.2000000" Value="90" />
+                     </DoubleAnimationUsingKeyFrames>
+                     <ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="path" Storyboard.TargetProperty="(FrameworkElement.Margin)">
+                        <SplineThicknessKeyFrame KeyTime="00:00:00.2000000" Value="0,1,0,0" />
+                     </ThicknessAnimationUsingKeyFrames>
+                  </Storyboard>
+                  <Storyboard x:Key="ExpandIndicatorIsCheckedFalse">
+                     <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="path" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)">
+                        <SplineDoubleKeyFrame KeyTime="00:00:00" Value="90" />
+                        <SplineDoubleKeyFrame KeyTime="00:00:00.2000000" Value="0" />
+                     </DoubleAnimationUsingKeyFrames>
+                     <ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="path" Storyboard.TargetProperty="(FrameworkElement.Margin)">
+                        <SplineThicknessKeyFrame KeyTime="00:00:00" Value="1,0,0,0" />
+                        <SplineThicknessKeyFrame KeyTime="00:00:00.2000000" Value="2,0,0,0" />
+                     </ThicknessAnimationUsingKeyFrames>
+                     <BooleanAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="grid" Storyboard.TargetProperty="(UIElement.SnapsToDevicePixels)">
+                        <DiscreteBooleanKeyFrame KeyTime="00:00:00.2000000" Value="True" />
+                     </BooleanAnimationUsingKeyFrames>
+                  </Storyboard>
+               </ControlTemplate.Resources>
+               <Grid Width="15" Height="13" Background="Transparent" x:Name="grid">
+                  <Ellipse Width="12" Height="12" Fill="{TemplateBinding Background}" Stroke="{x:Null}" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                  <Path HorizontalAlignment="Center" VerticalAlignment="Center" Height="6" Width="6" Stretch="Fill" Opacity="1" 
+                        Data="M303,349 C303,349 303,345 303,345 303,345 309.04167,347 309.04167,347 309.04167,347 303,349 303,349 z" Fill="{TemplateBinding Foreground}" Margin="2,0,0,0" x:Name="path" RenderTransformOrigin="0.5,0.5">
+                     <Path.RenderTransform>
+                        <TransformGroup>
+                           <ScaleTransform ScaleX="1" ScaleY="1" />
+                           <SkewTransform AngleX="0" AngleY="0" />
+                           <RotateTransform Angle="0" />
+                           <TranslateTransform X="0" Y="0" />
+                        </TransformGroup>
+                     </Path.RenderTransform>
+                  </Path>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsChecked" Value="True">
+                     <Trigger.ExitActions>
+                        <BeginStoryboard x:Name="ExpandIndicatorIsCheckedFalse_BeginStoryboard1" Storyboard="{StaticResource ExpandIndicatorIsCheckedFalse}" />
+                     </Trigger.ExitActions>
+                     <Trigger.EnterActions>
+                        <BeginStoryboard Storyboard="{StaticResource ExpandIndicatorIsChecked}" x:Name="ExpandIndicatorIsChecked_BeginStoryboard" />
+                     </Trigger.EnterActions>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="Foreground" Value="{StaticResource GlyphFill}" />
+      <Setter Property="Background" Value="{StaticResource ControlFill}" />
+   </Style>
+
+   <Style TargetType="{x:Type TreeViewItem}">
+      <Setter Property="Background" Value="{StaticResource CommonFill}" />
+      <Setter Property="HorizontalContentAlignment" Value="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
+      <Setter Property="VerticalContentAlignment" Value="{Binding Path=VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
+      <Setter Property="Padding" Value="1,0,0,0" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type TreeViewItem}">
+               <ControlTemplate.Resources>
+                  <Storyboard x:Key="TreeItemIsExpanded">
+                     <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="ItemsHost" Storyboard.TargetProperty="(UIElement.Opacity)">
+                        <SplineDoubleKeyFrame KeyTime="00:00:00.2000000" Value="1" />
+                     </DoubleAnimationUsingKeyFrames>
+                  </Storyboard>
+                  <Storyboard x:Key="MouseOver">
+                     <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Selection_Border" Storyboard.TargetProperty="(Panel.Background).(GradientBrush.GradientStops)[0].(GradientStop.Color)">
+                        <SplineColorKeyFrame KeyTime="00:00:00" Value="#4CFFFFFF" />
+                     </ColorAnimationUsingKeyFrames>
+                     <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Selection_Border" Storyboard.TargetProperty="(Panel.Background).(GradientBrush.GradientStops)[2].(GradientStop.Color)">
+                        <SplineColorKeyFrame KeyTime="00:00:00" Value="#4CFFFFFF" />
+                     </ColorAnimationUsingKeyFrames>
+                     <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Selection_Border" Storyboard.TargetProperty="(Panel.Background).(GradientBrush.GradientStops)[1].(GradientStop.Color)">
+                        <SplineColorKeyFrame KeyTime="00:00:00" Value="#4CFFFFFF" />
+                     </ColorAnimationUsingKeyFrames>
+                  </Storyboard>
+                  <Storyboard x:Key="MouseOut">
+                     <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Selection_Border" Storyboard.TargetProperty="(Panel.Background).(GradientBrush.GradientStops)[0].(GradientStop.Color)">
+                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#00FFFFFF" />
+                     </ColorAnimationUsingKeyFrames>
+                     <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Selection_Border" Storyboard.TargetProperty="(Panel.Background).(GradientBrush.GradientStops)[1].(GradientStop.Color)">
+                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#00FFFFFF" />
+                     </ColorAnimationUsingKeyFrames>
+                     <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Selection_Border" Storyboard.TargetProperty="(Panel.Background).(GradientBrush.GradientStops)[2].(GradientStop.Color)">
+                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#00FFFFFF" />
+                     </ColorAnimationUsingKeyFrames>
+                  </Storyboard>
+                  <Storyboard x:Key="ItemSelected">
+                     <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="SelectedRect" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[2].(GradientStop.Offset)">
+                        <SplineDoubleKeyFrame KeyTime="00:00:00.2000000" Value="0.5" />
+                     </DoubleAnimationUsingKeyFrames>
+                     <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="SelectedRect" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[0].(GradientStop.Color)">
+                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#59FFFFFF" />
+                     </ColorAnimationUsingKeyFrames>
+                     <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="SelectedRect" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[2].(GradientStop.Color)">
+                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#0CFFFFFF" />
+                     </ColorAnimationUsingKeyFrames>
+                     <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="SelectedRect" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[1].(GradientStop.Color)">
+                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#33FFFFFF" />
+                     </ColorAnimationUsingKeyFrames>
+                  </Storyboard>
+                  <Storyboard x:Key="ItemDeselected">
+                     <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="SelectedRect" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[0].(GradientStop.Color)">
+                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#00FFFFFF" />
+                     </ColorAnimationUsingKeyFrames>
+                     <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="SelectedRect" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[2].(GradientStop.Color)">
+                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#00FFFFFF" />
+                     </ColorAnimationUsingKeyFrames>
+                     <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="SelectedRect" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[1].(GradientStop.Color)">
+                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#00FFFFFF" />
+                     </ColorAnimationUsingKeyFrames>
+                  </Storyboard>
+               </ControlTemplate.Resources>
+               <DockPanel SnapsToDevicePixels="True">
+                  <Grid x:Name="HeaderContainer" Background="Transparent" DockPanel.Dock="Top">
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                     </Grid.ColumnDefinitions>
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                     </Grid.RowDefinitions>
+                     <Border Grid.Column="0" x:Name="Selection_Border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" Grid.ColumnSpan="2" Grid.Row="0" Grid.RowSpan="1" Opacity="1">
+                        <Border.Background>
+                           <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
+                              <GradientStop Color="#00FFFFFF" Offset="0" />
+                              <GradientStop Color="#00FFFFFF" Offset="1" />
+                              <GradientStop Color="#00FFFFFF" Offset="0.5" />
+                           </LinearGradientBrush>
+                        </Border.Background>
+                     </Border>
+                     <Rectangle Stroke="{x:Null}" HorizontalAlignment="Stretch" Width="Auto" Grid.Column="0" Grid.RowSpan="1" Grid.ColumnSpan="2" x:Name="SelectedRect">
+                        <Rectangle.Fill>
+                           <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
+                              <GradientStop Color="#00FFFFFF" Offset="0" />
+                              <GradientStop Color="#00FFFFFF" Offset="1 "/>
+                              <GradientStop Color="#00FFFFFF" Offset="0.533" />
+                           </LinearGradientBrush>
+                        </Rectangle.Fill>
+                     </Rectangle>
+                     <ContentPresenter x:Name="PART_Header" ContentSource="Header" Width="Auto" VerticalAlignment="Center" Grid.ColumnSpan="1" Grid.Column="1" Margin="3,0,0,0" />
+                     <ToggleButton x:Name="Expander"  Style="{StaticResource TreeViewItemToggleButton}" IsChecked="{Binding Path=IsExpanded, RelativeSource={RelativeSource TemplatedParent}}" ClickMode="Press" VerticalAlignment="Center" Margin="0,3,0,3" />
+                  </Grid>
+                  <ItemsPresenter x:Name="ItemsHost" HorizontalAlignment="Stretch" Height="Auto" Opacity="0" Margin="14,1,0,0" />
+               </DockPanel>
+               <ControlTemplate.Triggers>
+
+                  <DataTrigger Binding="{Binding Path=Parent.Parent, RelativeSource={RelativeSource TemplatedParent}}" Value="{x:Null}">
+                     <Setter TargetName="ItemsHost" Property="Margin" Value="15,1,0,0" />
+                  </DataTrigger>
+
+                  <Trigger SourceName="HeaderContainer" Property="IsMouseOver" Value="True">
+                     <Trigger.EnterActions>
+                        <BeginStoryboard Storyboard="{StaticResource MouseOver}" x:Name="MouseOver_BeginStoryboard_HitTestArea" />
+                     </Trigger.EnterActions>
+                     <Trigger.ExitActions>
+                        <BeginStoryboard Storyboard="{StaticResource MouseOut}" x:Name="MouseOut_BeginStoryboard_HitTestArea" />
+                     </Trigger.ExitActions>
+                  </Trigger>
+
+
+                  <Trigger Property="IsExpanded" Value="false">
+                     <Setter Property="Visibility" Value="Collapsed" TargetName="ItemsHost" />
+                  </Trigger>
+                  <Trigger Property="IsExpanded" Value="True">
+                     <Trigger.EnterActions>
+                        <BeginStoryboard Storyboard="{StaticResource TreeItemIsExpanded}" x:Name="TreeItemIsExpanded_BeginStoryboard" />
+                     </Trigger.EnterActions>
+                     <Trigger.ExitActions>
+                        <StopStoryboard BeginStoryboardName="TreeItemIsExpanded_BeginStoryboard" />
+                     </Trigger.ExitActions>
+                     <Setter Property="Margin" Value="0,0,0,0" />
+                     <Setter Property="Grid.RowSpan" TargetName="Selection_Border" Value="1" />
+                  </Trigger>
+                  <Trigger Property="HasItems" Value="false">
+                     <Setter Property="Visibility" Value="Hidden" TargetName="Expander" />
+                  </Trigger>
+                  <Trigger Property="IsSelected" Value="true">
+                     <Trigger.ExitActions>
+                        <BeginStoryboard x:Name="ItemDeselected_BeginStoryboard1" Storyboard="{StaticResource ItemDeselected}" />
+                     </Trigger.ExitActions>
+                     <Trigger.EnterActions>
+                        <BeginStoryboard Storyboard="{StaticResource ItemSelected}" x:Name="ItemSelected_BeginStoryboard" />
+                     </Trigger.EnterActions>
+                  </Trigger>
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="IsSelected" Value="true" />
+                        <Condition Property="IsSelectionActive" Value="false" />
+                     </MultiTrigger.Conditions>
+                     <Setter Property="Background" Value="{StaticResource SelectedFill}" />
+                     <Setter Property="Foreground" Value="{StaticResource ForegroundHighlightFill}" />
+                  </MultiTrigger>
+                  <Trigger Property="IsEnabled" Value="false">
+                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="Margin" Value="0,0,0,1" />
+      <Setter Property="Foreground" Value="{StaticResource ForegroundFill}" />
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples/Samples.csproj b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples/Samples.csproj
new file mode 100644
index 00000000..21cf80f7
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples/Samples.csproj
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{6EE69D18-F8AB-4CF9-AC3D-4719F36A8D99}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Samples</RootNamespace>
+    <AssemblyName>Samples</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.Practices.Prism, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Practices.Prism.UnityExtensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\Libs\Prism\Microsoft.Practices.Prism.UnityExtensions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Practices.ServiceLocation, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\Libs\Prism\Microsoft.Practices.ServiceLocation.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Practices.Unity, Version=2.0.414.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xaml" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Bootstrapper.cs" />
+    <Compile Include="IShellViewModel.cs" />
+    <Compile Include="Shell.xaml.cs">
+      <DependentUpon>Shell.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="ShellViewModel.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <None Include="App.config" />
+    <AppDesigner Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Samples.Infrastructure\Samples.Infrastructure.csproj">
+      <Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
+      <Name>Samples.Infrastructure</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="Resources\TextBlockStyles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Resources\TreeViewStyles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Shell.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\Background.png" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples/Shell.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples/Shell.xaml
new file mode 100644
index 00000000..5c2a5dca
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples/Shell.xaml
@@ -0,0 +1,65 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<Window x:Class="Samples.Shell" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:inf="clr-namespace:Samples.Infrastructure;assembly=Samples.Infrastructure"
+        xmlns:infCommands="clr-namespace:Samples.Infrastructure.Commands;assembly=Samples.Infrastructure"
+        xmlns:prism="http://www.codeplex.com/CompositeWPF"
+        Background="Black"
+        Title="Extended WPF Toolkit - Samples" Height="768" Width="1024" >
+   <Grid>
+      <Image Source="/Images/Background.png" Stretch="None" VerticalAlignment="Top" HorizontalAlignment="Left" Grid.RowSpan="2" />
+      <Grid Margin="15" >
+         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition />
+         </Grid.RowDefinitions>
+
+         <Grid Margin="10,0,10,10">
+            <TextBlock Text="Extended WPF Toolkit" Foreground="White" FontSize="28" FontWeight="Bold" />
+         </Grid>
+
+         <Grid Grid.Row="1">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="Auto" />
+               <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+
+            <Border CornerRadius="5" BorderBrush="#FF666666" BorderThickness="1">
+               <TreeView prism:RegionManager.RegionName="{x:Static inf:RegionNames.NavigationRegion}" 
+                         infCommands:TreeViewSelected.Command="{Binding NavigateCommand}" 
+                         BorderBrush="{x:Null}" MinWidth="225" Margin="3"
+                         Loaded="TreeView_Loaded">
+                  <TreeView.Background>
+                     <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                        <GradientStop Color="#A1000000" Offset="0" />
+                        <GradientStop Color="Black" Offset="1" />
+                     </LinearGradientBrush>
+                  </TreeView.Background>
+               </TreeView>
+            </Border>
+
+            <Border Grid.Column="1" Margin="10,0,10,0" BorderBrush="Gray" BorderThickness="1" Background="#2C2E3E" CornerRadius="3">
+               <ContentControl x:Name="MainContent" prism:RegionManager.RegionName="{x:Static inf:RegionNames.ContentRegion}" Margin="5,0,5,8" />
+            </Border>
+
+         </Grid>
+      </Grid>
+   </Grid>
+</Window>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples/Shell.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples/Shell.xaml.cs
new file mode 100644
index 00000000..c48add0f
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples/Shell.xaml.cs
@@ -0,0 +1,52 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Samples
+{
+  public partial class Shell : Window
+  {
+    public Shell( IShellViewModel viewModel )
+    {
+      InitializeComponent();
+      ViewModel = viewModel;
+    }
+
+    public IShellViewModel ViewModel
+    {
+      get
+      {
+        return ( IShellViewModel )DataContext;
+      }
+      private set
+      {
+        DataContext = value;
+      }
+    }
+
+    private void TreeView_Loaded( object sender, RoutedEventArgs e )
+    {
+      TreeView tv = ( TreeView )sender;
+      tv.Items.SortDescriptions.Add( new SortDescription( "Header", ListSortDirection.Ascending ) );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples/ShellViewModel.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples/ShellViewModel.cs
new file mode 100644
index 00000000..8d1d8f91
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/Samples/Samples/ShellViewModel.cs
@@ -0,0 +1,50 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows.Input;
+using Microsoft.Practices.Prism.Commands;
+using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure;
+
+namespace Samples
+{
+  public class ShellViewModel : ViewModelBase, IShellViewModel
+  {
+    private readonly IRegionManager _regionManager;
+
+    public ICommand NavigateCommand
+    {
+      get;
+      set;
+    }
+
+    public ShellViewModel( IRegionManager regionManager )
+    {
+      _regionManager = regionManager;
+      NavigateCommand = new DelegateCommand<string>( Navigate );
+    }
+
+    private void Navigate( string navigatePath )
+    {
+      if( !String.IsNullOrWhiteSpace( navigatePath ) )
+        _regionManager.RequestNavigate( RegionNames.ContentRegion, navigatePath );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/AssemblyVersionInfo.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/AssemblyVersionInfo.cs
new file mode 100644
index 00000000..74011485
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/AssemblyVersionInfo.cs
@@ -0,0 +1,39 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+[assembly: System.Reflection.AssemblyVersion( _XceedVersionInfo.Version )]
+
+internal static class _XceedVersionInfo
+{
+  [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
+  public const string BaseVersion = "1.7";
+  [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
+  public const string Version = BaseVersion + 
+  _XceedVersionInfoCommon.Build;
+  [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
+  public const string PublicKeyToken = "ba83ff368b7563c6";
+  [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
+  public const string DesignFullName =
+    "Xceed.Wpf.Toolkit,Version=" +
+    Version +
+    ",Culture=neutral,PublicKeyToken=" + PublicKeyToken;
+
+
+
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/AssemblyVersionInfoCommon.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/AssemblyVersionInfoCommon.cs
new file mode 100644
index 00000000..d9308cb5
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/AssemblyVersionInfoCommon.cs
@@ -0,0 +1,25 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+internal static class _XceedVersionInfoCommon
+{
+[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
+  public const string Build = ".*";
+
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/BusyIndicator/Implementation/BusyIndicator.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/BusyIndicator/Implementation/BusyIndicator.cs
new file mode 100644
index 00000000..4a9e2678
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/BusyIndicator/Implementation/BusyIndicator.cs
@@ -0,0 +1,325 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Shapes;
+using System.Windows.Threading;
+
+namespace Xceed.Wpf.Toolkit
+{
+  /// <summary>
+  /// A control to provide a visual indicator when an application is busy.
+  /// </summary>
+  [TemplateVisualState( Name = VisualStates.StateIdle, GroupName = VisualStates.GroupBusyStatus )]
+  [TemplateVisualState( Name = VisualStates.StateBusy, GroupName = VisualStates.GroupBusyStatus )]
+  [TemplateVisualState( Name = VisualStates.StateVisible, GroupName = VisualStates.GroupVisibility )]
+  [TemplateVisualState( Name = VisualStates.StateHidden, GroupName = VisualStates.GroupVisibility )]
+  [StyleTypedProperty( Property = "OverlayStyle", StyleTargetType = typeof( Rectangle ) )]
+  [StyleTypedProperty( Property = "ProgressBarStyle", StyleTargetType = typeof( ProgressBar ) )]
+  public class BusyIndicator : ContentControl
+  {
+    #region Private Members
+
+    /// <summary>
+    /// Timer used to delay the initial display and avoid flickering.
+    /// </summary>
+    private DispatcherTimer _displayAfterTimer = new DispatcherTimer();
+
+    #endregion //Private Members
+
+    #region Constructors
+
+    static BusyIndicator()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( BusyIndicator ), new FrameworkPropertyMetadata( typeof( BusyIndicator ) ) );
+    }
+
+    public BusyIndicator()
+    {
+      _displayAfterTimer.Tick += DisplayAfterTimerElapsed;
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    /// <summary>
+    /// Overrides the OnApplyTemplate method.
+    /// </summary>
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+      ChangeVisualState( false );
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Properties
+
+    /// <summary>
+    /// Gets or sets a value indicating whether the BusyContent is visible.
+    /// </summary>
+    protected bool IsContentVisible
+    {
+      get;
+      set;
+    }
+
+    #endregion //Properties
+
+    #region Dependency Properties
+
+    #region IsBusy
+
+    /// <summary>
+    /// Identifies the IsBusy dependency property.
+    /// </summary>
+    public static readonly DependencyProperty IsBusyProperty = DependencyProperty.Register(
+        "IsBusy",
+        typeof( bool ),
+        typeof( BusyIndicator ),
+        new PropertyMetadata( false, new PropertyChangedCallback( OnIsBusyChanged ) ) );
+
+    /// <summary>
+    /// Gets or sets a value indicating whether the busy indicator should show.
+    /// </summary>
+    public bool IsBusy
+    {
+      get
+      {
+        return ( bool )GetValue( IsBusyProperty );
+      }
+      set
+      {
+        SetValue( IsBusyProperty, value );
+      }
+    }
+
+    /// <summary>
+    /// IsBusyProperty property changed handler.
+    /// </summary>
+    /// <param name="d">BusyIndicator that changed its IsBusy.</param>
+    /// <param name="e">Event arguments.</param>
+    private static void OnIsBusyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( BusyIndicator )d ).OnIsBusyChanged( e );
+    }
+
+    /// <summary>
+    /// IsBusyProperty property changed handler.
+    /// </summary>
+    /// <param name="e">Event arguments.</param>
+    protected virtual void OnIsBusyChanged( DependencyPropertyChangedEventArgs e )
+    {
+      if( IsBusy )
+      {
+        if( DisplayAfter.Equals( TimeSpan.Zero ) )
+        {
+          // Go visible now
+          IsContentVisible = true;
+        }
+        else
+        {
+          // Set a timer to go visible
+          _displayAfterTimer.Interval = DisplayAfter;
+          _displayAfterTimer.Start();
+        }
+      }
+      else
+      {
+        // No longer visible
+        _displayAfterTimer.Stop();
+        IsContentVisible = false;
+      }
+
+      ChangeVisualState( true );
+    }
+
+    #endregion //IsBusy
+
+    #region Busy Content
+
+    /// <summary>
+    /// Identifies the BusyContent dependency property.
+    /// </summary>
+    public static readonly DependencyProperty BusyContentProperty = DependencyProperty.Register(
+        "BusyContent",
+        typeof( object ),
+        typeof( BusyIndicator ),
+        new PropertyMetadata( null ) );
+
+    /// <summary>
+    /// Gets or sets a value indicating the busy content to display to the user.
+    /// </summary>
+    public object BusyContent
+    {
+      get
+      {
+        return ( object )GetValue( BusyContentProperty );
+      }
+      set
+      {
+        SetValue( BusyContentProperty, value );
+      }
+    }
+
+    #endregion //Busy Content
+
+    #region Busy Content Template
+
+    /// <summary>
+    /// Identifies the BusyTemplate dependency property.
+    /// </summary>
+    public static readonly DependencyProperty BusyContentTemplateProperty = DependencyProperty.Register(
+        "BusyContentTemplate",
+        typeof( DataTemplate ),
+        typeof( BusyIndicator ),
+        new PropertyMetadata( null ) );
+
+    /// <summary>
+    /// Gets or sets a value indicating the template to use for displaying the busy content to the user.
+    /// </summary>
+    public DataTemplate BusyContentTemplate
+    {
+      get
+      {
+        return ( DataTemplate )GetValue( BusyContentTemplateProperty );
+      }
+      set
+      {
+        SetValue( BusyContentTemplateProperty, value );
+      }
+    }
+
+    #endregion //Busy Content Template
+
+    #region Display After
+
+    /// <summary>
+    /// Identifies the DisplayAfter dependency property.
+    /// </summary>
+    public static readonly DependencyProperty DisplayAfterProperty = DependencyProperty.Register(
+        "DisplayAfter",
+        typeof( TimeSpan ),
+        typeof( BusyIndicator ),
+        new PropertyMetadata( TimeSpan.FromSeconds( 0.1 ) ) );
+
+    /// <summary>
+    /// Gets or sets a value indicating how long to delay before displaying the busy content.
+    /// </summary>
+    public TimeSpan DisplayAfter
+    {
+      get
+      {
+        return ( TimeSpan )GetValue( DisplayAfterProperty );
+      }
+      set
+      {
+        SetValue( DisplayAfterProperty, value );
+      }
+    }
+
+    #endregion //Display After
+
+    #region Overlay Style
+
+    /// <summary>
+    /// Identifies the OverlayStyle dependency property.
+    /// </summary>
+    public static readonly DependencyProperty OverlayStyleProperty = DependencyProperty.Register(
+        "OverlayStyle",
+        typeof( Style ),
+        typeof( BusyIndicator ),
+        new PropertyMetadata( null ) );
+
+    /// <summary>
+    /// Gets or sets a value indicating the style to use for the overlay.
+    /// </summary>
+    public Style OverlayStyle
+    {
+      get
+      {
+        return ( Style )GetValue( OverlayStyleProperty );
+      }
+      set
+      {
+        SetValue( OverlayStyleProperty, value );
+      }
+    }
+    #endregion //Overlay Style
+
+    #region ProgressBar Style
+
+    /// <summary>
+    /// Identifies the ProgressBarStyle dependency property.
+    /// </summary>
+    public static readonly DependencyProperty ProgressBarStyleProperty = DependencyProperty.Register(
+        "ProgressBarStyle",
+        typeof( Style ),
+        typeof( BusyIndicator ),
+        new PropertyMetadata( null ) );
+
+    /// <summary>
+    /// Gets or sets a value indicating the style to use for the progress bar.
+    /// </summary>
+    public Style ProgressBarStyle
+    {
+      get
+      {
+        return ( Style )GetValue( ProgressBarStyleProperty );
+      }
+      set
+      {
+        SetValue( ProgressBarStyleProperty, value );
+      }
+    }
+
+    #endregion //ProgressBar Style
+
+    #endregion //Dependency Properties
+
+    #region Methods
+
+    /// <summary>
+    /// Handler for the DisplayAfterTimer.
+    /// </summary>
+    /// <param name="sender">Event sender.</param>
+    /// <param name="e">Event arguments.</param>
+    private void DisplayAfterTimerElapsed( object sender, EventArgs e )
+    {
+      _displayAfterTimer.Stop();
+      IsContentVisible = true;
+      ChangeVisualState( true );
+    }
+
+    /// <summary>
+    /// Changes the control's visual state(s).
+    /// </summary>
+    /// <param name="useTransitions">True if state transitions should be used.</param>
+    protected virtual void ChangeVisualState( bool useTransitions )
+    {
+      VisualStateManager.GoToState( this, IsBusy ? VisualStates.StateBusy : VisualStates.StateIdle, useTransitions );
+      VisualStateManager.GoToState( this, IsContentVisible ? VisualStates.StateVisible : VisualStates.StateHidden, useTransitions );
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/BusyIndicator/Implementation/VisualStates.BusyIndicator.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/BusyIndicator/Implementation/VisualStates.BusyIndicator.cs
new file mode 100644
index 00000000..fa49289d
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/BusyIndicator/Implementation/VisualStates.BusyIndicator.cs
@@ -0,0 +1,54 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit
+{
+  internal static partial class VisualStates
+  {
+    /// <summary>
+    /// Busyness group name.
+    /// </summary>
+    public const string GroupBusyStatus = "BusyStatusStates";
+
+    /// <summary>
+    /// Busy state for BusyIndicator.
+    /// </summary>
+    public const string StateBusy = "Busy";
+
+    /// <summary>
+    /// Idle state for BusyIndicator.
+    /// </summary>
+    public const string StateIdle = "Idle";
+
+    /// <summary>
+    /// BusyDisplay group.
+    /// </summary>
+    public const string GroupVisibility = "VisibilityStates";
+
+    /// <summary>
+    /// Visible state name for BusyIndicator.
+    /// </summary>
+    public const string StateVisible = "Visible";
+
+    /// <summary>
+    /// Hidden state name for BusyIndicator.
+    /// </summary>
+    public const string StateHidden = "Hidden";
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/BusyIndicator/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/BusyIndicator/Themes/Generic.xaml
new file mode 100644
index 00000000..cbd9490a
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/BusyIndicator/Themes/Generic.xaml
@@ -0,0 +1,163 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
+
+   <!-- =============================================================================== -->
+   <!-- BusyIndicator                                                                   -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type local:BusyIndicator}">
+      <Setter Property="BusyContent" Value="Please wait..." />
+      <Setter Property="IsTabStop" Value="False" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="OverlayStyle">
+         <Setter.Value>
+            <Style TargetType="Rectangle">
+               <Setter Property="Fill" Value="White" />
+               <Setter Property="Opacity" Value="0.5" />
+            </Style>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="ProgressBarStyle">
+         <Setter.Value>
+            <Style TargetType="ProgressBar">
+               <Setter Property="IsIndeterminate" Value="True" />
+               <Setter Property="Height" Value="15" />
+               <Setter Property="Margin" Value="8,0,8,8" />
+            </Style>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="DisplayAfter" Value="00:00:00.1" />
+      <Setter Property="HorizontalAlignment" Value="Stretch" />
+      <Setter Property="VerticalAlignment" Value="Stretch" />
+      <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+      <Setter Property="VerticalContentAlignment" Value="Stretch" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:BusyIndicator}">
+               <Grid>
+                  <VisualStateManager.VisualStateGroups>
+                     <VisualStateGroup x:Name="VisibilityStates">
+                        <VisualState x:Name="Hidden">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="busycontent" Storyboard.TargetProperty="(UIElement.Visibility)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Collapsed</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="overlay" Storyboard.TargetProperty="(UIElement.Visibility)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Collapsed</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Visible">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="busycontent" Storyboard.TargetProperty="(UIElement.Visibility)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="overlay" Storyboard.TargetProperty="(UIElement.Visibility)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                     </VisualStateGroup>
+                     <VisualStateGroup x:Name="BusyStatusStates">
+                        <VisualState x:Name="Idle">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="content" Storyboard.TargetProperty="(Control.IsEnabled)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <sys:Boolean>True</sys:Boolean>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Busy">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="content" Storyboard.TargetProperty="(Control.IsEnabled)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <sys:Boolean>False</sys:Boolean>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                     </VisualStateGroup>
+                  </VisualStateManager.VisualStateGroups>
+                  <ContentControl x:Name="content" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsTabStop="False" Focusable="False" />
+                  <Rectangle x:Name="overlay" Style="{TemplateBinding OverlayStyle}" />
+                  <ContentPresenter x:Name="busycontent">
+                     <ContentPresenter.Content>
+                        <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
+                           <Border Background="White" BorderThickness="1" CornerRadius="2">
+                              <Border.BorderBrush>
+                                 <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
+                                    <GradientStop Color="#FFA3AEB9" Offset="0" />
+                                    <GradientStop Color="#FF8399A9" Offset="0.375" />
+                                    <GradientStop Color="#FF718597" Offset="0.375" />
+                                    <GradientStop Color="#FF617584" Offset="1" />
+                                 </LinearGradientBrush>
+                              </Border.BorderBrush>
+                              <Border CornerRadius="1.5" Margin="1">
+                                 <Border.Background>
+                                    <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
+                                       <GradientStop Color="#FFF6F8F9" Offset="0.02" />
+                                       <GradientStop Color="#FFB8B8B8" Offset="0.996" />
+                                    </LinearGradientBrush>
+                                 </Border.Background>
+                                 <Grid MinWidth="150">
+                                    <Grid.RowDefinitions>
+                                       <RowDefinition />
+                                       <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+                                    <ContentPresenter Content="{TemplateBinding BusyContent}" ContentTemplate="{TemplateBinding BusyContentTemplate}" Margin="8" />
+                                    <ProgressBar Grid.Row="1" Style="{TemplateBinding ProgressBarStyle}" />
+                                 </Grid>
+                              </Border>
+                           </Border>
+                        </Grid>
+                     </ContentPresenter.Content>
+                  </ContentPresenter>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/ButtonSpinner.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/ButtonSpinner.cs
new file mode 100644
index 00000000..f05a0872
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/ButtonSpinner.cs
@@ -0,0 +1,280 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows;
+using System.Windows.Controls.Primitives;
+using System.Windows.Input;
+using System.Windows.Markup;
+
+namespace Xceed.Wpf.Toolkit
+{
+  /// <summary>
+  /// Represents a spinner control that includes two Buttons.
+  /// </summary>
+  [TemplatePart( Name = PART_IncreaseButton, Type = typeof( ButtonBase ) )]
+  [TemplatePart( Name = PART_DecreaseButton, Type = typeof( ButtonBase ) )]
+  [ContentProperty( "Content" )]
+  public class ButtonSpinner : Spinner
+  {
+    private const string PART_IncreaseButton = "PART_IncreaseButton";
+    private const string PART_DecreaseButton = "PART_DecreaseButton";
+
+    #region Properties
+
+    #region AllowSpin
+
+    public static readonly DependencyProperty AllowSpinProperty = DependencyProperty.Register( "AllowSpin", typeof( bool ), typeof( ButtonSpinner ), new UIPropertyMetadata( true ) );
+    public bool AllowSpin
+    {
+      get
+      {
+        return ( bool )GetValue( AllowSpinProperty );
+      }
+      set
+      {
+        SetValue( AllowSpinProperty, value );
+      }
+    }
+
+    #endregion //AllowSpin
+
+    #region Content
+
+    /// <summary>
+    /// Identifies the Content dependency property.
+    /// </summary>
+    public static readonly DependencyProperty ContentProperty = DependencyProperty.Register( "Content", typeof( object ), typeof( ButtonSpinner ), new PropertyMetadata( null, OnContentPropertyChanged ) );
+    public object Content
+    {
+      get
+      {
+        return GetValue( ContentProperty ) as object;
+      }
+      set
+      {
+        SetValue( ContentProperty, value );
+      }
+    }
+
+    /// <summary>
+    /// ContentProperty property changed handler.
+    /// </summary>
+    /// <param name="d">ButtonSpinner that changed its Content.</param>
+    /// <param name="e">Event arguments.</param>
+    private static void OnContentPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ButtonSpinner source = d as ButtonSpinner;
+      source.OnContentChanged( e.OldValue, e.NewValue );
+    }
+
+    #endregion //Content
+
+    #region DecreaseButton
+
+    private ButtonBase _decreaseButton;
+    /// <summary>
+    /// Gets or sets the DecreaseButton template part.
+    /// </summary>
+    private ButtonBase DecreaseButton
+    {
+      get
+      {
+        return _decreaseButton;
+      }
+      set
+      {
+        if( _decreaseButton != null )
+        {
+          _decreaseButton.Click -= OnButtonClick;
+        }
+
+        _decreaseButton = value;
+
+        if( _decreaseButton != null )
+        {
+          _decreaseButton.Click += OnButtonClick;
+        }
+      }
+    }
+
+    #endregion //DecreaseButton
+
+    #region IncreaseButton
+
+    private ButtonBase _increaseButton;
+    /// <summary>
+    /// Gets or sets the IncreaseButton template part.
+    /// </summary>
+    private ButtonBase IncreaseButton
+    {
+      get
+      {
+        return _increaseButton;
+      }
+      set
+      {
+        if( _increaseButton != null )
+        {
+          _increaseButton.Click -= OnButtonClick;
+        }
+
+        _increaseButton = value;
+
+        if( _increaseButton != null )
+        {
+          _increaseButton.Click += OnButtonClick;
+        }
+      }
+    }
+
+    #endregion //IncreaseButton
+
+    #region ShowButtonSpinner
+
+    public static readonly DependencyProperty ShowButtonSpinnerProperty = DependencyProperty.Register( "ShowButtonSpinner", typeof( bool ), typeof( ButtonSpinner ), new UIPropertyMetadata( true ) );
+    public bool ShowButtonSpinner
+    {
+      get
+      {
+        return ( bool )GetValue( ShowButtonSpinnerProperty );
+      }
+      set
+      {
+        SetValue( ShowButtonSpinnerProperty, value );
+      }
+    }
+
+    #endregion //ShowButtonSpinner
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static ButtonSpinner()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( ButtonSpinner ), new FrameworkPropertyMetadata( typeof( ButtonSpinner ) ) );
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+
+      IncreaseButton = GetTemplateChild( PART_IncreaseButton ) as ButtonBase;
+      DecreaseButton = GetTemplateChild( PART_DecreaseButton ) as ButtonBase;
+
+      SetButtonUsage();
+    }
+
+    /// <summary>
+    /// Cancel LeftMouseButtonUp events originating from a button that has
+    /// been changed to disabled.
+    /// </summary>
+    /// <param name="e">The data for the event.</param>
+    protected override void OnMouseLeftButtonUp( MouseButtonEventArgs e )
+    {
+      base.OnMouseLeftButtonUp( e );
+
+      Point mousePosition;
+      if( IncreaseButton != null && IncreaseButton.IsEnabled == false )
+      {
+        mousePosition = e.GetPosition( IncreaseButton );
+        if( mousePosition.X > 0 && mousePosition.X < IncreaseButton.ActualWidth &&
+            mousePosition.Y > 0 && mousePosition.Y < IncreaseButton.ActualHeight )
+        {
+          e.Handled = true;
+        }
+      }
+
+      if( DecreaseButton != null && DecreaseButton.IsEnabled == false )
+      {
+        mousePosition = e.GetPosition( DecreaseButton );
+        if( mousePosition.X > 0 && mousePosition.X < DecreaseButton.ActualWidth &&
+            mousePosition.Y > 0 && mousePosition.Y < DecreaseButton.ActualHeight )
+        {
+          e.Handled = true;
+        }
+      }
+    }
+
+    /// <summary>
+    /// Called when valid spin direction changed.
+    /// </summary>
+    /// <param name="oldValue">The old value.</param>
+    /// <param name="newValue">The new value.</param>
+    protected override void OnValidSpinDirectionChanged( ValidSpinDirections oldValue, ValidSpinDirections newValue )
+    {
+      SetButtonUsage();
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Event Handlers
+
+    /// <summary>
+    /// Handle click event of IncreaseButton and DecreaseButton template parts,
+    /// translating Click to appropriate Spin event.
+    /// </summary>
+    /// <param name="sender">Event sender, should be either IncreaseButton or DecreaseButton template part.</param>
+    /// <param name="e">Event args.</param>
+    private void OnButtonClick( object sender, RoutedEventArgs e )
+    {
+      if( AllowSpin )
+      {
+        SpinDirection direction = sender == IncreaseButton ? SpinDirection.Increase : SpinDirection.Decrease;
+        OnSpin( new SpinEventArgs( direction ) );
+      }
+    }
+
+    #endregion //Event Handlers
+
+    #region Methods
+
+    /// <summary>
+    /// Occurs when the Content property value changed.
+    /// </summary>
+    /// <param name="oldValue">The old value of the Content property.</param>
+    /// <param name="newValue">The new value of the Content property.</param>
+    protected virtual void OnContentChanged( object oldValue, object newValue )
+    {
+    }
+
+    /// <summary>
+    /// Disables or enables the buttons based on the valid spin direction.
+    /// </summary>
+    private void SetButtonUsage()
+    {
+      // buttonspinner adds buttons that spin, so disable accordingly.
+      if( IncreaseButton != null )
+      {
+        IncreaseButton.IsEnabled = ( ( ValidSpinDirection & ValidSpinDirections.Increase ) == ValidSpinDirections.Increase );
+      }
+
+      if( DecreaseButton != null )
+      {
+        DecreaseButton.IsEnabled = ( ( ValidSpinDirection & ValidSpinDirections.Decrease ) == ValidSpinDirections.Decrease );
+      }
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/SpinDirection.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/SpinDirection.cs
new file mode 100644
index 00000000..22bd9a6d
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/SpinDirection.cs
@@ -0,0 +1,38 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit
+{
+  /// <summary>
+  /// Represents spin directions that could be initiated by the end-user.
+  /// </summary>
+  /// <QualityBand>Preview</QualityBand>
+  public enum SpinDirection
+  {
+    /// <summary>
+    /// Represents a spin initiated by the end-user in order to Increase a value.
+    /// </summary>
+    Increase = 0,
+
+    /// <summary>
+    /// Represents a spin initiated by the end-user in order to Decrease a value.
+    /// </summary>
+    Decrease = 1
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/SpinEventArgs.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/SpinEventArgs.cs
new file mode 100644
index 00000000..bd432c2b
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/SpinEventArgs.cs
@@ -0,0 +1,50 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit
+{
+  /// <summary>
+  /// Provides data for the Spinner.Spin event.
+  /// </summary>
+  /// <QualityBand>Preview</QualityBand>
+  public class SpinEventArgs : RoutedEventArgs
+  {
+    /// <summary>
+    /// Gets the SpinDirection for the spin that has been initiated by the 
+    /// end-user.
+    /// </summary>
+    public SpinDirection Direction
+    {
+      get;
+      private set;
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the SpinEventArgs class.
+    /// </summary>
+    /// <param name="direction">Spin direction.</param>
+    public SpinEventArgs( SpinDirection direction )
+      : base()
+    {
+      Direction = direction;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/Spinner.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/Spinner.cs
new file mode 100644
index 00000000..3ca8296b
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/Spinner.cs
@@ -0,0 +1,104 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Xceed.Wpf.Toolkit
+{
+  /// <summary>
+  /// Base class for controls that represents controls that can spin.
+  /// </summary>
+  public abstract class Spinner : Control
+  {
+    #region Properties
+
+    /// <summary>
+    /// Identifies the ValidSpinDirection dependency property.
+    /// </summary>
+    public static readonly DependencyProperty ValidSpinDirectionProperty = DependencyProperty.Register( "ValidSpinDirection", typeof( ValidSpinDirections ), typeof( Spinner ), new PropertyMetadata( ValidSpinDirections.Increase | ValidSpinDirections.Decrease, OnValidSpinDirectionPropertyChanged ) );
+    public ValidSpinDirections ValidSpinDirection
+    {
+      get
+      {
+        return ( ValidSpinDirections )GetValue( ValidSpinDirectionProperty );
+      }
+      set
+      {
+        SetValue( ValidSpinDirectionProperty, value );
+      }
+    }
+
+    /// <summary>
+    /// ValidSpinDirectionProperty property changed handler.
+    /// </summary>
+    /// <param name="d">ButtonSpinner that changed its ValidSpinDirection.</param>
+    /// <param name="e">Event arguments.</param>
+    private static void OnValidSpinDirectionPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      Spinner source = ( Spinner )d;
+      ValidSpinDirections oldvalue = ( ValidSpinDirections )e.OldValue;
+      ValidSpinDirections newvalue = ( ValidSpinDirections )e.NewValue;
+      source.OnValidSpinDirectionChanged( oldvalue, newvalue );
+    }
+
+    #endregion //Properties
+
+    /// <summary>
+    /// Occurs when spinning is initiated by the end-user.
+    /// </summary>
+    public event EventHandler<SpinEventArgs> Spin;
+
+    /// <summary>
+    /// Initializes a new instance of the Spinner class.
+    /// </summary>
+    protected Spinner()
+    {
+    }
+
+    /// <summary>
+    /// Raises the OnSpin event when spinning is initiated by the end-user.
+    /// </summary>
+    /// <param name="e">Spin event args.</param>
+    protected virtual void OnSpin( SpinEventArgs e )
+    {
+      ValidSpinDirections valid = e.Direction == SpinDirection.Increase ? ValidSpinDirections.Increase : ValidSpinDirections.Decrease;
+
+      //Only raise the event if spin is allowed.
+      if( ( ValidSpinDirection & valid ) == valid )
+      {
+        EventHandler<SpinEventArgs> handler = Spin;
+        if( handler != null )
+        {
+          handler( this, e );
+        }
+      }
+    }
+
+    /// <summary>
+    /// Called when valid spin direction changed.
+    /// </summary>
+    /// <param name="oldValue">The old value.</param>
+    /// <param name="newValue">The new value.</param>
+    protected virtual void OnValidSpinDirectionChanged( ValidSpinDirections oldValue, ValidSpinDirections newValue )
+    {
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/ValidSpinDirections.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/ValidSpinDirections.cs
new file mode 100644
index 00000000..48108690
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/ValidSpinDirections.cs
@@ -0,0 +1,45 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+
+namespace Xceed.Wpf.Toolkit
+{
+  /// <summary>
+  /// Represents spin directions that are valid.
+  /// </summary>
+  [Flags]
+  public enum ValidSpinDirections
+  {
+    /// <summary>
+    /// Can not increase nor decrease.
+    /// </summary>
+    None = 0,
+
+    /// <summary>
+    /// Can increase.
+    /// </summary>
+    Increase = 1,
+
+    /// <summary>
+    /// Can decrease.
+    /// </summary>
+    Decrease = 2
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Themes/Generic.xaml
new file mode 100644
index 00000000..adaa75f3
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Themes/Generic.xaml
@@ -0,0 +1,90 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes">
+
+   <ResourceDictionary.MergedDictionaries>
+      <ResourceDictionary Source="../../Themes/Generic/Glyphs.xaml" />
+   </ResourceDictionary.MergedDictionaries>
+
+   <!-- =============================================================================== -->
+   <!-- ButtonSpinner                                                                   -->
+   <!-- =============================================================================== -->
+
+   <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+
+   <Style TargetType="{x:Type local:ButtonSpinner}">
+      <Setter Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBackgroundKey}}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+      <Setter Property="IsTabStop" Value="True" />
+      <Setter Property="Padding" Value="2" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:ButtonSpinner}">
+               <Grid SnapsToDevicePixels="True">
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="*" />
+                     <ColumnDefinition Width="Auto" />
+                  </Grid.ColumnDefinitions>
+
+                  <Border x:Name="Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Grid.ColumnSpan="2" />
+
+                  <ContentPresenter Focusable="False" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+
+                  <Grid Grid.Column="1" Visibility="{TemplateBinding ShowButtonSpinner, Converter={StaticResource BooleanToVisibilityConverter}}" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="*" />
+                        <RowDefinition Height="*" />
+                     </Grid.RowDefinitions>
+
+                     <RepeatButton x:Name="PART_IncreaseButton"
+                                   Style="{DynamicResource {x:Static themes:ResourceKeys.SpinnerButtonStyleKey}}"
+                                   IsTabStop="{TemplateBinding IsTabStop}" ContentTemplate="{StaticResource IncreaseGlyphNormalKey}" />
+
+                     <RepeatButton x:Name="PART_DecreaseButton"
+                                   Grid.Row="1"
+                                   Style="{DynamicResource {x:Static themes:ResourceKeys.SpinnerButtonStyleKey}}"
+                                   IsTabStop="{TemplateBinding IsTabStop}" ContentTemplate="{StaticResource DecreaseGlyphNormalKey}" />
+
+                  </Grid>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsEnabled" Value="False">
+                     <Setter Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}}" />
+                  </Trigger>
+                  <Trigger SourceName="PART_IncreaseButton" Property="IsEnabled" Value="False">
+                     <Setter TargetName="PART_IncreaseButton" Property="ContentTemplate" Value="{StaticResource IncreaseGlyphDisabledKey}" />
+                  </Trigger>
+                  <Trigger SourceName="PART_DecreaseButton" Property="IsEnabled" Value="False">
+                     <Setter TargetName="PART_DecreaseButton" Property="ContentTemplate" Value="{StaticResource DecreaseGlyphDisabledKey}" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Calculator/Implementation/Calculator.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Calculator/Implementation/Calculator.cs
new file mode 100644
index 00000000..c5aae90b
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Calculator/Implementation/Calculator.cs
@@ -0,0 +1,549 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Threading;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+
+namespace Xceed.Wpf.Toolkit
+{
+  [TemplatePart( Name = PART_CalculatorButtonPanel, Type = typeof( ContentControl ) )]
+  public class Calculator : Control
+  {
+    private const string PART_CalculatorButtonPanel = "PART_CalculatorButtonPanel";
+
+    #region Members
+
+    private ContentControl _buttonPanel;
+    private bool _showNewNumber = true;
+    private decimal _previousValue;
+    private Operation _lastOperation = Operation.None;
+    private CalculatorButtonType _lastButtonPressed;
+    private readonly Dictionary<Button, DispatcherTimer> _timers = new Dictionary<Button, DispatcherTimer>();
+
+    #endregion //Members
+
+    #region Enumerations
+
+    public enum CalculatorButtonType
+    {
+      Add,
+      Back,
+      Cancel,
+      Clear,
+      Decimal,
+      Divide,
+      Eight,
+      Equal,
+      Five,
+      Four,
+      Fraction,
+      MAdd,
+      MC,
+      MR,
+      MS,
+      MSub,
+      Multiply,
+      Negate,
+      Nine,
+      None,
+      One,
+      Percent,
+      Seven,
+      Six,
+      Sqrt,
+      Subtract,
+      Three,
+      Two,
+      Zero
+    }
+
+    public enum Operation
+    {
+      Add,
+      Subtract,
+      Divide,
+      Multiply,
+      Percent,
+      Sqrt,
+      Fraction,
+      None,
+      Clear,
+      Negate
+    }
+
+    #endregion //Enumerations
+
+    #region Properties
+
+    #region CalculatorButtonType
+
+    public static readonly DependencyProperty CalculatorButtonTypeProperty = DependencyProperty.RegisterAttached( "CalculatorButtonType", typeof( CalculatorButtonType ), typeof( Calculator ), new UIPropertyMetadata( CalculatorButtonType.None, OnCalculatorButtonTypeChanged ) );
+    public static CalculatorButtonType GetCalculatorButtonType( DependencyObject target )
+    {
+      return ( CalculatorButtonType )target.GetValue( CalculatorButtonTypeProperty );
+    }
+    public static void SetCalculatorButtonType( DependencyObject target, CalculatorButtonType value )
+    {
+      target.SetValue( CalculatorButtonTypeProperty, value );
+    }
+    private static void OnCalculatorButtonTypeChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      OnCalculatorButtonTypeChanged( o, ( CalculatorButtonType )e.OldValue, ( CalculatorButtonType )e.NewValue );
+    }
+    private static void OnCalculatorButtonTypeChanged( DependencyObject o, CalculatorButtonType oldValue, CalculatorButtonType newValue )
+    {
+      Button button = o as Button;
+      button.CommandParameter = newValue;
+      button.Content = CalculatorUtilities.GetCalculatorButtonContent( newValue );
+    }
+
+    #endregion //CalculatorButtonType
+
+    #region DisplayText
+
+    public static readonly DependencyProperty DisplayTextProperty = DependencyProperty.Register( "DisplayText", typeof( string ), typeof( Calculator ), new UIPropertyMetadata( "0", OnDisplayTextChanged ) );
+    public string DisplayText
+    {
+      get
+      {
+        return ( string )GetValue( DisplayTextProperty );
+      }
+      set
+      {
+        SetValue( DisplayTextProperty, value );
+      }
+    }
+
+    private static void OnDisplayTextChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      Calculator calculator = o as Calculator;
+      if( calculator != null )
+        calculator.OnDisplayTextChanged( ( string )e.OldValue, ( string )e.NewValue );
+    }
+
+    protected virtual void OnDisplayTextChanged( string oldValue, string newValue )
+    {
+      // TODO: Add your property changed side-effects. Descendants can override as well.
+    }
+
+    #endregion //DisplayText
+
+    #region Memory
+
+    public static readonly DependencyProperty MemoryProperty = DependencyProperty.Register( "Memory", typeof( decimal ), typeof( Calculator ), new UIPropertyMetadata( default( decimal ) ) );
+    public decimal Memory
+    {
+      get
+      {
+        return ( decimal )GetValue( MemoryProperty );
+      }
+      set
+      {
+        SetValue( MemoryProperty, value );
+      }
+    }
+
+    #endregion //Memory
+
+    #region Precision
+
+    public static readonly DependencyProperty PrecisionProperty = DependencyProperty.Register( "Precision", typeof( int ), typeof( Calculator ), new UIPropertyMetadata( 6 ) );
+    public int Precision
+    {
+      get
+      {
+        return ( int )GetValue( PrecisionProperty );
+      }
+      set
+      {
+        SetValue( PrecisionProperty, value );
+      }
+    }
+
+    #endregion //Precision
+
+    #region Value
+
+    public static readonly DependencyProperty ValueProperty = DependencyProperty.Register( "Value", typeof( decimal? ), typeof( Calculator ), new FrameworkPropertyMetadata( default( decimal ), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnValueChanged ) );
+    public decimal? Value
+    {
+      get
+      {
+        return ( decimal? )GetValue( ValueProperty );
+      }
+      set
+      {
+        SetValue( ValueProperty, value );
+      }
+    }
+
+    private static void OnValueChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      Calculator calculator = o as Calculator;
+      if( calculator != null )
+        calculator.OnValueChanged( ( decimal? )e.OldValue, ( decimal? )e.NewValue );
+    }
+
+    protected virtual void OnValueChanged( decimal? oldValue, decimal? newValue )
+    {
+      SetDisplayText( newValue );
+
+      RoutedPropertyChangedEventArgs<object> args = new RoutedPropertyChangedEventArgs<object>( oldValue, newValue );
+      args.RoutedEvent = ValueChangedEvent;
+      RaiseEvent( args );
+    }
+
+    #endregion //Value
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static Calculator()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( Calculator ), new FrameworkPropertyMetadata( typeof( Calculator ) ) );
+    }
+
+    public Calculator()
+    {
+      CommandBindings.Add( new CommandBinding( CalculatorCommands.CalculatorButtonClick, ExecuteCalculatorButtonClick ) );
+      AddHandler( MouseDownEvent, new MouseButtonEventHandler( Calculator_OnMouseDown ), true );
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+
+      _buttonPanel = GetTemplateChild( PART_CalculatorButtonPanel ) as ContentControl;
+    }
+
+    protected override void OnTextInput( TextCompositionEventArgs e )
+    {
+      var buttonType = CalculatorUtilities.GetCalculatorButtonTypeFromText( e.Text );
+      if( buttonType != CalculatorButtonType.None )
+      {
+        SimulateCalculatorButtonClick( buttonType );
+        ProcessCalculatorButton( buttonType );
+      }
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Event Handlers
+
+    private void Calculator_OnMouseDown( object sender, MouseButtonEventArgs e )
+    {
+      if( !IsFocused )
+      {
+        Focus();
+        e.Handled = true;
+      }
+    }
+
+    void Timer_Tick( object sender, EventArgs e )
+    {
+      DispatcherTimer timer = ( DispatcherTimer )sender;
+      timer.Stop();
+      timer.Tick -= Timer_Tick;
+
+      if( _timers.ContainsValue( timer ) )
+      {
+        var button = _timers.Where( x => x.Value == timer ).Select( x => x.Key ).FirstOrDefault();
+        if( button != null )
+        {
+          VisualStateManager.GoToState( button, button.IsMouseOver ? "MouseOver" : "Normal", true );
+          _timers.Remove( button );
+        }
+      }
+    }
+
+    #endregion //Event Handlers
+
+    #region Methods
+
+    private void Calculate()
+    {
+      if( _lastOperation == Operation.None )
+        return;
+
+      try
+      {
+        Value = Decimal.Round( CalculateValue( _lastOperation ), Precision );
+        SetDisplayText( Value ); //Set DisplayText even when Value doesn't change
+      }
+      catch
+      {
+        Value = null;
+        DisplayText = "ERROR";
+      }
+    }
+
+    private void SetDisplayText( decimal? newValue )
+    {
+      if( newValue.HasValue && ( newValue.Value != 0 ) )
+        DisplayText = newValue.ToString();
+      else
+        DisplayText = "0";
+    }
+
+    private void Calculate( Operation newOperation )
+    {
+      if( !_showNewNumber )
+        Calculate();
+
+      _lastOperation = newOperation;
+    }
+
+    private void Calculate( Operation currentOperation, Operation newOperation )
+    {
+      _lastOperation = currentOperation;
+      Calculate();
+      _lastOperation = newOperation;
+    }
+
+    private decimal CalculateValue( Operation operation )
+    {
+      decimal newValue = decimal.Zero;
+      decimal currentValue = CalculatorUtilities.ParseDecimal( DisplayText );
+
+      switch( operation )
+      {
+        case Operation.Add:
+          newValue = CalculatorUtilities.Add( _previousValue, currentValue );
+          break;
+        case Operation.Subtract:
+          newValue = CalculatorUtilities.Subtract( _previousValue, currentValue );
+          break;
+        case Operation.Multiply:
+          newValue = CalculatorUtilities.Multiply( _previousValue, currentValue );
+          break;
+        case Operation.Divide:
+          newValue = CalculatorUtilities.Divide( _previousValue, currentValue );
+          break;
+        //case Operation.Percent:
+        //    newValue = CalculatorUtilities.Percent(_previousValue, currentValue);
+        //    break;
+        case Operation.Sqrt:
+          newValue = CalculatorUtilities.SquareRoot( currentValue );
+          break;
+        case Operation.Fraction:
+          newValue = CalculatorUtilities.Fraction( currentValue );
+          break;
+        case Operation.Negate:
+          newValue = CalculatorUtilities.Negate( currentValue );
+          break;
+        default:
+          newValue = decimal.Zero;
+          break;
+      }
+
+      return newValue;
+    }
+
+    void ProcessBackKey()
+    {
+      string displayText;
+      if( DisplayText.Length > 1 && !( DisplayText.Length == 2 && DisplayText[ 0 ] == '-' ) )
+      {
+        displayText = DisplayText.Remove( DisplayText.Length - 1, 1 );
+      }
+      else
+      {
+        displayText = "0";
+        _showNewNumber = true;
+      }
+
+      DisplayText = displayText;
+    }
+
+    private void ProcessCalculatorButton( CalculatorButtonType buttonType )
+    {
+      if( CalculatorUtilities.IsDigit( buttonType ) )
+        ProcessDigitKey( buttonType );
+      else if( ( CalculatorUtilities.IsMemory( buttonType ) ) )
+        ProcessMemoryKey( buttonType );
+      else
+        ProcessOperationKey( buttonType );
+
+      _lastButtonPressed = buttonType;
+    }
+
+    private void ProcessDigitKey( CalculatorButtonType buttonType )
+    {
+      if( _showNewNumber )
+        DisplayText = CalculatorUtilities.GetCalculatorButtonContent( buttonType );
+      else
+        DisplayText += CalculatorUtilities.GetCalculatorButtonContent( buttonType );
+
+      _showNewNumber = false;
+    }
+
+    private void ProcessMemoryKey( Calculator.CalculatorButtonType buttonType )
+    {
+      decimal currentValue = CalculatorUtilities.ParseDecimal( DisplayText );
+
+      switch( buttonType )
+      {
+        case Calculator.CalculatorButtonType.MAdd:
+          Memory += currentValue;
+          break;
+        case Calculator.CalculatorButtonType.MC:
+          Memory = decimal.Zero;
+          break;
+        case Calculator.CalculatorButtonType.MR:
+          DisplayText = Memory.ToString();
+          break;
+        case Calculator.CalculatorButtonType.MS:
+          Memory = currentValue;
+          break;
+        case Calculator.CalculatorButtonType.MSub:
+          Memory -= currentValue;
+          break;
+        default:
+          break;
+      }
+
+      _showNewNumber = true;
+    }
+
+    private void ProcessOperationKey( CalculatorButtonType buttonType )
+    {
+      switch( buttonType )
+      {
+        case CalculatorButtonType.Add:
+          Calculate( Operation.Add );
+          break;
+        case CalculatorButtonType.Subtract:
+          Calculate( Operation.Subtract );
+          break;
+        case CalculatorButtonType.Multiply:
+          Calculate( Operation.Multiply );
+          break;
+        case CalculatorButtonType.Divide:
+          Calculate( Operation.Divide );
+          break;
+        case CalculatorButtonType.Percent:
+          if( _lastOperation != Operation.None )
+          {
+            decimal currentValue = CalculatorUtilities.ParseDecimal( DisplayText );
+            decimal newValue = CalculatorUtilities.Percent( _previousValue, currentValue );
+            DisplayText = newValue.ToString();
+          }
+          else
+          {
+            DisplayText = "0";
+            _showNewNumber = true;
+          }
+          return;
+        case CalculatorButtonType.Sqrt:
+          Calculate( Operation.Sqrt, Operation.None );
+          break;
+        case CalculatorButtonType.Fraction:
+          Calculate( Operation.Fraction, Operation.None );
+          break;
+        case CalculatorButtonType.Negate:
+          Calculate( Operation.Negate, Operation.None );
+          break;
+        case CalculatorButtonType.Equal:
+          Calculate( Operation.None );
+          break;
+        case CalculatorButtonType.Clear:
+          Calculate( Operation.Clear, Operation.None );
+          break;
+        case CalculatorButtonType.Cancel:
+          DisplayText = _previousValue.ToString();
+          _lastOperation = Operation.None;
+          _showNewNumber = true;
+          return;
+        case CalculatorButtonType.Back:
+          ProcessBackKey();
+          return;
+        default:
+          break;
+      }
+
+      Decimal.TryParse( DisplayText, out _previousValue );
+      _showNewNumber = true;
+    }
+
+    private void SimulateCalculatorButtonClick( CalculatorButtonType buttonType )
+    {
+      var button = CalculatorUtilities.FindButtonByCalculatorButtonType( _buttonPanel, buttonType );
+      if( button != null )
+      {
+        VisualStateManager.GoToState( button, "Pressed", true );
+        DispatcherTimer timer;
+        if( _timers.ContainsKey( button ) )
+        {
+          timer = _timers[ button ];
+          timer.Stop();
+        }
+        else
+        {
+          timer = new DispatcherTimer();
+          timer.Interval = TimeSpan.FromMilliseconds( 100 );
+          timer.Tick += Timer_Tick;
+          _timers.Add( button, timer );
+        }
+
+        timer.Start();
+      }
+    }
+
+    #endregion //Methods
+
+    #region Events
+
+    //Due to a bug in Visual Studio, you cannot create event handlers for nullable args in XAML, so I have to use object instead.
+    public static readonly RoutedEvent ValueChangedEvent = EventManager.RegisterRoutedEvent( "ValueChanged", RoutingStrategy.Bubble, typeof( RoutedPropertyChangedEventHandler<object> ), typeof( Calculator ) );
+    public event RoutedPropertyChangedEventHandler<object> ValueChanged
+    {
+      add
+      {
+        AddHandler( ValueChangedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( ValueChangedEvent, value );
+      }
+    }
+
+    #endregion //Events
+
+    #region Commands
+
+    private void ExecuteCalculatorButtonClick( object sender, ExecutedRoutedEventArgs e )
+    {
+      var buttonType = ( CalculatorButtonType )e.Parameter;
+      ProcessCalculatorButton( buttonType );
+    }
+
+    #endregion //Commands
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Calculator/Implementation/CalculatorCommands.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Calculator/Implementation/CalculatorCommands.cs
new file mode 100644
index 00000000..5d02c9d7
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Calculator/Implementation/CalculatorCommands.cs
@@ -0,0 +1,36 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows.Input;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public static class CalculatorCommands
+  {
+    private static RoutedCommand _calculatorButtonClickCommand = new RoutedCommand();
+
+    public static RoutedCommand CalculatorButtonClick
+    {
+      get
+      {
+        return _calculatorButtonClickCommand;
+      }
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Calculator/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Calculator/Themes/Generic.xaml
new file mode 100644
index 00000000..7924cb4b
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Calculator/Themes/Generic.xaml
@@ -0,0 +1,519 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
+
+   <conv:CalculatorMemoryToVisibilityConverter x:Key="CalculatorMemoryToVisibilityConverter" />
+
+   <Style x:Key="CalculatorOperatorButtonStyle" TargetType="{x:Type Button}">
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Foreground" Value="#FF5B636E" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Button}">
+               <Grid x:Name="Control">
+                  <VisualStateManager.VisualStateGroups>
+                     <VisualStateGroup x:Name="CommonStates">
+                        <VisualState x:Name="Normal" />
+                        <VisualState x:Name="MouseOver">
+                           <Storyboard>
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To="0" />
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_MouseOver" Storyboard.TargetProperty="Opacity" To="1" />
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Pressed">
+                           <Storyboard>
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To="0" />
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Pressed" Storyboard.TargetProperty="Opacity" To="1" />
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Disabled">
+                           <Storyboard>
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To=".5" />
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="contentPresenter" Storyboard.TargetProperty="Opacity" To=".5" />
+                           </Storyboard>
+                        </VisualState>
+                     </VisualStateGroup>
+                     <VisualStateGroup x:Name="MemoryStates">
+                        <VisualState x:Name="EmptyMemory" />
+                        <VisualState x:Name="MemoryAssigned">
+                           <Storyboard>
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Border1" Storyboard.TargetProperty="Opacity" To="0" />
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Border2" Storyboard.TargetProperty="Opacity" To="1" />
+                           </Storyboard>
+                        </VisualState>
+                     </VisualStateGroup>
+                  </VisualStateManager.VisualStateGroups>
+                  <Border Background="White" BorderBrush="{x:Null}" BorderThickness="0" CornerRadius="2" Margin="0,0,0,-1" Opacity="0.5" />
+                  <Grid x:Name="PART_Default">
+                     <Border BorderThickness="0" CornerRadius="2" Background="#FF9CA2AB">
+                        <Grid>
+                           <Border x:Name="PART_Border1" BorderThickness="0" CornerRadius="1" Margin="1">
+                              <Border.Background>
+                                 <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                                    <GradientStop Color="#FFEDF1F7" Offset="0" />
+                                    <GradientStop Color="#FFD5DBE3" Offset="1" />
+                                 </LinearGradientBrush>
+                              </Border.Background>
+                              <Border BorderThickness="0" CornerRadius="1" Margin="2">
+                                 <Border.Background>
+                                    <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                                       <GradientStop Color="#FFEDF1F7" Offset="0" />
+                                       <GradientStop Color="#FFD5DBE3" Offset="1" />
+                                    </LinearGradientBrush>
+                                 </Border.Background>
+                              </Border>
+                           </Border>
+                           <Border x:Name="PART_Border2" BorderThickness="0" CornerRadius="1" Margin="1" Opacity="0">
+                              <Border.Background>
+                                 <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                                    <GradientStop Color="#FF9CA2AB" Offset="0" />
+                                    <GradientStop Color="#FF9CA2AB" Offset="1" />
+                                 </LinearGradientBrush>
+                              </Border.Background>
+                              <Border BorderThickness="0" CornerRadius="1" Margin="2">
+                                 <Border.Background>
+                                    <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                                       <GradientStop Color="#FFEDF1F7" Offset="0" />
+                                       <GradientStop Color="#FFD5DBE3" Offset="1" />
+                                    </LinearGradientBrush>
+                                 </Border.Background>
+                              </Border>
+                           </Border>
+                        </Grid>
+                     </Border>
+                  </Grid>
+                  <Grid x:Name="PART_MouseOver" Opacity="0">
+                     <Border BorderThickness="0" CornerRadius="2" Background="#FF9CA2AB">
+                        <Border BorderThickness="0" CornerRadius="1" Margin="1">
+                           <Border.Background>
+                              <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                                 <GradientStop Color="#FFFDFEFF" Offset="0" />
+                                 <GradientStop Color="#FFD9DFE8" Offset="1" />
+                              </LinearGradientBrush>
+                           </Border.Background>
+                        </Border>
+                     </Border>
+                  </Grid>
+                  <Grid x:Name="PART_Pressed" Opacity="0">
+                     <Border BorderThickness="0" CornerRadius="2" Background="#FF90959D">
+                        <Border BorderThickness="0" CornerRadius="1" Margin="1" Background="#FFB5BBC5" />
+                     </Border>
+                  </Grid>
+                  <ContentPresenter x:Name="contentPresenter"
+							               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+							               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+							               SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="CalculatorClearButtonStyle" TargetType="{x:Type Button}">
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Foreground" Value="#FFBF5254" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Button}">
+               <Grid x:Name="Control">
+                  <VisualStateManager.VisualStateGroups>
+                     <VisualStateGroup x:Name="CommonStates">
+                        <VisualState x:Name="Normal" />
+                        <VisualState x:Name="MouseOver">
+                           <Storyboard>
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To="0" />
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_MouseOver" Storyboard.TargetProperty="Opacity" To="1" />
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Pressed">
+                           <Storyboard>
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To="0" />
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Pressed" Storyboard.TargetProperty="Opacity" To="1" />
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Disabled">
+                           <Storyboard>
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To=".5" />
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="contentPresenter" Storyboard.TargetProperty="Opacity" To=".5" />
+                           </Storyboard>
+                        </VisualState>
+                     </VisualStateGroup>
+                  </VisualStateManager.VisualStateGroups>
+                  <Border Background="White" BorderBrush="{x:Null}" BorderThickness="0" CornerRadius="2" Margin="0,0,0,-1" Opacity="0.5" />
+                  <Grid x:Name="PART_Default">
+                     <Border BorderThickness="0" CornerRadius="2">
+                        <Border.Background>
+                           <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                              <GradientStop Color="#FFC19497" Offset="0" />
+                              <GradientStop Color="#FFA67D80" Offset="1" />
+                           </LinearGradientBrush>
+                        </Border.Background>
+                        <Border BorderThickness="0" CornerRadius="1" Margin="1">
+                           <Border.Background>
+                              <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                                 <GradientStop Color="#FFFDB8B8" Offset="0" />
+                                 <GradientStop Color="#FFF39998" Offset="1" />
+                              </LinearGradientBrush>
+                           </Border.Background>
+                        </Border>
+                     </Border>
+                  </Grid>
+                  <Grid x:Name="PART_MouseOver" Opacity="0">
+                     <Border BorderThickness="0" CornerRadius="2">
+                        <Border.Background>
+                           <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                              <GradientStop Color="#FFC19497" Offset="0" />
+                              <GradientStop Color="#FFA67D80" Offset="1" />
+                           </LinearGradientBrush>
+                        </Border.Background>
+                        <Border BorderThickness="0" CornerRadius="1" Margin="1">
+                           <Border.Background>
+                              <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                                 <GradientStop Color="#FFFEC9C9" Offset="0" />
+                                 <GradientStop Color="#FFEAA4A3" Offset="1" />
+                              </LinearGradientBrush>
+                           </Border.Background>
+                        </Border>
+                     </Border>
+                  </Grid>
+                  <Grid x:Name="PART_Pressed" Opacity="0">
+                     <Border BorderThickness="0" CornerRadius="2" Background="#FF9B6F72">
+                        <Border BorderThickness="0" CornerRadius="1" Margin="1" Background="#FFE69197" />
+                     </Border>
+                  </Grid>
+                  <ContentPresenter x:Name="contentPresenter"
+							               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+							               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+							               SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="CalculatorDigitButtonStyle" TargetType="{x:Type Button}">
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Foreground" Value="#FF2A313A" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Button}">
+               <Grid x:Name="Control">
+                  <VisualStateManager.VisualStateGroups>
+                     <VisualStateGroup x:Name="CommonStates">
+                        <VisualState x:Name="Normal" />
+                        <VisualState x:Name="MouseOver">
+                           <Storyboard>
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To="0" />
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_MouseOver" Storyboard.TargetProperty="Opacity" To="1" />
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Pressed">
+                           <Storyboard>
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To="0" />
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Pressed" Storyboard.TargetProperty="Opacity" To="1" />
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Disabled">
+                           <Storyboard>
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To=".5" />
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="contentPresenter" Storyboard.TargetProperty="Opacity" To=".5" />
+                           </Storyboard>
+                        </VisualState>
+                     </VisualStateGroup>
+                  </VisualStateManager.VisualStateGroups>
+                  <Border BorderBrush="{x:Null}" BorderThickness="0" Background="White" CornerRadius="3" Margin="0,0,0,-1" Opacity="0.5" />
+                  <Grid x:Name="PART_Default">
+                     <Border BorderThickness="0" CornerRadius="2">
+                        <Border.Background>
+                           <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                              <GradientStop Color="#FFA9AAAB" Offset="0" />
+                              <GradientStop Color="#FF98999A" Offset="1" />
+                           </LinearGradientBrush>
+                        </Border.Background>
+                        <Border BorderThickness="0" CornerRadius="1" Margin="1">
+                           <Border.Background>
+                              <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                                 <GradientStop Color="#FFF6F7F7" Offset="0" />
+                                 <GradientStop Color="#FFDEE0E2" Offset="1" />
+                              </LinearGradientBrush>
+                           </Border.Background>
+                        </Border>
+                     </Border>
+                  </Grid>
+                  <Grid x:Name="PART_MouseOver" Opacity="0">
+                     <Border BorderThickness="0" CornerRadius="2">
+                        <Border.Background>
+                           <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                              <GradientStop Color="#FFA9AAAB" Offset="0" />
+                              <GradientStop Color="#FF98999A" Offset="1" />
+                           </LinearGradientBrush>
+                        </Border.Background>
+                        <Border BorderThickness="0" CornerRadius="1" Margin="1">
+                           <Border.Background>
+                              <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                                 <GradientStop Color="#FFFCFCFC" Offset="0" />
+                                 <GradientStop Color="#FFEEEFF2" Offset="1" />
+                              </LinearGradientBrush>
+                           </Border.Background>
+                        </Border>
+                     </Border>
+                  </Grid>
+                  <Grid x:Name="PART_Pressed" Opacity="0">
+                     <Border BorderThickness="0" CornerRadius="2" Background="#FF87888A">
+                        <Border BorderThickness="0" CornerRadius="1" Margin="1" Background="#FFB5BBC5" />
+                     </Border>
+                  </Grid>
+                  <ContentPresenter x:Name="contentPresenter"
+							               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+							               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+							               SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+
+   <ControlTemplate x:Key="CalculatorButtonPanel" TargetType="{x:Type ContentControl}">
+      <Grid>
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition />
+            <ColumnDefinition Width="3" />
+            <ColumnDefinition />
+            <ColumnDefinition Width="3" />
+            <ColumnDefinition />
+            <ColumnDefinition Width="3" />
+            <ColumnDefinition />
+            <ColumnDefinition Width="3" />
+            <ColumnDefinition />
+         </Grid.ColumnDefinitions>
+         <Grid.RowDefinitions>
+            <RowDefinition />
+            <RowDefinition Height="3" />
+            <RowDefinition />
+            <RowDefinition Height="3" />
+            <RowDefinition />
+            <RowDefinition Height="3" />
+            <RowDefinition />
+            <RowDefinition Height="3" />
+            <RowDefinition />
+            <RowDefinition Height="3" />
+            <RowDefinition />
+         </Grid.RowDefinitions>
+         <Button Grid.Column="0" Grid.Row="0" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="MC"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="2" Grid.Row="0" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="MR" 
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="0" Grid.Row="2" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Back" 
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" Grid.RowSpan="1" />
+
+         <Button Grid.Column="2" Grid.Row="2" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Cancel" 
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorClearButtonStyle}" />
+
+         <Button Grid.Column="4" Grid.Row="2" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Clear"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorClearButtonStyle}" Grid.ColumnSpan="1" Grid.RowSpan="1" />
+
+         <Button Grid.Column="4" Grid.Row="0" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="MS"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="6" Grid.Row="0" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="MAdd"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" Margin="0" />
+
+         <Button Grid.Column="8" Grid.Row="0" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="MSub"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="6" Grid.Row="2" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Negate"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="8" Grid.Row="2" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Sqrt"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="0" Grid.Row="4" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Seven"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="2" Grid.Row="4" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Eight"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="4" Grid.Row="4" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Nine"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="6" Grid.Row="4" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Divide"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="8" Grid.Row="4" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Percent"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="0" Grid.Row="6" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Four"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="2" Grid.Row="6" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Five"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="4" Grid.Row="6" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Six"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="6" Grid.Row="6" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Multiply"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="8" Grid.Row="6" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Fraction"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="0" Grid.Row="8" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="One"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"                                    
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="2" Grid.Row="8" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Two"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="4" Grid.Row="8" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Three"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="6" Grid.Row="8" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Subtract"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="8" Grid.Row="8" Grid.RowSpan="3" MinWidth="28" MinHeight="55"
+					  local:Calculator.CalculatorButtonType="Equal"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="0" Grid.Row="10" Grid.ColumnSpan="3" MinWidth="59" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Zero"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="4" Grid.Row="10" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Decimal"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="6" Grid.Row="10" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Add"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+      </Grid>
+   </ControlTemplate>
+
+   <Style TargetType="{x:Type local:Calculator}">
+      <Setter Property="Background">
+         <Setter.Value>
+            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+               <GradientStop Color="#FFFAFBFB" Offset="0" />
+               <GradientStop Color="#FFF4F4F4" Offset="1" />
+            </LinearGradientBrush>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="BorderBrush" Value="#FF949494" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:Calculator}">
+               <Border Background="{TemplateBinding Background}"
+                       BorderBrush="{TemplateBinding BorderBrush}"
+                       BorderThickness="{TemplateBinding BorderThickness}"
+                       CornerRadius="3">
+                  <Grid Margin="10">
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="*" />
+                     </Grid.RowDefinitions>
+                     <Border x:Name="PART_Display" Margin="0,0,0,10" Background="White" BorderBrush="#FF949494" BorderThickness="1">
+                        <StackPanel>
+                           <Path Stretch="Fill"
+                                 Height="9"
+                                 Width="9"
+                                 Fill="DarkGray"
+                                 Data="F1 M 508.172,390L 506.031,390L 504.612,393.385C 504.174,394.477 503.788,395.533 503.453,396.555L 503.417,396.555C 503.334,395.528 503.206,394.471 503.035,393.385L 502.454,390L 500.301,390L 498.637,399L 500.226,399L 500.807,395.537C 500.903,394.973 501,394.379 501.099,393.756C 501.198,393.133 501.287,392.534 501.367,391.957L 501.402,391.957C 501.444,392.514 501.499,393.08 501.567,393.655C 501.635,394.231 501.712,394.776 501.8,395.292L 502.382,398.871L 503.7,398.871L 505.231,395.233C 505.445,394.724 505.663,394.187 505.884,393.622C 506.105,393.057 506.313,392.502 506.508,391.957L 506.543,391.957C 506.411,393.11 506.304,394.292 506.223,395.502L 505.979,399L 507.637,399L 508.172,390 Z "
+                                 HorizontalAlignment="Left"
+                                 VerticalAlignment="Top"                                              
+                                 Margin="4,4,0,0"
+                                 Visibility="{Binding Memory, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CalculatorMemoryToVisibilityConverter}}" />
+                           <TextBlock FontSize="18"
+                                      HorizontalAlignment="Right"
+                                      Margin="0,0,4,0"
+                                      Text="{Binding DisplayText, RelativeSource={RelativeSource TemplatedParent}}" />
+                        </StackPanel>
+                     </Border>
+                     <ContentControl x:Name="PART_CalculatorButtonPanel" Grid.Row="1" Template="{StaticResource CalculatorButtonPanel}" DataContext="{Binding RelativeSource={RelativeSource TemplatedParent}}" />
+                  </Grid>
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsFocused" Value="True">
+                     <Setter TargetName="PART_Display" Property="Background" Value="#E7F5FF" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CalculatorUpDown/Implementation/CalculatorUpDown.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CalculatorUpDown/Implementation/CalculatorUpDown.cs
new file mode 100644
index 00000000..c29cf464
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CalculatorUpDown/Implementation/CalculatorUpDown.cs
@@ -0,0 +1,225 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Controls.Primitives;
+using System.Windows.Input;
+
+namespace Xceed.Wpf.Toolkit
+{
+  [TemplatePart( Name = PART_CalculatorPopup, Type = typeof( Popup ) )]
+  [TemplatePart( Name = PART_Calculator, Type = typeof( Calculator ) )]
+  public class CalculatorUpDown : DecimalUpDown
+  {
+    private const string PART_CalculatorPopup = "PART_CalculatorPopup";
+    private const string PART_Calculator = "PART_Calculator";
+
+    #region Members
+
+    private Popup _calculatorPopup;
+    private Calculator _calculator;
+
+    #endregion //Members
+
+    #region Properties
+
+    #region DisplayText
+
+    public static readonly DependencyProperty DisplayTextProperty = DependencyProperty.Register( "DisplayText", typeof( string ), typeof( CalculatorUpDown ), new UIPropertyMetadata( "0" ) );
+    public string DisplayText
+    {
+      get
+      {
+        return ( string )GetValue( DisplayTextProperty );
+      }
+      set
+      {
+        SetValue( DisplayTextProperty, value );
+      }
+    }
+
+    #endregion //DisplayText
+
+    #region EnterClosesCalculator
+
+    public static readonly DependencyProperty EnterClosesCalculatorProperty = DependencyProperty.Register( "EnterClosesCalculator", typeof( bool ), typeof( CalculatorUpDown ), new UIPropertyMetadata( false ) );
+    public bool EnterClosesCalculator
+    {
+      get
+      {
+        return ( bool )GetValue( EnterClosesCalculatorProperty );
+      }
+      set
+      {
+        SetValue( EnterClosesCalculatorProperty, value );
+      }
+    }
+
+    #endregion //EnterClosesCalculator
+
+    #region IsOpen
+
+    public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register( "IsOpen", typeof( bool ), typeof( CalculatorUpDown ), new UIPropertyMetadata( false, OnIsOpenChanged ) );
+    public bool IsOpen
+    {
+      get
+      {
+        return ( bool )GetValue( IsOpenProperty );
+      }
+      set
+      {
+        SetValue( IsOpenProperty, value );
+      }
+    }
+
+    private static void OnIsOpenChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      CalculatorUpDown calculatorUpDown = o as CalculatorUpDown;
+      if( calculatorUpDown != null )
+        calculatorUpDown.OnIsOpenChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnIsOpenChanged( bool oldValue, bool newValue )
+    {
+
+    }
+
+    #endregion //IsOpen
+
+    #region Memory
+
+    public static readonly DependencyProperty MemoryProperty = DependencyProperty.Register( "Memory", typeof( decimal ), typeof( CalculatorUpDown ), new UIPropertyMetadata( default( decimal ) ) );
+    public decimal Memory
+    {
+      get
+      {
+        return ( decimal )GetValue( MemoryProperty );
+      }
+      set
+      {
+        SetValue( MemoryProperty, value );
+      }
+    }
+
+    #endregion //Memory
+
+    #region Precision
+
+    public static readonly DependencyProperty PrecisionProperty = DependencyProperty.Register( "Precision", typeof( int ), typeof( CalculatorUpDown ), new UIPropertyMetadata( 6 ) );
+    public int Precision
+    {
+      get
+      {
+        return ( int )GetValue( PrecisionProperty );
+      }
+      set
+      {
+        SetValue( PrecisionProperty, value );
+      }
+    }
+
+    #endregion //Precision
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static CalculatorUpDown()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( CalculatorUpDown ), new FrameworkPropertyMetadata( typeof( CalculatorUpDown ) ) );
+    }
+
+    public CalculatorUpDown()
+    {
+      Keyboard.AddKeyDownHandler( this, OnKeyDown );
+      Mouse.AddPreviewMouseDownOutsideCapturedElementHandler( this, OnMouseDownOutsideCapturedElement );
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+
+      if( _calculatorPopup != null )
+        _calculatorPopup.Opened -= CalculatorPopup_Opened;
+
+      _calculatorPopup = GetTemplateChild( PART_CalculatorPopup ) as Popup;
+
+      if( _calculatorPopup != null )
+        _calculatorPopup.Opened += CalculatorPopup_Opened;
+
+      _calculator = GetTemplateChild( PART_Calculator ) as Calculator;
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Event Handlers
+
+    void CalculatorPopup_Opened( object sender, EventArgs e )
+    {
+      _calculator.Focus();
+    }
+
+    private void OnKeyDown( object sender, KeyEventArgs e )
+    {
+      switch( e.Key )
+      {
+        case Key.Enter:
+          {
+            if( EnterClosesCalculator && IsOpen )
+              CloseCalculatorUpDown();
+            break;
+          }
+        case Key.Escape:
+          {
+            CloseCalculatorUpDown();
+            e.Handled = true;
+            break;
+          }
+        case Key.Tab:
+          {
+            CloseCalculatorUpDown();
+            break;
+          }
+      }
+    }
+
+    private void OnMouseDownOutsideCapturedElement( object sender, MouseButtonEventArgs e )
+    {
+      CloseCalculatorUpDown();
+    }
+
+    #endregion //Event Handlers
+
+    #region Methods
+
+    private void CloseCalculatorUpDown()
+    {
+      if( IsOpen )
+        IsOpen = false;
+      ReleaseMouseCapture();
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CalculatorUpDown/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CalculatorUpDown/Themes/Generic.xaml
new file mode 100644
index 00000000..a861356e
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CalculatorUpDown/Themes/Generic.xaml
@@ -0,0 +1,160 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
+
+   <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+
+   <LinearGradientBrush x:Key="PopupDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="1" Color="#FFE8EBED" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <Style x:Key="CalculatorToggleButtonStyle" TargetType="ToggleButton">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="ToggleButton">
+               <Grid SnapsToDevicePixels="True">
+                  <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                       CornerRadius="0,2.75,2.75,0"
+                                       RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:CalculatorUpDown}}"
+                                       RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:CalculatorUpDown}}"
+											      RenderMouseOver="{TemplateBinding IsMouseOver}"
+											      RenderPressed="{TemplateBinding IsPressed}">
+
+                     <Grid>
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="*" />
+                           <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+
+                        <ContentPresenter HorizontalAlignment="Stretch" VerticalAlignment="Stretch" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+
+                        <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
+                           <Path x:Name="Arrow" Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000" />
+                        </Grid>
+                     </Grid>
+                  </chrome:ButtonChrome>
+               </Grid>
+                <ControlTemplate.Triggers>
+                    <Trigger Property="IsEnabled" Value="False">
+                        <Setter Property="Fill" TargetName="Arrow" Value="#AFAFAF" />
+                    </Trigger>
+                </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <DataTemplate x:Key="DefaultWatermarkTemplate">
+      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
+   </DataTemplate>
+
+   <!-- =============================================================================== -->
+   <!-- CalculatorUpDown                                                                -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type local:CalculatorUpDown}">
+      <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+      <Setter Property="BorderThickness" Value="1,1,0,1" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+      <Setter Property="HorizontalContentAlignment" Value="Right" />
+      <Setter Property="TextAlignment" Value="Right" />
+      <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:CalculatorUpDown}">
+               <Grid>
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                     </Grid.ColumnDefinitions>
+                     <local:ButtonSpinner x:Name="PART_Spinner"
+                                          IsTabStop="False"
+                                          Background="{TemplateBinding Background}"
+                                          BorderThickness="{TemplateBinding BorderThickness}"
+                                          AllowSpin="{TemplateBinding AllowSpin}"
+                                          ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
+                        <local:WatermarkTextBox x:Name="PART_TextBox"
+                                                BorderThickness="0" 
+                                                Background="Transparent"
+                                                ContextMenu="{TemplateBinding ContextMenu}"
+                                                FontFamily="{TemplateBinding FontFamily}" 
+                                                FontSize="{TemplateBinding FontSize}" 
+                                                FontStretch="{TemplateBinding FontStretch}"
+                                                FontStyle="{TemplateBinding FontStyle}" 
+                                                FontWeight="{TemplateBinding FontWeight}" 
+                                                Foreground="{TemplateBinding Foreground}" 
+                                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
+                                                MinWidth="20"
+                                                AcceptsReturn="False"
+                                                Padding="0"
+                                                TextAlignment="{TemplateBinding TextAlignment}"
+                                                TextWrapping="NoWrap" 
+                                                TabIndex="{TemplateBinding TabIndex}"
+                                                Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
+                                                Watermark="{TemplateBinding Watermark}"
+                                                WatermarkTemplate="{TemplateBinding WatermarkTemplate}" />
+                     </local:ButtonSpinner>
+                     <ToggleButton x:Name="_calculatorToggleButton"
+                                   Grid.Column="1"
+                                   IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                                   Style="{StaticResource CalculatorToggleButtonStyle}"
+                                   IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}" />
+                  </Grid>
+                  <Popup x:Name="PART_CalculatorPopup"
+                         IsOpen="{Binding IsChecked, ElementName=_calculatorToggleButton}"
+                         StaysOpen="False">
+                     <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}" Padding="3">
+                        <StackPanel>
+                           <local:Calculator x:Name="PART_Calculator"
+                                             Background="Transparent"
+                                             BorderThickness="0"
+                                             DisplayText="{Binding DisplayText, RelativeSource={RelativeSource TemplatedParent}}"
+                                             Memory="{Binding Memory, RelativeSource={RelativeSource TemplatedParent}}"
+                                             Precision="{Binding Precision, RelativeSource={RelativeSource TemplatedParent}}"
+                                             Value="{Binding Value, RelativeSource={RelativeSource TemplatedParent}}" />
+                        </StackPanel>
+                     </Border>
+                  </Popup>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckComboBox/Implementation/CheckComboBox.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckComboBox/Implementation/CheckComboBox.cs
new file mode 100644
index 00000000..be17afce
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckComboBox/Implementation/CheckComboBox.cs
@@ -0,0 +1,150 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Linq;
+using System.Windows;
+using System.Windows.Input;
+using Xceed.Wpf.Toolkit.Primitives;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class CheckComboBox : Selector
+  {
+    #region Constructors
+
+    static CheckComboBox()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( CheckComboBox ), new FrameworkPropertyMetadata( typeof( CheckComboBox ) ) );
+    }
+
+    public CheckComboBox()
+    {
+      Mouse.AddPreviewMouseDownOutsideCapturedElementHandler( this, OnMouseDownOutsideCapturedElement );
+    }
+
+    #endregion //Constructors
+
+    #region Properties
+
+    public static readonly DependencyProperty TextProperty = DependencyProperty.Register( "Text", typeof( string ), typeof( CheckComboBox ), new UIPropertyMetadata( null ) );
+    public string Text
+    {
+      get
+      {
+        return ( string )GetValue( TextProperty );
+      }
+      set
+      {
+        SetValue( TextProperty, value );
+      }
+    }
+
+    #region IsDropDownOpen
+
+    public static readonly DependencyProperty IsDropDownOpenProperty = DependencyProperty.Register( "IsDropDownOpen", typeof( bool ), typeof( CheckComboBox ), new UIPropertyMetadata( false, OnIsDropDownOpenChanged ) );
+    public bool IsDropDownOpen
+    {
+      get
+      {
+        return ( bool )GetValue( IsDropDownOpenProperty );
+      }
+      set
+      {
+        SetValue( IsDropDownOpenProperty, value );
+      }
+    }
+
+    private static void OnIsDropDownOpenChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      CheckComboBox comboBox = o as CheckComboBox;
+      if( comboBox != null )
+        comboBox.OnIsDropDownOpenChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnIsDropDownOpenChanged( bool oldValue, bool newValue )
+    {
+      // TODO: Add your property changed side-effects. Descendants can override as well.
+    }
+
+    #endregion //IsDropDownOpen
+
+    #endregion //Properties
+
+    #region Base Class Overrides
+
+    protected override void OnSelectedValueChanged( string oldValue, string newValue )
+    {
+      base.OnSelectedValueChanged( oldValue, newValue );
+      UpdateText();
+    }
+
+    protected override void OnDisplayMemberPathChanged( string oldDisplayMemberPath, string newDisplayMemberPath )
+    {
+      base.OnDisplayMemberPathChanged( oldDisplayMemberPath, newDisplayMemberPath );
+      UpdateText();
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Event Handlers
+
+    private void OnMouseDownOutsideCapturedElement( object sender, MouseButtonEventArgs e )
+    {
+      CloseDropDown();
+    }
+
+    #endregion //Event Handlers
+
+    #region Methods
+
+    private void UpdateText()
+    {
+#if VS2008
+      string newValue = String.Join( Delimiter, SelectedItems.Cast<object>().Select( x => GetItemDisplayValue( x ).ToString() ).ToArray() ); 
+#else
+      string newValue = String.Join( Delimiter, SelectedItems.Cast<object>().Select( x => GetItemDisplayValue( x ) ) );
+#endif
+
+      if( String.IsNullOrEmpty( Text ) || !Text.Equals( newValue ) )
+        Text = newValue;
+    }
+
+    protected object GetItemDisplayValue( object item )
+    {
+      if( !String.IsNullOrEmpty( DisplayMemberPath ) )
+      {
+        var property = item.GetType().GetProperty( DisplayMemberPath );
+        if( property != null )
+          return property.GetValue( item, null );
+      }
+
+      return item;
+    }
+
+    private void CloseDropDown()
+    {
+      if( IsDropDownOpen )
+        IsDropDownOpen = false;
+      ReleaseMouseCapture();
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckComboBox/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckComboBox/Themes/Generic.xaml
new file mode 100644
index 00000000..4cacc43a
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckComboBox/Themes/Generic.xaml
@@ -0,0 +1,109 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
+                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes">
+
+   <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+
+   <SolidColorBrush x:Key="ButtonNormalBorder" Color="#FF707070" />
+
+   <Geometry x:Key="DownArrowGeometry">M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z</Geometry>
+
+   <Style x:Key="ComboBoxToggleButton" TargetType="{x:Type ToggleButton}">
+      <Setter Property="OverridesDefaultStyle" Value="true" />
+      <Setter Property="IsTabStop" Value="false" />
+      <Setter Property="Focusable" Value="false" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ToggleButton}">
+               <chrome:ButtonChrome x:Name="Chrome"
+                                    BorderBrush="{TemplateBinding BorderBrush}" 
+                                    Background="{TemplateBinding Background}"
+                                    CornerRadius="0"
+                                    RenderEnabled="{TemplateBinding IsEnabled}"
+                                    RenderMouseOver="{Binding IsMouseOver, ElementName=PART_DropDownButton}"
+                                    RenderNormal="False"
+                                    RenderPressed="{Binding IsPressed, ElementName=PART_DropDownButton}"
+                                    SnapsToDevicePixels="true">
+                  <Grid HorizontalAlignment="Right" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
+                     <Path x:Name="Arrow" Data="{StaticResource DownArrowGeometry}" Fill="Black" HorizontalAlignment="Center" Margin="3,0,3,0" VerticalAlignment="Center" />
+                  </Grid>
+               </chrome:ButtonChrome>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsChecked" Value="true">
+                     <Setter Property="RenderPressed" TargetName="Chrome" Value="true" />
+                  </Trigger>
+                  <Trigger Property="IsEnabled" Value="false">
+                     <Setter Property="Fill" TargetName="Arrow" Value="#AFAFAF" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style TargetType="{x:Type local:CheckComboBox}">
+      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+      <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+      <Setter Property="BorderBrush" Value="{StaticResource ButtonNormalBorder}" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+      <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+      <Setter Property="Padding" Value="2" />
+      <Setter Property="ScrollViewer.CanContentScroll" Value="true" />
+      <Setter Property="ScrollViewer.PanningMode" Value="Both" />
+      <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:CheckComboBox}">
+               <Grid x:Name="MainGrid" SnapsToDevicePixels="true">
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="*" />
+                     <ColumnDefinition MinWidth="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" Width="0" />
+                  </Grid.ColumnDefinitions>
+                  <Popup x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" StaysOpen="False" Margin="1" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+                     <Grid MinWidth="{Binding ActualWidth, ElementName=MainGrid}">
+                        <Border x:Name="DropDownBorder" BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}" BorderThickness="1" Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}">
+                           <ScrollViewer x:Name="DropDownScrollViewer">
+                              <Grid RenderOptions.ClearTypeHint="Enabled">
+                                 <Canvas HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
+                                    <Rectangle x:Name="OpaqueRect" Fill="{Binding Background, ElementName=DropDownBorder}" Height="{Binding ActualHeight, ElementName=DropDownBorder}" Width="{Binding ActualWidth, ElementName=DropDownBorder}" />
+                                 </Canvas>
+                                 <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                              </Grid>
+                           </ScrollViewer>
+                        </Border>
+                     </Grid>
+                  </Popup>
+
+                  <Border Grid.ColumnSpan="2" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
+                  <TextBox Text="{TemplateBinding Text}" IsReadOnly="True" BorderThickness="0" Background="Transparent" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+                  <ToggleButton x:Name="PART_DropDownButton" Grid.Column="1" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxToggleButton}"
+                                IsHitTestVisible="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}" />
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Implementation/CheckListBox.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Implementation/CheckListBox.cs
new file mode 100644
index 00000000..956ac25e
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Implementation/CheckListBox.cs
@@ -0,0 +1,41 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows;
+using Xceed.Wpf.Toolkit.Primitives;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class CheckListBox : Selector
+  {
+    #region Constructors
+
+    static CheckListBox()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( CheckListBox ), new FrameworkPropertyMetadata( typeof( CheckListBox ) ) );
+    }
+
+    public CheckListBox()
+    {
+
+    }
+
+    #endregion //Constructors
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Themes/Generic.xaml
new file mode 100644
index 00000000..a3037418
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Themes/Generic.xaml
@@ -0,0 +1,43 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
+
+   <Style TargetType="{x:Type local:CheckListBox}">
+      <Setter Property="BorderBrush" Value="#FF707070" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="KeyboardNavigation.TabNavigation" Value="Once" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:CheckListBox}">
+               <Border Background="{TemplateBinding Background}"
+                       BorderBrush="{TemplateBinding BorderBrush}"
+                       BorderThickness="{TemplateBinding BorderThickness}">
+                  <ScrollViewer Padding="{TemplateBinding Padding}" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
+                     <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                  </ScrollViewer>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ChildWindow/Implementation/ChildWindow.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ChildWindow/Implementation/ChildWindow.cs
new file mode 100644
index 00000000..b7eb67ec
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ChildWindow/Implementation/ChildWindow.cs
@@ -0,0 +1,902 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Shapes;
+using System.Windows.Threading;
+
+namespace Xceed.Wpf.Toolkit
+{
+  [TemplatePart( Name = PART_DragWidget, Type = typeof( Border ) )]
+  [TemplatePart( Name = PART_CloseButton, Type = typeof( Button ) )]
+  [TemplatePart( Name = PART_WindowRoot, Type = typeof( Grid ) )]
+  [TemplatePart( Name = PART_Root, Type = typeof( Grid ) )]
+  public class ChildWindow : ContentControl
+  {
+    private const string PART_DragWidget = "PART_DragWidget";
+    private const string PART_CloseButton = "PART_CloseButton";
+    private const string PART_WindowRoot = "PART_WindowRoot";
+    private const string PART_Root = "PART_Root";
+
+    #region Private Members
+
+    private Grid _root;
+    private TranslateTransform _moveTransform = new TranslateTransform();
+    private bool _startupPositionInitialized;
+    private bool _isMouseCaptured;
+    private Point _clickPoint;
+    private Point _oldPosition;
+    private Border _dragWidget;
+    private FrameworkElement _parentContainer;
+    private Rectangle _modalLayer = new Rectangle();
+    private Canvas _modalLayerPanel = new Canvas();
+
+    private const int _horizaontalOffset = 3;
+    private const int _verticalOffset = 3;
+
+    bool _ignorePropertyChanged;
+
+    #endregion //Private Members
+
+    #region Properties
+
+    #region Internal Properties
+
+    internal Grid WindowRoot
+    {
+      get;
+      private set;
+    }
+    internal Thumb DragWidget
+    {
+      get;
+      private set;
+    }
+    internal Button MinimizeButton
+    {
+      get;
+      private set;
+    }
+    internal Button MaximizeButton
+    {
+      get;
+      private set;
+    }
+    internal Button CloseButton
+    {
+      get;
+      private set;
+    }
+
+    #endregion //Internal Properties
+
+    #region Public Properties
+
+    #region Caption
+
+    public static readonly DependencyProperty CaptionProperty = DependencyProperty.Register( "Caption", typeof( object ), typeof( ChildWindow ), new UIPropertyMetadata( String.Empty ) );
+    public object Caption
+    {
+      get
+      {
+        return ( object )GetValue( CaptionProperty );
+      }
+      set
+      {
+        SetValue( CaptionProperty, value );
+      }
+    }
+
+    #endregion //Caption
+
+    #region CaptionForeground
+
+    public static readonly DependencyProperty CaptionForegroundProperty = DependencyProperty.Register( "CaptionForeground", typeof( Brush ), typeof( ChildWindow ), new UIPropertyMetadata( null ) );
+    public Brush CaptionForeground
+    {
+      get
+      {
+        return ( Brush )GetValue( CaptionForegroundProperty );
+      }
+      set
+      {
+        SetValue( CaptionForegroundProperty, value );
+      }
+    }
+
+    #endregion //CaptionForeground
+
+    #region CloseButtonStyle
+
+    public static readonly DependencyProperty CloseButtonStyleProperty = DependencyProperty.Register( "CloseButtonStyle", typeof( Style ), typeof( ChildWindow ), new PropertyMetadata( null ) );
+    public Style CloseButtonStyle
+    {
+      get
+      {
+        return ( Style )GetValue( CloseButtonStyleProperty );
+      }
+      set
+      {
+        SetValue( CloseButtonStyleProperty, value );
+      }
+    }
+
+    #endregion //CloseButtonStyle
+
+    #region CloseButtonVisibility
+
+    public static readonly DependencyProperty CloseButtonVisibilityProperty = DependencyProperty.Register( "CloseButtonVisibility", typeof( Visibility ), typeof( ChildWindow ), new PropertyMetadata( Visibility.Visible ) );
+    public Visibility CloseButtonVisibility
+    {
+      get
+      {
+        return ( Visibility )GetValue( CloseButtonVisibilityProperty );
+      }
+      set
+      {
+        SetValue( CloseButtonVisibilityProperty, value );
+      }
+    }
+
+    #endregion //CloseButtonVisibility
+
+    #region DialogResult
+
+    private bool? _dialogResult;
+    /// <summary>
+    /// Gets or sets a value indicating whether the ChildWindow was accepted or canceled.
+    /// </summary>
+    /// <value>
+    /// True if the child window was accepted; false if the child window was
+    /// canceled. The default is null.
+    /// </value>
+    [TypeConverter( typeof( NullableBoolConverter ) )]
+    public bool? DialogResult
+    {
+      get
+      {
+        return _dialogResult;
+      }
+      set
+      {
+        if( _dialogResult != value )
+        {
+          _dialogResult = value;
+          Close();
+        }
+      }
+    }
+
+    #endregion //DialogResult
+
+    #region DesignerWindowState
+
+    public static readonly DependencyProperty DesignerWindowStateProperty = DependencyProperty.Register( "DesignerWindowState", typeof( WindowState ), typeof( ChildWindow ), new PropertyMetadata( WindowState.Closed, OnDesignerWindowStatePropertyChanged ) );
+    public WindowState DesignerWindowState
+    {
+      get
+      {
+        return ( WindowState )GetValue( DesignerWindowStateProperty );
+      }
+      set
+      {
+        SetValue( DesignerWindowStateProperty, value );
+      }
+    }
+
+    private static void OnDesignerWindowStatePropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ChildWindow childWindow = d as ChildWindow;
+      if( childWindow != null )
+        childWindow.OnDesignerWindowStatePropertyChanged( ( WindowState )e.OldValue, ( WindowState )e.NewValue );
+    }
+
+    protected virtual void OnDesignerWindowStatePropertyChanged( WindowState oldValue, WindowState newValue )
+    {
+      if( DesignerProperties.GetIsInDesignMode( this ) )
+      {
+        Visibility = newValue == Xceed.Wpf.Toolkit.WindowState.Open ? Visibility.Visible : Visibility.Collapsed;
+      }
+    }
+
+    #endregion //DesignerWindowState
+
+    #region FocusedElement
+
+    public static readonly DependencyProperty FocusedElementProperty = DependencyProperty.Register( "FocusedElement", typeof( FrameworkElement ), typeof( ChildWindow ), new UIPropertyMetadata( null ) );
+    public FrameworkElement FocusedElement
+    {
+      get
+      {
+        return ( FrameworkElement )GetValue( FocusedElementProperty );
+      }
+      set
+      {
+        SetValue( FocusedElementProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region IsModal
+
+    public static readonly DependencyProperty IsModalProperty = DependencyProperty.Register( "IsModal", typeof( bool ), typeof( ChildWindow ), new UIPropertyMetadata( false, new PropertyChangedCallback( OnIsModalPropertyChanged ) ) );
+    public bool IsModal
+    {
+      get
+      {
+        return ( bool )GetValue( IsModalProperty );
+      }
+      set
+      {
+        SetValue( IsModalProperty, value );
+      }
+    }
+
+    private static void OnIsModalPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ChildWindow childWindow = d as ChildWindow;
+      if( childWindow != null )
+        childWindow.OnIsModalChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    private void OnIsModalChanged( bool oldValue, bool newValue )
+    {
+      if( newValue )
+      {
+        KeyboardNavigation.SetTabNavigation( this, KeyboardNavigationMode.Cycle );
+        ShowModalLayer();
+      }
+      else
+      {
+        KeyboardNavigation.SetTabNavigation( this, KeyboardNavigationMode.Continue );
+        HideModalLayer();
+      }
+    }
+
+    #endregion //IsModal
+
+    #region Left
+
+    public static readonly DependencyProperty LeftProperty = DependencyProperty.Register( "Left", typeof( double ), typeof( ChildWindow ), new PropertyMetadata( 0.0, new PropertyChangedCallback( OnLeftPropertyChanged ) ) );
+    public double Left
+    {
+      get
+      {
+        return ( double )GetValue( LeftProperty );
+      }
+      set
+      {
+        SetValue( LeftProperty, value );
+      }
+    }
+
+    private static void OnLeftPropertyChanged( DependencyObject obj, DependencyPropertyChangedEventArgs e )
+    {
+      ChildWindow childWindow = obj as ChildWindow;
+      if( childWindow != null )
+        childWindow.OnLeftPropertyChanged( ( double )e.OldValue, ( double )e.NewValue );
+    }
+
+    private void OnLeftPropertyChanged( double oldValue, double newValue )
+    {
+      Left = GetRestrictedLeft();
+      ProcessMove( newValue - oldValue, 0 );
+    }
+
+    #endregion //Left
+
+    #region OverlayBrush
+
+    public static readonly DependencyProperty OverlayBrushProperty = DependencyProperty.Register( "OverlayBrush", typeof( Brush ), typeof( ChildWindow ), new PropertyMetadata( Brushes.Gray, OnOverlayBrushChanged ) );
+    public Brush OverlayBrush
+    {
+      get
+      {
+        return ( Brush )GetValue( OverlayBrushProperty );
+      }
+      set
+      {
+        SetValue( OverlayBrushProperty, value );
+      }
+    }
+
+    private static void OnOverlayBrushChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ChildWindow childWindow = d as ChildWindow;
+      if( childWindow != null )
+        childWindow.OnOverlayBrushChanged( ( Brush )e.OldValue, ( Brush )e.NewValue );
+    }
+
+    protected virtual void OnOverlayBrushChanged( Brush oldValue, Brush newValue )
+    {
+      _modalLayer.Fill = newValue;
+    }
+
+    #endregion //OverlayBrush
+
+    #region OverlayOpacity
+
+    public static readonly DependencyProperty OverlayOpacityProperty = DependencyProperty.Register( "OverlayOpacity", typeof( double ), typeof( ChildWindow ), new PropertyMetadata( 0.5, OnOverlayOpacityChanged ) );
+    public double OverlayOpacity
+    {
+      get
+      {
+        return ( double )GetValue( OverlayOpacityProperty );
+      }
+      set
+      {
+        SetValue( OverlayOpacityProperty, value );
+      }
+    }
+
+    private static void OnOverlayOpacityChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ChildWindow childWindow = d as ChildWindow;
+      if( childWindow != null )
+        childWindow.OnOverlayOpacityChanged( ( double )e.OldValue, ( double )e.NewValue );
+    }
+
+    protected virtual void OnOverlayOpacityChanged( double oldValue, double newValue )
+    {
+      _modalLayer.Opacity = newValue;
+    }
+
+    #endregion //OverlayOpacity
+
+    #region Top
+
+    public static readonly DependencyProperty TopProperty = DependencyProperty.Register( "Top", typeof( double ), typeof( ChildWindow ), new PropertyMetadata( 0.0, new PropertyChangedCallback( OnTopPropertyChanged ) ) );
+    public double Top
+    {
+      get
+      {
+        return ( double )GetValue( TopProperty );
+      }
+      set
+      {
+        SetValue( TopProperty, value );
+      }
+    }
+
+    private static void OnTopPropertyChanged( DependencyObject obj, DependencyPropertyChangedEventArgs e )
+    {
+      ChildWindow childWindow = obj as ChildWindow;
+      if( childWindow != null )
+        childWindow.OnTopPropertyChanged( ( double )e.OldValue, ( double )e.NewValue );
+    }
+
+    private void OnTopPropertyChanged( double oldValue, double newValue )
+    {
+      Top = GetRestrictedTop();
+      ProcessMove( 0, newValue - oldValue );
+    }
+
+    #endregion //TopProperty
+
+    #region WindowBackground
+
+    public static readonly DependencyProperty WindowBackgroundProperty = DependencyProperty.Register( "WindowBackground", typeof( Brush ), typeof( ChildWindow ), new PropertyMetadata( null ) );
+    public Brush WindowBackground
+    {
+      get
+      {
+        return ( Brush )GetValue( WindowBackgroundProperty );
+      }
+      set
+      {
+        SetValue( WindowBackgroundProperty, value );
+      }
+    }
+
+    #endregion //WindowBackground
+
+    #region WindowBorderBrush
+
+    public static readonly DependencyProperty WindowBorderBrushProperty = DependencyProperty.Register( "WindowBorderBrush", typeof( Brush ), typeof( ChildWindow ), new PropertyMetadata( null ) );
+    public Brush WindowBorderBrush
+    {
+      get
+      {
+        return ( Brush )GetValue( WindowBorderBrushProperty );
+      }
+      set
+      {
+        SetValue( WindowBorderBrushProperty, value );
+      }
+    }
+
+    #endregion //WindowBorderBrush
+
+    #region WindowOpacity
+
+    public static readonly DependencyProperty WindowOpacityProperty = DependencyProperty.Register( "WindowOpacity", typeof( double ), typeof( ChildWindow ), new PropertyMetadata( null ) );
+    public double WindowOpacity
+    {
+      get
+      {
+        return ( double )GetValue( WindowOpacityProperty );
+      }
+      set
+      {
+        SetValue( WindowOpacityProperty, value );
+      }
+    }
+
+    #endregion //WindowOpacity
+
+    #region WindowStartupLocation
+
+    public static readonly DependencyProperty WindowStartupLocationProperty = DependencyProperty.Register( "WindowStartupLocation", typeof( WindowStartupLocation ), typeof( ChildWindow ), new UIPropertyMetadata( WindowStartupLocation.Manual, OnWindowStartupLocationChanged ) );
+    public WindowStartupLocation WindowStartupLocation
+    {
+      get
+      {
+        return ( WindowStartupLocation )GetValue( WindowStartupLocationProperty );
+      }
+      set
+      {
+        SetValue( WindowStartupLocationProperty, value );
+      }
+    }
+
+    private static void OnWindowStartupLocationChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ChildWindow childWindow = o as ChildWindow;
+      if( childWindow != null )
+        childWindow.OnWindowStartupLocationChanged( ( WindowStartupLocation )e.OldValue, ( WindowStartupLocation )e.NewValue );
+    }
+
+    protected virtual void OnWindowStartupLocationChanged( WindowStartupLocation oldValue, WindowStartupLocation newValue )
+    {
+      // TODO: Add your property changed side-effects. Descendants can override as well.
+    }
+
+    #endregion //WindowStartupLocation
+
+    #region WindowState
+
+    public static readonly DependencyProperty WindowStateProperty = DependencyProperty.Register( "WindowState", typeof( WindowState ), typeof( ChildWindow ), new FrameworkPropertyMetadata( WindowState.Closed, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnWindowStatePropertyChanged ) );
+    public WindowState WindowState
+    {
+      get
+      {
+        return ( WindowState )GetValue( WindowStateProperty );
+      }
+      set
+      {
+        SetValue( WindowStateProperty, value );
+      }
+    }
+
+    private static void OnWindowStatePropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ChildWindow childWindow = d as ChildWindow;
+      if( childWindow != null )
+        childWindow.OnWindowStatePropertyChanged( ( WindowState )e.OldValue, ( WindowState )e.NewValue );
+    }
+
+    protected virtual void OnWindowStatePropertyChanged( WindowState oldValue, WindowState newValue )
+    {
+      if( !DesignerProperties.GetIsInDesignMode( this ) )
+      {
+        if( !_ignorePropertyChanged )
+          SetWindowState( newValue );
+      }
+      else
+      {
+        Visibility = DesignerWindowState == Xceed.Wpf.Toolkit.WindowState.Open ? Visibility.Visible : System.Windows.Visibility.Collapsed;
+      }
+    }
+
+    #endregion //WindowState
+
+    #endregion //Public Properties
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static ChildWindow()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( ChildWindow ), new FrameworkPropertyMetadata( typeof( ChildWindow ) ) );
+    }
+
+    public ChildWindow()
+    {
+      DesignerWindowState = Xceed.Wpf.Toolkit.WindowState.Open;
+
+      IsVisibleChanged += ChildWindow_IsVisibleChanged;
+
+      _modalLayer.Fill = OverlayBrush;
+      _modalLayer.Opacity = OverlayOpacity;
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+
+      if( _dragWidget != null )
+      {
+        _dragWidget.RemoveHandler( UIElement.MouseLeftButtonDownEvent, new MouseButtonEventHandler( HeaderLeftMouseButtonDown ) );
+        _dragWidget.RemoveHandler( UIElement.MouseLeftButtonUpEvent, new MouseButtonEventHandler( HeaderMouseLeftButtonUp ) );
+        _dragWidget.MouseMove -= ( o, e ) => HeaderMouseMove( e );
+      }
+
+      _dragWidget = GetTemplateChild( PART_DragWidget ) as Border;
+
+      if( _dragWidget != null )
+      {
+        _dragWidget.AddHandler( UIElement.MouseLeftButtonDownEvent, new MouseButtonEventHandler( HeaderLeftMouseButtonDown ), true );
+        _dragWidget.AddHandler( UIElement.MouseLeftButtonUpEvent, new MouseButtonEventHandler( HeaderMouseLeftButtonUp ), true );
+        _dragWidget.MouseMove += ( o, e ) => HeaderMouseMove( e );
+      }
+
+      if( CloseButton != null )
+        CloseButton.Click -= ( o, e ) => Close();
+
+      CloseButton = GetTemplateChild( PART_CloseButton ) as Button;
+
+      if( CloseButton != null )
+        CloseButton.Click += ( o, e ) => Close();
+
+      WindowRoot = GetTemplateChild( PART_WindowRoot ) as Grid;
+      WindowRoot.RenderTransform = _moveTransform;
+
+      _parentContainer = VisualTreeHelper.GetParent( this ) as FrameworkElement;
+      _parentContainer.LayoutUpdated += ParentContainer_LayoutUpdated;
+      _parentContainer.SizeChanged += ParentContainer_SizeChanged;
+
+      //initialize our modal background width/height
+      _modalLayer.Height = _parentContainer.ActualHeight;
+      _modalLayer.Width = _parentContainer.ActualWidth;
+
+      //this is for XBAP applications only. When inside an XBAP the parent container has no height or width until it has loaded. Therefore
+      //we need to handle the loaded event and reposition the window.
+      if( System.Windows.Interop.BrowserInteropHelper.IsBrowserHosted )
+      {
+        _parentContainer.Loaded += ( o, e ) =>
+            {
+              ExecuteOpen();
+            };
+      }
+
+      _root = GetTemplateChild( PART_Root ) as Grid;
+
+#if VS2008
+      FocusVisualStyle = null;
+#else
+      Style focusStyle = _root.Resources[ "FocusVisualStyle" ] as Style;
+      if( focusStyle != null )
+      {
+        Setter focusStyleDataContext = new Setter( Control.DataContextProperty, this );
+        focusStyle.Setters.Add( focusStyleDataContext );
+        FocusVisualStyle = focusStyle;
+      }
+#endif
+      _root.Children.Add( _modalLayerPanel );
+    }
+
+    protected override void OnGotFocus( RoutedEventArgs e )
+    {
+      Action action = () =>
+      {
+        if( FocusedElement != null )
+          FocusedElement.Focus();
+      };
+
+      Dispatcher.BeginInvoke( DispatcherPriority.ApplicationIdle, action );
+    }
+
+    protected override void OnKeyDown( KeyEventArgs e )
+    {
+      base.OnKeyDown( e );
+
+      if( WindowState == WindowState.Open )
+      {
+        switch( e.Key )
+        {
+          case Key.Left:
+            this.Left -= _horizaontalOffset;
+            e.Handled = true;
+            break;
+
+          case Key.Right:
+            this.Left += _horizaontalOffset;
+            e.Handled = true;
+            break;
+
+          case Key.Down:
+            this.Top += _verticalOffset;
+            e.Handled = true;
+            break;
+
+          case Key.Up:
+            this.Top -= _verticalOffset;
+            e.Handled = true;
+            break;
+        }
+      }
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Event Handlers
+
+    void ChildWindow_IsVisibleChanged( object sender, DependencyPropertyChangedEventArgs e )
+    {
+      if( ( bool )e.NewValue )
+        Focus();
+    }
+
+    void HeaderLeftMouseButtonDown( object sender, MouseButtonEventArgs e )
+    {
+      e.Handled = true;
+      Focus();
+      _dragWidget.CaptureMouse();
+      _isMouseCaptured = true;
+      _clickPoint = e.GetPosition( null ); //save off the mouse position
+      _oldPosition = new Point( Left, Top ); //save off our original window position
+    }
+
+    private void HeaderMouseLeftButtonUp( object sender, MouseButtonEventArgs e )
+    {
+      e.Handled = true;
+      _dragWidget.ReleaseMouseCapture();
+      _isMouseCaptured = false;
+    }
+
+    private void HeaderMouseMove( MouseEventArgs e )
+    {
+      if( _isMouseCaptured && Visibility == Visibility.Visible )
+      {
+        Point currentPosition = e.GetPosition( null ); //our current mouse position
+
+        Left = _oldPosition.X + ( currentPosition.X - _clickPoint.X );
+        Top = _oldPosition.Y + ( currentPosition.Y - _clickPoint.Y );
+
+        //this helps keep our mouse position in sync with the drag widget position
+        Point dragWidgetPosition = e.GetPosition( _dragWidget );
+        if( dragWidgetPosition.X < 0 || dragWidgetPosition.X > _dragWidget.ActualWidth || dragWidgetPosition.Y < 0 || dragWidgetPosition.Y > _dragWidget.ActualHeight )
+        {
+          return;
+        }
+
+        _oldPosition = new Point( Left, Top );
+        _clickPoint = e.GetPosition( Window.GetWindow( this ) ); //store the point where we are relative to the window
+      }
+    }
+
+    private void ParentContainer_LayoutUpdated( object sender, EventArgs e )
+    {
+      if( DesignerProperties.GetIsInDesignMode( this ) )
+        return;
+
+      //we only want to set the start position if this is the first time the control has bee initialized
+      if( !_startupPositionInitialized )
+      {
+        ExecuteOpen();
+        _startupPositionInitialized = true;
+      }
+    }
+
+    void ParentContainer_SizeChanged( object sender, SizeChangedEventArgs e )
+    {
+      //resize our modal layer
+      _modalLayer.Height = e.NewSize.Height;
+      _modalLayer.Width = e.NewSize.Width;
+
+      //reposition our window
+      Left = GetRestrictedLeft();
+      Top = GetRestrictedTop();
+    }
+
+    #endregion //Event Handlers
+
+    #region Methods
+
+    #region Private
+
+    private double GetRestrictedLeft()
+    {
+      if( Left < 0 )
+        return 0;
+
+      if( _parentContainer != null )
+      {
+        if( Left + WindowRoot.ActualWidth > _parentContainer.ActualWidth && _parentContainer.ActualWidth != 0 )
+        {
+          double left = _parentContainer.ActualWidth - WindowRoot.ActualWidth;
+          return left < 0 ? 0 : left;
+        }
+      }
+
+      return Left;
+    }
+
+    private double GetRestrictedTop()
+    {
+      if( Top < 0 )
+        return 0;
+
+      if( _parentContainer != null )
+      {
+        if( Top + WindowRoot.ActualHeight > _parentContainer.ActualHeight && _parentContainer.ActualHeight != 0 )
+        {
+          double top = _parentContainer.ActualHeight - WindowRoot.ActualHeight;
+          return top < 0 ? 0 : top;
+        }
+      }
+
+      return Top;
+    }
+
+    private void SetWindowState( WindowState state )
+    {
+      switch( state )
+      {
+        case WindowState.Closed:
+          {
+            ExecuteClose();
+            break;
+          }
+        case WindowState.Open:
+          {
+            ExecuteOpen();
+            break;
+          }
+      }
+    }
+
+    private void ExecuteClose()
+    {
+      CancelEventArgs e = new CancelEventArgs();
+      OnClosing( e );
+
+      if( !e.Cancel )
+      {
+        if( !_dialogResult.HasValue )
+          _dialogResult = false;
+
+        OnClosed( EventArgs.Empty );
+      }
+      else
+      {
+        CancelClose();
+      }
+    }
+
+    private void CancelClose()
+    {
+      _dialogResult = null; //when the close is cancelled, DialogResult should be null
+
+      _ignorePropertyChanged = true;
+      WindowState = WindowState.Open; //now reset the window state to open because the close was cancelled
+      _ignorePropertyChanged = false;
+    }
+
+    private void ExecuteOpen()
+    {
+      _dialogResult = null; //reset the dialogResult to null each time the window is opened
+
+      if( WindowStartupLocation == Xceed.Wpf.Toolkit.WindowStartupLocation.Center )
+        CenterChildWindow();
+
+      BringToFront();
+    }
+
+    private void BringToFront()
+    {
+      int index = 0;
+
+      if( _parentContainer != null )
+        index = ( int )_parentContainer.GetValue( Canvas.ZIndexProperty );
+
+      SetValue( Canvas.ZIndexProperty, ++index );
+
+      if( IsModal )
+        Canvas.SetZIndex( _modalLayerPanel, index - 2 );
+    }
+
+    private void CenterChildWindow()
+    {
+      if( _parentContainer != null )
+      {
+        Left = ( _parentContainer.ActualWidth - WindowRoot.ActualWidth ) / 2.0;
+        Top = ( _parentContainer.ActualHeight - WindowRoot.ActualHeight ) / 2.0;
+      }
+    }
+
+    private void ShowModalLayer()
+    {
+      if( !DesignerProperties.GetIsInDesignMode( this ) )
+      {
+        if( !_modalLayerPanel.Children.Contains( _modalLayer ) )
+          _modalLayerPanel.Children.Add( _modalLayer );
+
+        _modalLayer.Visibility = System.Windows.Visibility.Visible;
+      }
+    }
+
+    private void HideModalLayer()
+    {
+      _modalLayer.Visibility = System.Windows.Visibility.Collapsed;
+    }
+
+    private void ProcessMove( double x, double y )
+    {
+      _moveTransform.X += x;
+      _moveTransform.Y += y;
+
+      InvalidateArrange();
+    }
+
+    #endregion //Private
+
+    #region Public
+
+    public void Show()
+    {
+      WindowState = WindowState.Open;
+    }
+
+    public void Close()
+    {
+      WindowState = WindowState.Closed;
+    }
+
+    #endregion //Public
+
+    #endregion //Methods
+
+    #region Events
+
+    /// <summary>
+    /// Occurs when the ChildWindow is closed.
+    /// </summary>
+    public event EventHandler Closed;
+    protected virtual void OnClosed( EventArgs e )
+    {
+      if( Closed != null )
+        Closed( this, e );
+    }
+
+    /// <summary>
+    /// Occurs when the ChildWindow is closing.
+    /// </summary>
+    public event EventHandler<CancelEventArgs> Closing;
+    protected virtual void OnClosing( CancelEventArgs e )
+    {
+      if( Closing != null )
+        Closing( this, e );
+    }
+
+    #endregion //Events
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ChildWindow/Implementation/WindowStartupLocation.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ChildWindow/Implementation/WindowStartupLocation.cs
new file mode 100644
index 00000000..eb5e3261
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ChildWindow/Implementation/WindowStartupLocation.cs
@@ -0,0 +1,27 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit
+{
+  public enum WindowStartupLocation
+  {
+    Center,
+    Manual
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ChildWindow/Implementation/WindowState.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ChildWindow/Implementation/WindowState.cs
new file mode 100644
index 00000000..f9f8f0d5
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ChildWindow/Implementation/WindowState.cs
@@ -0,0 +1,27 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit
+{
+  public enum WindowState
+  {
+    Closed,
+    Open
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ChildWindow/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ChildWindow/Themes/Generic.xaml
new file mode 100644
index 00000000..3208ade1
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ChildWindow/Themes/Generic.xaml
@@ -0,0 +1,240 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
+
+   <LinearGradientBrush x:Key="WindowDarkBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="WindowBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="0.479" Color="#FFf4f5f6" />
+            <GradientStop Offset="1" Color="#FFd0d6db" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="WindowButtonHoverBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFb5bdc8" />
+            <GradientStop Offset="0.370" Color="#FF8399a9" />
+            <GradientStop Offset="0.370" Color="#FF718597" />
+            <GradientStop Offset="0.906" Color="#FFb9c1ca" />
+            <GradientStop Offset="1" Color="#FFb9c1ca" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="WindowButtonPressedBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FF6b7c8d" />
+            <GradientStop Offset="0.370" Color="#FF4d606f" />
+            <GradientStop Offset="0.370" Color="#FF465460" />
+            <GradientStop Offset="0.906" Color="#FF262d33" />
+            <GradientStop Offset="1" Color="#FF262d33" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <Style x:Key="WindowCloseButtonStyle" TargetType="Button">
+      <Setter Property="Foreground" Value="#FF000000" />
+      <Setter Property="Padding" Value="3" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="Button">
+               <Grid>
+                  <VisualStateManager.VisualStateGroups>
+                     <VisualStateGroup x:Name="CommonStates">
+                        <VisualState x:Name="Normal" />
+                        <VisualState x:Name="MouseOver">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonHoverBrush}" />
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Pressed">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonPressedBrush}" />
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                     </VisualStateGroup>
+                  </VisualStateManager.VisualStateGroups>
+                  <Border x:Name="Background" CornerRadius="0,0,2,0" Background="{StaticResource WindowDarkBrush}">
+                     <Border Margin="1,0,1,1" BorderBrush="#59FFFFFF" BorderThickness="1" CornerRadius="0,0,1,0" />
+                  </Border>
+                  <ContentPresenter x:Name="contentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
+                  <Path x:Name="path"
+								Height="6"
+								Width="7"
+								Stretch="Fill"
+								Opacity="1"
+								Data="M 2,6 C2,6 3,6 3,6 3,6 3,5 3,5 3,5 4,5 4,5 4,5 4,6 4,6 4,6 5,6 5,6 5,6 7,6 7,6 7,6 7,5 7,5 7,5 6,5 6,5 6,5 6,4 6,4 6,4 5,4 5,4 5,4 5,2 5,2 5,2 6,2 6,2 6,2 6,1 6,1 6,1 7,1 7,1 7,1 7,0 7,0 7,0 5,0 5,0 5,0 4,0 4,0 4,0 4,1 4,1 4,1 3,1 3,1 3,1 3,0 3,0 3,0 2,0 2,0 2,0 0,0 0,0 0,0 0,1 0,1 0,1 1,1 1,1 1,1 1,2 1,2 1,2 2,2 2,2 2,2 2,4 2,4 2,4 1,4 1,4 1,4 1,5 1,5 1,5 0,5 0,5 0,5 0,6 0,6 0,6 2,6 2,6 z"
+								Fill="White"
+                        Margin="0,0,0,1"
+                        Visibility="Collapsed" />
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <!-- =============================================================================== -->
+   <!-- ChildWindow                                                                      -->
+   <!-- =============================================================================== -->
+
+   <SolidColorBrush x:Key="ChildWindowMainBrushColor" Color="#FF3C688D" />
+   <LinearGradientBrush x:Key="BorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#7FFFFFFF" Offset="0.05" />
+      <GradientStop Color="#B2FFFFFF" Offset="0.07" />
+      <GradientStop Color="#00FFFFFF" Offset="1" />
+   </LinearGradientBrush>
+
+   <Style TargetType="{x:Type local:ChildWindow}">
+      <Setter Property="Background" Value="#FFFFFFFF" />
+      <Setter Property="BorderBrush" Value="{StaticResource WindowDarkBrush}" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="CaptionForeground" Value="#FF000000" />
+      <Setter Property="CloseButtonStyle" Value="{StaticResource WindowCloseButtonStyle}" />
+      <Setter Property="HorizontalAlignment" Value="Left" />
+      <Setter Property="HorizontalContentAlignment" Value="Left" />
+      <Setter Property="IsTabStop" Value="False" />
+      <Setter Property="VerticalAlignment" Value="Top" />
+      <Setter Property="VerticalContentAlignment" Value="Top" />
+      <Setter Property="WindowBorderBrush" Value="{StaticResource WindowDarkBrush}" />
+      <Setter Property="WindowBackground" Value="{StaticResource WindowBackgroundBrush}" />
+      <Setter Property="WindowOpacity" Value="1.0" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:ChildWindow}">
+               <Grid x:Name="PART_Root">
+                  <Grid.Resources>
+                     <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+                     <Style x:Key="FocusVisualStyle" TargetType="Control">
+                        <Setter Property="BorderBrush" Value="Black" />
+                        <Setter Property="Background" Value="Transparent" />
+                        <Setter Property="Margin" Value="-1" />
+                        <Setter Property="Template">
+                           <Setter.Value>
+                              <ControlTemplate>
+                                 <Rectangle Stroke="{TemplateBinding BorderBrush}" Fill="{TemplateBinding Background}" Margin="{TemplateBinding Margin}" StrokeDashArray="4 3" StrokeThickness="0.5">
+                                    <Rectangle.RenderTransform>
+                                       <TranslateTransform X="{Binding Left}" Y="{Binding Top}" />
+                                    </Rectangle.RenderTransform>
+                                 </Rectangle>
+                              </ControlTemplate>
+                           </Setter.Value>
+                        </Setter>
+                     </Style>
+                  </Grid.Resources>
+
+                  <Grid x:Name="PART_WindowRoot" HorizontalAlignment="Left" VerticalAlignment="Top" MinWidth="{TemplateBinding MinWidth}" MinHeight="{TemplateBinding MinHeight}" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
+                     <Grid.RenderTransform>
+                        <TransformGroup>
+                           <ScaleTransform />
+                           <SkewTransform />
+                           <RotateTransform />
+                           <TranslateTransform />
+                        </TransformGroup>
+                     </Grid.RenderTransform>
+
+                     <!-- Borders -->
+                     <Grid  x:Name="WindowGrid">
+                        <Border BorderBrush="{TemplateBinding WindowBorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="5,5,0,0" Opacity="{TemplateBinding WindowOpacity}" />
+                        <Grid Margin="0" Background="{x:Null}">
+                           <Border x:Name="WindowBorder" Margin="1,1,1,1" Background="{TemplateBinding WindowBackground}" CornerRadius="4,4,0,0" Opacity="{TemplateBinding WindowOpacity}" />
+                           <Border BorderBrush="White" BorderThickness="1" CornerRadius="4,4,0,0" Margin="1" Opacity="0.7" />
+                        </Grid>
+                     </Grid>
+
+                     <Grid>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="Auto" MinHeight="26" />
+                           <RowDefinition />
+                        </Grid.RowDefinitions>
+
+                        <!-- Content Border -->
+                        <Grid Margin="6,0,6,6" x:Name="ContentGrid" Grid.Row="1">
+                           <Grid.RowDefinitions>
+                              <RowDefinition />
+                              <RowDefinition Height="Auto" />
+                           </Grid.RowDefinitions>
+                           <Border BorderBrush="#FFFFFFFF" BorderThickness="1" CornerRadius="1" />
+                           <Border Margin="1"  BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="0.1" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}">
+                              <ContentPresenter x:Name="Content"
+                                                Content="{TemplateBinding Content}" 
+                                                ContentTemplate="{TemplateBinding ContentTemplate}" />
+                           </Border>
+                        </Grid>
+
+                        <!-- Header -->
+                        <Border x:Name="PART_DragWidget" Background="Transparent" Grid.Column="1" CornerRadius="5,5,0,0" Margin="1,1,1,0">
+                           <Grid>
+                              <Grid x:Name="CaptionHeader" Margin="1,1,105,0" VerticalAlignment="Center">
+                                 <!-- Caption -->
+                                 <ContentControl x:Name="Caption"
+                                                 Margin="5,0,0,0"
+                                                 IsTabStop="False"
+                                                 HorizontalAlignment="Stretch"
+                                                 Content="{TemplateBinding Caption}"
+                                                 Foreground="{TemplateBinding CaptionForeground}" />
+                              </Grid>
+                           </Grid>
+                        </Border>
+                     </Grid>
+
+                     <!-- Buttons -->
+                     <Border BorderBrush="#A5FFFFFF" BorderThickness="1,0,1,1" CornerRadius="0,0,3,3" VerticalAlignment="Top" Margin="0,1,7,0" HorizontalAlignment="Right">
+                        <Button x:Name="PART_CloseButton" Style="{TemplateBinding CloseButtonStyle}" Visibility="{TemplateBinding CloseButtonVisibility}" Height="17" Width="43" IsTabStop="False">
+                           <Path Height="10"
+                                 HorizontalAlignment="Center"
+                                 VerticalAlignment="Center"
+                                 Width="12"
+                                 Fill="#E4FFFFFF"
+                                 Stretch="Fill"
+                                 Stroke="#FF535666" 
+                                 Data="M0.5,0.5 L4.5178828,0.5 L6.0620003,3.125 L7.4936447,0.5 L11.5,0.5 L11.5,1.5476431 L8.7425003,6.1201854 L11.5,10.359666 L11.5,11.5 L7.4941902,11.5 L6.0620003,8.8740005 L4.5172949,11.5 L0.5,11.5 L0.5,10.43379 L3.3059995,6.1201582 L0.5,1.4676378 L0.5,0.5 z" />
+                        </Button>
+                     </Border>
+                  </Grid>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="WindowState" Value="Closed">
+                     <Setter Property="Visibility" Value="Collapsed" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Chromes/Implementation/ButtonChrome.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Chromes/Implementation/ButtonChrome.cs
new file mode 100644
index 00000000..a8ab8c26
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Chromes/Implementation/ButtonChrome.cs
@@ -0,0 +1,275 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Xceed.Wpf.Toolkit.Chromes
+{
+  public class ButtonChrome : ContentControl
+  {
+    #region CornerRadius
+
+    public static readonly DependencyProperty CornerRadiusProperty = DependencyProperty.Register( "CornerRadius", typeof( CornerRadius ), typeof( ButtonChrome ), new UIPropertyMetadata( default( CornerRadius ), new PropertyChangedCallback( OnCornerRadiusChanged ) ) );
+    public CornerRadius CornerRadius
+    {
+      get
+      {
+        return ( CornerRadius )GetValue( CornerRadiusProperty );
+      }
+      set
+      {
+        SetValue( CornerRadiusProperty, value );
+      }
+    }
+
+    private static void OnCornerRadiusChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ButtonChrome buttonChrome = o as ButtonChrome;
+      if( buttonChrome != null )
+        buttonChrome.OnCornerRadiusChanged( ( CornerRadius )e.OldValue, ( CornerRadius )e.NewValue );
+    }
+
+    protected virtual void OnCornerRadiusChanged( CornerRadius oldValue, CornerRadius newValue )
+    {
+      //we always want the InnerBorderRadius to be one less than the CornerRadius
+      CornerRadius newInnerCornerRadius = new CornerRadius( Math.Max( 0, newValue.TopLeft - 1 ),
+                                                           Math.Max( 0, newValue.TopRight - 1 ),
+                                                           Math.Max( 0, newValue.BottomRight - 1 ),
+                                                           Math.Max( 0, newValue.BottomLeft - 1 ) );
+
+      InnerCornerRadius = newInnerCornerRadius;
+    }
+
+    #endregion //CornerRadius
+
+    #region InnerCornerRadius
+
+    public static readonly DependencyProperty InnerCornerRadiusProperty = DependencyProperty.Register( "InnerCornerRadius", typeof( CornerRadius ), typeof( ButtonChrome ), new UIPropertyMetadata( default( CornerRadius ), new PropertyChangedCallback( OnInnerCornerRadiusChanged ) ) );
+    public CornerRadius InnerCornerRadius
+    {
+      get
+      {
+        return ( CornerRadius )GetValue( InnerCornerRadiusProperty );
+      }
+      set
+      {
+        SetValue( InnerCornerRadiusProperty, value );
+      }
+    }
+
+    private static void OnInnerCornerRadiusChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ButtonChrome buttonChrome = o as ButtonChrome;
+      if( buttonChrome != null )
+        buttonChrome.OnInnerCornerRadiusChanged( ( CornerRadius )e.OldValue, ( CornerRadius )e.NewValue );
+    }
+
+    protected virtual void OnInnerCornerRadiusChanged( CornerRadius oldValue, CornerRadius newValue )
+    {
+      // TODO: Add your property changed side-effects. Descendants can override as well.
+    }
+
+    #endregion //InnerCornerRadius
+
+    #region RenderChecked
+
+    public static readonly DependencyProperty RenderCheckedProperty = DependencyProperty.Register( "RenderChecked", typeof( bool ), typeof( ButtonChrome ), new UIPropertyMetadata( false, OnRenderCheckedChanged ) );
+    public bool RenderChecked
+    {
+      get
+      {
+        return ( bool )GetValue( RenderCheckedProperty );
+      }
+      set
+      {
+        SetValue( RenderCheckedProperty, value );
+      }
+    }
+
+    private static void OnRenderCheckedChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ButtonChrome buttonChrome = o as ButtonChrome;
+      if( buttonChrome != null )
+        buttonChrome.OnRenderCheckedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnRenderCheckedChanged( bool oldValue, bool newValue )
+    {
+      // TODO: Add your property changed side-effects. Descendants can override as well.
+    }
+
+    #endregion //RenderChecked
+
+    #region RenderEnabled
+
+    public static readonly DependencyProperty RenderEnabledProperty = DependencyProperty.Register( "RenderEnabled", typeof( bool ), typeof( ButtonChrome ), new UIPropertyMetadata( true, OnRenderEnabledChanged ) );
+    public bool RenderEnabled
+    {
+      get
+      {
+        return ( bool )GetValue( RenderEnabledProperty );
+      }
+      set
+      {
+        SetValue( RenderEnabledProperty, value );
+      }
+    }
+
+    private static void OnRenderEnabledChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ButtonChrome buttonChrome = o as ButtonChrome;
+      if( buttonChrome != null )
+        buttonChrome.OnRenderEnabledChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnRenderEnabledChanged( bool oldValue, bool newValue )
+    {
+      // TODO: Add your property changed side-effects. Descendants can override as well.
+    }
+
+    #endregion //RenderEnabled
+
+    #region RenderFocused
+
+    public static readonly DependencyProperty RenderFocusedProperty = DependencyProperty.Register( "RenderFocused", typeof( bool ), typeof( ButtonChrome ), new UIPropertyMetadata( false, OnRenderFocusedChanged ) );
+    public bool RenderFocused
+    {
+      get
+      {
+        return ( bool )GetValue( RenderFocusedProperty );
+      }
+      set
+      {
+        SetValue( RenderFocusedProperty, value );
+      }
+    }
+
+    private static void OnRenderFocusedChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ButtonChrome buttonChrome = o as ButtonChrome;
+      if( buttonChrome != null )
+        buttonChrome.OnRenderFocusedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnRenderFocusedChanged( bool oldValue, bool newValue )
+    {
+      // TODO: Add your property changed side-effects. Descendants can override as well.
+    }
+
+    #endregion //RenderFocused
+
+    #region RenderMouseOver
+
+    public static readonly DependencyProperty RenderMouseOverProperty = DependencyProperty.Register( "RenderMouseOver", typeof( bool ), typeof( ButtonChrome ), new UIPropertyMetadata( false, OnRenderMouseOverChanged ) );
+    public bool RenderMouseOver
+    {
+      get
+      {
+        return ( bool )GetValue( RenderMouseOverProperty );
+      }
+      set
+      {
+        SetValue( RenderMouseOverProperty, value );
+      }
+    }
+
+    private static void OnRenderMouseOverChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ButtonChrome buttonChrome = o as ButtonChrome;
+      if( buttonChrome != null )
+        buttonChrome.OnRenderMouseOverChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnRenderMouseOverChanged( bool oldValue, bool newValue )
+    {
+      // TODO: Add your property changed side-effects. Descendants can override as well.
+    }
+
+    #endregion //RenderMouseOver
+
+    #region RenderNormal
+
+    public static readonly DependencyProperty RenderNormalProperty = DependencyProperty.Register( "RenderNormal", typeof( bool ), typeof( ButtonChrome ), new UIPropertyMetadata( true, OnRenderNormalChanged ) );
+    public bool RenderNormal
+    {
+      get
+      {
+        return ( bool )GetValue( RenderNormalProperty );
+      }
+      set
+      {
+        SetValue( RenderNormalProperty, value );
+      }
+    }
+
+    private static void OnRenderNormalChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ButtonChrome buttonChrome = o as ButtonChrome;
+      if( buttonChrome != null )
+        buttonChrome.OnRenderNormalChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnRenderNormalChanged( bool oldValue, bool newValue )
+    {
+      // TODO: Add your property changed side-effects. Descendants can override as well.
+    }
+
+    #endregion //RenderNormal
+
+    #region RenderPressed
+
+    public static readonly DependencyProperty RenderPressedProperty = DependencyProperty.Register( "RenderPressed", typeof( bool ), typeof( ButtonChrome ), new UIPropertyMetadata( false, OnRenderPressedChanged ) );
+    public bool RenderPressed
+    {
+      get
+      {
+        return ( bool )GetValue( RenderPressedProperty );
+      }
+      set
+      {
+        SetValue( RenderPressedProperty, value );
+      }
+    }
+
+    private static void OnRenderPressedChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ButtonChrome buttonChrome = o as ButtonChrome;
+      if( buttonChrome != null )
+        buttonChrome.OnRenderPressedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnRenderPressedChanged( bool oldValue, bool newValue )
+    {
+      // TODO: Add your property changed side-effects. Descendants can override as well.
+    }
+
+    #endregion //RenderPressed
+
+    #region Contsructors
+
+    static ButtonChrome()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( ButtonChrome ), new FrameworkPropertyMetadata( typeof( ButtonChrome ) ) );
+    }
+
+    #endregion //Contsructors
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Chromes/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Chromes/Themes/Generic.xaml
new file mode 100644
index 00000000..24d7d2b0
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Chromes/Themes/Generic.xaml
@@ -0,0 +1,231 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes">
+
+   <!-- =============================================================================== -->
+   <!-- ButtonChrome                                                                    -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type chrome:ButtonChrome}">
+      <Setter Property="IsTabStop" Value="False" />
+      <Setter Property="SnapsToDevicePixels" Value="True" />
+      <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+      <Setter Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}}" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type chrome:ButtonChrome}">
+               <Grid>
+
+                  <Border x:Name="OuterBorder" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
+                     <Border x:Name="InnerBorder" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding InnerCornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalInnerBorderKey}}" />
+                  </Border>
+
+                  <Border x:Name="MouseOverVisual" Opacity="0" Visibility="Collapsed" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}}" Background="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}}">
+                     <Border x:Name="MouseOverInnerVisual" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding InnerCornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverInnerBorderKey}}" />
+                  </Border>
+                  <Border x:Name="PressedVisual" Opacity="0" Visibility="Collapsed" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}}" Background="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}}">
+                     <Border x:Name="PressedInnerVisual" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding InnerCornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedInnerBorderKey}}" />
+                  </Border>
+
+                  <Border x:Name="FocusVisual" Opacity="0" Visibility="Collapsed" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonFocusedOuterBorderKey}}" Background="{DynamicResource {x:Static themes:ResourceKeys.ButtonFocusedBackgroundKey}}">
+                     <Border x:Name="FocusInnerVisual" BorderThickness="1" CornerRadius="{TemplateBinding InnerCornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonFocusedInnerBorderKey}}" />
+                  </Border>
+
+                  <ContentPresenter Margin="{TemplateBinding Padding}"
+										      IsEnabled="{TemplateBinding IsEnabled}"
+										      Content="{TemplateBinding Content}"
+										      ContentStringFormat="{TemplateBinding ContentStringFormat}"
+										      ContentTemplate="{TemplateBinding ContentTemplate}"
+										      ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
+
+               </Grid>
+               <ControlTemplate.Triggers>
+
+                  <!-- If button is disabled, not checked, and is rendered normal -->
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="RenderEnabled" Value="False" />
+                        <Condition Property="RenderChecked" Value="False" />
+                     </MultiTrigger.Conditions>
+                     <Setter TargetName="OuterBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonDisabledOuterBorderKey}}" />
+                     <Setter TargetName="InnerBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonInnerBorderDisabledKey}}" />
+                     <Setter TargetName="OuterBorder" Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}}" />
+                  </MultiTrigger>
+
+                  <!-- if button is enabled and pressed -->
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="RenderEnabled" Value="True" />
+                        <Condition Property="RenderPressed" Value="True" />
+                     </MultiTrigger.Conditions>
+                     <MultiTrigger.EnterActions>
+                        <BeginStoryboard>
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PressedVisual" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PressedVisual" Storyboard.TargetProperty="Opacity">
+                                 <LinearDoubleKeyFrame KeyTime="00:00:00.050" Value="1" />
+                              </DoubleAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </BeginStoryboard>
+                     </MultiTrigger.EnterActions>
+                     <MultiTrigger.ExitActions>
+                        <BeginStoryboard>
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PressedVisual" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00.115">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Collapsed</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PressedVisual" Storyboard.TargetProperty="Opacity">
+                                 <LinearDoubleKeyFrame KeyTime="00:00:00.115" Value="0" />
+                              </DoubleAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </BeginStoryboard>
+                     </MultiTrigger.ExitActions>
+                  </MultiTrigger>
+
+                  <!-- if button is enabled, is not checked, the mouse is over, and not pressed -->
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="RenderEnabled" Value="True" />
+                        <Condition Property="RenderChecked" Value="False" />
+                        <Condition Property="RenderMouseOver" Value="True" />
+                        <Condition Property="RenderPressed" Value="False" />
+                     </MultiTrigger.Conditions>
+                     <MultiTrigger.EnterActions>
+                        <BeginStoryboard>
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MouseOverVisual" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <DoubleAnimationUsingKeyFrames Storyboard.TargetName="MouseOverVisual" Storyboard.TargetProperty="Opacity">
+                                 <LinearDoubleKeyFrame KeyTime="00:00:00.115" Value="1" />
+                              </DoubleAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </BeginStoryboard>
+                     </MultiTrigger.EnterActions>
+                     <MultiTrigger.ExitActions>
+                        <BeginStoryboard>
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MouseOverVisual" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00.150">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Collapsed</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <DoubleAnimationUsingKeyFrames Storyboard.TargetName="MouseOverVisual" Storyboard.TargetProperty="Opacity">
+                                 <LinearDoubleKeyFrame KeyTime="00:00:00.150" Value="0" />
+                              </DoubleAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </BeginStoryboard>
+                     </MultiTrigger.ExitActions>
+                  </MultiTrigger>
+
+                  <!-- if button is enabled, checked, he mouse is not over, and it is not pressed -->
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="RenderEnabled" Value="True" />
+                        <Condition Property="RenderChecked" Value="True" />
+                        <Condition Property="RenderMouseOver" Value="False" />
+                        <Condition Property="RenderPressed" Value="False" />
+                     </MultiTrigger.Conditions>
+                     <Setter TargetName="OuterBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}}" />
+                     <Setter TargetName="InnerBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedInnerBorderKey}}" />
+                     <Setter TargetName="OuterBorder" Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}}" />
+                  </MultiTrigger>
+
+                  <!-- if button is focused, is enabled, not pressed, and the mouse is not over -->
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="RenderFocused" Value="True" />
+                        <Condition Property="RenderEnabled" Value="True" />
+                        <Condition Property="RenderPressed" Value="False" />
+                        <Condition Property="RenderMouseOver" Value="False" />
+                     </MultiTrigger.Conditions>
+                     <MultiTrigger.EnterActions>
+                        <BeginStoryboard>
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="FocusVisual" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <DoubleAnimationUsingKeyFrames Storyboard.TargetName="FocusVisual" Storyboard.TargetProperty="Opacity">
+                                 <LinearDoubleKeyFrame KeyTime="00:00:00.25" Value="1" />
+                              </DoubleAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </BeginStoryboard>
+                     </MultiTrigger.EnterActions>
+                     <MultiTrigger.ExitActions>
+                        <BeginStoryboard>
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="FocusVisual" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00.115">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Collapsed</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <DoubleAnimationUsingKeyFrames Storyboard.TargetName="FocusVisual" Storyboard.TargetProperty="Opacity">
+                                 <LinearDoubleKeyFrame KeyTime="00:00:00.115" Value="0" />
+                              </DoubleAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </BeginStoryboard>
+                     </MultiTrigger.ExitActions>
+                  </MultiTrigger>
+
+                  <!-- if not rendered normally -->
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="RenderNormal" Value="False" />
+                        <Condition Property="RenderChecked" Value="False" />
+                     </MultiTrigger.Conditions>
+                     <Setter TargetName="OuterBorder" Property="BorderBrush" Value="Transparent" />
+                     <Setter TargetName="InnerBorder" Property="BorderBrush" Value="{x:Null}" />
+                     <Setter TargetName="OuterBorder" Property="Background" Value="Transparent" />
+                  </MultiTrigger>
+
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Images/Delete16.png b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Images/Delete16.png
new file mode 100644
index 00000000..dee2496a
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Images/Delete16.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Implementation/CollectionEditor.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Implementation/CollectionEditor.cs
new file mode 100644
index 00000000..8693a5ea
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Implementation/CollectionEditor.cs
@@ -0,0 +1,290 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Reflection;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class CollectionEditor : Control
+  {
+    #region Properties
+
+    public static readonly DependencyProperty ItemsProperty = DependencyProperty.Register( "Items", typeof( ObservableCollection<object> ), typeof( CollectionEditor ), new UIPropertyMetadata( null ) );
+    public ObservableCollection<object> Items
+    {
+      get
+      {
+        return ( ObservableCollection<object> )GetValue( ItemsProperty );
+      }
+      set
+      {
+        SetValue( ItemsProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty ItemsSourceProperty = DependencyProperty.Register( "ItemsSource", typeof( IList ), typeof( CollectionEditor ), new UIPropertyMetadata( null, OnItemsSourceChanged ) );
+    public IList ItemsSource
+    {
+      get
+      {
+        return ( IList )GetValue( ItemsSourceProperty );
+      }
+      set
+      {
+        SetValue( ItemsSourceProperty, value );
+      }
+    }
+
+    private static void OnItemsSourceChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      CollectionEditor collectionEditor = ( CollectionEditor )d;
+      if( collectionEditor != null )
+        collectionEditor.OnItemSourceChanged( ( IList )e.OldValue, ( IList )e.NewValue );
+    }
+
+    public void OnItemSourceChanged( IList oldValue, IList newValue )
+    {
+      if( newValue != null )
+      {
+        foreach( var item in newValue )
+          Items.Add( CreateClone( item ) );
+      }
+    }
+
+    public static readonly DependencyProperty ItemsSourceTypeProperty = DependencyProperty.Register( "ItemsSourceType", typeof( Type ), typeof( CollectionEditor ), new UIPropertyMetadata( null, new PropertyChangedCallback( ItemsSourceTypeChanged ) ) );
+    public Type ItemsSourceType
+    {
+      get
+      {
+        return ( Type )GetValue( ItemsSourceTypeProperty );
+      }
+      set
+      {
+        SetValue( ItemsSourceTypeProperty, value );
+      }
+    }
+
+    private static void ItemsSourceTypeChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      CollectionEditor collectionEditor = ( CollectionEditor )d;
+      if( collectionEditor != null )
+        collectionEditor.ItemsSourceTypeChanged( ( Type )e.OldValue, ( Type )e.NewValue );
+    }
+
+    protected virtual void ItemsSourceTypeChanged( Type oldValue, Type newValue )
+    {
+      List<Type> types = new List<Type>();
+      Type listType = GetListItemType( newValue );
+
+      if( listType != null )
+      {
+        types.Add( listType );
+      }
+
+      NewItemTypes = types;
+    }
+
+    public static readonly DependencyProperty NewItemTypesProperty = DependencyProperty.Register( "NewItemTypes", typeof( IList ), typeof( CollectionEditor ), new UIPropertyMetadata( null ) );
+    public IList<Type> NewItemTypes
+    {
+      get
+      {
+        return ( IList<Type> )GetValue( NewItemTypesProperty );
+      }
+      set
+      {
+        SetValue( NewItemTypesProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty SelectedItemProperty = DependencyProperty.Register( "SelectedItem", typeof( object ), typeof( CollectionEditor ), new UIPropertyMetadata( null ) );
+    public object SelectedItem
+    {
+      get
+      {
+        return ( object )GetValue( SelectedItemProperty );
+      }
+      set
+      {
+        SetValue( SelectedItemProperty, value );
+      }
+    }
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static CollectionEditor()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( CollectionEditor ), new FrameworkPropertyMetadata( typeof( CollectionEditor ) ) );
+    }
+
+    public CollectionEditor()
+    {
+      Items = new ObservableCollection<object>();
+      CommandBindings.Add( new CommandBinding( ApplicationCommands.New, AddNew, CanAddNew ) );
+      CommandBindings.Add( new CommandBinding( ApplicationCommands.Delete, Delete, CanDelete ) );
+      CommandBindings.Add( new CommandBinding( ComponentCommands.MoveDown, MoveDown, CanMoveDown ) );
+      CommandBindings.Add( new CommandBinding( ComponentCommands.MoveUp, MoveUp, CanMoveUp ) );
+    }
+
+    #endregion //Constructors
+
+    #region Commands
+
+    private void AddNew( object sender, ExecutedRoutedEventArgs e )
+    {
+      var newItem = CreateNewItem( ( Type )e.Parameter );
+      Items.Add( newItem );
+      SelectedItem = newItem;
+    }
+
+    private void CanAddNew( object sender, CanExecuteRoutedEventArgs e )
+    {
+      Type t = e.Parameter as Type;
+      if( t != null && t.GetConstructor( Type.EmptyTypes ) != null )
+        e.CanExecute = true;
+    }
+
+    private void Delete( object sender, ExecutedRoutedEventArgs e )
+    {
+      Items.Remove( e.Parameter );
+    }
+
+    private void CanDelete( object sender, CanExecuteRoutedEventArgs e )
+    {
+      e.CanExecute = e.Parameter != null;
+    }
+
+    private void MoveDown( object sender, ExecutedRoutedEventArgs e )
+    {
+      var selectedItem = e.Parameter;
+      var index = Items.IndexOf( selectedItem );
+      Items.RemoveAt( index );
+      Items.Insert( ++index, selectedItem );
+      SelectedItem = selectedItem;
+    }
+
+    private void CanMoveDown( object sender, CanExecuteRoutedEventArgs e )
+    {
+      if( e.Parameter != null && Items.IndexOf( e.Parameter ) < ( Items.Count - 1 ) )
+        e.CanExecute = true;
+    }
+
+    private void MoveUp( object sender, ExecutedRoutedEventArgs e )
+    {
+      var selectedItem = e.Parameter;
+      var index = Items.IndexOf( selectedItem );
+      Items.RemoveAt( index );
+      Items.Insert( --index, selectedItem );
+      SelectedItem = selectedItem;
+    }
+
+    private void CanMoveUp( object sender, CanExecuteRoutedEventArgs e )
+    {
+      if( e.Parameter != null && Items.IndexOf( e.Parameter ) > 0 )
+        e.CanExecute = true;
+    }
+
+    #endregion //Commands
+
+    #region Methods
+
+    private static void CopyValues( object source, object destination )
+    {
+      FieldInfo[] myObjectFields = source.GetType().GetFields( BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance );
+      foreach( FieldInfo fi in myObjectFields )
+      {
+        fi.SetValue( destination, fi.GetValue( source ) );
+      }
+    }
+
+    private object CreateClone( object source )
+    {
+      object clone = null;
+
+      Type type = source.GetType();
+      clone = Activator.CreateInstance( type );
+      CopyValues( source, clone );
+
+      return clone;
+    }
+
+    private IList CreateItemsSource()
+    {
+      IList list = null;
+
+      if( ItemsSourceType != null )
+      {
+        ConstructorInfo constructor = ItemsSourceType.GetConstructor( Type.EmptyTypes );
+        list = ( IList )constructor.Invoke( null );
+      }
+
+      return list;
+    }
+
+    private object CreateNewItem( Type type )
+    {
+      return Activator.CreateInstance( type );
+    }
+
+    internal static Type GetListItemType(Type listType)
+    {
+      Type iListOfT = listType.GetInterfaces().FirstOrDefault(
+        ( i ) => i.IsGenericType && i.GetGenericTypeDefinition() == typeof( IList<> ) );
+
+      return ( iListOfT != null )
+        ? iListOfT.GetGenericArguments()[ 0 ]
+        : null;
+    }
+
+    public void PersistChanges()
+    {
+      IList list = ResolveItemsSource();
+      if( list == null )
+        return;
+
+      //the easiest way to persist changes to the source is to just clear the source list and then add all items to it.
+      list.Clear();
+
+      foreach( var item in Items )
+      {
+        list.Add( item );
+      }
+    }
+
+    private IList ResolveItemsSource()
+    {
+      if( ItemsSource == null )
+        ItemsSource = CreateItemsSource();
+
+      return ItemsSource;
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Implementation/CollectionEditorDialog.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Implementation/CollectionEditorDialog.xaml
new file mode 100644
index 00000000..496bbbe6
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Implementation/CollectionEditorDialog.xaml
@@ -0,0 +1,46 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<Window x:Class="Xceed.Wpf.Toolkit.CollectionEditorDialog"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+        Title="Collection Editor" 
+        Height="400" 
+        Width="600" 
+        WindowStartupLocation="CenterScreen">
+
+   <Grid Margin="10">
+      <Grid.RowDefinitions>
+         <RowDefinition Height="*" />
+         <RowDefinition Height="Auto" />
+      </Grid.RowDefinitions>
+
+      <local:CollectionEditor x:Name="_propertyGrid"
+                              ItemsSourceType="{Binding ItemsSourceType, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"
+                              ItemsSource="{Binding ItemsSource, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"
+                              NewItemTypes="{Binding NewItemTypes, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" />
+
+      <StackPanel Orientation="Horizontal" Grid.Row="1" HorizontalAlignment="Right" Margin="5">
+         <Button Width="75" Margin="2" Click="OkButton_Click" IsDefault="True">OK</Button>
+         <Button Width="75" Margin="2" IsCancel="True">Cancel</Button>
+      </StackPanel>
+
+   </Grid>
+</Window>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Implementation/CollectionEditorDialog.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Implementation/CollectionEditorDialog.xaml.cs
new file mode 100644
index 00000000..e73003dc
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Implementation/CollectionEditorDialog.xaml.cs
@@ -0,0 +1,100 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit
+{
+  /// <summary>
+  /// Interaction logic for CollectionEditorDialog.xaml
+  /// </summary>
+  public partial class CollectionEditorDialog : Window
+  {
+    #region Properties
+
+    public static readonly DependencyProperty ItemsSourceProperty = DependencyProperty.Register( "ItemsSource", typeof( IList ), typeof( CollectionEditorDialog ), new UIPropertyMetadata( null ) );
+    public IList ItemsSource
+    {
+      get
+      {
+        return ( IList )GetValue( ItemsSourceProperty );
+      }
+      set
+      {
+        SetValue( ItemsSourceProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty ItemsSourceTypeProperty = DependencyProperty.Register( "ItemsSourceType", typeof( Type ), typeof( CollectionEditorDialog ), new UIPropertyMetadata( null ) );
+    public Type ItemsSourceType
+    {
+      get
+      {
+        return ( Type )GetValue( ItemsSourceTypeProperty );
+      }
+      set
+      {
+        SetValue( ItemsSourceTypeProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty NewItemTypesProperty = DependencyProperty.Register( "NewItemTypes", typeof( IList ), typeof( CollectionEditorDialog ), new UIPropertyMetadata( null ) );
+    public IList<Type> NewItemTypes
+    {
+      get
+      {
+        return ( IList<Type> )GetValue( NewItemTypesProperty );
+      }
+      set
+      {
+        SetValue( NewItemTypesProperty, value );
+      }
+    }
+
+    #endregion //Properties
+
+    #region Constructors
+
+    public CollectionEditorDialog()
+    {
+      InitializeComponent();
+    }
+
+    public CollectionEditorDialog( Type type )
+      : this()
+    {
+      ItemsSourceType = type;
+    }
+
+    #endregion //Constructors
+
+    #region Event Handlers
+
+    private void OkButton_Click( object sender, RoutedEventArgs e )
+    {
+      _propertyGrid.PersistChanges();
+      Close();
+    }
+
+    #endregion //Event Hanlders
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Implementation/PrimitiveTypeCollectionEditor.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Implementation/PrimitiveTypeCollectionEditor.cs
new file mode 100644
index 00000000..b843784c
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Implementation/PrimitiveTypeCollectionEditor.cs
@@ -0,0 +1,272 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class PrimitiveTypeCollectionEditor : ContentControl
+  {
+    #region Members
+
+    bool _surpressTextChanged;
+    bool _conversionFailed;
+
+    #endregion //Members
+
+    #region Properties
+
+    #region IsOpen
+
+    public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register( "IsOpen", typeof( bool ), typeof( PrimitiveTypeCollectionEditor ), new UIPropertyMetadata( false, OnIsOpenChanged ) );
+    public bool IsOpen
+    {
+      get
+      {
+        return ( bool )GetValue( IsOpenProperty );
+      }
+      set
+      {
+        SetValue( IsOpenProperty, value );
+      }
+    }
+
+    private static void OnIsOpenChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PrimitiveTypeCollectionEditor primitiveTypeCollectionEditor = o as PrimitiveTypeCollectionEditor;
+      if( primitiveTypeCollectionEditor != null )
+        primitiveTypeCollectionEditor.OnIsOpenChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnIsOpenChanged( bool oldValue, bool newValue )
+    {
+
+    }
+
+    #endregion //IsOpen
+
+    #region ItemsSource
+
+    public static readonly DependencyProperty ItemsSourceProperty = DependencyProperty.Register( "ItemsSource", typeof( IList ), typeof( PrimitiveTypeCollectionEditor ), new UIPropertyMetadata( null, OnItemsSourceChanged ) );
+    public IList ItemsSource
+    {
+      get
+      {
+        return ( IList )GetValue( ItemsSourceProperty );
+      }
+      set
+      {
+        SetValue( ItemsSourceProperty, value );
+      }
+    }
+
+    private static void OnItemsSourceChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PrimitiveTypeCollectionEditor primitiveTypeCollectionEditor = o as PrimitiveTypeCollectionEditor;
+      if( primitiveTypeCollectionEditor != null )
+        primitiveTypeCollectionEditor.OnItemsSourceChanged( ( IList )e.OldValue, ( IList )e.NewValue );
+    }
+
+    protected virtual void OnItemsSourceChanged( IList oldValue, IList newValue )
+    {
+      if( newValue == null )
+        return;
+
+      if( ItemsSourceType == null )
+        ItemsSourceType = newValue.GetType();
+
+      if( ItemType == null )
+        ItemType = newValue.GetType().GetGenericArguments()[ 0 ];
+
+      if( newValue.Count > 0 )
+        SetText( newValue );
+    }
+
+    #endregion //ItemsSource
+
+    public static readonly DependencyProperty ItemsSourceTypeProperty = DependencyProperty.Register( "ItemsSourceType", typeof( Type ), typeof( PrimitiveTypeCollectionEditor ), new UIPropertyMetadata( null ) );
+    public Type ItemsSourceType
+    {
+      get
+      {
+        return ( Type )GetValue( ItemsSourceTypeProperty );
+      }
+      set
+      {
+        SetValue( ItemsSourceTypeProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty ItemTypeProperty = DependencyProperty.Register( "ItemType", typeof( Type ), typeof( PrimitiveTypeCollectionEditor ), new UIPropertyMetadata( null ) );
+    public Type ItemType
+    {
+      get
+      {
+        return ( Type )GetValue( ItemTypeProperty );
+      }
+      set
+      {
+        SetValue( ItemTypeProperty, value );
+      }
+    }
+
+    #region Text
+
+    public static readonly DependencyProperty TextProperty = DependencyProperty.Register( "Text", typeof( string ), typeof( PrimitiveTypeCollectionEditor ), new UIPropertyMetadata( null, OnTextChanged ) );
+    public string Text
+    {
+      get
+      {
+        return ( string )GetValue( TextProperty );
+      }
+      set
+      {
+        SetValue( TextProperty, value );
+      }
+    }
+
+    private static void OnTextChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PrimitiveTypeCollectionEditor primitiveTypeCollectionEditor = o as PrimitiveTypeCollectionEditor;
+      if( primitiveTypeCollectionEditor != null )
+        primitiveTypeCollectionEditor.OnTextChanged( ( string )e.OldValue, ( string )e.NewValue );
+    }
+
+    protected virtual void OnTextChanged( string oldValue, string newValue )
+    {
+      if( !_surpressTextChanged )
+        PersistChanges();
+    }
+
+    #endregion //Text
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static PrimitiveTypeCollectionEditor()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( PrimitiveTypeCollectionEditor ), new FrameworkPropertyMetadata( typeof( PrimitiveTypeCollectionEditor ) ) );
+    }
+
+    public PrimitiveTypeCollectionEditor()
+    {
+
+    }
+
+    #endregion //Constructors
+
+    #region Methods
+
+    private void PersistChanges()
+    {
+      IList list = ResolveItemsSource();
+      if( list == null )
+        return;
+
+      //the easiest way to persist changes to the source is to just clear the source list and then add all items to it.
+      list.Clear();
+
+      IList items = ResolveItems();
+      foreach( var item in items )
+      {
+        list.Add( item );
+      };
+
+      // if something went wrong during conversion we want to reload the text to show only valid entries
+      if( _conversionFailed )
+        SetText( list );
+    }
+
+    private IList ResolveItems()
+    {
+      IList items = new List<object>();
+
+      if( ItemType == null )
+        return items;
+
+      string[] textArray = Text.Split( '\n' );
+
+      foreach( string s in textArray )
+      {
+        string valueString = s.TrimEnd( '\r' );
+        if( !String.IsNullOrEmpty( valueString ) )
+        {
+          object value = null;
+          try
+          {
+            value = Convert.ChangeType( valueString, ItemType );
+          }
+          catch
+          {
+            //a conversion failed
+            _conversionFailed = true;
+          }
+
+          if( value != null )
+            items.Add( value );
+        }
+      }
+
+      return items;
+    }
+
+    private IList ResolveItemsSource()
+    {
+      if( ItemsSource == null )
+        ItemsSource = CreateItemsSource();
+
+      return ItemsSource;
+    }
+
+    private IList CreateItemsSource()
+    {
+      IList list = null;
+
+      if( ItemsSourceType != null )
+      {
+        ConstructorInfo constructor = ItemsSourceType.GetConstructor( Type.EmptyTypes );
+        list = ( IList )constructor.Invoke( null );
+      }
+
+      return list;
+    }
+
+    private void SetText( IEnumerable collection )
+    {
+      _surpressTextChanged = true;
+      StringBuilder builder = new StringBuilder();
+      foreach( object obj2 in collection )
+      {
+        builder.Append( obj2.ToString() );
+        builder.AppendLine();
+      }
+      Text = builder.ToString().Trim();
+      _surpressTextChanged = false;
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Themes/Generic.xaml
new file mode 100644
index 00000000..31ead62b
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Themes/Generic.xaml
@@ -0,0 +1,162 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
+                    xmlns:pg="clr-namespace:Xceed.Wpf.Toolkit.PropertyGrid">
+
+   <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+   <conv:ObjectTypeToNameConverter x:Key="ObjectTypeToNameConverter" />
+
+   <Style x:Key="CollectionEditorButtonStyle" TargetType="{x:Type Button}">
+      <Style.Triggers>
+         <Trigger Property="IsEnabled" Value="false">
+            <Setter Property="Opacity" Value="0.6" />
+         </Trigger>
+      </Style.Triggers>
+      <Setter Property="HorizontalContentAlignment" Value="Center" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Height" Value="26" />
+      <Setter Property="Width" Value="26" />
+   </Style>
+
+   <Style TargetType="{x:Type local:CollectionEditor}">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:CollectionEditor}">
+               <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="1.5*" />
+                     </Grid.ColumnDefinitions>
+                     <Grid>
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition />
+                           <ColumnDefinition Width="Auto" />
+                           <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="Auto" />
+                           <RowDefinition Height="Auto" />
+                           <RowDefinition />
+                        </Grid.RowDefinitions>
+                        <TextBlock Margin="0,0,0,5" Text="Select type:" />
+                        <ComboBox x:Name="_newItemTypes"
+                                  Grid.Row="1"
+                                  Margin="0,0,0,3"
+                                  HorizontalAlignment="Stretch"
+                                  ItemsSource="{Binding NewItemTypes, RelativeSource={RelativeSource TemplatedParent}}"
+                                  DisplayMemberPath="Name"
+                                  SelectedIndex="0" />
+                        <Button Margin="3,0,0,3"
+                                Grid.Row="1"
+                                Grid.Column="1"
+                                Padding="5,0"
+                                Content="Add" 
+                                Command="New"
+                                CommandParameter="{Binding SelectedItem, ElementName=_newItemTypes}" />
+                        <ListBox x:Name="_itemsListBox"
+                                 Grid.Row="2"
+                                 Grid.ColumnSpan="2"
+                                 ItemsSource="{Binding Items, RelativeSource={RelativeSource TemplatedParent}}"
+                                 SelectedItem="{Binding SelectedItem, RelativeSource={RelativeSource TemplatedParent}}"
+                                 SelectedIndex="0">
+                           <ListBox.ItemTemplate>
+                              <DataTemplate>
+                                 <TextBlock Text="{Binding Converter={StaticResource ObjectTypeToNameConverter}}" />
+                              </DataTemplate>
+                           </ListBox.ItemTemplate>
+                        </ListBox>
+                        <StackPanel Margin="7,2,0,0" VerticalAlignment="Top" Grid.Column="2" Grid.Row="2">
+                           <Button Style="{StaticResource CollectionEditorButtonStyle}"
+                                   Command="ComponentCommands.MoveUp"
+                                   CommandParameter="{Binding SelectedItem, ElementName=_itemsListBox}">
+                              <Path Fill="#FF404040" Data="F0 M 6,0 L 12,7 8,7 8,12 4,12 4,7 0,7 Z" />
+                           </Button>
+                           <Button Margin="0,1,0,0"
+                                   Style="{StaticResource CollectionEditorButtonStyle}"
+                                   Command="ComponentCommands.MoveDown"
+                                   CommandParameter="{Binding SelectedItem, ElementName=_itemsListBox}">
+                              <Path Fill="#FF404040" Data="F0 M 4,0 L 8,0 8,5 12,5 6,12 0,5 4,5 Z" />
+                           </Button>
+                           <Button Margin="0,7,0,0"
+                                   Style="{StaticResource CollectionEditorButtonStyle}"
+                                   Command="Delete"
+                                   CommandParameter="{Binding SelectedItem, ElementName=_itemsListBox}">
+                              <Image Stretch="None" Height="16" Width="16" Margin="1" Source="/WPFToolkit.Extended;component/CollectionEditors/Images/Delete16.png" />
+                           </Button>
+                        </StackPanel>
+                     </Grid>
+                     <Grid Column="1" Margin="20,0,0,0">
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="Auto" />
+                           <RowDefinition />
+                        </Grid.RowDefinitions>
+                        <TextBlock Grid.Column="1" Text="Properties:" />
+                        <pg:PropertyGrid Grid.Row="1"
+                                         Grid.Column="1"
+                                         Margin="0,5,0,0"
+                                         HorizontalAlignment="Stretch"
+                                         VerticalAlignment="Stretch"
+                                         SelectedObject="{Binding SelectedItem, RelativeSource={RelativeSource TemplatedParent}}" />
+                     </Grid>
+                  </Grid>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style TargetType="{x:Type local:PrimitiveTypeCollectionEditor}">
+      <Setter Property="BorderBrush">
+         <Setter.Value>
+            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+               <GradientStop Color="#FFA3AEB9" Offset="0" />
+               <GradientStop Color="#FF8399A9" Offset="0.375" />
+               <GradientStop Color="#FF718597" Offset="0.375" />
+               <GradientStop Color="#FF617584" Offset="1" />
+            </LinearGradientBrush>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="BorderThickness" Value="1,1,0,1" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Padding" Value="2,0,0,0" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:PrimitiveTypeCollectionEditor}">
+               <local:MultiLineTextEditor Background="{TemplateBinding Background}"
+                                          BorderBrush="{TemplateBinding BorderBrush}"
+                                          BorderThickness="{TemplateBinding BorderThickness}"
+                                          Content="{TemplateBinding Content}"  
+                                          Padding="{TemplateBinding Padding}"
+                                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          IsOpen="{TemplateBinding IsOpen}"
+                                          Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
+                                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Implementation/ColorCanvas.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Implementation/ColorCanvas.cs
new file mode 100644
index 00000000..01a0031c
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Implementation/ColorCanvas.cs
@@ -0,0 +1,521 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Input;
+using System.Windows.Media;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+using Xceed.Wpf.Toolkit.Primitives;
+using System.IO;
+
+namespace Xceed.Wpf.Toolkit
+{
+  [TemplatePart( Name = PART_ColorShadingCanvas, Type = typeof( Canvas ) )]
+  [TemplatePart( Name = PART_ColorShadeSelector, Type = typeof( Canvas ) )]
+  [TemplatePart( Name = PART_SpectrumSlider, Type = typeof( ColorSpectrumSlider ) )]
+  public class ColorCanvas : Control
+  {
+    private const string PART_ColorShadingCanvas = "PART_ColorShadingCanvas";
+    private const string PART_ColorShadeSelector = "PART_ColorShadeSelector";
+    private const string PART_SpectrumSlider = "PART_SpectrumSlider";
+
+    #region Private Members
+
+    private TranslateTransform _colorShadeSelectorTransform = new TranslateTransform();
+    private Canvas _colorShadingCanvas;
+    private Canvas _colorShadeSelector;
+    private ColorSpectrumSlider _spectrumSlider;
+    private Point? _currentColorPosition;
+    private bool _surpressPropertyChanged;
+
+    #endregion //Private Members
+
+    #region Properties
+
+    #region SelectedColor
+
+    public static readonly DependencyProperty SelectedColorProperty = DependencyProperty.Register( "SelectedColor", typeof( Color ), typeof( ColorCanvas ), new FrameworkPropertyMetadata( Colors.Black, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnSelectedColorChanged ) );
+    public Color SelectedColor
+    {
+      get
+      {
+        return ( Color )GetValue( SelectedColorProperty );
+      }
+      set
+      {
+        SetValue( SelectedColorProperty, value );
+      }
+    }
+
+    private static void OnSelectedColorChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ColorCanvas colorCanvas = o as ColorCanvas;
+      if( colorCanvas != null )
+        colorCanvas.OnSelectedColorChanged( ( Color )e.OldValue, ( Color )e.NewValue );
+    }
+
+    protected virtual void OnSelectedColorChanged( Color oldValue, Color newValue )
+    {
+      HexadecimalString = GetFormatedColorString( newValue );
+      UpdateRGBValues( newValue );
+      UpdateColorShadeSelectorPosition( newValue );
+
+      RoutedPropertyChangedEventArgs<Color> args = new RoutedPropertyChangedEventArgs<Color>( oldValue, newValue );
+      args.RoutedEvent = SelectedColorChangedEvent;
+      RaiseEvent( args );
+    }
+
+    #endregion //SelectedColor
+
+    #region RGB
+
+    #region A
+
+    public static readonly DependencyProperty AProperty = DependencyProperty.Register( "A", typeof( byte ), typeof( ColorCanvas ), new UIPropertyMetadata( ( byte )255, OnAChanged ) );
+    public byte A
+    {
+      get
+      {
+        return ( byte )GetValue( AProperty );
+      }
+      set
+      {
+        SetValue( AProperty, value );
+      }
+    }
+
+    private static void OnAChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ColorCanvas colorCanvas = o as ColorCanvas;
+      if( colorCanvas != null )
+        colorCanvas.OnAChanged( ( byte )e.OldValue, ( byte )e.NewValue );
+    }
+
+    protected virtual void OnAChanged( byte oldValue, byte newValue )
+    {
+      if( !_surpressPropertyChanged )
+        UpdateSelectedColor();
+    }
+
+    #endregion //A
+
+    #region R
+
+    public static readonly DependencyProperty RProperty = DependencyProperty.Register( "R", typeof( byte ), typeof( ColorCanvas ), new UIPropertyMetadata( ( byte )0, OnRChanged ) );
+    public byte R
+    {
+      get
+      {
+        return ( byte )GetValue( RProperty );
+      }
+      set
+      {
+        SetValue( RProperty, value );
+      }
+    }
+
+    private static void OnRChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ColorCanvas colorCanvas = o as ColorCanvas;
+      if( colorCanvas != null )
+        colorCanvas.OnRChanged( ( byte )e.OldValue, ( byte )e.NewValue );
+    }
+
+    protected virtual void OnRChanged( byte oldValue, byte newValue )
+    {
+      if( !_surpressPropertyChanged )
+        UpdateSelectedColor();
+    }
+
+    #endregion //R
+
+    #region G
+
+    public static readonly DependencyProperty GProperty = DependencyProperty.Register( "G", typeof( byte ), typeof( ColorCanvas ), new UIPropertyMetadata( ( byte )0, OnGChanged ) );
+    public byte G
+    {
+      get
+      {
+        return ( byte )GetValue( GProperty );
+      }
+      set
+      {
+        SetValue( GProperty, value );
+      }
+    }
+
+    private static void OnGChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ColorCanvas colorCanvas = o as ColorCanvas;
+      if( colorCanvas != null )
+        colorCanvas.OnGChanged( ( byte )e.OldValue, ( byte )e.NewValue );
+    }
+
+    protected virtual void OnGChanged( byte oldValue, byte newValue )
+    {
+      if( !_surpressPropertyChanged )
+        UpdateSelectedColor();
+    }
+
+    #endregion //G
+
+    #region B
+
+    public static readonly DependencyProperty BProperty = DependencyProperty.Register( "B", typeof( byte ), typeof( ColorCanvas ), new UIPropertyMetadata( ( byte )0, OnBChanged ) );
+    public byte B
+    {
+      get
+      {
+        return ( byte )GetValue( BProperty );
+      }
+      set
+      {
+        SetValue( BProperty, value );
+      }
+    }
+
+    private static void OnBChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ColorCanvas colorCanvas = o as ColorCanvas;
+      if( colorCanvas != null )
+        colorCanvas.OnBChanged( ( byte )e.OldValue, ( byte )e.NewValue );
+    }
+
+    protected virtual void OnBChanged( byte oldValue, byte newValue )
+    {
+      if( !_surpressPropertyChanged )
+        UpdateSelectedColor();
+    }
+
+    #endregion //B
+
+    #endregion //RGB
+
+    #region HexadecimalString
+
+    public static readonly DependencyProperty HexadecimalStringProperty = DependencyProperty.Register( "HexadecimalString", typeof( string ), typeof( ColorCanvas ), new UIPropertyMetadata( "#FFFFFFFF", OnHexadecimalStringChanged, OnCoerceHexadecimalString ) );
+    public string HexadecimalString
+    {
+      get
+      {
+        return ( string )GetValue( HexadecimalStringProperty );
+      }
+      set
+      {
+        SetValue( HexadecimalStringProperty, value );
+      }
+    }
+
+    private static void OnHexadecimalStringChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ColorCanvas colorCanvas = o as ColorCanvas;
+      if( colorCanvas != null )
+        colorCanvas.OnHexadecimalStringChanged( ( string )e.OldValue, ( string )e.NewValue );
+    }
+
+    protected virtual void OnHexadecimalStringChanged( string oldValue, string newValue )
+    {
+      string newColorString = GetFormatedColorString( newValue );
+      string currentColorString = GetFormatedColorString( SelectedColor );
+      if( !currentColorString.Equals( newColorString ) )
+        UpdateSelectedColor( ( Color )ColorConverter.ConvertFromString( newColorString ) );
+    }
+
+    private static object OnCoerceHexadecimalString( DependencyObject d, object basevalue )
+    {
+      var colorCanvas = ( ColorCanvas )d;
+      if( colorCanvas == null )
+        return basevalue;
+
+      return colorCanvas.OnCoerceHexadecimalString( basevalue );
+    }
+
+    private object OnCoerceHexadecimalString( object newValue )
+    {
+      var value = newValue as string;
+      try
+      {
+        ColorConverter.ConvertFromString( value );
+      }
+      catch
+      {
+        throw new InvalidDataException( "Color provided is not in the correct format." );
+      }
+
+      return value;
+    }
+
+    #endregion //HexadecimalString
+
+    #region UsingAlphaChannel
+
+    public static readonly DependencyProperty UsingAlphaChannelProperty = DependencyProperty.Register( "UsingAlphaChannel", typeof( bool ), typeof( ColorCanvas ), new FrameworkPropertyMetadata( true, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, new PropertyChangedCallback( OnUsingAlphaChannelPropertyChanged ) ) );
+    public bool UsingAlphaChannel
+    {
+      get
+      {
+        return ( bool )GetValue( UsingAlphaChannelProperty );
+      }
+      set
+      {
+        SetValue( UsingAlphaChannelProperty, value );
+      }
+    }
+
+    private static void OnUsingAlphaChannelPropertyChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ColorCanvas colorCanvas = o as ColorCanvas;
+      if( colorCanvas != null )
+        colorCanvas.OnUsingAlphaChannelChanged();
+    }
+
+    protected virtual void OnUsingAlphaChannelChanged()
+    {
+      HexadecimalString = GetFormatedColorString( SelectedColor );
+    }
+
+    #endregion //UsingAlphaChannel
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static ColorCanvas()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( ColorCanvas ), new FrameworkPropertyMetadata( typeof( ColorCanvas ) ) );
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+
+      if( _colorShadingCanvas != null )
+      {
+        _colorShadingCanvas.MouseLeftButtonDown -= ColorShadingCanvas_MouseLeftButtonDown;
+        _colorShadingCanvas.MouseLeftButtonUp -= ColorShadingCanvas_MouseLeftButtonUp;
+        _colorShadingCanvas.MouseMove -= ColorShadingCanvas_MouseMove;
+        _colorShadingCanvas.SizeChanged -= ColorShadingCanvas_SizeChanged;
+      }
+
+      _colorShadingCanvas = GetTemplateChild( PART_ColorShadingCanvas ) as Canvas;
+
+      if( _colorShadingCanvas != null )
+      {
+        _colorShadingCanvas.MouseLeftButtonDown += ColorShadingCanvas_MouseLeftButtonDown;
+        _colorShadingCanvas.MouseLeftButtonUp += ColorShadingCanvas_MouseLeftButtonUp;
+        _colorShadingCanvas.MouseMove += ColorShadingCanvas_MouseMove;
+        _colorShadingCanvas.SizeChanged += ColorShadingCanvas_SizeChanged;
+      }
+
+      _colorShadeSelector = GetTemplateChild( PART_ColorShadeSelector ) as Canvas;
+
+      if( _colorShadeSelector != null )
+        _colorShadeSelector.RenderTransform = _colorShadeSelectorTransform;
+
+      if( _spectrumSlider != null )
+        _spectrumSlider.ValueChanged -= SpectrumSlider_ValueChanged;
+
+      _spectrumSlider = GetTemplateChild( PART_SpectrumSlider ) as ColorSpectrumSlider;
+
+      if( _spectrumSlider != null )
+        _spectrumSlider.ValueChanged += SpectrumSlider_ValueChanged;
+
+      UpdateRGBValues( SelectedColor );
+      UpdateColorShadeSelectorPosition( SelectedColor );
+    }
+
+    protected override void OnPreviewKeyDown( KeyEventArgs e )
+    {
+      //hitting enter on textbox will update value of underlying source
+      if( e.Key == Key.Enter && e.OriginalSource is TextBox )
+      {
+        BindingExpression be = ( ( TextBox )e.OriginalSource ).GetBindingExpression( TextBox.TextProperty );
+        be.UpdateSource();
+      }
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Event Handlers
+
+    void ColorShadingCanvas_MouseLeftButtonDown( object sender, MouseButtonEventArgs e )
+    {
+      Point p = e.GetPosition( _colorShadingCanvas );
+      UpdateColorShadeSelectorPositionAndCalculateColor( p, true );
+      _colorShadingCanvas.CaptureMouse();
+    }
+
+    void ColorShadingCanvas_MouseLeftButtonUp( object sender, MouseButtonEventArgs e )
+    {
+      _colorShadingCanvas.ReleaseMouseCapture();
+    }
+
+    void ColorShadingCanvas_MouseMove( object sender, MouseEventArgs e )
+    {
+      if( e.LeftButton == MouseButtonState.Pressed )
+      {
+        Point p = e.GetPosition( _colorShadingCanvas );
+        UpdateColorShadeSelectorPositionAndCalculateColor( p, true );
+        Mouse.Synchronize();
+      }
+    }
+
+    void ColorShadingCanvas_SizeChanged( object sender, SizeChangedEventArgs e )
+    {
+      if( _currentColorPosition != null )
+      {
+        Point _newPoint = new Point
+        {
+          X = ( ( Point )_currentColorPosition ).X * e.NewSize.Width,
+          Y = ( ( Point )_currentColorPosition ).Y * e.NewSize.Height
+        };
+
+        UpdateColorShadeSelectorPositionAndCalculateColor( _newPoint, false );
+      }
+    }
+
+    void SpectrumSlider_ValueChanged( object sender, RoutedPropertyChangedEventArgs<double> e )
+    {
+      if( _currentColorPosition != null )
+      {
+        CalculateColor( ( Point )_currentColorPosition );
+      }
+    }
+
+    #endregion //Event Handlers
+
+    #region Events
+
+    public static readonly RoutedEvent SelectedColorChangedEvent = EventManager.RegisterRoutedEvent( "SelectedColorChanged", RoutingStrategy.Bubble, typeof( RoutedPropertyChangedEventHandler<Color> ), typeof( ColorCanvas ) );
+    public event RoutedPropertyChangedEventHandler<Color> SelectedColorChanged
+    {
+      add
+      {
+        AddHandler( SelectedColorChangedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( SelectedColorChangedEvent, value );
+      }
+    }
+
+    #endregion //Events
+
+    #region Methods
+
+    private void UpdateSelectedColor()
+    {
+      SelectedColor = Color.FromArgb( A, R, G, B );
+    }
+
+    private void UpdateSelectedColor( Color color )
+    {
+      SelectedColor = Color.FromArgb( color.A, color.R, color.G, color.B );
+    }
+
+    private void UpdateRGBValues( Color color )
+    {
+      _surpressPropertyChanged = true;
+
+      A = color.A;
+      R = color.R;
+      G = color.G;
+      B = color.B;
+
+      _surpressPropertyChanged = false;
+    }
+
+    private void UpdateColorShadeSelectorPositionAndCalculateColor( Point p, bool calculateColor )
+    {
+      if( p.Y < 0 )
+        p.Y = 0;
+
+      if( p.X < 0 )
+        p.X = 0;
+
+      if( p.X > _colorShadingCanvas.ActualWidth )
+        p.X = _colorShadingCanvas.ActualWidth;
+
+      if( p.Y > _colorShadingCanvas.ActualHeight )
+        p.Y = _colorShadingCanvas.ActualHeight;
+
+      _colorShadeSelectorTransform.X = p.X - ( _colorShadeSelector.Width / 2 );
+      _colorShadeSelectorTransform.Y = p.Y - ( _colorShadeSelector.Height / 2 );
+
+      p.X = p.X / _colorShadingCanvas.ActualWidth;
+      p.Y = p.Y / _colorShadingCanvas.ActualHeight;
+
+      _currentColorPosition = p;
+
+      if( calculateColor )
+        CalculateColor( p );
+    }
+
+    private void UpdateColorShadeSelectorPosition( Color color )
+    {
+      if( _spectrumSlider == null || _colorShadingCanvas == null )
+        return;
+
+      _currentColorPosition = null;
+
+      HsvColor hsv = ColorUtilities.ConvertRgbToHsv( color.R, color.G, color.B );
+
+      if( !( color.R == color.G && color.R == color.B ) )
+        _spectrumSlider.Value = hsv.H;
+
+      Point p = new Point( hsv.S, 1 - hsv.V );
+
+      _currentColorPosition = p;
+
+      _colorShadeSelectorTransform.X = ( p.X * _colorShadingCanvas.Width ) - 5;
+      _colorShadeSelectorTransform.Y = ( p.Y * _colorShadingCanvas.Height ) - 5;
+    }
+
+    private void CalculateColor( Point p )
+    {
+      HsvColor hsv = new HsvColor( 360 - _spectrumSlider.Value, 1, 1 )
+      {
+        S = p.X,
+        V = 1 - p.Y
+      };
+      var currentColor = ColorUtilities.ConvertHsvToRgb( hsv.H, hsv.S, hsv.V );
+      currentColor.A = A;
+      SelectedColor = currentColor;
+      HexadecimalString = GetFormatedColorString( SelectedColor );
+    }
+
+    private string GetFormatedColorString( Color colorToFormat )
+    {
+      return ColorUtilities.FormatColorString( colorToFormat.ToString(), UsingAlphaChannel );
+    }
+
+    private string GetFormatedColorString( string stringToFormat )
+    {
+      return ColorUtilities.FormatColorString( stringToFormat, UsingAlphaChannel );
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Implementation/ColorSpectrumSlider.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Implementation/ColorSpectrumSlider.cs
new file mode 100644
index 00000000..30553408
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Implementation/ColorSpectrumSlider.cs
@@ -0,0 +1,114 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+using System.Windows.Shapes;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+
+namespace Xceed.Wpf.Toolkit
+{
+  [TemplatePart( Name = PART_SpectrumDisplay, Type = typeof( Rectangle ) )]
+  public class ColorSpectrumSlider : Slider
+  {
+    private const string PART_SpectrumDisplay = "PART_SpectrumDisplay";
+
+    #region Private Members
+
+    private Rectangle _spectrumDisplay;
+    private LinearGradientBrush _pickerBrush;
+
+    #endregion //Private Members
+
+    #region Constructors
+
+    static ColorSpectrumSlider()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( ColorSpectrumSlider ), new FrameworkPropertyMetadata( typeof( ColorSpectrumSlider ) ) );
+    }
+
+    #endregion //Constructors
+
+    #region Dependency Properties
+
+    public static readonly DependencyProperty SelectedColorProperty = DependencyProperty.Register( "SelectedColor", typeof( Color ), typeof( ColorSpectrumSlider ), new PropertyMetadata( System.Windows.Media.Colors.Transparent ) );
+    public Color SelectedColor
+    {
+      get
+      {
+        return ( Color )GetValue( SelectedColorProperty );
+      }
+      set
+      {
+        SetValue( SelectedColorProperty, value );
+      }
+    }
+
+    #endregion //Dependency Properties
+
+    #region Base Class Overrides
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+
+      _spectrumDisplay = ( Rectangle )GetTemplateChild( PART_SpectrumDisplay );
+      CreateSpectrum();
+      OnValueChanged( Double.NaN, Value );
+    }
+
+    protected override void OnValueChanged( double oldValue, double newValue )
+    {
+      base.OnValueChanged( oldValue, newValue );
+
+      Color color = ColorUtilities.ConvertHsvToRgb( 360 - newValue, 1, 1 );
+      SelectedColor = color;
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Methods
+
+    private void CreateSpectrum()
+    {
+      _pickerBrush = new LinearGradientBrush();
+      _pickerBrush.StartPoint = new Point( 0.5, 0 );
+      _pickerBrush.EndPoint = new Point( 0.5, 1 );
+      _pickerBrush.ColorInterpolationMode = ColorInterpolationMode.SRgbLinearInterpolation;
+
+      List<Color> colorsList = ColorUtilities.GenerateHsvSpectrum();
+
+      double stopIncrement = ( double )1 / colorsList.Count;
+
+      int i;
+      for( i = 0; i < colorsList.Count; i++ )
+      {
+        _pickerBrush.GradientStops.Add( new GradientStop( colorsList[ i ], i * stopIncrement ) );
+      }
+
+      _pickerBrush.GradientStops[ i - 1 ].Offset = 1.0;
+      _spectrumDisplay.Fill = _pickerBrush;
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Themes/Generic.xaml
new file mode 100644
index 00000000..7164d0a0
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Themes/Generic.xaml
@@ -0,0 +1,408 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
+
+   <conv:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
+   <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+
+   <LinearGradientBrush x:Key="ColorPickerDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="ColorCanvasBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="1" Color="#FFE8EBED" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <DrawingBrush  x:Key="CheckerBrush" Viewport="0,0,10,10" ViewportUnits="Absolute" TileMode="Tile">
+      <DrawingBrush.Drawing>
+         <DrawingGroup>
+            <GeometryDrawing Brush="White">
+               <GeometryDrawing.Geometry>
+                  <RectangleGeometry Rect="0,0 100,100" />
+               </GeometryDrawing.Geometry>
+            </GeometryDrawing>
+            <GeometryDrawing Brush="LightGray">
+               <GeometryDrawing.Geometry>
+                  <GeometryGroup>
+                     <RectangleGeometry Rect="0,0 50,50" />
+                     <RectangleGeometry Rect="50,50 50,50" />
+                  </GeometryGroup>
+               </GeometryDrawing.Geometry>
+            </GeometryDrawing>
+         </DrawingGroup>
+      </DrawingBrush.Drawing>
+   </DrawingBrush>
+
+   <SolidColorBrush x:Key="HorizontalSliderTrackNormalBackground" Color="#FFE7EAEA" />
+
+   <LinearGradientBrush x:Key="HorizontalSliderTrackNormalBorder" EndPoint="0,1" StartPoint="0,0">
+      <GradientStop Color="#FFAEB1AF" Offset="0.1" />
+      <GradientStop Color="White" Offset=".9" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="ThumbStroke" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="ThumbFill" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFfefefe" />
+            <GradientStop Offset="0.5" Color="#FFeff1f2" />
+            <GradientStop Offset="1" Color="#FFd0d6db" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <SolidColorBrush x:Key="ThumbMouseOver" Color="#FFE5F2F6" />
+
+   <Style x:Key="ColorCanvasTextBoxStyle" TargetType="TextBox" BasedOn="{StaticResource {x:Type TextBox}}">
+      <Setter Property="Background" Value="Transparent" />
+      <Style.Triggers>
+         <Trigger Property="IsFocused" Value="False">
+            <Setter Property="BorderBrush" Value="Transparent" />
+         </Trigger>
+      </Style.Triggers>
+   </Style>
+
+   <Style x:Key="SliderRepeatButtonStyle"
+         TargetType="{x:Type RepeatButton}">
+      <Setter Property="OverridesDefaultStyle" Value="true" />
+      <Setter Property="IsTabStop" Value="false" />
+      <Setter Property="Focusable" Value="false" />
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type RepeatButton}">
+               <Border Background="{TemplateBinding Background}" />
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="CustomThumbForSlider" TargetType="{x:Type Thumb}">
+      <Setter Property="OverridesDefaultStyle" Value="True" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Thumb}">
+               <Rectangle x:Name="_thumb" Fill="{StaticResource ThumbFill}" Stroke="{StaticResource ThumbStroke}" Height="14" Width="8" RadiusX="1" RadiusY="1" />
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsMouseOver" Value="True">
+                     <Setter TargetName="_thumb" Property="Rectangle.Fill" Value="{StaticResource ThumbMouseOver}" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="VerticalSlideThumbStyle" TargetType="{x:Type Thumb}">
+      <Setter Property="Focusable" Value="false" />
+      <Setter Property="OverridesDefaultStyle" Value="true" />
+      <Setter Property="Height" Value="12" />
+      <Setter Property="Width" Value="11" />
+      <Setter Property="Foreground" Value="Gray" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Thumb}">
+               <Canvas SnapsToDevicePixels="true">
+                  <Path x:Name="LeftArrow" Stretch="Fill" StrokeLineJoin="Round" Stroke="#FF000000" Fill="#FF000000" Data="F1 M 276.761,316L 262.619,307.835L 262.619,324.165L 276.761,316 Z " RenderTransformOrigin="0.5,0.5" Width="6" Height="8">
+                     <Path.RenderTransform>
+                        <TransformGroup>
+                           <ScaleTransform />
+                           <SkewTransform />
+                           <RotateTransform />
+                           <TranslateTransform Y="6" X="-3" />
+                        </TransformGroup>
+                     </Path.RenderTransform>
+                  </Path>
+                  <Path x:Name="RightArrow" Stretch="Fill" StrokeLineJoin="Round" Stroke="#FF000000" Fill="#FF000000" Data="F1 M 276.761,316L 262.619,307.835L 262.619,324.165L 276.761,316 Z " RenderTransformOrigin="0.5,0.5" Width="6" Height="8">
+                     <Path.RenderTransform>
+                        <TransformGroup>
+                           <ScaleTransform />
+                           <SkewTransform />
+                           <RotateTransform Angle="-180" />
+                           <TranslateTransform Y="6" X="8" />
+                        </TransformGroup>
+                     </Path.RenderTransform>
+                  </Path>
+               </Canvas>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="ColorCanvasSliderStyle" TargetType="{x:Type Slider}">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Slider}">
+               <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+                  <Grid>
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" MinHeight="{TemplateBinding MinHeight}" />
+                        <RowDefinition Height="Auto" />
+                     </Grid.RowDefinitions>
+                     <TickBar x:Name="TopTick" Fill="{TemplateBinding Foreground}" Height="4" Placement="Top" Grid.Row="0" Visibility="Collapsed" />
+                     <TickBar x:Name="BottomTick" Fill="{TemplateBinding Foreground}" Height="4" Placement="Bottom" Grid.Row="2" Visibility="Collapsed" />
+                     <Border x:Name="TrackBackground" BorderBrush="{StaticResource HorizontalSliderTrackNormalBorder}" BorderThickness="1" Background="{StaticResource HorizontalSliderTrackNormalBackground}" CornerRadius="1" Height="4.0" Margin="5,0" Grid.Row="1" VerticalAlignment="center">
+                        <Canvas Margin="-6,-1">
+                           <Rectangle x:Name="PART_SelectionRange" Fill="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" Height="4.0" Stroke="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}" StrokeThickness="1.0" Visibility="Hidden" />
+                        </Canvas>
+                     </Border>
+                     <Track x:Name="PART_Track" Grid.Row="1">
+                        <Track.DecreaseRepeatButton>
+                           <RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource SliderRepeatButtonStyle}" />
+                        </Track.DecreaseRepeatButton>
+                        <Track.IncreaseRepeatButton>
+                           <RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource SliderRepeatButtonStyle}" />
+                        </Track.IncreaseRepeatButton>
+                        <Track.Thumb>
+                           <Thumb x:Name="Thumb" Style="{StaticResource CustomThumbForSlider}" />
+                        </Track.Thumb>
+                     </Track>
+                  </Grid>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style TargetType="{x:Type local:ColorCanvas}">
+      <Setter Property="Background" Value="{StaticResource ColorCanvasBackgroundBrush}" />
+      <Setter Property="BorderBrush" Value="{StaticResource ColorPickerDarkBorderBrush}" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:ColorCanvas}">
+               <Border Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Padding="3">
+                  <Grid Margin="2">
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                     </Grid.RowDefinitions>
+                     <Grid>
+                        <Grid.ColumnDefinitions >
+                           <ColumnDefinition Width="200" />
+                           <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="Auto" />
+                           <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+
+                        <Border BorderThickness="1" BorderBrush="DarkGray" ClipToBounds="True" Background="{StaticResource CheckerBrush}">
+                           <Canvas x:Name="PART_ColorShadingCanvas" Width="200" Height="100" HorizontalAlignment="Left" VerticalAlignment="Top">
+                              <Rectangle x:Name="ColorShadingRectangle"
+                                         Height="{Binding ElementName=PART_ColorShadingCanvas, Path=Height}"
+                                         Width="{Binding ElementName=PART_ColorShadingCanvas, Path=Width}"
+                                         Fill="{Binding SelectedColor, ElementName=PART_SpectrumSlider, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
+                              <Rectangle x:Name="WhiteGradient" Width="{Binding ElementName=PART_ColorShadingCanvas,Path=Width}" Height="{Binding ElementName=PART_ColorShadingCanvas,Path=Height}">
+                                 <Rectangle.Fill>
+                                    <LinearGradientBrush StartPoint="0,0" EndPoint="1,0">
+                                       <GradientStop Offset="0" Color="#ffffffff" />
+                                       <GradientStop Offset="1" Color="Transparent" />
+                                    </LinearGradientBrush>
+                                 </Rectangle.Fill>
+                              </Rectangle>
+                              <Rectangle x:Name="BlackGradient" Width="{Binding ElementName=PART_ColorShadingCanvas,Path=Width}" Height="{Binding ElementName=PART_ColorShadingCanvas,Path=Height}">
+                                 <Rectangle.Fill>
+                                    <LinearGradientBrush StartPoint="0,1" EndPoint="0, 0">
+                                       <GradientStop Offset="0" Color="#ff000000" />
+                                       <GradientStop Offset="1" Color="#00000000" />
+                                    </LinearGradientBrush>
+                                 </Rectangle.Fill>
+                              </Rectangle>
+                              <Canvas x:Name="PART_ColorShadeSelector" Width="10" Height="10" IsHitTestVisible="False">
+                                 <Ellipse Width="10" Height="10" StrokeThickness="3" Stroke="#FFFFFFFF" IsHitTestVisible="False" />
+                                 <Ellipse Width="10" Height="10" StrokeThickness="1" Stroke="#FF000000" IsHitTestVisible="False" />
+                              </Canvas>
+                           </Canvas>
+                        </Border>
+
+                        <Border Grid.Row="1" Margin="0,5,0,0">
+                           <Grid>
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="*" />
+                                 <ColumnDefinition Width="*" />
+                              </Grid.ColumnDefinitions>
+                              <Border Background="{StaticResource CheckerBrush}" Height="22" Margin="2,0,2,0" BorderThickness="1" BorderBrush="#FFC9CACA">
+                                 <Rectangle x:Name="SelectedColor" Fill="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
+                              </Border>
+                              <TextBox Grid.Column="1" Text="{Binding HexadecimalString, RelativeSource={RelativeSource TemplatedParent}}" Margin="2,0,2,0" VerticalAlignment="Center" Style="{StaticResource ColorCanvasTextBoxStyle}" />
+                           </Grid>
+                        </Border>
+
+                        <Border Grid.Column="1" Grid.RowSpan="2" Margin="4,-8,0,0" ClipToBounds="False">
+                           <local:ColorSpectrumSlider x:Name="PART_SpectrumSlider" VerticalAlignment="Stretch" />
+                        </Border>
+                     </Grid>
+
+                     <Border MinWidth="180" Grid.Row="1" BorderThickness="1" ClipToBounds="True" Margin="0,10,0,0">
+                        <Grid>
+                           <Grid.RowDefinitions>
+                              <RowDefinition Height="Auto" />
+                              <RowDefinition Height="Auto" />
+                              <RowDefinition Height="Auto" />
+                              <RowDefinition Height="Auto" />
+                           </Grid.RowDefinitions>
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="Auto" />
+                              <ColumnDefinition Width="*" />
+                              <ColumnDefinition Width="Auto" />
+                           </Grid.ColumnDefinitions>
+
+                           <TextBlock Grid.Row="0"
+                                      Grid.Column="0"
+                                      Text="R"
+                                      VerticalAlignment="Center" />
+                           <Slider x:Name="PART_RSlider"
+                                   Maximum="255"
+                                   TickFrequency="1"
+                                   Grid.Row="0"
+                                   Grid.Column="1"
+                                   Margin="4,6,4,6"
+                                   Style="{StaticResource ColorCanvasSliderStyle}"
+                                   Value="{Binding R, RelativeSource={RelativeSource TemplatedParent}}"
+                                   VerticalAlignment="Center" />
+                           <TextBox Grid.Row="0"
+                                    Grid.Column="2"
+                                    Text="{Binding Value, ElementName=PART_RSlider}"
+                                    VerticalAlignment="Center"
+                                    Style="{StaticResource ColorCanvasTextBoxStyle}" />
+
+                           <TextBlock Grid.Row="1"
+                                      Grid.Column="0"
+                                      Text="G"
+                                      VerticalAlignment="Center" />
+                           <Slider x:Name="PART_GSlider"
+                                   Maximum="255"
+                                   TickFrequency="1"
+                                   Grid.Row="1"
+                                   Grid.Column="1"
+                                   Margin="4,6,4,6"
+                                   Style="{StaticResource ColorCanvasSliderStyle}"
+                                   Value="{Binding G, RelativeSource={RelativeSource TemplatedParent}}"
+                                   VerticalAlignment="Center" />
+                           <TextBox Grid.Row="1"
+                                    Grid.Column="2"
+                                    Text="{Binding Value, ElementName=PART_GSlider}"
+                                    VerticalAlignment="Center"
+                                    Style="{StaticResource ColorCanvasTextBoxStyle}" />
+
+                           <TextBlock Grid.Row="2"
+                                      Grid.Column="0"
+                                      Text="B"
+                                      VerticalAlignment="Center" />
+                           <Slider x:Name="PART_BSlider"
+                                   Maximum="255"
+                                   TickFrequency="1"
+                                   Grid.Row="2"
+                                   Grid.Column="1"
+                                   Margin="4,6,4,6"
+                                   Style="{StaticResource ColorCanvasSliderStyle}"
+                                   Value="{Binding B, RelativeSource={RelativeSource TemplatedParent}}"
+                                   VerticalAlignment="Center" />
+                           <TextBox Grid.Row="2"
+                                    Grid.Column="3"
+                                    Text="{Binding Value, ElementName=PART_BSlider}"
+                                    VerticalAlignment="Center"
+                                    Style="{StaticResource ColorCanvasTextBoxStyle}" />
+
+                           <TextBlock Grid.Row="3"
+                                      Grid.Column="0"
+                                      Text="A"
+                                      VerticalAlignment="Center"
+                                      Visibility="{Binding Path=UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}"/>
+                           <Slider x:Name="PART_OpacitySlider"
+                                   Grid.Row="3"
+                                   Grid.Column="1"
+                                   Maximum="255"
+                                   Margin="4,6,4,6"
+                                   Style="{StaticResource ColorCanvasSliderStyle}"
+                                   Value="{Binding Path=A, RelativeSource={RelativeSource TemplatedParent}}"
+                                   VerticalAlignment="Center"
+                                   Visibility="{Binding Path=UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}"/>
+                           <TextBox Grid.Row="3"
+                                    Grid.Column="3"
+                                    Text="{Binding Value, ElementName=PART_OpacitySlider}"
+                                    VerticalAlignment="Center"
+                                    Style="{StaticResource ColorCanvasTextBoxStyle}" 
+                                    Visibility="{Binding Path=UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}"/>
+                         </Grid>
+                     </Border>
+                  </Grid>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style TargetType="{x:Type local:ColorSpectrumSlider}">
+      <Setter Property="Orientation" Value="Vertical" />
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+      <Setter Property="Minimum" Value="1" />
+      <Setter Property="Maximum" Value="360" />
+      <Setter Property="TickFrequency" Value="0.001" />
+      <Setter Property="IsSnapToTickEnabled" Value="True" />
+      <Setter Property="IsDirectionReversed" Value="False" />
+      <Setter Property="IsMoveToPointEnabled" Value="True" />
+      <Setter Property="Value" Value="0" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:ColorSpectrumSlider}">
+               <Grid>
+                  <Border x:Name="PART_TrackBackground" BorderBrush="DarkGray" BorderThickness="1" Width="15" Margin="0,8,0,0">
+                     <Rectangle x:Name="PART_SpectrumDisplay" Stretch="Fill" VerticalAlignment="Stretch" />
+                  </Border>
+
+                  <Track Name="PART_Track">
+                     <Track.DecreaseRepeatButton>
+                        <RepeatButton Style="{StaticResource SliderRepeatButtonStyle}" Command="Slider.DecreaseLarge" />
+                     </Track.DecreaseRepeatButton>
+                     <Track.IncreaseRepeatButton>
+                        <RepeatButton Style="{StaticResource SliderRepeatButtonStyle}" Command="Slider.IncreaseLarge" />
+                     </Track.IncreaseRepeatButton>
+                     <Track.Thumb>
+                        <Thumb Style="{StaticResource VerticalSlideThumbStyle}" />
+                     </Track.Thumb>
+                  </Track>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/Implementation/ColorItem.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/Implementation/ColorItem.cs
new file mode 100644
index 00000000..b9b25a8b
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/Implementation/ColorItem.cs
@@ -0,0 +1,43 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows.Media;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class ColorItem
+  {
+    public Color Color
+    {
+      get;
+      set;
+    }
+    public string Name
+    {
+      get;
+      set;
+    }
+
+    public ColorItem( Color color, string name )
+    {
+      Color = color;
+      Name = name;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/Implementation/ColorPicker.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/Implementation/ColorPicker.cs
new file mode 100644
index 00000000..42aca48a
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/Implementation/ColorPicker.cs
@@ -0,0 +1,525 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections.ObjectModel;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+
+namespace Xceed.Wpf.Toolkit
+{
+  [TemplatePart( Name = PART_AvailableColors, Type = typeof( ListBox ) )]
+  [TemplatePart( Name = PART_StandardColors, Type = typeof( ListBox ) )]
+  [TemplatePart( Name = PART_RecentColors, Type = typeof( ListBox ) )]
+  public class ColorPicker : Control
+  {
+    private const string PART_AvailableColors = "PART_AvailableColors";
+    private const string PART_StandardColors = "PART_StandardColors";
+    private const string PART_RecentColors = "PART_RecentColors";
+
+    #region Members
+
+    private ListBox _availableColors;
+    private ListBox _standardColors;
+    private ListBox _recentColors;
+
+    #endregion //Members
+
+    #region Properties
+
+    #region AvailableColors
+
+    public static readonly DependencyProperty AvailableColorsProperty = DependencyProperty.Register( "AvailableColors", typeof( ObservableCollection<ColorItem> ), typeof( ColorPicker ), new UIPropertyMetadata( CreateAvailableColors() ) );
+    public ObservableCollection<ColorItem> AvailableColors
+    {
+      get
+      {
+        return ( ObservableCollection<ColorItem> )GetValue( AvailableColorsProperty );
+      }
+      set
+      {
+        SetValue( AvailableColorsProperty, value );
+      }
+    }
+
+    #endregion //AvailableColors
+
+    #region AvailableColorsHeader
+
+    public static readonly DependencyProperty AvailableColorsHeaderProperty = DependencyProperty.Register( "AvailableColorsHeader", typeof( string ), typeof( ColorPicker ), new UIPropertyMetadata( "Available Colors" ) );
+    public string AvailableColorsHeader
+    {
+      get
+      {
+        return ( string )GetValue( AvailableColorsHeaderProperty );
+      }
+      set
+      {
+        SetValue( AvailableColorsHeaderProperty, value );
+      }
+    }
+
+    #endregion //AvailableColorsHeader
+
+    #region ButtonStyle
+
+    public static readonly DependencyProperty ButtonStyleProperty = DependencyProperty.Register( "ButtonStyle", typeof( Style ), typeof( ColorPicker ) );
+    public Style ButtonStyle
+    {
+      get
+      {
+        return ( Style )GetValue( ButtonStyleProperty );
+      }
+      set
+      {
+        SetValue( ButtonStyleProperty, value );
+      }
+    }
+
+    #endregion //ButtonStyle
+
+    #region DisplayColorAndName
+
+    public static readonly DependencyProperty DisplayColorAndNameProperty = DependencyProperty.Register( "DisplayColorAndName", typeof( bool ), typeof( ColorPicker ), new UIPropertyMetadata( false ) );
+    public bool DisplayColorAndName
+    {
+      get
+      {
+        return ( bool )GetValue( DisplayColorAndNameProperty );
+      }
+      set
+      {
+        SetValue( DisplayColorAndNameProperty, value );
+      }
+    }
+
+    #endregion //DisplayColorAndName
+
+    #region IsOpen
+
+    public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register( "IsOpen", typeof( bool ), typeof( ColorPicker ), new UIPropertyMetadata( false ) );
+    public bool IsOpen
+    {
+      get
+      {
+        return ( bool )GetValue( IsOpenProperty );
+      }
+      set
+      {
+        SetValue( IsOpenProperty, value );
+      }
+    }
+
+    #endregion //IsOpen
+
+    #region RecentColors
+
+    public static readonly DependencyProperty RecentColorsProperty = DependencyProperty.Register( "RecentColors", typeof( ObservableCollection<ColorItem> ), typeof( ColorPicker ), new UIPropertyMetadata( null ) );
+    public ObservableCollection<ColorItem> RecentColors
+    {
+      get
+      {
+        return ( ObservableCollection<ColorItem> )GetValue( RecentColorsProperty );
+      }
+      set
+      {
+        SetValue( RecentColorsProperty, value );
+      }
+    }
+
+    #endregion //RecentColors
+
+    #region RecentColorsHeader
+
+    public static readonly DependencyProperty RecentColorsHeaderProperty = DependencyProperty.Register( "RecentColorsHeader", typeof( string ), typeof( ColorPicker ), new UIPropertyMetadata( "Recent Colors" ) );
+    public string RecentColorsHeader
+    {
+      get
+      {
+        return ( string )GetValue( RecentColorsHeaderProperty );
+      }
+      set
+      {
+        SetValue( RecentColorsHeaderProperty, value );
+      }
+    }
+
+    #endregion //RecentColorsHeader
+
+    #region SelectedColor
+
+    public static readonly DependencyProperty SelectedColorProperty = DependencyProperty.Register( "SelectedColor", typeof( Color ), typeof( ColorPicker ), new FrameworkPropertyMetadata( Colors.Black, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, new PropertyChangedCallback( OnSelectedColorPropertyChanged ) ) );
+    public Color SelectedColor
+    {
+      get
+      {
+        return ( Color )GetValue( SelectedColorProperty );
+      }
+      set
+      {
+        SetValue( SelectedColorProperty, value );
+      }
+    }
+
+    private static void OnSelectedColorPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ColorPicker colorPicker = ( ColorPicker )d;
+      if( colorPicker != null )
+        colorPicker.OnSelectedColorChanged( ( Color )e.OldValue, ( Color )e.NewValue );
+    }
+
+    private void OnSelectedColorChanged( Color oldValue, Color newValue )
+    {
+      SelectedColorText = GetFormatedColorString( newValue );
+
+      RoutedPropertyChangedEventArgs<Color> args = new RoutedPropertyChangedEventArgs<Color>( oldValue, newValue );
+      args.RoutedEvent = ColorPicker.SelectedColorChangedEvent;
+      RaiseEvent( args );
+    }
+
+    #endregion //SelectedColor
+
+    #region SelectedColorText
+
+    public static readonly DependencyProperty SelectedColorTextProperty = DependencyProperty.Register( "SelectedColorText", typeof( string ), typeof( ColorPicker ), new UIPropertyMetadata( "Black" ) );
+    public string SelectedColorText
+    {
+      get
+      {
+        return ( string )GetValue( SelectedColorTextProperty );
+      }
+      protected set
+      {
+        SetValue( SelectedColorTextProperty, value );
+      }
+    }
+
+    #endregion //SelectedColorText
+
+    #region ShowAdvancedButton
+
+    public static readonly DependencyProperty ShowAdvancedButtonProperty = DependencyProperty.Register( "ShowAdvancedButton", typeof( bool ), typeof( ColorPicker ), new UIPropertyMetadata( true ) );
+    public bool ShowAdvancedButton
+    {
+      get
+      {
+        return ( bool )GetValue( ShowAdvancedButtonProperty );
+      }
+      set
+      {
+        SetValue( ShowAdvancedButtonProperty, value );
+      }
+    }
+
+    #endregion //ShowAdvancedButton
+
+    #region ShowAvailableColors
+
+    public static readonly DependencyProperty ShowAvailableColorsProperty = DependencyProperty.Register( "ShowAvailableColors", typeof( bool ), typeof( ColorPicker ), new UIPropertyMetadata( true ) );
+    public bool ShowAvailableColors
+    {
+      get
+      {
+        return ( bool )GetValue( ShowAvailableColorsProperty );
+      }
+      set
+      {
+        SetValue( ShowAvailableColorsProperty, value );
+      }
+    }
+
+    #endregion //ShowAvailableColors
+
+    #region ShowRecentColors
+
+    public static readonly DependencyProperty ShowRecentColorsProperty = DependencyProperty.Register( "ShowRecentColors", typeof( bool ), typeof( ColorPicker ), new UIPropertyMetadata( false ) );
+    public bool ShowRecentColors
+    {
+      get
+      {
+        return ( bool )GetValue( ShowRecentColorsProperty );
+      }
+      set
+      {
+        SetValue( ShowRecentColorsProperty, value );
+      }
+    }
+
+    #endregion //DisplayRecentColors
+
+    #region ShowStandardColors
+
+    public static readonly DependencyProperty ShowStandardColorsProperty = DependencyProperty.Register( "ShowStandardColors", typeof( bool ), typeof( ColorPicker ), new UIPropertyMetadata( true ) );
+    public bool ShowStandardColors
+    {
+      get
+      {
+        return ( bool )GetValue( ShowStandardColorsProperty );
+      }
+      set
+      {
+        SetValue( ShowStandardColorsProperty, value );
+      }
+    }
+
+    #endregion //DisplayStandardColors
+
+    #region ShowDropDownButton
+
+    public static readonly DependencyProperty ShowDropDownButtonProperty = DependencyProperty.Register( "ShowDropDownButton", typeof( bool ), typeof( ColorPicker ), new UIPropertyMetadata( true ) );
+    public bool ShowDropDownButton
+    {
+      get
+      {
+        return ( bool )GetValue( ShowDropDownButtonProperty );
+      }
+      set
+      {
+        SetValue( ShowDropDownButtonProperty, value );
+      }
+    }
+
+    #endregion //ShowDropDownButton
+
+    #region StandardColors
+
+    public static readonly DependencyProperty StandardColorsProperty = DependencyProperty.Register( "StandardColors", typeof( ObservableCollection<ColorItem> ), typeof( ColorPicker ), new UIPropertyMetadata( CreateStandardColors() ) );
+    public ObservableCollection<ColorItem> StandardColors
+    {
+      get
+      {
+        return ( ObservableCollection<ColorItem> )GetValue( StandardColorsProperty );
+      }
+      set
+      {
+        SetValue( StandardColorsProperty, value );
+      }
+    }
+
+    #endregion //StandardColors
+
+    #region StandardColorsHeader
+
+    public static readonly DependencyProperty StandardColorsHeaderProperty = DependencyProperty.Register( "StandardColorsHeader", typeof( string ), typeof( ColorPicker ), new UIPropertyMetadata( "Standard Colors" ) );
+    public string StandardColorsHeader
+    {
+      get
+      {
+        return ( string )GetValue( StandardColorsHeaderProperty );
+      }
+      set
+      {
+        SetValue( StandardColorsHeaderProperty, value );
+      }
+    }
+
+    #endregion //StandardColorsHeader
+
+    #region UsingAlphaChannel
+
+    public static readonly DependencyProperty UsingAlphaChannelProperty = DependencyProperty.Register( "UsingAlphaChannel", typeof( bool ), typeof( ColorPicker ), new FrameworkPropertyMetadata( true, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, new PropertyChangedCallback( OnUsingAlphaChannelPropertyChanged ) ) );
+    public bool UsingAlphaChannel
+    {
+      get
+      {
+        return ( bool )GetValue( UsingAlphaChannelProperty );
+      }
+      protected set
+      {
+        SetValue( UsingAlphaChannelProperty, value );
+      }
+    }
+
+    private static void OnUsingAlphaChannelPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ColorPicker colorPicker = ( ColorPicker )d;
+      if( colorPicker != null )
+        colorPicker.OnUsingAlphaChannelChanged();
+    }
+
+    private void OnUsingAlphaChannelChanged()
+    {
+      SelectedColorText = GetFormatedColorString( SelectedColor );
+    }
+
+    #endregion //UsingAlphaChannel
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static ColorPicker()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( ColorPicker ), new FrameworkPropertyMetadata( typeof( ColorPicker ) ) );
+    }
+
+    public ColorPicker()
+    {
+      RecentColors = new ObservableCollection<ColorItem>();
+      Keyboard.AddKeyDownHandler( this, OnKeyDown );
+      Mouse.AddPreviewMouseDownOutsideCapturedElementHandler( this, OnMouseDownOutsideCapturedElement );
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+
+      if( _availableColors != null )
+        _availableColors.SelectionChanged -= Color_SelectionChanged;
+
+      _availableColors = GetTemplateChild( PART_AvailableColors ) as ListBox;
+      if( _availableColors != null )
+        _availableColors.SelectionChanged += Color_SelectionChanged;
+
+      if( _standardColors != null )
+        _standardColors.SelectionChanged -= Color_SelectionChanged;
+
+      _standardColors = GetTemplateChild( PART_StandardColors ) as ListBox;
+      if( _standardColors != null )
+        _standardColors.SelectionChanged += Color_SelectionChanged;
+
+      if( _recentColors != null )
+        _recentColors.SelectionChanged -= Color_SelectionChanged;
+
+      _recentColors = GetTemplateChild( PART_RecentColors ) as ListBox;
+      if( _recentColors != null )
+        _recentColors.SelectionChanged += Color_SelectionChanged;
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Event Handlers
+
+    private void OnKeyDown( object sender, KeyEventArgs e )
+    {
+      switch( e.Key )
+      {
+        case Key.Escape:
+        case Key.Tab:
+          {
+            CloseColorPicker();
+            break;
+          }
+      }
+    }
+
+    private void OnMouseDownOutsideCapturedElement( object sender, MouseButtonEventArgs e )
+    {
+      CloseColorPicker();
+    }
+
+    private void Color_SelectionChanged( object sender, SelectionChangedEventArgs e )
+    {
+      ListBox lb = ( ListBox )sender;
+
+      if( e.AddedItems.Count > 0 )
+      {
+        var colorItem = ( ColorItem )e.AddedItems[ 0 ];
+        SelectedColor = colorItem.Color;
+        UpdateRecentColors( colorItem );
+        CloseColorPicker();
+        lb.SelectedIndex = -1; //for now I don't care about keeping track of the selected color
+      }
+    }
+
+    #endregion //Event Handlers
+
+    #region Events
+
+    public static readonly RoutedEvent SelectedColorChangedEvent = EventManager.RegisterRoutedEvent( "SelectedColorChanged", RoutingStrategy.Bubble, typeof( RoutedPropertyChangedEventHandler<Color> ), typeof( ColorPicker ) );
+    public event RoutedPropertyChangedEventHandler<Color> SelectedColorChanged
+    {
+      add
+      {
+        AddHandler( SelectedColorChangedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( SelectedColorChangedEvent, value );
+      }
+    }
+
+    #endregion //Events
+
+    #region Methods
+
+    private void CloseColorPicker()
+    {
+      if( IsOpen )
+        IsOpen = false;
+      ReleaseMouseCapture();
+    }
+
+    private void UpdateRecentColors( ColorItem colorItem )
+    {
+      if( !RecentColors.Contains( colorItem ) )
+        RecentColors.Add( colorItem );
+
+      if( RecentColors.Count > 10 ) //don't allow more than ten, maybe make a property that can be set by the user.
+        RecentColors.RemoveAt( 0 );
+    }
+
+    private string GetFormatedColorString( Color colorToFormat )
+    {
+      return ColorUtilities.FormatColorString( colorToFormat.GetColorName(), UsingAlphaChannel );
+    }
+
+    private static ObservableCollection<ColorItem> CreateStandardColors()
+    {
+      ObservableCollection<ColorItem> _standardColors = new ObservableCollection<ColorItem>();
+      _standardColors.Add( new ColorItem( Colors.Transparent, "Transparent" ) );
+      _standardColors.Add( new ColorItem( Colors.White, "White" ) );
+      _standardColors.Add( new ColorItem( Colors.Gray, "Gray" ) );
+      _standardColors.Add( new ColorItem( Colors.Black, "Black" ) );
+      _standardColors.Add( new ColorItem( Colors.Red, "Red" ) );
+      _standardColors.Add( new ColorItem( Colors.Green, "Green" ) );
+      _standardColors.Add( new ColorItem( Colors.Blue, "Blue" ) );
+      _standardColors.Add( new ColorItem( Colors.Yellow, "Yellow" ) );
+      _standardColors.Add( new ColorItem( Colors.Orange, "Orange" ) );
+      _standardColors.Add( new ColorItem( Colors.Purple, "Purple" ) );
+      return _standardColors;
+    }
+
+    private static ObservableCollection<ColorItem> CreateAvailableColors()
+    {
+      ObservableCollection<ColorItem> _standardColors = new ObservableCollection<ColorItem>();
+
+      foreach( var item in ColorUtilities.KnownColors )
+      {
+        if( !String.Equals( item.Key, "Transparent" ) )
+        {
+          var colorItem = new ColorItem( item.Value, item.Key );
+          if( !_standardColors.Contains( colorItem ) )
+            _standardColors.Add( colorItem );
+        }
+      }
+
+      return _standardColors;
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/Themes/Generic.xaml
new file mode 100644
index 00000000..dd7c3188
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/Themes/Generic.xaml
@@ -0,0 +1,323 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
+                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes">
+
+   <SolidColorBrush x:Key="ButtonHover" Color="#C2E0FF" />
+   <SolidColorBrush x:Key="ButtonHoverBorder" Color="#3399FF" />
+   <SolidColorBrush x:Key="ButtonChecked" Color="#E6F0FA" />
+   <SolidColorBrush x:Key="ButtonPressed" Color="#99CCFF" />
+   <SolidColorBrush x:Key="ButtonPressedBorder" Color="#3399FF" />
+
+   <!-- =============================================================================== -->
+   <!-- ColorPicker                                                                     -->
+   <!-- =============================================================================== -->
+
+   <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+   <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+   <conv:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
+
+   <LinearGradientBrush x:Key="ColorPickerDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="1" Color="#FFE8EBED" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <DrawingBrush  x:Key="CheckerBrush" Viewport="0,0,10,10" ViewportUnits="Absolute" TileMode="Tile">
+      <DrawingBrush.Drawing>
+         <DrawingGroup>
+            <GeometryDrawing Brush="White">
+               <GeometryDrawing.Geometry>
+                  <RectangleGeometry Rect="0,0 100,100" />
+               </GeometryDrawing.Geometry>
+            </GeometryDrawing>
+            <GeometryDrawing Brush="LightGray">
+               <GeometryDrawing.Geometry>
+                  <GeometryGroup>
+                     <RectangleGeometry Rect="0,0 50,50" />
+                     <RectangleGeometry Rect="50,50 50,50" />
+                  </GeometryGroup>
+               </GeometryDrawing.Geometry>
+            </GeometryDrawing>
+         </DrawingGroup>
+      </DrawingBrush.Drawing>
+   </DrawingBrush>
+
+   <Style x:Key="ColorItemContainerStyle" TargetType="{x:Type ListBoxItem}">
+      <Setter Property="ToolTip" Value="{Binding Name}" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ListBoxItem}">
+               <Grid ToolTip="{Binding Name}">
+                  <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
+                  <Border BorderThickness="1" Background="Transparent" BorderBrush="Transparent" x:Name="_outerBorder" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                     <Border Background="Transparent" BorderThickness="1" BorderBrush="Transparent" x:Name="_innerBorder" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" />
+                  </Border>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsMouseOver" Value="True">
+                     <Setter TargetName="_outerBorder" Property="BorderBrush" Value="#FFFF0000" />
+                     <Setter TargetName="_innerBorder" Property="BorderBrush" Value="#FFFFFF00" />
+                  </Trigger>
+                  <Trigger Property="IsSelected" Value="True">
+                     <Setter TargetName="_outerBorder" Property="BorderBrush" Value="#FFFF0000" />
+                     <Setter TargetName="_innerBorder" Property="BorderBrush" Value="#FFFFFF00" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <DataTemplate x:Key="ColorItemTemplate">
+      <Grid>
+         <Border BorderBrush="#FFC9CACA" BorderThickness="1" Margin="2,2,2,2" >
+            <Rectangle Width="14" Height="14">
+               <Rectangle.Style>
+                  <Style TargetType="Rectangle">
+                     <Setter Property="Fill" Value="{Binding Color, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
+                     <Style.Triggers>
+                        <DataTrigger Binding="{Binding Name}" Value="Transparent">
+                           <Setter Property="Fill" Value="{StaticResource CheckerBrush}" />
+                        </DataTrigger>
+                     </Style.Triggers>
+                  </Style>
+               </Rectangle.Style>
+            </Rectangle>
+         </Border>
+      </Grid>
+   </DataTemplate>
+
+   <Style x:Key="ColorPickerToggleButtonStyle" TargetType="ToggleButton">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="ToggleButton">
+               <Grid SnapsToDevicePixels="True">
+
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+
+                     <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
+                        <ContentPresenter Content="{TemplateBinding Content}"
+                                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                                          ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                     </Border>
+
+                     <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                          Grid.Column="1"
+                                          CornerRadius="0,2.75,2.75,0"
+                                          Visibility="{Binding ShowDropDownButton, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}, Converter={StaticResource BooleanToVisibilityConverter}}"
+                                          RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}}"
+                                          RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}}"
+											         RenderMouseOver="{TemplateBinding IsMouseOver}"
+											         RenderPressed="{TemplateBinding IsPressed}">
+
+                        <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
+                           <Path x:Name="Arrow" Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000" />
+                        </Grid>
+                     </chrome:ButtonChrome>
+                  </Grid>
+
+               </Grid>
+                <ControlTemplate.Triggers>
+                    <Trigger Property="IsEnabled" Value="False">
+                        <Setter Property="Fill" TargetName="Arrow" Value="#AFAFAF" />
+                    </Trigger>
+                </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="ColorDisplayStyle" TargetType="Border">
+      <Setter Property="Background" Value="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
+      <Style.Triggers>
+         <DataTrigger Binding="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}}" Value="Transparent">
+            <Setter Property="Background" Value="{StaticResource CheckerBrush}" />
+         </DataTrigger>
+      </Style.Triggers>
+   </Style>
+
+   <Style x:Key="ColorListStyle" TargetType="ListBox">
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="BorderThickness" Value="0" />
+      <Setter Property="ItemsPanel">
+         <Setter.Value>
+            <ItemsPanelTemplate>
+               <WrapPanel Width="200" />
+            </ItemsPanelTemplate>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="ItemContainerStyle" Value="{StaticResource ColorItemContainerStyle}" />
+      <Setter Property="ItemTemplate" Value="{StaticResource ColorItemTemplate}" />
+      <Setter Property="SelectionMode" Value="Single" />
+   </Style>
+
+   <Style TargetType="{x:Type local:ColorPicker}">
+      <Setter Property="Background" Value="White" />
+      <Setter Property="BorderBrush" Value="{StaticResource ColorPickerDarkBorderBrush}" />
+      <Setter Property="BorderThickness" Value="1,1,1,1" />
+      <Setter Property="ButtonStyle" Value="{StaticResource ColorPickerToggleButtonStyle}" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:ColorPicker}">
+               <Grid>
+                  <ToggleButton x:Name="PART_ColorPickerToggleButton"
+                                IsTabStop="True"
+                                MinHeight="22" 
+                                Background="{TemplateBinding Background}" 
+                                BorderBrush="{TemplateBinding BorderBrush}" 
+                                BorderThickness="{TemplateBinding BorderThickness}" 
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                Padding="{TemplateBinding Padding}"
+                                IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
+                                Style="{TemplateBinding ButtonStyle}">
+                     <Grid Margin="2">
+                        <Border x:Name="ColorOnly" Style="{StaticResource ColorDisplayStyle}" />
+
+                        <Border x:Name="ColorAndName" Background="White" Visibility="Hidden">
+                           <StackPanel Orientation="Horizontal">
+                              <Border HorizontalAlignment="Left" Width="20" Margin="2,1,4,1" Style="{StaticResource ColorDisplayStyle}" BorderThickness="1" BorderBrush="#FFC9CACA" />
+                              <TextBlock Text="{Binding SelectedColorText, RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="Center" />
+                           </StackPanel>
+                        </Border>
+                     </Grid>
+                  </ToggleButton>
+
+                  <Popup x:Name="PART_ColorPickerPalettePopup" VerticalAlignment="Bottom" IsOpen="{Binding ElementName=PART_ColorPickerToggleButton, Path=IsChecked}" StaysOpen="False" AllowsTransparency="True" Focusable="False" HorizontalOffset="1" VerticalOffset="1" PopupAnimation="Slide">
+                     <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource ColorPickerDarkBorderBrush}" Padding="3">
+                        <Grid>
+                           <Grid.RowDefinitions>
+                              <RowDefinition Height="Auto" />
+                              <RowDefinition />
+                              <RowDefinition Height="Auto" />
+                           </Grid.RowDefinitions>
+
+                           <Grid x:Name="_gridStandardColorsHost" Margin="4">
+                              <Grid.RowDefinitions>
+                                 <RowDefinition Height="Auto" />
+                                 <RowDefinition Height="Auto" />
+                                 <RowDefinition Height="Auto" />
+                                 <RowDefinition Height="Auto" />
+                              </Grid.RowDefinitions>
+
+                              <!-- Available Colors -->
+                              <Grid Grid.Row="1" Visibility="{TemplateBinding ShowAvailableColors, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                 <Grid>
+                                    <Grid.RowDefinitions>
+                                       <RowDefinition Height="Auto" />
+                                       <RowDefinition />
+                                    </Grid.RowDefinitions>
+                                    <TextBlock Text="{TemplateBinding AvailableColorsHeader}" Background="AliceBlue" Padding="2" Margin="0,0,0,1" />
+                                    <ListBox x:Name="PART_AvailableColors"
+                                             Grid.Row="1"
+                                             ItemsSource="{Binding AvailableColors, RelativeSource={RelativeSource TemplatedParent}}"
+                                             Style="{StaticResource ColorListStyle}" />
+                                 </Grid>
+                              </Grid>
+
+                              <!-- Standard Colors-->
+                              <Grid Grid.Row="2" Visibility="{TemplateBinding ShowStandardColors, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                 <Grid>
+                                    <Grid.RowDefinitions>
+                                       <RowDefinition Height="Auto" />
+                                       <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+                                    <TextBlock Text="{TemplateBinding StandardColorsHeader}" Background="AliceBlue" Padding="2" Margin="0,1,0,1" />
+                                    <ListBox x:Name="PART_StandardColors"
+                                             Grid.Row="1"
+                                             ItemsSource="{Binding StandardColors, RelativeSource={RelativeSource TemplatedParent}}"                                                      
+                                             Style="{StaticResource ColorListStyle}" />
+                                 </Grid>
+                              </Grid>
+
+                              <!-- Recent Colors-->
+                              <Grid Grid.Row="3" Margin="0,1,0,1" Visibility="{TemplateBinding ShowRecentColors, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                 <Grid>
+                                    <Grid.RowDefinitions>
+                                       <RowDefinition Height="Auto" />
+                                       <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+                                    <TextBlock Text="{TemplateBinding RecentColorsHeader}" Background="AliceBlue" Padding="2" Margin="0,1,0,1" />
+                                    <ListBox x:Name="PART_RecentColors"
+                                             Grid.Row="1"
+                                             ItemsSource="{Binding RecentColors, RelativeSource={RelativeSource TemplatedParent}}"
+                                             Style="{StaticResource ColorListStyle}" />
+                                 </Grid>
+                              </Grid>
+                           </Grid>
+
+                           <!-- ColorCanvas -->
+                           <Grid x:Name="_colorCanvasHost" Visibility="Collapsed">
+                              <local:ColorCanvas x:Name="PART_ColorCanvas"
+                                                 Background="Transparent"
+                                                 BorderThickness="0"
+                                                 UsingAlphaChannel="{Binding UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}}"
+                                                 SelectedColor="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}}" />
+                           </Grid>
+
+                           <Separator Grid.Row="1" HorizontalAlignment="Stretch" Margin="5,0,5,0" />
+
+                           <!-- More Colors Button -->
+                           <ToggleButton x:Name="_colorMode" Grid.Row="2" Content="Advanced" Margin="5" Visibility="{TemplateBinding ShowAdvancedButton, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                        </Grid>
+                     </Border>
+                  </Popup>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="DisplayColorAndName" Value="True">
+                     <Setter TargetName="ColorOnly" Property="Visibility" Value="Collapsed" />
+                     <Setter TargetName="ColorAndName" Property="Visibility" Value="Visible" />
+                  </Trigger>
+                  <Trigger SourceName="_colorMode" Property="IsChecked" Value="True">
+                     <Setter TargetName="_colorMode" Property="Content" Value="Standard" />
+                     <Setter TargetName="_colorCanvasHost" Property="Visibility" Value="Visible" />
+                     <Setter TargetName="_gridStandardColorsHost" Property="Visibility" Value="Collapsed" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/CalculatorMemoryToVisibilityConverter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/CalculatorMemoryToVisibilityConverter.cs
new file mode 100644
index 00000000..e9a35daa
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/CalculatorMemoryToVisibilityConverter.cs
@@ -0,0 +1,38 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.Core.Converters
+{
+  public class CalculatorMemoryToVisibilityConverter : IValueConverter
+  {
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      return ( decimal )value == decimal.Zero ? Visibility.Hidden : Visibility.Visible;
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/ColorToSolidColorBrushConverter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/ColorToSolidColorBrushConverter.cs
new file mode 100644
index 00000000..7ecc05f5
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/ColorToSolidColorBrushConverter.cs
@@ -0,0 +1,70 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows.Data;
+using System.Windows.Media;
+
+namespace Xceed.Wpf.Toolkit.Core.Converters
+{
+  public class ColorToSolidColorBrushConverter : IValueConverter
+  {
+    #region IValueConverter Members
+
+    /// <summary>
+    /// Converts a Color to a SolidColorBrush.
+    /// </summary>
+    /// <param name="value">The Color produced by the binding source.</param>
+    /// <param name="targetType">The type of the binding target property.</param>
+    /// <param name="parameter">The converter parameter to use.</param>
+    /// <param name="culture">The culture to use in the converter.</param>
+    /// <returns>
+    /// A converted SolidColorBrush. If the method returns null, the valid null value is used.
+    /// </returns>
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      if( value != null )
+        return new SolidColorBrush( ( Color )value );
+
+      return value;
+    }
+
+
+    /// <summary>
+    /// Converts a SolidColorBrush to a Color.
+    /// </summary>
+    /// <remarks>Currently not used in toolkit, but provided for developer use in their own projects</remarks>
+    /// <param name="value">The SolidColorBrush that is produced by the binding target.</param>
+    /// <param name="targetType">The type to convert to.</param>
+    /// <param name="parameter">The converter parameter to use.</param>
+    /// <param name="culture">The culture to use in the converter.</param>
+    /// <returns>
+    /// A converted value. If the method returns null, the valid null value is used.
+    /// </returns>
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      if( value != null )
+        return ( ( SolidColorBrush )value ).Color;
+
+      return value;
+    }
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/InverseBoolConverter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/InverseBoolConverter.cs
new file mode 100644
index 00000000..2d1df1fb
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/InverseBoolConverter.cs
@@ -0,0 +1,41 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.Core.Converters
+{
+  public class InverseBoolConverter : IValueConverter
+  {
+    #region IValueConverter Members
+
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      return !( bool )value;
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/ObjectTypeToNameConverter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/ObjectTypeToNameConverter.cs
new file mode 100644
index 00000000..276b4de4
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/ObjectTypeToNameConverter.cs
@@ -0,0 +1,36 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.Core.Converters
+{
+  public class ObjectTypeToNameConverter : IValueConverter
+  {
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      return value.GetType().Name;
+    }
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/RoundedValueConverter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/RoundedValueConverter.cs
new file mode 100644
index 00000000..e5fa5f52
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/RoundedValueConverter.cs
@@ -0,0 +1,68 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.Core.Converters
+{
+  public class RoundedValueConverter : IValueConverter
+  {
+    #region Precision Property
+
+    public int Precision
+    {
+      get
+      {
+        return _precision;
+      }
+      set
+      {
+        _precision = value;
+      }
+    }
+
+    private int _precision = 0;
+
+    #endregion
+
+    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
+    {
+      if( value is double )
+      {
+        return Math.Round( ( double )value, _precision );
+      }
+      else if( value is Point )
+      {
+        return new Point( Math.Round( ( ( Point )value ).X, _precision ), Math.Round( ( ( Point )value ).Y, _precision ) );
+      }
+      else
+      {
+        return value;
+      }
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
+    {
+      return value;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/SolidColorBrushToColorConverter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/SolidColorBrushToColorConverter.cs
new file mode 100644
index 00000000..f318b655
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/SolidColorBrushToColorConverter.cs
@@ -0,0 +1,52 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows.Data;
+using System.Windows.Media;
+
+namespace Xceed.Wpf.Toolkit.Core.Converters
+{
+  public class SolidColorBrushToColorConverter : IValueConverter
+  {
+    #region IValueConverter Members
+
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      SolidColorBrush brush = value as SolidColorBrush;
+      if( brush != null )
+        return brush.Color;
+
+      return default( Color );
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      if( value != null )
+      {
+        Color color = ( Color )value;
+        return new SolidColorBrush( color );
+      }
+
+      return default( SolidColorBrush );
+    }
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/TimeFormatToDateTimeFormatConverter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/TimeFormatToDateTimeFormatConverter.cs
new file mode 100644
index 00000000..e36cc204
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/TimeFormatToDateTimeFormatConverter.cs
@@ -0,0 +1,52 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.Core.Converters
+{
+  public class TimeFormatToDateTimeFormatConverter : IValueConverter
+  {
+    #region IValueConverter Members
+
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      TimeFormat timeFormat = ( TimeFormat )value;
+      switch( timeFormat )
+      {
+        case TimeFormat.Custom:
+          return DateTimeFormat.Custom;
+        case TimeFormat.ShortTime:
+          return DateTimeFormat.ShortTime;
+        case TimeFormat.LongTime:
+          return DateTimeFormat.LongTime;
+        default:
+          return DateTimeFormat.ShortTime;
+      }
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/VisibilityToBoolConverter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/VisibilityToBoolConverter.cs
new file mode 100644
index 00000000..79ccaee6
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/VisibilityToBoolConverter.cs
@@ -0,0 +1,92 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+using Xceed.Wpf.Toolkit.Core;
+
+namespace Xceed.Wpf.Toolkit.Core.Converters
+{
+  public class VisibilityToBoolConverter : IValueConverter
+  {
+    #region Inverted Property
+
+    public bool Inverted
+    {
+      get
+      {
+        return _inverted;
+      }
+      set
+      {
+        _inverted = value;
+      }
+    }
+
+    private bool _inverted; //false
+
+    #endregion
+
+    #region Not Property
+
+    public bool Not
+    {
+      get
+      {
+        return _not;
+      }
+      set
+      {
+        _not = value;
+      }
+    }
+
+    private bool _not; //false
+
+    #endregion
+
+    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
+    {
+      return this.Inverted ? this.BoolToVisibility( value ) : this.VisibilityToBool( value );
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
+    {
+      return this.Inverted ? this.VisibilityToBool( value ) : this.BoolToVisibility( value );
+    }
+
+    private object VisibilityToBool( object value )
+    {
+      if( !( value is Visibility ) )
+        throw new InvalidOperationException( ErrorMessages.GetMessage( "SuppliedValueWasNotVisibility" ) );
+
+      return ( ( ( Visibility )value ) == Visibility.Visible ) ^ Not;
+    }
+
+    private object BoolToVisibility( object value )
+    {
+      if( !( value is bool ) )
+        throw new InvalidOperationException( ErrorMessages.GetMessage( "SuppliedValueWasNotBool" ) );
+
+      return ( ( bool )value ^ Not ) ? Visibility.Visible : Visibility.Collapsed;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/WizardPageButtonVisibilityConverter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/WizardPageButtonVisibilityConverter.cs
new file mode 100644
index 00000000..1c8bc7a9
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/WizardPageButtonVisibilityConverter.cs
@@ -0,0 +1,59 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.Core.Converters
+{
+  public class WizardPageButtonVisibilityConverter : IMultiValueConverter
+  {
+    public object Convert( object[] values, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      Visibility wizardVisibility = ( Visibility )values[ 0 ];
+      WizardPageButtonVisibility wizardPageVisibility = ( WizardPageButtonVisibility )values[ 1 ];
+
+      Visibility visibility = Visibility.Visible;
+
+      switch( wizardPageVisibility )
+      {
+        case WizardPageButtonVisibility.Inherit:
+          visibility = wizardVisibility;
+          break;
+        case WizardPageButtonVisibility.Collapsed:
+          visibility = Visibility.Collapsed;
+          break;
+        case WizardPageButtonVisibility.Hidden:
+          visibility = Visibility.Hidden;
+          break;
+        case WizardPageButtonVisibility.Visible:
+          visibility = Visibility.Visible;
+          break;
+      }
+
+      return visibility;
+    }
+
+    public object[] ConvertBack( object value, Type[] targetTypes, object parameter, System.Globalization.CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/ErrorMessages.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/ErrorMessages.cs
new file mode 100644
index 00000000..9702be3b
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/ErrorMessages.cs
@@ -0,0 +1,65 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Resources;
+
+namespace Xceed.Wpf.Toolkit.Core
+{
+  internal static class ErrorMessages
+  {
+    #region Static Fields
+
+
+    public const string EndAngleCannotBeSetDirectlyInSlice = "EndAngleCannotBeSetDirectlyInSlice";
+    public const string SliceCannotBeSetDirectlyInEndAngle = "SliceCannotBeSetDirectlyInEndAngle";
+    public const string SliceOOR = "SliceOOR";
+    public const string AnimationAccelerationRatioOOR = "AnimationAccelerationRatioOOR";
+    public const string AnimationDecelerationRatioOOR = "AnimationDecelerationRatioOOR";
+    public const string ZoomboxContentMustBeUIElement = "ZoomboxContentMustBeUIElement";
+    public const string ViewModeInvalidForSource = "ViewModeInvalidForSource";
+    public const string ZoomboxTemplateNeedsContent = "ZoomboxTemplateNeedsContent";
+    public const string ZoomboxHasViewFinderButNotDisplay = "ZoomboxHasViewFinderButNotDisplay";
+    public const string PositionOnlyAccessibleOnAbsolute = "PositionOnlyAccessibleOnAbsolute";
+    public const string ZoomboxViewAlreadyInitialized = "ZoomboxViewAlreadyInitialized";
+    public const string ScaleOnlyAccessibleOnAbsolute = "ScaleOnlyAccessibleOnAbsolute";
+    public const string RegionOnlyAccessibleOnRegionalView = "RegionOnlyAccessibleOnRegionalView";
+    public const string UnableToConvertToZoomboxView = "UnableToConvertToZoomboxView";
+    public const string ViewStackCannotBeManipulatedNow = "ViewStackCannotBeManipulatedNow";
+
+    public const string SuppliedValueWasNotVisibility = "SuppliedValueWasNotVisibility";
+
+    private static readonly ResourceManager _resourceManager;
+
+    #endregion
+
+    #region Constructor
+
+    static ErrorMessages()
+    {
+      _resourceManager = new ResourceManager( "Xceed.Wpf.Toolkit.Core.ErrorMessages", typeof( ErrorMessages ).Assembly );
+    }
+
+    #endregion
+
+    public static string GetMessage( string msgId )
+    {
+      return _resourceManager.GetString( msgId );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/ErrorMessages.resx b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/ErrorMessages.resx
new file mode 100644
index 00000000..f06c5874
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/ErrorMessages.resx
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="AnimationAccelerationRatioOOR" xml:space="preserve">
+    <value>AnimationAccelerationRatio must be between 0.0 and 1.0.</value>
+  </data>
+  <data name="AnimationDecelerationRatioOOR" xml:space="preserve">
+    <value>AnimationDecelerationRatio must be between 0.0 and 1.0.</value>
+  </data>
+  <data name="AnimationStateNeedsHelper" xml:space="preserve">
+    <value>ItemAnimationState can only be used once the animation helper has been assigned</value>
+  </data>
+  <data name="CannotConvertBackToRange" xml:space="preserve">
+    <value>Cannot convert back to a range.</value>
+  </data>
+  <data name="ContainerModelAlreadyRemoved" xml:space="preserve">
+    <value>Container model was already removed from children collection.</value>
+  </data>
+  <data name="EndAngleCannotBeSetDirectlyInSlice" xml:space="preserve">
+    <value>The EndAngle property cannot be set directly while a Pie's Mode is Slice. You must set the Slice property instead.</value>
+  </data>
+  <data name="GlassEnabledNeedsFullTrust" xml:space="preserve">
+    <value>GlassEnabled can be set only in Full Trust enviornments</value>
+  </data>
+  <data name="ItemMustBeAVisual" xml:space="preserve">
+    <value>item must be a Visual</value>
+  </data>
+  <data name="ItemMustBeMode3DOrVisual3D" xml:space="preserve">
+    <value>item must be either a Model3D or a Visual3D.</value>
+  </data>
+  <data name="MethodNotImplemented" xml:space="preserve">
+    <value>The method or operation is not implemented.</value>
+  </data>
+  <data name="OperationNotSupported" xml:space="preserve">
+    <value>Operation not supported on the platform</value>
+  </data>
+  <data name="OrderedItemsNeedEveryVisible" xml:space="preserve">
+    <value>orderedItems must contain every item in the visible items.</value>
+  </data>
+  <data name="PositionOnlyAccessibleOnAbsolute" xml:space="preserve">
+    <value>The Position property can only be accessed on an absolute view.</value>
+  </data>
+  <data name="RegionOnlyAccessibleOnRegionalView" xml:space="preserve">
+    <value>The Region property can only be accessed on a region-based view.</value>
+  </data>
+  <data name="ScaleOnlyAccessibleOnAbsolute" xml:space="preserve">
+    <value>The Scale property can only be accessed on an absolute view.</value>
+  </data>
+  <data name="SetNewToValueSetOnCompletedHelper" xml:space="preserve">
+    <value>SetNewToValue set on a completed animation helper</value>
+  </data>
+  <data name="SliceCannotBeSetDirectlyInEndAngle" xml:space="preserve">
+    <value>The Slice property cannot be set directly while a Pie's Mode is EndAngle. You must set the EndAngle property instead.</value>
+  </data>
+  <data name="SliceOOR" xml:space="preserve">
+    <value>Slice must be between 0.0 and 1.0.</value>
+  </data>
+  <data name="SuppliedValueWasNotBool" xml:space="preserve">
+    <value>Error converting from bool value to Visibility value. Supplied value was not of type bool.</value>
+  </data>
+  <data name="SuppliedValueWasNotVisibility" xml:space="preserve">
+    <value>Error converting from Visibility value to bool value. Supplied value was not of type Visibility.</value>
+  </data>
+  <data name="ToAndFromMatrixAreEqual" xml:space="preserve">
+    <value>To and from matrix are equal</value>
+  </data>
+  <data name="UnableToConvertToZoomboxView" xml:space="preserve">
+    <value>Unable to convert object '{0}' to ZoomboxView.</value>
+  </data>
+  <data name="ValueToConvertMustBeNumber" xml:space="preserve">
+    <value>Value to convert must be a number.</value>
+  </data>
+  <data name="ViewModeInvalidForSource" xml:space="preserve">
+    <value>The ViewStackMode must be Default or Manual while ViewStackSource is in use.</value>
+  </data>
+  <data name="ViewStackCannotBeManipulatedNow" xml:space="preserve">
+    <value>The ViewStack cannot be directly manipulated. Operation is not valid while ViewStackSource is in use. Access and modify members of the Zoombox.ViewStackSource instead.</value>
+  </data>
+  <data name="VisibleMustEqualOrdered" xml:space="preserve">
+    <value>VisibleItemCount and orderedItems count must be equal.</value>
+  </data>
+  <data name="ZoomboxContentMustBeUIElement" xml:space="preserve">
+    <value>The Content property of a Zoombox control must specify a UIElement.</value>
+  </data>
+  <data name="ZoomboxHasViewFinderButNotDisplay" xml:space="preserve">
+    <value>The Zoombox template contains a ViewFinder element but it does not contain a ZoomboxViewFinderDisplay element</value>
+  </data>
+  <data name="ZoomboxTemplateNeedsContent" xml:space="preserve">
+    <value>The Zoombox template does not contain a content presenter.</value>
+  </data>
+  <data name="ZoomboxViewAlreadyInitialized" xml:space="preserve">
+    <value>The ZoomboxView instance is already initialized for a different type of view: {0}</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/IndexChangedEventArgs.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/IndexChangedEventArgs.cs
new file mode 100644
index 00000000..4f3a2482
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/IndexChangedEventArgs.cs
@@ -0,0 +1,41 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.Core
+{
+  public class IndexChangedEventArgs : PropertyChangedEventArgs<int>
+  {
+    #region Constructors
+
+    public IndexChangedEventArgs( RoutedEvent routedEvent, int oldIndex, int newIndex )
+      : base( routedEvent, oldIndex, newIndex )
+    {
+    }
+
+    #endregion
+
+    protected override void InvokeEventHandler( Delegate genericHandler, object genericTarget )
+    {
+      ( ( IndexChangedEventHandler )genericHandler )( genericTarget, this );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/IndexChangedEventHandler.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/IndexChangedEventHandler.cs
new file mode 100644
index 00000000..90b8efc4
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/IndexChangedEventHandler.cs
@@ -0,0 +1,23 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit.Core
+{
+  public delegate void IndexChangedEventHandler( object sender, IndexChangedEventArgs e );
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Input/KeyModifier.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Input/KeyModifier.cs
new file mode 100644
index 00000000..b3213eb4
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Input/KeyModifier.cs
@@ -0,0 +1,38 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+
+namespace Xceed.Wpf.Toolkit.Core.Input
+{
+  public enum KeyModifier
+  {
+    None,
+    Blocked,
+    Ctrl,
+    LeftCtrl,
+    RightCtrl,
+    Shift,
+    LeftShift,
+    RightShift,
+    Alt,
+    LeftAlt,
+    RightAlt,
+    Exact,
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Input/KeyModifierCollection.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Input/KeyModifierCollection.cs
new file mode 100644
index 00000000..7479759d
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Input/KeyModifierCollection.cs
@@ -0,0 +1,226 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Windows.Input;
+
+namespace Xceed.Wpf.Toolkit.Core.Input
+{
+  [TypeConverter( typeof( KeyModifierCollectionConverter ) )]
+  public class KeyModifierCollection : Collection<KeyModifier>
+  {
+    #region AreActive Property
+
+    public bool AreActive
+    {
+      get
+      {
+        if( this.Count == 0 )
+          return true;
+
+        // if the Blocked modifier is present, then the action is not allowed
+        // so simply return false
+        if( this.Contains( KeyModifier.Blocked ) )
+          return false;
+
+        if( this.Contains( KeyModifier.Exact ) )
+          return this.IsExactMatch();
+
+        return this.MatchAny();
+      }
+    }
+
+    #endregion
+
+    private static bool IsKeyPressed( KeyModifier modifier, ICollection<Key> keys )
+    {
+      switch( modifier )
+      {
+        case KeyModifier.Alt:
+          return keys.Contains( Key.LeftAlt )
+              || keys.Contains( Key.RightAlt );
+
+        case KeyModifier.LeftAlt:
+          return keys.Contains( Key.LeftAlt );
+
+        case KeyModifier.RightAlt:
+          return keys.Contains( Key.RightAlt );
+
+        case KeyModifier.Ctrl:
+          return keys.Contains( Key.LeftCtrl )
+              || keys.Contains( Key.RightCtrl );
+
+        case KeyModifier.LeftCtrl:
+          return keys.Contains( Key.LeftCtrl );
+
+        case KeyModifier.RightCtrl:
+          return keys.Contains( Key.RightCtrl );
+
+        case KeyModifier.Shift:
+          return keys.Contains( Key.LeftShift )
+              || keys.Contains( Key.RightShift );
+
+        case KeyModifier.LeftShift:
+          return keys.Contains( Key.LeftShift );
+
+        case KeyModifier.RightShift:
+          return keys.Contains( Key.RightShift );
+
+        case KeyModifier.None:
+          return true;
+
+        default:
+          throw new NotSupportedException( "Unknown modifier" );
+      }
+    }
+
+    private static bool HasModifier( Key key, ICollection<KeyModifier> modifiers )
+    {
+      switch( key )
+      {
+        case Key.LeftAlt:
+          return modifiers.Contains( KeyModifier.Alt )
+              || modifiers.Contains( KeyModifier.LeftAlt );
+
+        case Key.RightAlt:
+          return modifiers.Contains( KeyModifier.Alt )
+              || modifiers.Contains( KeyModifier.RightAlt );
+
+        case Key.LeftCtrl:
+          return modifiers.Contains( KeyModifier.Ctrl )
+              || modifiers.Contains( KeyModifier.LeftCtrl );
+
+        case Key.RightCtrl:
+          return modifiers.Contains( KeyModifier.Ctrl )
+              || modifiers.Contains( KeyModifier.RightCtrl );
+
+        case Key.LeftShift:
+          return modifiers.Contains( KeyModifier.Shift )
+              || modifiers.Contains( KeyModifier.LeftShift );
+
+        case Key.RightShift:
+          return modifiers.Contains( KeyModifier.Shift )
+              || modifiers.Contains( KeyModifier.RightShift );
+
+        default:
+          throw new NotSupportedException( "Unknown key" );
+      }
+    }
+
+    private bool IsExactMatch()
+    {
+      HashSet<KeyModifier> modifiers = this.GetKeyModifiers();
+      HashSet<Key> keys = this.GetKeysPressed();
+
+      // No key must be pressed for the modifier None.
+      if( this.Contains( KeyModifier.None ) )
+        return ( modifiers.Count == 0 )
+            && ( keys.Count == 0 );
+
+      // Make sure every modifier has a matching key pressed.
+      foreach( KeyModifier modifier in modifiers )
+      {
+        if( !KeyModifierCollection.IsKeyPressed( modifier, keys ) )
+          return false;
+      }
+
+      // Make sure every key pressed has a matching modifier.
+      foreach( Key key in keys )
+      {
+        if( !KeyModifierCollection.HasModifier( key, modifiers ) )
+          return false;
+      }
+
+      return true;
+    }
+
+    private bool MatchAny()
+    {
+      if( this.Contains( KeyModifier.None ) )
+        return true;
+
+      HashSet<KeyModifier> modifiers = this.GetKeyModifiers();
+      HashSet<Key> keys = this.GetKeysPressed();
+
+      foreach( KeyModifier modifier in modifiers )
+      {
+        if( KeyModifierCollection.IsKeyPressed( modifier, keys ) )
+          return true;
+      }
+
+      return false;
+    }
+
+    private HashSet<KeyModifier> GetKeyModifiers()
+    {
+      HashSet<KeyModifier> modifiers = new HashSet<KeyModifier>();
+
+      foreach( KeyModifier modifier in this )
+      {
+        switch( modifier )
+        {
+          case KeyModifier.Alt:
+          case KeyModifier.LeftAlt:
+          case KeyModifier.RightAlt:
+          case KeyModifier.Ctrl:
+          case KeyModifier.LeftCtrl:
+          case KeyModifier.RightCtrl:
+          case KeyModifier.Shift:
+          case KeyModifier.LeftShift:
+          case KeyModifier.RightShift:
+            {
+              if( !modifiers.Contains( modifier ) )
+              {
+                modifiers.Add( modifier );
+              }
+            }
+            break;
+
+          default:
+            break;
+        }
+      }
+
+      return modifiers;
+    }
+
+    private HashSet<Key> GetKeysPressed()
+    {
+      HashSet<Key> keys = new HashSet<Key>();
+
+      if( Keyboard.IsKeyDown( Key.LeftAlt ) )
+        keys.Add( Key.LeftAlt );
+      if( Keyboard.IsKeyDown( Key.RightAlt ) )
+        keys.Add( Key.RightAlt );
+      if( Keyboard.IsKeyDown( Key.LeftCtrl ) )
+        keys.Add( Key.LeftCtrl );
+      if( Keyboard.IsKeyDown( Key.RightCtrl ) )
+        keys.Add( Key.RightCtrl );
+      if( Keyboard.IsKeyDown( Key.LeftShift ) )
+        keys.Add( Key.LeftShift );
+      if( Keyboard.IsKeyDown( Key.RightShift ) )
+        keys.Add( Key.RightShift );
+
+      return keys;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Input/KeyModifierCollectionConverter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Input/KeyModifierCollectionConverter.cs
new file mode 100644
index 00000000..1c1b1561
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Input/KeyModifierCollectionConverter.cs
@@ -0,0 +1,125 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design.Serialization;
+using System.Globalization;
+using System.Reflection;
+using System.Security;
+
+namespace Xceed.Wpf.Toolkit.Core.Input
+{
+  public sealed class KeyModifierCollectionConverter : TypeConverter
+  {
+    #region Static Fields
+
+    private static readonly TypeConverter _keyModifierConverter = TypeDescriptor.GetConverter( typeof( KeyModifier ) );
+
+    #endregion
+
+    public override bool CanConvertFrom( ITypeDescriptorContext typeDescriptorContext, Type type )
+    {
+      return _keyModifierConverter.CanConvertFrom( typeDescriptorContext, type );
+    }
+
+    public override bool CanConvertTo( ITypeDescriptorContext typeDescriptorContext, Type type )
+    {
+      return ( type == typeof( InstanceDescriptor )
+          || type == typeof( KeyModifierCollection )
+          || type == typeof( string ) );
+    }
+
+    public override object ConvertFrom( ITypeDescriptorContext typeDescriptorContext,
+        CultureInfo cultureInfo, object value )
+    {
+      KeyModifierCollection result = new KeyModifierCollection();
+      string stringValue = value as string;
+
+      // convert null as None
+      if( value == null
+          || ( stringValue != null && stringValue.Trim() == string.Empty ) )
+      {
+        result.Add( KeyModifier.None );
+      }
+      else
+      {
+        // respect the following separators: '+', ' ', '|', or ','
+        foreach( string token in stringValue.Split( new char[] { '+', ' ', '|', ',' },
+                StringSplitOptions.RemoveEmptyEntries ) )
+          result.Add( ( KeyModifier )_keyModifierConverter.ConvertFrom( typeDescriptorContext, cultureInfo, token ) );
+
+        // if nothing added, assume None
+        if( result.Count == 0 )
+          result.Add( KeyModifier.None );
+      }
+      return result;
+    }
+
+    public override object ConvertTo( ITypeDescriptorContext typeDescriptorContext,
+        CultureInfo cultureInfo, object value, Type destinationType )
+    {
+      // special handling for null or an empty collection
+      if( value == null || ( ( KeyModifierCollection )value ).Count == 0 )
+      {
+        if( destinationType == typeof( InstanceDescriptor ) )
+        {
+          object result = null;
+          try
+          {
+            result = ConstructInstanceDescriptor();
+          }
+          catch( SecurityException )
+          {
+          }
+          return result;
+        }
+        else if( destinationType == typeof( string ) )
+        {
+          return _keyModifierConverter.ConvertTo( typeDescriptorContext,
+                  cultureInfo, KeyModifier.None, destinationType );
+        }
+      }
+
+      // return a '+' delimited string containing the modifiers
+      if( destinationType == typeof( string ) )
+      {
+        string result = string.Empty;
+        foreach( KeyModifier modifier in ( KeyModifierCollection )value )
+        {
+          if( result != string.Empty )
+            result = result + '+';
+
+          result = result + _keyModifierConverter.ConvertTo( typeDescriptorContext,
+                  cultureInfo, modifier, destinationType );
+        }
+        return result;
+      }
+
+      // unexpected type requested so return null
+      return null;
+    }
+
+    private static object ConstructInstanceDescriptor()
+    {
+      ConstructorInfo ci = typeof( KeyModifierCollection ).GetConstructor( new Type[] { } );
+      return new InstanceDescriptor( ci, new Object[] { } );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/InvalidContentException.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/InvalidContentException.cs
new file mode 100644
index 00000000..401615f8
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/InvalidContentException.cs
@@ -0,0 +1,40 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+
+namespace Xceed.Wpf.Toolkit.Core
+{
+  public class InvalidContentException : Exception
+  {
+    #region Constructors
+
+    public InvalidContentException( string message )
+      : base( message )
+    {
+    }
+
+    public InvalidContentException( string message, Exception innerException )
+      : base( message, innerException )
+    {
+    }
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/InvalidTemplateException.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/InvalidTemplateException.cs
new file mode 100644
index 00000000..40e8d8f5
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/InvalidTemplateException.cs
@@ -0,0 +1,40 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+
+namespace Xceed.Wpf.Toolkit.Core
+{
+  public class InvalidTemplateException : Exception
+  {
+    #region Constructors
+
+    public InvalidTemplateException( string message )
+      : base( message )
+    {
+    }
+
+    public InvalidTemplateException( string message, Exception innerException )
+      : base( message, innerException )
+    {
+    }
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/HsvColor.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/HsvColor.cs
new file mode 100644
index 00000000..09454084
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/HsvColor.cs
@@ -0,0 +1,35 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit.Primitives
+{
+  internal struct HsvColor
+  {
+    public double H;
+    public double S;
+    public double V;
+
+    public HsvColor( double h, double s, double v )
+    {
+      H = h;
+      S = s;
+      V = v;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/InputBase.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/InputBase.cs
new file mode 100644
index 00000000..392b1354
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/InputBase.cs
@@ -0,0 +1,161 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.Primitives
+{
+  public abstract class InputBase : Control
+  {
+    #region Properties
+
+    #region CultureInfo
+
+    public static readonly DependencyProperty CultureInfoProperty = DependencyProperty.Register( "CultureInfo", typeof( CultureInfo ), typeof( InputBase ), new UIPropertyMetadata( CultureInfo.CurrentCulture, OnCultureInfoChanged ) );
+    public CultureInfo CultureInfo
+    {
+      get
+      {
+        return ( CultureInfo )GetValue( CultureInfoProperty );
+      }
+      set
+      {
+        SetValue( CultureInfoProperty, value );
+      }
+    }
+
+    private static void OnCultureInfoChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      InputBase inputBase = o as InputBase;
+      if( inputBase != null )
+        inputBase.OnCultureInfoChanged( ( CultureInfo )e.OldValue, ( CultureInfo )e.NewValue );
+    }
+
+    protected virtual void OnCultureInfoChanged( CultureInfo oldValue, CultureInfo newValue )
+    {
+
+    }
+
+    #endregion //CultureInfo
+
+    #region IsReadOnly
+
+    public static readonly DependencyProperty IsReadOnlyProperty = DependencyProperty.Register( "IsReadOnly", typeof( bool ), typeof( InputBase ), new UIPropertyMetadata( false ) );
+    public bool IsReadOnly
+    {
+      get
+      {
+        return ( bool )GetValue( IsReadOnlyProperty );
+      }
+      set
+      {
+        SetValue( IsReadOnlyProperty, value );
+      }
+    }
+
+    #endregion //IsReadOnly
+
+    #region Text
+
+    public static readonly DependencyProperty TextProperty = DependencyProperty.Register( "Text", typeof( string ), typeof( InputBase ), new FrameworkPropertyMetadata( default( String ), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnTextChanged, null, false, UpdateSourceTrigger.LostFocus ) );
+    public string Text
+    {
+      get
+      {
+        return ( string )GetValue( TextProperty );
+      }
+      set
+      {
+        SetValue( TextProperty, value );
+      }
+    }
+
+    private static void OnTextChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      InputBase inputBase = o as InputBase;
+      if( inputBase != null )
+        inputBase.OnTextChanged( ( string )e.OldValue, ( string )e.NewValue );
+    }
+
+    protected virtual void OnTextChanged( string oldValue, string newValue )
+    {
+
+    }
+
+    #endregion //Text
+
+    #region TextAlignment
+
+    public static readonly DependencyProperty TextAlignmentProperty = DependencyProperty.Register( "TextAlignment", typeof( TextAlignment ), typeof( InputBase ), new UIPropertyMetadata( TextAlignment.Left ) );
+    public TextAlignment TextAlignment
+    {
+      get
+      {
+        return ( TextAlignment )GetValue( TextAlignmentProperty );
+      }
+      set
+      {
+        SetValue( TextAlignmentProperty, value );
+      }
+    }
+
+
+    #endregion //TextAlignment
+
+    #region Watermark
+
+    public static readonly DependencyProperty WatermarkProperty = DependencyProperty.Register( "Watermark", typeof( object ), typeof( InputBase ), new UIPropertyMetadata( null ) );
+    public object Watermark
+    {
+      get
+      {
+        return ( object )GetValue( WatermarkProperty );
+      }
+      set
+      {
+        SetValue( WatermarkProperty, value );
+      }
+    }
+
+    #endregion //Watermark
+
+    #region WatermarkTemplate
+
+    public static readonly DependencyProperty WatermarkTemplateProperty = DependencyProperty.Register( "WatermarkTemplate", typeof( DataTemplate ), typeof( InputBase ), new UIPropertyMetadata( null ) );
+    public DataTemplate WatermarkTemplate
+    {
+      get
+      {
+        return ( DataTemplate )GetValue( WatermarkTemplateProperty );
+      }
+      set
+      {
+        SetValue( WatermarkTemplateProperty, value );
+      }
+    }
+
+    #endregion //WatermarkTemplate
+
+    #endregion //Properties
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/Selector.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/Selector.cs
new file mode 100644
index 00000000..f8cfcd3f
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/Selector.cs
@@ -0,0 +1,463 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Input;
+
+namespace Xceed.Wpf.Toolkit.Primitives
+{
+  public class Selector : ItemsControl //should probably make this control an ICommandSource
+  {
+    #region Members
+
+    private bool _ignoreSetSelectedValue;
+    private bool _surpressSelectionChanged;
+    private bool _surpressSelectedValueChanged;
+
+    #endregion //Members
+
+    #region Constructors
+
+    public Selector()
+    {
+      SelectedItems = new ObservableCollection<object>();
+      AddHandler( Selector.SelectedEvent, new RoutedEventHandler( Selector_ItemSelected ) );
+      AddHandler( Selector.UnSelectedEvent, new RoutedEventHandler( Selector_ItemUnselected ) );
+    }
+
+    #endregion //Constructors
+
+    #region Properties
+
+    public static readonly DependencyProperty CommandProperty = DependencyProperty.Register( "Command", typeof( ICommand ), typeof( Selector ), new PropertyMetadata( ( ICommand )null ) );
+    [TypeConverter( typeof( CommandConverter ) )]
+    public ICommand Command
+    {
+      get
+      {
+        return ( ICommand )GetValue( CommandProperty );
+      }
+      set
+      {
+        SetValue( CommandProperty, value );
+      }
+    }
+
+    #region Delimiter
+
+    public static readonly DependencyProperty DelimiterProperty = DependencyProperty.Register( "Delimiter", typeof( string ), typeof( Selector ), new UIPropertyMetadata( ",", OnDelimiterChanged ) );
+    public string Delimiter
+    {
+      get
+      {
+        return ( string )GetValue( DelimiterProperty );
+      }
+      set
+      {
+        SetValue( DelimiterProperty, value );
+      }
+    }
+
+    private static void OnDelimiterChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( Selector )o ).UpdateSelectedValue();
+    }
+
+    #endregion
+
+    public static readonly DependencyProperty SelectedItemProperty = DependencyProperty.Register( "SelectedItem", typeof( object ), typeof( Selector ), new UIPropertyMetadata( null ) );
+    public object SelectedItem
+    {
+      get
+      {
+        return ( object )GetValue( SelectedItemProperty );
+      }
+      set
+      {
+        SetValue( SelectedItemProperty, value );
+      }
+    }
+
+    //Since you cannot data bind to ReadOnly DependencyProperty, I am leaving this a public get/set DP.  This will allow you to data bind to the SelectedItems from a ViewModel, but it is
+    //intended to be ReadOnly.  So you MUST set the binding Mode=OneWayToSource.  Otherwise it will not behave as expected.
+    public static readonly DependencyProperty SelectedItemsProperty = DependencyProperty.Register( "SelectedItems", typeof( IList ), typeof( Selector ), new UIPropertyMetadata( null ) );
+    public IList SelectedItems
+    {
+      get
+      {
+        return ( IList )GetValue( SelectedItemsProperty );
+      }
+      set
+      {
+        SetValue( SelectedItemsProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty SelectedMemberPathProperty = DependencyProperty.Register( "SelectedMemberPath", typeof( string ), typeof( Selector ), new UIPropertyMetadata( null ) );
+    public string SelectedMemberPath
+    {
+      get
+      {
+        return ( string )GetValue( SelectedMemberPathProperty );
+      }
+      set
+      {
+        SetValue( SelectedMemberPathProperty, value );
+      }
+    }
+
+    #region SelectedValue
+
+    public static readonly DependencyProperty SelectedValueProperty = DependencyProperty.Register( "SelectedValue", typeof( string ), typeof( Selector ), new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnSelectedValueChanged ) );
+    public string SelectedValue
+    {
+      get
+      {
+        return ( string )GetValue( SelectedValueProperty );
+      }
+      set
+      {
+        SetValue( SelectedValueProperty, value );
+      }
+    }
+
+    private static void OnSelectedValueChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      Selector selector = o as Selector;
+      if( selector != null )
+        selector.OnSelectedValueChanged( ( string )e.OldValue, ( string )e.NewValue );
+    }
+
+    protected virtual void OnSelectedValueChanged( string oldValue, string newValue )
+    {
+      if( _surpressSelectedValueChanged )
+        return;
+
+      UpdateSelectedItemsFromSelectedValue();
+    }
+
+    #endregion //SelectedValue
+
+    #region ValueMemberPath
+
+    public static readonly DependencyProperty ValueMemberPathProperty = DependencyProperty.Register( "ValueMemberPath", typeof( string ), typeof( Selector ), new UIPropertyMetadata( OnValueMemberPathChanged ) );
+    public string ValueMemberPath
+    {
+      get
+      {
+        return ( string )GetValue( ValueMemberPathProperty );
+      }
+      set
+      {
+        SetValue( ValueMemberPathProperty, value );
+      }
+    }
+
+    private static void OnValueMemberPathChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( Selector )o ).UpdateSelectedValue();
+    }
+
+    #endregion
+
+    #endregion //Properties
+
+    #region Base Class Overrides
+
+    protected override bool IsItemItsOwnContainerOverride( object item )
+    {
+      return item is SelectorItem;
+    }
+
+    protected override DependencyObject GetContainerForItemOverride()
+    {
+      return new SelectorItem();
+    }
+
+    protected override void PrepareContainerForItemOverride( DependencyObject element, object item )
+    {
+      _surpressSelectionChanged = true;
+      var selectorItem = element as FrameworkElement;
+
+      //first try resolving SelectorItem.IsSelected by data binding to the SelectedMemeberPath property
+      if( !String.IsNullOrEmpty( SelectedMemberPath ) )
+      {
+        Binding selectedBinding = new Binding( SelectedMemberPath )
+        {
+          Mode = BindingMode.TwoWay,
+          Source = item
+        };
+        selectorItem.SetBinding( SelectorItem.IsSelectedProperty, selectedBinding );
+      }
+
+      //now let's search the SelectedItems for the current item.  If it's there then mark it as selected
+      if( SelectedItems != null )
+      {
+        foreach( object selectedItem in SelectedItems )
+        {
+          //a match was found so select it and get the hell out of here
+          if( item.Equals( selectedItem ) )
+          {
+            selectorItem.SetValue( SelectorItem.IsSelectedProperty, true );
+            break;
+          }
+        }
+      }
+
+      base.PrepareContainerForItemOverride( element, item );
+      _surpressSelectionChanged = false;
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Events
+
+    public static readonly RoutedEvent SelectedEvent = EventManager.RegisterRoutedEvent( "SelectedEvent", RoutingStrategy.Bubble, typeof( SelectedItemChangedEventHandler ), typeof( Selector ) );
+    public static readonly RoutedEvent UnSelectedEvent = EventManager.RegisterRoutedEvent( "UnSelectedEvent", RoutingStrategy.Bubble, typeof( SelectedItemChangedEventHandler ), typeof( Selector ) );
+
+    public static readonly RoutedEvent SelectedItemChangedEvent = EventManager.RegisterRoutedEvent( "SelectedItemChanged", RoutingStrategy.Bubble, typeof( SelectedItemChangedEventHandler ), typeof( Selector ) );
+    public event SelectedItemChangedEventHandler SelectedItemChanged
+    {
+      add
+      {
+        AddHandler( SelectedItemChangedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( SelectedItemChangedEvent, value );
+      }
+    }
+
+    #endregion //Events
+
+    #region Event Handlers
+
+    protected virtual void Selector_ItemSelected( object sender, RoutedEventArgs e )
+    {
+      OnItemSelected( e.OriginalSource, false );
+    }
+
+    protected virtual void Selector_ItemUnselected( object sender, RoutedEventArgs e )
+    {
+      OnItemSelected( e.OriginalSource, true );
+    }
+
+    #endregion //Event Handlers
+
+    #region Methods
+
+    protected object GetItemValue( object item )
+    {
+      if( !String.IsNullOrEmpty( ValueMemberPath ) && (item != null))
+      {
+        var property = item.GetType().GetProperty( ValueMemberPath );
+        if( property != null )
+          return property.GetValue( item, null );
+      }
+
+      return item;
+    }
+
+    protected string GetDelimitedValue( object value )
+    {
+      return String.Format( "{0}{1}", value, Delimiter );
+    }
+
+    protected virtual void OnItemSelected( object itemContainer, bool remove )
+    {
+      object item = this.ItemContainerGenerator.ItemFromContainer( ( DependencyObject )itemContainer );
+      Update( item, remove );
+      RaiseSelectedItemChangedEvent( item, !remove ); //inverse the remove paramter to correctly reflect the IsSelected state
+    }
+
+    protected virtual void RaiseSelectedItemChangedEvent( object item, bool isSelected )
+    {
+      if( _surpressSelectionChanged )
+        return;
+
+      RaiseEvent( new SelectedItemChangedEventArgs( Selector.SelectedItemChangedEvent, this, item, isSelected ) );
+
+      if( Command != null )
+        Command.Execute( item );
+    }
+
+    protected virtual void Update( object item, bool remove )
+    {
+      UpdateSelectedItem( item );
+      UpdateSelectedItems( item, remove );
+      UpdateSelectedValue();
+    }
+
+    private void UpdateSelectedItem( object item )
+    {
+      SelectedItem = item;
+    }
+
+    private void UpdateSelectedItems( object item, bool remove )
+    {
+      if( SelectedItems == null )
+        SelectedItems = new ObservableCollection<object>();
+
+      if( remove )
+      {
+        if( SelectedItems.Contains( item ) )
+          SelectedItems.Remove( item );
+      }
+      else
+      {
+        if( !SelectedItems.Contains( item ) )
+          SelectedItems.Add( item );
+      }
+    }
+
+    private void UpdateSelectedValue()
+    {
+      //get out of here if we don't want to set the SelectedValue
+      if( _ignoreSetSelectedValue )
+        return;
+
+      _surpressSelectedValueChanged = true;
+
+#if VS2008
+      string newValue = String.Join( Delimiter, SelectedItems.Cast<object>().Select( x => GetItemValue( x ).ToString() ).ToArray() );
+#else
+      string newValue = String.Join( Delimiter, SelectedItems.Cast<object>().Select( x => GetItemValue( x ) ) );
+#endif
+      if( String.IsNullOrEmpty( SelectedValue ) || !SelectedValue.Equals( newValue ) )
+        SelectedValue = newValue;
+
+      _surpressSelectedValueChanged = false;
+    }
+
+    private void UpdateSelectedItemsFromSelectedValue()
+    {
+      _surpressSelectionChanged = true;
+
+      //first we have to unselect everything
+      ClearSelectedItems();
+
+      if( !String.IsNullOrEmpty( SelectedValue ) )
+      {
+        string[] values = SelectedValue.Split( new string[] { Delimiter }, StringSplitOptions.RemoveEmptyEntries );
+        foreach( string value in values )
+        {
+          var item = ResolveItemByValue( value );
+
+          if( item != null )
+          {
+            SelectedItems.Add( item );
+
+            //now try to select it in the list
+            var selectorItem = ItemContainerGenerator.ContainerFromItem( item ) as SelectorItem;
+            if( selectorItem != null )
+            {
+              if( !selectorItem.IsSelected )
+                selectorItem.IsSelected = true;
+            }
+          }
+        }
+      }
+
+      _surpressSelectionChanged = false;
+    }
+
+    private void ClearSelectedItems()
+    {
+      if( SelectedItems != null )
+        SelectedItems.Clear();
+      else
+        SelectedItems = new ObservableCollection<object>();
+
+      UnselectAllInternal();
+    }
+
+    private void UnselectAllInternal()
+    {
+      _ignoreSetSelectedValue = true;
+
+      if( ItemsSource != null )
+      {
+        foreach( object item in ItemsSource )
+        {
+          var selectorItem = ItemContainerGenerator.ContainerFromItem( item ) as SelectorItem;
+          if( selectorItem != null )
+          {
+            if( selectorItem.IsSelected )
+              selectorItem.IsSelected = false;
+          }
+        }
+      }
+
+      _ignoreSetSelectedValue = false;
+    }
+
+    protected object ResolveItemByValue( string value )
+    {
+      if( !String.IsNullOrEmpty( ValueMemberPath ) )
+      {
+        if( ItemsSource != null )
+        {
+          foreach( object item in ItemsSource )
+          {
+            var property = item.GetType().GetProperty( ValueMemberPath );
+            if( property != null )
+            {
+              var propertyValue = property.GetValue( item, null );
+              if( value.Equals( propertyValue.ToString(), StringComparison.InvariantCultureIgnoreCase ) )
+                return item;
+            }
+          }
+        }
+      }
+
+      return value;
+    }
+
+    #endregion //Methods
+  }
+
+  public delegate void SelectedItemChangedEventHandler( object sender, SelectedItemChangedEventArgs e );
+  public class SelectedItemChangedEventArgs : RoutedEventArgs
+  {
+    public bool IsSelected
+    {
+      get;
+      private set;
+    }
+    public object Item
+    {
+      get;
+      private set;
+    }
+
+    public SelectedItemChangedEventArgs( RoutedEvent routedEvent, object source, object item, bool isSelected )
+      : base( routedEvent, source )
+    {
+      Item = item;
+      IsSelected = isSelected;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/SelectorItem.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/SelectorItem.cs
new file mode 100644
index 00000000..ab70ae5b
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/SelectorItem.cs
@@ -0,0 +1,107 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace Xceed.Wpf.Toolkit.Primitives
+{
+  public class SelectorItem : ContentControl
+  {
+    #region Constructors
+
+    static SelectorItem()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( SelectorItem ), new FrameworkPropertyMetadata( typeof( SelectorItem ) ) );
+    }
+
+    public SelectorItem()
+    {
+      AddHandler( Mouse.MouseDownEvent, new MouseButtonEventHandler( OnMouseDown ) );
+    }
+
+    #endregion //Constructors
+
+    #region Properties
+
+    public static readonly DependencyProperty IsSelectedProperty = DependencyProperty.Register( "IsSelected", typeof( bool ), typeof( SelectorItem ), new UIPropertyMetadata( false, OnIsSelectedChanged ) );
+    public bool IsSelected
+    {
+      get
+      {
+        return ( bool )GetValue( IsSelectedProperty );
+      }
+      set
+      {
+        SetValue( IsSelectedProperty, value );
+      }
+    }
+
+    private static void OnIsSelectedChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      SelectorItem selectorItem = o as SelectorItem;
+      if( selectorItem != null )
+        selectorItem.OnIsSelectedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnIsSelectedChanged( bool oldValue, bool newValue )
+    {
+      if( newValue )
+        RaiseSelectionChangedEvent( new RoutedEventArgs( Selector.SelectedEvent, this ) );
+      else
+        RaiseSelectionChangedEvent( new RoutedEventArgs( Selector.UnSelectedEvent, this ) );
+    }
+
+    internal Selector ParentSelector
+    {
+      get
+      {
+        return ItemsControl.ItemsControlFromItemContainer( this ) as Selector;
+      }
+    }
+
+    #endregion //Properties
+
+    #region Events
+
+    public static readonly RoutedEvent SelectedEvent = Selector.SelectedEvent.AddOwner( typeof( SelectorItem ) );
+    public static readonly RoutedEvent UnselectedEvent = Selector.UnSelectedEvent.AddOwner( typeof( SelectorItem ) );
+
+    #endregion
+
+    #region Event Hanlders
+
+    void OnMouseDown( object sender, MouseButtonEventArgs e )
+    {
+      IsSelected = !IsSelected;
+    }
+
+    #endregion //Event Hanlders
+
+    #region Methods
+
+    private void RaiseSelectionChangedEvent( RoutedEventArgs e )
+    {
+      base.RaiseEvent( e );
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/ShapeBase.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/ShapeBase.cs
new file mode 100644
index 00000000..497453f3
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/ShapeBase.cs
@@ -0,0 +1,145 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Media;
+using System.Windows.Shapes;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+
+namespace Xceed.Wpf.Toolkit.Primitives
+{
+  public abstract class ShapeBase : Shape
+  {
+    #region Constructors
+
+    static ShapeBase()
+    {
+      ShapeBase.StrokeDashArrayProperty.OverrideMetadata( typeof( ShapeBase ), new FrameworkPropertyMetadata( new PropertyChangedCallback( ShapeBase.OnStrokeChanged ) ) );
+      ShapeBase.StrokeDashCapProperty.OverrideMetadata( typeof( ShapeBase ), new FrameworkPropertyMetadata( new PropertyChangedCallback( ShapeBase.OnStrokeChanged ) ) );
+      ShapeBase.StrokeDashOffsetProperty.OverrideMetadata( typeof( ShapeBase ), new FrameworkPropertyMetadata( new PropertyChangedCallback( ShapeBase.OnStrokeChanged ) ) );
+      ShapeBase.StrokeEndLineCapProperty.OverrideMetadata( typeof( ShapeBase ), new FrameworkPropertyMetadata( new PropertyChangedCallback( ShapeBase.OnStrokeChanged ) ) );
+      ShapeBase.StrokeLineJoinProperty.OverrideMetadata( typeof( ShapeBase ), new FrameworkPropertyMetadata( new PropertyChangedCallback( ShapeBase.OnStrokeChanged ) ) );
+      ShapeBase.StrokeMiterLimitProperty.OverrideMetadata( typeof( ShapeBase ), new FrameworkPropertyMetadata( new PropertyChangedCallback( ShapeBase.OnStrokeChanged ) ) );
+      ShapeBase.StrokeProperty.OverrideMetadata( typeof( ShapeBase ), new FrameworkPropertyMetadata( new PropertyChangedCallback( ShapeBase.OnStrokeChanged ) ) );
+      ShapeBase.StrokeStartLineCapProperty.OverrideMetadata( typeof( ShapeBase ), new FrameworkPropertyMetadata( new PropertyChangedCallback( ShapeBase.OnStrokeChanged ) ) );
+      ShapeBase.StrokeThicknessProperty.OverrideMetadata( typeof( ShapeBase ), new FrameworkPropertyMetadata( new PropertyChangedCallback( ShapeBase.OnStrokeChanged ) ) );
+    }
+
+    #endregion
+
+    #region IsPenEmptyOrUndefined Internal Property
+
+    internal bool IsPenEmptyOrUndefined
+    {
+      get
+      {
+        double strokeThickness = this.StrokeThickness;
+        return ( this.Stroke == null ) || DoubleHelper.IsNaN( strokeThickness ) || DoubleHelper.AreVirtuallyEqual( 0, strokeThickness );
+      }
+    }
+
+    #endregion
+
+    #region DefiningGeometry Protected Property
+
+    protected abstract override Geometry DefiningGeometry
+    {
+      get;
+    }
+
+    #endregion
+
+    internal virtual Rect GetDefiningGeometryBounds()
+    {
+      Geometry geometry = this.DefiningGeometry;
+
+      Debug.Assert( geometry != null );
+
+      return geometry.Bounds;
+    }
+
+    internal virtual Size GetNaturalSize()
+    {
+      Geometry geometry = this.DefiningGeometry;
+
+      Debug.Assert( geometry != null );
+
+      Rect bounds = geometry.GetRenderBounds( GetPen() );
+
+      return new Size( Math.Max( bounds.Right, 0 ), Math.Max( bounds.Bottom, 0 ) );
+    }
+
+    internal Pen GetPen()
+    {
+      if( this.IsPenEmptyOrUndefined )
+        return null;
+
+      if( _pen == null )
+      {
+        _pen = this.MakePen();
+      }
+
+      return _pen;
+    }
+
+    internal double GetStrokeThickness()
+    {
+      if( this.IsPenEmptyOrUndefined )
+        return 0d;
+
+      return Math.Abs( this.StrokeThickness );
+    }
+
+    internal bool IsSizeEmptyOrUndefined( Size size )
+    {
+      return ( DoubleHelper.IsNaN( size.Width ) || DoubleHelper.IsNaN( size.Height ) || size.IsEmpty );
+    }
+
+    private static void OnStrokeChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( ShapeBase )d )._pen = null;
+    }
+
+    private Pen MakePen()
+    {
+      Pen pen = new Pen();
+      pen.Brush = this.Stroke;
+      pen.DashCap = this.StrokeDashCap;
+      if( this.StrokeDashArray != null || this.StrokeDashOffset != 0.0 )
+      {
+        pen.DashStyle = new DashStyle( this.StrokeDashArray, this.StrokeDashOffset );
+      }
+      pen.EndLineCap = this.StrokeEndLineCap;
+      pen.LineJoin = this.StrokeLineJoin;
+      pen.MiterLimit = this.StrokeMiterLimit;
+      pen.StartLineCap = this.StrokeStartLineCap;
+      pen.Thickness = Math.Abs( this.StrokeThickness );
+
+      return pen;
+    }
+
+    #region Private Fields
+
+    private Pen _pen = null;
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/UpDownBase.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/UpDownBase.cs
new file mode 100644
index 00000000..86893750
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/UpDownBase.cs
@@ -0,0 +1,373 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Input;
+
+namespace Xceed.Wpf.Toolkit.Primitives
+{
+  [TemplatePart( Name = PART_TextBox, Type = typeof( TextBox ) )]
+  [TemplatePart( Name = PART_Spinner, Type = typeof( Spinner ) )]
+  public abstract class UpDownBase<T> : InputBase
+  {
+    #region Members
+
+    /// <summary>
+    /// Name constant for Text template part.
+    /// </summary>
+    internal const string PART_TextBox = "PART_TextBox";
+
+    /// <summary>
+    /// Name constant for Spinner template part.
+    /// </summary>
+    internal const string PART_Spinner = "PART_Spinner";
+
+    /// <summary>
+    /// Flags if the Text and Value properties are in the process of being sync'd
+    /// </summary>
+    private bool _isSyncingTextAndValueProperties;
+
+    #endregion //Members
+
+    #region Properties
+
+    protected Spinner Spinner
+    {
+      get;
+      private set;
+    }
+    protected TextBox TextBox
+    {
+      get;
+      private set;
+    }
+
+    #region AllowSpin
+
+    public static readonly DependencyProperty AllowSpinProperty = DependencyProperty.Register( "AllowSpin", typeof( bool ), typeof( UpDownBase<T> ), new UIPropertyMetadata( true ) );
+    public bool AllowSpin
+    {
+      get
+      {
+        return ( bool )GetValue( AllowSpinProperty );
+      }
+      set
+      {
+        SetValue( AllowSpinProperty, value );
+      }
+    }
+
+    #endregion //AllowSpin
+
+    #region MouseWheelActiveOnFocus
+
+    public static readonly DependencyProperty MouseWheelActiveOnFocusProperty = DependencyProperty.Register( "MouseWheelActiveOnFocus", typeof( bool ), typeof( UpDownBase<T> ), new UIPropertyMetadata( true ) );
+    public bool MouseWheelActiveOnFocus
+    {
+      get
+      {
+        return ( bool )GetValue( MouseWheelActiveOnFocusProperty );
+      }
+      set
+      {
+        SetValue( MouseWheelActiveOnFocusProperty, value );
+      }
+    }
+
+    #endregion //MouseWheelActiveOnFocus
+
+    #region ShowButtonSpinner
+
+    public static readonly DependencyProperty ShowButtonSpinnerProperty = DependencyProperty.Register( "ShowButtonSpinner", typeof( bool ), typeof( UpDownBase<T> ), new UIPropertyMetadata( true ) );
+    public bool ShowButtonSpinner
+    {
+      get
+      {
+        return ( bool )GetValue( ShowButtonSpinnerProperty );
+      }
+      set
+      {
+        SetValue( ShowButtonSpinnerProperty, value );
+      }
+    }
+
+    #endregion //ShowButtonSpinner
+
+    #region Value
+
+    public static readonly DependencyProperty ValueProperty = DependencyProperty.Register( "Value", typeof( T ), typeof( UpDownBase<T> ), new FrameworkPropertyMetadata( default( T ), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnValueChanged, null, false, UpdateSourceTrigger.LostFocus ) );
+    public T Value
+    {
+      get
+      {
+        return ( T )GetValue( ValueProperty );
+      }
+      set
+      {
+        SetValue( ValueProperty, value );
+      }
+    }
+
+    private static void OnValueChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      UpDownBase<T> upDownBase = o as UpDownBase<T>;
+      if( upDownBase != null )
+        upDownBase.OnValueChanged( ( T )e.OldValue, ( T )e.NewValue );
+    }
+
+    protected virtual void OnValueChanged( T oldValue, T newValue )
+    {
+      ValidateValue( newValue );
+
+      SyncTextAndValueProperties( ValueProperty, string.Empty );
+
+      SetValidSpinDirection();
+
+      RoutedPropertyChangedEventArgs<object> args = new RoutedPropertyChangedEventArgs<object>( oldValue, newValue );
+      args.RoutedEvent = ValueChangedEvent;
+      RaiseEvent( args );
+    }
+
+    #endregion //Value
+
+    #endregion //Properties
+
+    #region Constructors
+
+    internal UpDownBase()
+    {
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    protected override void OnAccessKey( AccessKeyEventArgs e )
+    {
+      if( TextBox != null )
+        TextBox.Focus();
+
+      base.OnAccessKey( e );
+    }
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+
+      TextBox = GetTemplateChild( PART_TextBox ) as TextBox;
+
+      if( Spinner != null )
+        Spinner.Spin -= OnSpinnerSpin;
+
+      Spinner = GetTemplateChild( PART_Spinner ) as Spinner;
+
+      if( Spinner != null )
+        Spinner.Spin += OnSpinnerSpin;
+
+      SetValidSpinDirection();
+    }
+
+    protected override void OnGotFocus( RoutedEventArgs e )
+    {
+      if( TextBox != null )
+        TextBox.Focus();
+    }
+
+    protected override void OnPreviewKeyDown( KeyEventArgs e )
+    {
+      switch( e.Key )
+      {
+        case Key.Up:
+          {
+            if( AllowSpin && !IsReadOnly )
+              DoIncrement();
+            e.Handled = true;
+            break;
+          }
+        case Key.Down:
+          {
+            if( AllowSpin && !IsReadOnly )
+              DoDecrement();
+            e.Handled = true;
+            break;
+          }
+      }
+    }
+
+    protected override void OnMouseWheel( MouseWheelEventArgs e )
+    {
+      base.OnMouseWheel( e );
+
+      if( !e.Handled && AllowSpin && !IsReadOnly && ( ( TextBox.IsFocused && MouseWheelActiveOnFocus ) || !MouseWheelActiveOnFocus ) )
+      {
+        if( e.Delta < 0 )
+        {
+          DoDecrement();
+        }
+        else if( 0 < e.Delta )
+        {
+          DoIncrement();
+        }
+
+        e.Handled = true;
+      }
+    }
+
+    protected override void OnTextChanged( string oldValue, string newValue )
+    {
+      SyncTextAndValueProperties( InputBase.TextProperty, newValue );
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Event Handlers
+
+    private void OnSpinnerSpin( object sender, SpinEventArgs e )
+    {
+      if( AllowSpin && !IsReadOnly )
+        OnSpin( e );
+    }
+
+    #endregion //Event Handlers
+
+    #region Events
+
+    //Due to a bug in Visual Studio, you cannot create event handlers for generic T args in XAML, so I have to use object instead.
+    public static readonly RoutedEvent ValueChangedEvent = EventManager.RegisterRoutedEvent( "ValueChanged", RoutingStrategy.Bubble, typeof( RoutedPropertyChangedEventHandler<object> ), typeof( UpDownBase<T> ) );
+    public event RoutedPropertyChangedEventHandler<object> ValueChanged
+    {
+      add
+      {
+        AddHandler( ValueChangedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( ValueChangedEvent, value );
+      }
+    }
+
+    #endregion //Events
+
+    #region Methods
+
+    protected virtual void OnSpin( SpinEventArgs e )
+    {
+      if( e == null )
+        throw new ArgumentNullException( "e" );
+
+      if( e.Direction == SpinDirection.Increase )
+        DoIncrement();
+      else
+        DoDecrement();
+    }
+
+    /// <summary>
+    /// Performs an increment if conditions allow it.
+    /// </summary>
+    private void DoDecrement()
+    {
+      if( Spinner == null || ( Spinner.ValidSpinDirection & ValidSpinDirections.Decrease ) == ValidSpinDirections.Decrease )
+      {
+        OnDecrement();
+      }
+    }
+
+    /// <summary>
+    /// Performs a decrement if conditions allow it.
+    /// </summary>
+    private void DoIncrement()
+    {
+      if( Spinner == null || ( Spinner.ValidSpinDirection & ValidSpinDirections.Increase ) == ValidSpinDirections.Increase )
+      {
+        OnIncrement();
+      }
+    }
+
+    protected void SyncTextAndValueProperties( DependencyProperty p, string text )
+    {
+      //prevents recursive syncing properties
+      if( _isSyncingTextAndValueProperties )
+        return;
+
+      _isSyncingTextAndValueProperties = true;
+
+      //this only occures when the user typed in the value
+      if( InputBase.TextProperty == p )
+      {
+        Value = ConvertTextToValue( text );
+      }
+
+      Text = ConvertValueToText();
+
+#if VS2008
+      //there is a bug in .NET 3.5 which will not correctly update the textbox text through binding.
+      if ( TextBox != null )
+        TextBox.Text = Text;
+#endif
+
+      _isSyncingTextAndValueProperties = false;
+    }
+
+    #region Abstract
+
+    /// <summary>
+    /// Coerces the value.
+    /// </summary>
+    protected abstract T CoerceValue( T value );
+
+    /// <summary>
+    /// Converts the formatted text to a value.
+    /// </summary>
+    protected abstract T ConvertTextToValue( string text );
+
+    /// <summary>
+    /// Converts the value to formatted text.
+    /// </summary>
+    /// <returns></returns>
+    protected abstract string ConvertValueToText();
+
+    /// <summary>
+    /// Called by OnSpin when the spin direction is SpinDirection.Increase.
+    /// </summary>
+    protected abstract void OnIncrement();
+
+    /// <summary>
+    /// Called by OnSpin when the spin direction is SpinDirection.Descrease.
+    /// </summary>
+    protected abstract void OnDecrement();
+
+    /// <summary>
+    /// Sets the valid spin directions.
+    /// </summary>
+    protected abstract void SetValidSpinDirection();
+
+    /// <summary>
+    /// Validates the value and keeps it between the Min and Max values.
+    /// </summary>
+    /// <param name="value">The value.</param>
+    protected abstract void ValidateValue( T value );
+
+    #endregion //Abstract
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/PropertyChangedEventArgs.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/PropertyChangedEventArgs.cs
new file mode 100644
index 00000000..103003bc
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/PropertyChangedEventArgs.cs
@@ -0,0 +1,73 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.Core
+{
+  public class PropertyChangedEventArgs<T> : RoutedEventArgs
+  {
+    #region Constructors
+
+    public PropertyChangedEventArgs( RoutedEvent Event, T oldValue, T newValue )
+      : base()
+    {
+      _oldValue = oldValue;
+      _newValue = newValue;
+      this.RoutedEvent = Event;
+    }
+
+    #endregion
+
+    #region NewValue Property
+
+    public T NewValue
+    {
+      get
+      {
+        return _newValue;
+      }
+    }
+
+    private readonly T _newValue;
+
+    #endregion
+
+    #region OldValue Property
+
+    public T OldValue
+    {
+      get
+      {
+        return _oldValue;
+      }
+    }
+
+    private readonly T _oldValue;
+
+    #endregion
+
+    protected override void InvokeEventHandler( Delegate genericHandler, object genericTarget )
+    {
+      PropertyChangedEventHandler<T> handler = ( PropertyChangedEventHandler<T> )genericHandler;
+      handler( genericTarget, this );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/PropertyChangedEventHandler.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/PropertyChangedEventHandler.cs
new file mode 100644
index 00000000..ada4a8aa
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/PropertyChangedEventHandler.cs
@@ -0,0 +1,23 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit.Core
+{
+  public delegate void PropertyChangedEventHandler<T>( object sender, PropertyChangedEventArgs<T> e );
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Themes/ResourceKeys.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Themes/ResourceKeys.cs
new file mode 100644
index 00000000..eaca3cd0
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Themes/ResourceKeys.cs
@@ -0,0 +1,66 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.Themes
+{
+  public static class ResourceKeys
+  {
+    #region Brush Keys
+
+    public static readonly ResourceKey ControlNormalBackgroundKey = new StaticResourceKey( typeof( ResourceKeys ), "ControlNormalBackgroundKey" );
+    public static readonly ResourceKey ControlDisabledBackgroundKey = new StaticResourceKey( typeof( ResourceKeys ), "ControlDisabledBackgroundKey" );
+    public static readonly ResourceKey ControlNormalBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ControlNormalBorderKey" );
+    public static readonly ResourceKey ControlMouseOverBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ControlMouseOverBorderKey" );
+    public static readonly ResourceKey ControlFocusedBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ControlFocusedBorderKey" );
+
+    public static readonly ResourceKey ButtonNormalOuterBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonNormalOuterBorderKey" );
+    public static readonly ResourceKey ButtonNormalInnerBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonNormalInnerBorderKey" );
+    public static readonly ResourceKey ButtonNormalBackgroundKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonNormalBackgroundKey" );
+
+    public static readonly ResourceKey ButtonMouseOverBackgroundKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonMouseOverBackgroundKey" );
+    public static readonly ResourceKey ButtonMouseOverOuterBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonMouseOverOuterBorderKey" );
+    public static readonly ResourceKey ButtonMouseOverInnerBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonMouseOverInnerBorderKey" );
+
+    public static readonly ResourceKey ButtonPressedOuterBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonPressedOuterBorderKey" );
+    public static readonly ResourceKey ButtonPressedInnerBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonPressedInnerBorderKey" );
+    public static readonly ResourceKey ButtonPressedBackgroundKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonPressedBackgroundKey" );
+
+    public static readonly ResourceKey ButtonFocusedOuterBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonFocusedOuterBorderKey" );
+    public static readonly ResourceKey ButtonFocusedInnerBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonFocusedInnerBorderKey" );
+    public static readonly ResourceKey ButtonFocusedBackgroundKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonFocusedBackgroundKey" );
+
+    public static readonly ResourceKey ButtonDisabledOuterBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonDisabledOuterBorderKey" );
+    public static readonly ResourceKey ButtonInnerBorderDisabledKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonInnerBorderDisabledKey" );
+
+    #endregion //Brush Keys
+
+    public static readonly ResourceKey GlyphNormalForegroundKey = new StaticResourceKey( typeof( ResourceKeys ), "GlyphNormalForegroundKey" );
+    public static readonly ResourceKey GlyphDisabledForegroundKey = new StaticResourceKey( typeof( ResourceKeys ), "GlyphDisabledForegroundKey" );
+
+
+
+    public static readonly ResourceKey SpinButtonCornerRadiusKey = new StaticResourceKey( typeof( ResourceKeys ), "SpinButtonCornerRadiusKey" );
+
+
+
+    public static readonly ResourceKey SpinnerButtonStyleKey = new StaticResourceKey( typeof( ResourceKeys ), "SpinnerButtonStyleKey" );
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Themes/StaticResourceKey.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Themes/StaticResourceKey.cs
new file mode 100644
index 00000000..9adfd914
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Themes/StaticResourceKey.cs
@@ -0,0 +1,59 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.Themes
+{
+  public sealed class StaticResourceKey : ResourceKey
+  {
+    private string _key;
+    public string Key
+    {
+      get
+      {
+        return _key;
+      }
+    }
+
+    private Type _type;
+    public Type Type
+    {
+      get
+      {
+        return _type;
+      }
+    }
+
+    public StaticResourceKey( Type type, string key )
+    {
+      _type = type;
+      _key = key;
+    }
+
+    public override System.Reflection.Assembly Assembly
+    {
+      get
+      {
+        return _type.Assembly;
+      }
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/UIElementAdorner.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/UIElementAdorner.cs
new file mode 100644
index 00000000..25af7c72
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/UIElementAdorner.cs
@@ -0,0 +1,243 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Collections;
+using System.Windows;
+using System.Windows.Documents;
+using System.Windows.Media;
+
+namespace Xceed.Wpf.Toolkit.Core
+{
+  /// <summary>
+  /// An adorner that can display one and only one UIElement.  
+  /// That element can be a panel, which contains multiple other elements.
+  /// The element is added to the adorner's visual and logical trees, enabling it to 
+  /// particpate in dependency property value inheritance, amongst other things.
+  /// </summary>
+  internal class UIElementAdorner<TElement> : Adorner where TElement : UIElement
+  {
+    #region Fields
+
+    TElement _child = null;
+    double _offsetLeft = 0;
+    double _offsetTop = 0;
+
+    #endregion // Fields
+
+    #region Constructor
+
+    /// <summary>
+    /// Constructor. 
+    /// </summary>
+    /// <param name="adornedElement">The element to which the adorner will be bound.</param>
+    public UIElementAdorner( UIElement adornedElement )
+      : base( adornedElement )
+    {
+    }
+
+    #endregion // Constructor
+
+    #region Public Interface
+
+    #region Child
+
+    /// <summary>
+    /// Gets/sets the child element hosted in the adorner.
+    /// </summary>
+    public TElement Child
+    {
+      get
+      {
+        return _child;
+      }
+      set
+      {
+        if( value == _child )
+          return;
+
+        if( _child != null )
+        {
+          base.RemoveLogicalChild( _child );
+          base.RemoveVisualChild( _child );
+        }
+
+        _child = value;
+
+        if( _child != null )
+        {
+          base.AddLogicalChild( _child );
+          base.AddVisualChild( _child );
+        }
+      }
+    }
+
+    #endregion // Child
+
+    #region GetDesiredTransform
+
+    /// <summary>
+    /// Override.
+    /// </summary>
+    /// <param name="transform"></param>
+    /// <returns></returns>
+    public override GeneralTransform GetDesiredTransform( GeneralTransform transform )
+    {
+      GeneralTransformGroup result = new GeneralTransformGroup();
+      result.Children.Add( base.GetDesiredTransform( transform ) );
+      result.Children.Add( new TranslateTransform( _offsetLeft, _offsetTop ) );
+      return result;
+    }
+
+    #endregion // GetDesiredTransform
+
+    #region OffsetLeft
+
+    /// <summary>
+    /// Gets/sets the horizontal offset of the adorner.
+    /// </summary>
+    public double OffsetLeft
+    {
+      get
+      {
+        return _offsetLeft;
+      }
+      set
+      {
+        _offsetLeft = value;
+        UpdateLocation();
+      }
+    }
+
+    #endregion // OffsetLeft
+
+    #region SetOffsets
+
+    /// <summary>
+    /// Updates the location of the adorner in one atomic operation.
+    /// </summary>
+    public void SetOffsets( double left, double top )
+    {
+      _offsetLeft = left;
+      _offsetTop = top;
+      this.UpdateLocation();
+    }
+
+    #endregion // SetOffsets
+
+    #region OffsetTop
+
+    /// <summary>
+    /// Gets/sets the vertical offset of the adorner.
+    /// </summary>
+    public double OffsetTop
+    {
+      get
+      {
+        return _offsetTop;
+      }
+      set
+      {
+        _offsetTop = value;
+        UpdateLocation();
+      }
+    }
+
+    #endregion // OffsetTop
+
+    #endregion // Public Interface
+
+    #region Protected Overrides
+
+    /// <summary>
+    /// Override.
+    /// </summary>
+    /// <param name="constraint"></param>
+    /// <returns></returns>
+    protected override Size MeasureOverride( Size constraint )
+    {
+      if( _child == null )
+        return base.MeasureOverride( constraint );
+
+      _child.Measure( constraint );
+      return _child.DesiredSize;
+    }
+
+    /// <summary>
+    /// Override.
+    /// </summary>
+    /// <param name="finalSize"></param>
+    /// <returns></returns>
+    protected override Size ArrangeOverride( Size finalSize )
+    {
+      if( _child == null )
+        return base.ArrangeOverride( finalSize );
+
+      _child.Arrange( new Rect( finalSize ) );
+      return finalSize;
+    }
+
+    /// <summary>
+    /// Override.
+    /// </summary>
+    protected override IEnumerator LogicalChildren
+    {
+      get
+      {
+        ArrayList list = new ArrayList();
+        if( _child != null )
+          list.Add( _child );
+        return list.GetEnumerator();
+      }
+    }
+
+    /// <summary>
+    /// Override.
+    /// </summary>
+    /// <param name="index"></param>
+    /// <returns></returns>
+    protected override Visual GetVisualChild( int index )
+    {
+      return _child;
+    }
+
+    /// <summary>
+    /// Override.
+    /// </summary>
+    protected override int VisualChildrenCount
+    {
+      get
+      {
+        return _child == null ? 0 : 1;
+      }
+    }
+
+    #endregion // Protected Overrides
+
+    #region Private Helpers
+
+    void UpdateLocation()
+    {
+      AdornerLayer adornerLayer = base.Parent as AdornerLayer;
+      if( adornerLayer != null )
+        adornerLayer.Update( base.AdornedElement );
+    }
+
+    #endregion // Private Helpers
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/CalculatorUtilities.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/CalculatorUtilities.cs
new file mode 100644
index 00000000..bddce5b5
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/CalculatorUtilities.cs
@@ -0,0 +1,281 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+
+namespace Xceed.Wpf.Toolkit.Core.Utilities
+{
+  static class CalculatorUtilities
+  {
+    public static Calculator.CalculatorButtonType GetCalculatorButtonTypeFromText( string text )
+    {
+      switch( text )
+      {
+        case "0":
+          return Calculator.CalculatorButtonType.Zero;
+        case "1":
+          return Calculator.CalculatorButtonType.One;
+        case "2":
+          return Calculator.CalculatorButtonType.Two;
+        case "3":
+          return Calculator.CalculatorButtonType.Three;
+        case "4":
+          return Calculator.CalculatorButtonType.Four;
+        case "5":
+          return Calculator.CalculatorButtonType.Five;
+        case "6":
+          return Calculator.CalculatorButtonType.Six;
+        case "7":
+          return Calculator.CalculatorButtonType.Seven;
+        case "8":
+          return Calculator.CalculatorButtonType.Eight;
+        case "9":
+          return Calculator.CalculatorButtonType.Nine;
+        case "+":
+          return Calculator.CalculatorButtonType.Add;
+        case "-":
+          return Calculator.CalculatorButtonType.Subtract;
+        case "*":
+          return Calculator.CalculatorButtonType.Multiply;
+        case "/":
+          return Calculator.CalculatorButtonType.Divide;
+        case "%":
+          return Calculator.CalculatorButtonType.Percent;
+        case "\b":
+          return Calculator.CalculatorButtonType.Back;
+        case "\r":
+        case "=":
+          return Calculator.CalculatorButtonType.Equal;
+      }
+
+      //the check for the decimal is not in the switch statement. To help localize we check against the current culture's decimal seperator
+      if( text == CultureInfo.CurrentCulture.NumberFormat.CurrencyDecimalSeparator )
+        return Calculator.CalculatorButtonType.Decimal;
+
+      //check for the escape key
+      if( text == ( ( char )27 ).ToString() )
+        return Calculator.CalculatorButtonType.Clear;
+
+      return Calculator.CalculatorButtonType.None;
+    }
+
+    public static Button FindButtonByCalculatorButtonType( DependencyObject parent, Calculator.CalculatorButtonType type )
+    {
+      for( int i = 0; i < VisualTreeHelper.GetChildrenCount( parent ); i++ )
+      {
+        var child = VisualTreeHelper.GetChild( parent, i );
+
+        object buttonType = child.GetValue( Button.CommandParameterProperty );
+
+        if( buttonType != null && ( Calculator.CalculatorButtonType )buttonType == type )
+        {
+          return child as Button;
+        }
+        else
+        {
+          var result = FindButtonByCalculatorButtonType( child, type );
+
+          if( result != null )
+            return result;
+        }
+      }
+      return null;
+    }
+
+    public static string GetCalculatorButtonContent( Calculator.CalculatorButtonType type )
+    {
+      string content = string.Empty;
+      switch( type )
+      {
+        case Calculator.CalculatorButtonType.Add:
+          content = "+";
+          break;
+        case Calculator.CalculatorButtonType.Back:
+          content = "Back";
+          break;
+        case Calculator.CalculatorButtonType.Cancel:
+          content = "CE";
+          break;
+        case Calculator.CalculatorButtonType.Clear:
+          content = "C";
+          break;
+        case Calculator.CalculatorButtonType.Decimal:
+          content = CultureInfo.CurrentCulture.NumberFormat.CurrencyDecimalSeparator;
+          break;
+        case Calculator.CalculatorButtonType.Divide:
+          content = "/";
+          break;
+        case Calculator.CalculatorButtonType.Eight:
+          content = "8";
+          break;
+        case Calculator.CalculatorButtonType.Equal:
+          content = "=";
+          break;
+        case Calculator.CalculatorButtonType.Five:
+          content = "5";
+          break;
+        case Calculator.CalculatorButtonType.Four:
+          content = "4";
+          break;
+        case Calculator.CalculatorButtonType.Fraction:
+          content = "1/x";
+          break;
+        case Calculator.CalculatorButtonType.MAdd:
+          content = "M+";
+          break;
+        case Calculator.CalculatorButtonType.MC:
+          content = "MC";
+          break;
+        case Calculator.CalculatorButtonType.MR:
+          content = "MR";
+          break;
+        case Calculator.CalculatorButtonType.MS:
+          content = "MS";
+          break;
+        case Calculator.CalculatorButtonType.MSub:
+          content = "M-";
+          break;
+        case Calculator.CalculatorButtonType.Multiply:
+          content = "*";
+          break;
+        case Calculator.CalculatorButtonType.Nine:
+          content = "9";
+          break;
+        case Calculator.CalculatorButtonType.None:
+          break;
+        case Calculator.CalculatorButtonType.One:
+          content = "1";
+          break;
+        case Calculator.CalculatorButtonType.Percent:
+          content = "%";
+          break;
+        case Calculator.CalculatorButtonType.Seven:
+          content = "7";
+          break;
+        case Calculator.CalculatorButtonType.Negate:
+          content = "+/-";
+          break;
+        case Calculator.CalculatorButtonType.Six:
+          content = "6";
+          break;
+        case Calculator.CalculatorButtonType.Sqrt:
+          content = "Sqrt";
+          break;
+        case Calculator.CalculatorButtonType.Subtract:
+          content = "-";
+          break;
+        case Calculator.CalculatorButtonType.Three:
+          content = "3";
+          break;
+        case Calculator.CalculatorButtonType.Two:
+          content = "2";
+          break;
+        case Calculator.CalculatorButtonType.Zero:
+          content = "0";
+          break;
+      }
+      return content;
+    }
+
+    public static bool IsDigit( Calculator.CalculatorButtonType buttonType )
+    {
+      switch( buttonType )
+      {
+        case Calculator.CalculatorButtonType.Zero:
+        case Calculator.CalculatorButtonType.One:
+        case Calculator.CalculatorButtonType.Two:
+        case Calculator.CalculatorButtonType.Three:
+        case Calculator.CalculatorButtonType.Four:
+        case Calculator.CalculatorButtonType.Five:
+        case Calculator.CalculatorButtonType.Six:
+        case Calculator.CalculatorButtonType.Seven:
+        case Calculator.CalculatorButtonType.Eight:
+        case Calculator.CalculatorButtonType.Nine:
+        case Calculator.CalculatorButtonType.Decimal:
+          return true;
+        default:
+          return false;
+      }
+    }
+
+    public static bool IsMemory( Calculator.CalculatorButtonType buttonType )
+    {
+      switch( buttonType )
+      {
+        case Calculator.CalculatorButtonType.MAdd:
+        case Calculator.CalculatorButtonType.MC:
+        case Calculator.CalculatorButtonType.MR:
+        case Calculator.CalculatorButtonType.MS:
+        case Calculator.CalculatorButtonType.MSub:
+          return true;
+        default:
+          return false;
+      }
+    }
+
+    public static decimal ParseDecimal( string text )
+    {
+      return Decimal.Parse( text, CultureInfo.CurrentCulture );
+    }
+
+    public static decimal Add( decimal firstNumber, decimal secondNumber )
+    {
+      return firstNumber + secondNumber;
+    }
+
+    public static decimal Subtract( decimal firstNumber, decimal secondNumber )
+    {
+      return firstNumber - secondNumber;
+    }
+
+    public static decimal Multiply( decimal firstNumber, decimal secondNumber )
+    {
+      return firstNumber * secondNumber;
+    }
+
+    public static decimal Divide( decimal firstNumber, decimal secondNumber )
+    {
+      return firstNumber / secondNumber;
+    }
+
+    public static decimal Percent( decimal firstNumber, decimal secondNumber )
+    {
+      return firstNumber * secondNumber / 100M;
+    }
+
+    public static decimal SquareRoot( decimal operand )
+    {
+      return Convert.ToDecimal( Math.Sqrt( Convert.ToDouble( operand ) ) );
+    }
+
+    public static decimal Fraction( decimal operand )
+    {
+      return 1 / operand;
+    }
+
+    public static decimal Negate( decimal operand )
+    {
+      return operand * -1M;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/ColorUtilities.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/ColorUtilities.cs
new file mode 100644
index 00000000..db088862
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/ColorUtilities.cs
@@ -0,0 +1,208 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Windows.Media;
+using Xceed.Wpf.Toolkit.Primitives;
+
+namespace Xceed.Wpf.Toolkit.Core.Utilities
+{
+  static class ColorUtilities
+  {
+    public static readonly Dictionary<string, Color> KnownColors = GetKnownColors();
+
+    public static string GetColorName( this Color color )
+    {
+      string colorName = KnownColors.Where( kvp => kvp.Value.Equals( color ) ).Select( kvp => kvp.Key ).FirstOrDefault();
+
+      if( String.IsNullOrEmpty( colorName ) )
+        colorName = color.ToString();
+
+      return colorName;
+    }
+
+    public static string FormatColorString( string stringToFormat, bool isUsingAlphaChannel )
+    {
+      if( !isUsingAlphaChannel && ( stringToFormat.Length == 9 ) )
+        return stringToFormat.Remove( 1, 2 );
+      return stringToFormat;
+    }
+
+    private static Dictionary<string, Color> GetKnownColors()
+    {
+      var colorProperties = typeof( Colors ).GetProperties( BindingFlags.Static | BindingFlags.Public );
+      return colorProperties.ToDictionary( p => p.Name, p => ( Color )p.GetValue( null, null ) );
+    }
+
+    /// <summary>
+    /// Converts an RGB color to an HSV color.
+    /// </summary>
+    /// <param name="r"></param>
+    /// <param name="b"></param>
+    /// <param name="g"></param>
+    /// <returns></returns>
+    public static HsvColor ConvertRgbToHsv( int r, int b, int g )
+    {
+      double delta, min;
+      double h = 0, s, v;
+
+      min = Math.Min( Math.Min( r, g ), b );
+      v = Math.Max( Math.Max( r, g ), b );
+      delta = v - min;
+
+      if( v == 0.0 )
+      {
+        s = 0;
+      }
+      else
+        s = delta / v;
+
+      if( s == 0 )
+        h = 0.0;
+
+      else
+      {
+        if( r == v )
+          h = ( g - b ) / delta;
+        else if( g == v )
+          h = 2 + ( b - r ) / delta;
+        else if( b == v )
+          h = 4 + ( r - g ) / delta;
+
+        h *= 60;
+        if( h < 0.0 )
+          h = h + 360;
+
+      }
+
+      return new HsvColor
+      {
+        H = h,
+        S = s,
+        V = v / 255
+      };
+    }
+
+    /// <summary>
+    ///  Converts an HSV color to an RGB color.
+    /// </summary>
+    /// <param name="h"></param>
+    /// <param name="s"></param>
+    /// <param name="v"></param>
+    /// <returns></returns>
+    public static Color ConvertHsvToRgb( double h, double s, double v )
+    {
+      double r = 0, g = 0, b = 0;
+
+      if( s == 0 )
+      {
+        r = v;
+        g = v;
+        b = v;
+      }
+      else
+      {
+        int i;
+        double f, p, q, t;
+
+        if( h == 360 )
+          h = 0;
+        else
+          h = h / 60;
+
+        i = ( int )Math.Truncate( h );
+        f = h - i;
+
+        p = v * ( 1.0 - s );
+        q = v * ( 1.0 - ( s * f ) );
+        t = v * ( 1.0 - ( s * ( 1.0 - f ) ) );
+
+        switch( i )
+        {
+          case 0:
+            {
+              r = v;
+              g = t;
+              b = p;
+              break;
+            }
+          case 1:
+            {
+              r = q;
+              g = v;
+              b = p;
+              break;
+            }
+          case 2:
+            {
+              r = p;
+              g = v;
+              b = t;
+              break;
+            }
+          case 3:
+            {
+              r = p;
+              g = q;
+              b = v;
+              break;
+            }
+          case 4:
+            {
+              r = t;
+              g = p;
+              b = v;
+              break;
+            }
+          default:
+            {
+              r = v;
+              g = p;
+              b = q;
+              break;
+            }
+        }
+
+      }
+
+      return Color.FromArgb( 255, ( byte )( r * 255 ), ( byte )( g * 255 ), ( byte )( b * 255 ) );
+    }
+
+    /// <summary>
+    /// Generates a list of colors with hues ranging from 0 360 and a saturation and value of 1. 
+    /// </summary>
+    /// <returns></returns>
+    public static List<Color> GenerateHsvSpectrum()
+    {
+      List<Color> colorsList = new List<Color>( 8 );
+
+      for( int i = 0; i < 29; i++ )
+      {
+        colorsList.Add( ColorUtilities.ConvertHsvToRgb( i * 12, 1, 1 ) );
+      }
+
+      colorsList.Add( ColorUtilities.ConvertHsvToRgb( 0, 1, 1 ) );
+
+      return colorsList;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/ContextMenuUtilities.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/ContextMenuUtilities.cs
new file mode 100644
index 00000000..d7fdf67e
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/ContextMenuUtilities.cs
@@ -0,0 +1,53 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.Core.Utilities
+{
+  public class ContextMenuUtilities
+  {
+    public static readonly DependencyProperty OpenOnMouseLeftButtonClickProperty = DependencyProperty.RegisterAttached( "OpenOnMouseLeftButtonClick", typeof( bool ), typeof( ContextMenuUtilities ), new FrameworkPropertyMetadata( false, OpenOnMouseLeftButtonClickChanged ) );
+    public static void SetOpenOnMouseLeftButtonClick( FrameworkElement element, bool value )
+    {
+      element.SetValue( OpenOnMouseLeftButtonClickProperty, value );
+    }
+    public static bool GetOpenOnMouseLeftButtonClick( FrameworkElement element )
+    {
+      return ( bool )element.GetValue( OpenOnMouseLeftButtonClickProperty );
+    }
+
+    public static void OpenOnMouseLeftButtonClickChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
+    {
+      var control = ( FrameworkElement )sender;
+      if( ( bool )e.NewValue )
+      {
+        control.PreviewMouseLeftButtonDown += ( s, args ) =>
+        {
+          if( control.ContextMenu != null )
+          {
+            control.ContextMenu.PlacementTarget = control;
+            control.ContextMenu.IsOpen = true;
+          }
+        };
+      }
+      //TODO: remove handler when set to false
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/DoubleHelper.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/DoubleHelper.cs
new file mode 100644
index 00000000..37572ffb
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/DoubleHelper.cs
@@ -0,0 +1,100 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.Core.Utilities
+{
+  internal static class DoubleHelper
+  {
+    public static bool AreVirtuallyEqual( double d1, double d2 )
+    {
+      if( double.IsPositiveInfinity( d1 ) )
+        return double.IsPositiveInfinity( d2 );
+
+      if( double.IsNegativeInfinity( d1 ) )
+        return double.IsNegativeInfinity( d2 );
+
+      if( IsNaN( d1 ) )
+        return IsNaN( d2 );
+
+      double n = d1 - d2;
+      double d = ( Math.Abs( d1 ) + Math.Abs( d2 ) + 10 ) * 1.0e-15;
+      return ( -d < n ) && ( d > n );
+    }
+
+    public static bool AreVirtuallyEqual( Size s1, Size s2 )
+    {
+      return ( AreVirtuallyEqual( s1.Width, s2.Width )
+          && AreVirtuallyEqual( s1.Height, s2.Height ) );
+    }
+
+    public static bool AreVirtuallyEqual( Point p1, Point p2 )
+    {
+      return ( AreVirtuallyEqual( p1.X, p2.X )
+          && AreVirtuallyEqual( p1.Y, p2.Y ) );
+    }
+
+    public static bool AreVirtuallyEqual( Rect r1, Rect r2 )
+    {
+      return ( AreVirtuallyEqual( r1.TopLeft, r2.TopLeft )
+          && AreVirtuallyEqual( r1.BottomRight, r2.BottomRight ) );
+    }
+
+    public static bool AreVirtuallyEqual( Vector v1, Vector v2 )
+    {
+      return ( AreVirtuallyEqual( v1.X, v2.X )
+          && AreVirtuallyEqual( v1.Y, v2.Y ) );
+    }
+
+    public static bool AreVirtuallyEqual( Segment s1, Segment s2 )
+    {
+      // note: Segment struct already uses "virtually equal" approach
+      return ( s1 == s2 );
+    }
+
+    public static bool IsNaN( double value )
+    {
+      // used reflector to borrow the high performance IsNan function 
+      // from the WPF MS.Internal namespace
+      NanUnion t = new NanUnion();
+      t.DoubleValue = value;
+
+      UInt64 exp = t.UintValue & 0xfff0000000000000;
+      UInt64 man = t.UintValue & 0x000fffffffffffff;
+
+      return ( exp == 0x7ff0000000000000 || exp == 0xfff0000000000000 ) && ( man != 0 );
+    }
+
+    #region NanUnion Nested Types
+
+    [StructLayout( LayoutKind.Explicit )]
+    private struct NanUnion
+    {
+      [FieldOffset( 0 )]
+      internal double DoubleValue;
+      [FieldOffset( 0 )]
+      internal UInt64 UintValue;
+    }
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/EllipseHelper.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/EllipseHelper.cs
new file mode 100644
index 00000000..1b68fdcb
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/EllipseHelper.cs
@@ -0,0 +1,72 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.Core.Utilities
+{
+  internal static class EllipseHelper
+  {
+    public static Point PointOfRadialIntersection( Rect ellipseRect, double angle )
+    {
+      // given by the formula:
+      //
+      // x =  a cos q,
+      // y =  b sin q,
+      //
+      // where a is the elliptical radius along the major axis
+      //       b is the elliptical radius along the minor axis
+      //       q is the central angle from the major axis
+
+      double a = ellipseRect.Width / 2;
+      double b = ellipseRect.Height / 2;
+
+      // since this is WPF, we can assume angle is currently specified in degrees, so convert to radians
+      double q = angle * Math.PI / 180;
+
+      return RectHelper.Center( ellipseRect ) + new Vector( a * Math.Cos( q ), b * Math.Sin( q ) );
+    }
+
+    public static double RadialDistanceFromCenter( Rect ellipseRect, double angle )
+    {
+      // given by the formula:
+      //
+      //              2 2
+      //   2         a b
+      //  r  = -----------------
+      //        2   2     2   2
+      //       a sin q + b cos q
+      //
+      // where a is the elliptical radius along the major axis
+      //       b is the elliptical radius along the minor axis
+      //       q is the central angle from the major axis
+
+      double a = ellipseRect.Width / 2;
+      double b = ellipseRect.Height / 2;
+
+      // since this is WPF, we can assume angle is currently specified in degrees, so convert to radians
+      double q = angle * Math.PI / 180;
+
+      double sinq = Math.Sin( q );
+      double cosq = Math.Cos( q );
+      return Math.Sqrt( ( a * a * b * b ) / ( ( a * a * sinq * sinq ) + ( b * b * cosq * cosq ) ) );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/PointHelper.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/PointHelper.cs
new file mode 100644
index 00000000..7554e634
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/PointHelper.cs
@@ -0,0 +1,45 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.Core.Utilities
+{
+  internal static class PointHelper
+  {
+    public static double DistanceBetween( Point p1, Point p2 )
+    {
+      return Math.Sqrt( Math.Pow( p1.X - p2.X, 2 ) + Math.Pow( p1.Y - p2.Y, 2 ) );
+    }
+
+    public static Point Empty
+    {
+      get
+      {
+        return new Point( double.NaN, double.NaN );
+      }
+    }
+
+    public static bool IsEmpty( Point point )
+    {
+      return DoubleHelper.IsNaN( point.X ) && DoubleHelper.IsNaN( point.Y );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/RectHelper.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/RectHelper.cs
new file mode 100644
index 00000000..bdab9e41
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/RectHelper.cs
@@ -0,0 +1,89 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.Core.Utilities
+{
+  internal static class RectHelper
+  {
+    public static Point Center( Rect rect )
+    {
+      return new Point( rect.Left + rect.Width / 2, rect.Top + rect.Height / 2 );
+    }
+
+    public static Nullable<Point> GetNearestPointOfIntersectionBetweenRectAndSegment( Rect rect, Segment segment, Point point )
+    {
+      Nullable<Point> result = null;
+      double distance = double.PositiveInfinity;
+
+      Segment leftIntersection = segment.Intersection( new Segment( rect.BottomLeft, rect.TopLeft ) );
+      Segment topIntersection = segment.Intersection( new Segment( rect.TopLeft, rect.TopRight ) );
+      Segment rightIntersection = segment.Intersection( new Segment( rect.TopRight, rect.BottomRight ) );
+      Segment bottomIntersection = segment.Intersection( new Segment( rect.BottomRight, rect.BottomLeft ) );
+
+      RectHelper.AdjustResultForIntersectionWithSide( ref result, ref distance, leftIntersection, point );
+      RectHelper.AdjustResultForIntersectionWithSide( ref result, ref distance, topIntersection, point );
+      RectHelper.AdjustResultForIntersectionWithSide( ref result, ref distance, rightIntersection, point );
+      RectHelper.AdjustResultForIntersectionWithSide( ref result, ref distance, bottomIntersection, point );
+
+      return result;
+    }
+
+    public static Rect GetRectCenteredOnPoint( Point center, Size size )
+    {
+      return new Rect( new Point( center.X - size.Width / 2, center.Y - size.Height / 2 ), size );
+    }
+
+    private static void AdjustResultForIntersectionWithSide( ref Nullable<Point> result, ref double distance, Segment intersection, Point point )
+    {
+      if( !intersection.IsEmpty )
+      {
+        if( intersection.Contains( point ) )
+        {
+          distance = 0;
+          result = point;
+          return;
+        }
+
+        double p1Distance = PointHelper.DistanceBetween( point, intersection.P1 );
+        double p2Distance = double.PositiveInfinity;
+        if( !intersection.IsPoint )
+        {
+          p2Distance = PointHelper.DistanceBetween( point, intersection.P2 );
+        }
+
+        if( Math.Min( p1Distance, p2Distance ) < distance )
+        {
+          if( p1Distance < p2Distance )
+          {
+            distance = p1Distance;
+            result = intersection.P1;
+          }
+          else
+          {
+            distance = p2Distance;
+            result = intersection.P2;
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/ResourceHelper.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/ResourceHelper.cs
new file mode 100644
index 00000000..d66e1196
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/ResourceHelper.cs
@@ -0,0 +1,39 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.IO;
+using System.Reflection;
+using System.Resources;
+
+namespace Xceed.Wpf.Toolkit.Core.Utilities
+{
+  internal class ResourceHelper
+  {
+    internal static Stream LoadResourceStream( Assembly assembly, string resId )
+    {
+      string basename = System.IO.Path.GetFileNameWithoutExtension( assembly.ManifestModule.Name ) + ".g";
+      ResourceManager resourceManager = new ResourceManager( basename, assembly );
+
+      // resource names are lower case and contain only forward slashes
+      resId = resId.ToLower();
+      resId = resId.Replace( '\\', '/' );
+      return ( resourceManager.GetObject( resId ) as Stream );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/Segment.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/Segment.cs
new file mode 100644
index 00000000..3015f02f
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/Segment.cs
@@ -0,0 +1,387 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.Core.Utilities
+{
+  internal struct Segment
+  {
+    #region Constructors
+
+    public Segment( Point point )
+    {
+      _p1 = point;
+      _p2 = point;
+      _isP1Excluded = false;
+      _isP2Excluded = false;
+    }
+
+    public Segment( Point p1, Point p2 )
+    {
+      _p1 = p1;
+      _p2 = p2;
+      _isP1Excluded = false;
+      _isP2Excluded = false;
+    }
+
+    public Segment( Point p1, Point p2, bool excludeP1, bool excludeP2 )
+    {
+      _p1 = p1;
+      _p2 = p2;
+      _isP1Excluded = excludeP1;
+      _isP2Excluded = excludeP2;
+    }
+
+    #endregion
+
+    #region Empty Static Properties
+
+    public static Segment Empty
+    {
+      get
+      {
+        Segment result = new Segment( new Point( 0, 0 ) );
+        result._isP1Excluded = true;
+        result._isP2Excluded = true;
+        return result;
+      }
+    }
+
+    #endregion
+
+    #region P1 Property
+
+    public Point P1
+    {
+      get
+      {
+        return _p1;
+      }
+    }
+
+    #endregion
+
+    #region P2 Property
+
+    public Point P2
+    {
+      get
+      {
+        return _p2;
+      }
+    }
+
+    #endregion
+
+    #region IsP1Excluded Property
+
+    public bool IsP1Excluded
+    {
+      get
+      {
+        return _isP1Excluded;
+      }
+    }
+
+    #endregion
+
+    #region IsP2Excluded Property
+
+    public bool IsP2Excluded
+    {
+      get
+      {
+        return _isP2Excluded;
+      }
+    }
+
+    #endregion
+
+    #region IsEmpty Property
+
+    public bool IsEmpty
+    {
+      get
+      {
+        return DoubleHelper.AreVirtuallyEqual( _p1, _p2 ) && ( _isP1Excluded || _isP2Excluded );
+      }
+    }
+
+    #endregion
+
+    #region IsPoint Property
+
+    public bool IsPoint
+    {
+      get
+      {
+        return DoubleHelper.AreVirtuallyEqual( _p1, _p2 );
+      }
+    }
+
+    #endregion
+
+    #region Length Property
+
+    public double Length
+    {
+      get
+      {
+        return ( this.P2 - this.P1 ).Length;
+      }
+    }
+
+    #endregion
+
+    #region Slope Property
+
+    public double Slope
+    {
+      get
+      {
+        return ( this.P2.X == this.P1.X ) ? double.NaN : ( this.P2.Y - this.P1.Y ) / ( this.P2.X - this.P1.X );
+      }
+    }
+
+    #endregion
+
+    public bool Contains( Point point )
+    {
+      if( IsEmpty )
+        return false;
+
+      // if the point is an endpoint, ensure that it is not excluded
+      if( DoubleHelper.AreVirtuallyEqual( _p1, point ) )
+        return _isP1Excluded;
+
+      if( DoubleHelper.AreVirtuallyEqual( _p2, point ) )
+        return _isP2Excluded;
+
+      bool result = false;
+
+      // ensure that a line through P1 and the point is parallel to the current segment
+      if( DoubleHelper.AreVirtuallyEqual( Slope, new Segment( _p1, point ).Slope ) )
+      {
+        // finally, ensure that the point is between the segment's endpoints
+        result = ( point.X >= Math.Min( _p1.X, _p2.X ) )
+              && ( point.X <= Math.Max( _p1.X, _p2.X ) )
+              && ( point.Y >= Math.Min( _p1.Y, _p2.Y ) )
+              && ( point.Y <= Math.Max( _p1.Y, _p2.Y ) );
+      }
+      return result;
+    }
+
+    public bool Contains( Segment segment )
+    {
+      return ( segment == this.Intersection( segment ) );
+    }
+
+    public override bool Equals( object o )
+    {
+      if( !( o is Segment ) )
+        return false;
+
+      Segment other = ( Segment )o;
+
+      // empty segments are always considered equal
+      if( this.IsEmpty )
+        return other.IsEmpty;
+
+      // segments are considered equal if
+      //    1) the endpoints are equal and equally excluded
+      //    2) the opposing endpoints are equal and equally excluded
+      if( DoubleHelper.AreVirtuallyEqual( _p1, other._p1 ) )
+      {
+        return ( DoubleHelper.AreVirtuallyEqual( _p2, other._p2 )
+             && _isP1Excluded == other._isP1Excluded
+             && _isP2Excluded == other._isP2Excluded );
+      }
+      else
+      {
+        return ( DoubleHelper.AreVirtuallyEqual( _p1, other._p2 )
+             && DoubleHelper.AreVirtuallyEqual( _p2, other._p1 )
+             && _isP1Excluded == other._isP2Excluded
+             && _isP2Excluded == other._isP1Excluded );
+      }
+    }
+
+    public override int GetHashCode()
+    {
+      return _p1.GetHashCode() ^ _p2.GetHashCode() ^ _isP1Excluded.GetHashCode() ^ _isP2Excluded.GetHashCode();
+    }
+
+    public Segment Intersection( Segment segment )
+    {
+      // if either segment is empty, the intersection is also empty
+      if( this.IsEmpty || segment.IsEmpty )
+        return Segment.Empty;
+
+      // if the segments are equal, just return a new equal segment
+      if( this == segment )
+        return new Segment( this._p1, this._p2, this._isP1Excluded, this._isP2Excluded );
+
+      // if either segment is a Point, just see if the point is contained in the other segment
+      if( this.IsPoint )
+        return segment.Contains( this._p1 ) ? new Segment( this._p1 ) : Segment.Empty;
+
+      if( segment.IsPoint )
+        return this.Contains( segment._p1 ) ? new Segment( segment._p1 ) : Segment.Empty;
+
+      // okay, no easy answer, so let's do the math...
+      Point p1 = this._p1;
+      Vector v1 = this._p2 - this._p1;
+      Point p2 = segment._p1;
+      Vector v2 = segment._p2 - segment._p1;
+      Vector endpointVector = p2 - p1;
+
+      double xProd = Vector.CrossProduct( v1, v2 );
+
+      // if segments are not parallel, then look for intersection on each segment
+      if( !DoubleHelper.AreVirtuallyEqual( Slope, segment.Slope ) )
+      {
+        // check for intersection on other segment
+        double s = ( Vector.CrossProduct( endpointVector, v1 ) ) / xProd;
+        if( s < 0 || s > 1 )
+          return Segment.Empty;
+
+        // check for intersection on this segment
+        s = ( Vector.CrossProduct( endpointVector, v2 ) ) / xProd;
+        if( s < 0 || s > 1 )
+          return Segment.Empty;
+
+        // intersection of segments is a point
+        return new Segment( p1 + s * v1 );
+      }
+
+      // segments are parallel
+      xProd = Vector.CrossProduct( endpointVector, v1 );
+      if( xProd * xProd > 1.0e-06 * v1.LengthSquared * endpointVector.LengthSquared )
+      {
+        // segments do not intersect
+        return Segment.Empty;
+      }
+
+      // intersection is overlapping segment
+      Segment result = new Segment();
+
+      // to determine the overlapping segment, create reference segments where the endpoints are *not* excluded
+      Segment refThis = new Segment( this._p1, this._p2 );
+      Segment refSegment = new Segment( segment._p1, segment._p2 );
+
+      // check whether this segment is contained in the other segment
+      bool includeThisP1 = refSegment.Contains( refThis._p1 );
+      bool includeThisP2 = refSegment.Contains( refThis._p2 );
+      if( includeThisP1 && includeThisP2 )
+      {
+        result._p1 = this._p1;
+        result._p2 = this._p2;
+        result._isP1Excluded = this._isP1Excluded || !segment.Contains( this._p1 );
+        result._isP2Excluded = this._isP2Excluded || !segment.Contains( this._p2 );
+        return result;
+      }
+
+      // check whether the other segment is contained in this segment
+      bool includeSegmentP1 = refThis.Contains( refSegment._p1 );
+      bool includeSegmentP2 = refThis.Contains( refSegment._p2 );
+      if( includeSegmentP1 && includeSegmentP2 )
+      {
+        result._p1 = segment._p1;
+        result._p2 = segment._p2;
+        result._isP1Excluded = segment._isP1Excluded || !this.Contains( segment._p1 );
+        result._isP2Excluded = segment._isP2Excluded || !this.Contains( segment._p2 );
+        return result;
+      }
+
+      // the intersection must include one endpoint from this segment and one endpoint from the other segment
+      if( includeThisP1 )
+      {
+        result._p1 = this._p1;
+        result._isP1Excluded = this._isP1Excluded || !segment.Contains( this._p1 );
+      }
+      else
+      {
+        result._p1 = this._p2;
+        result._isP1Excluded = this._isP2Excluded || !segment.Contains( this._p2 );
+      }
+      if( includeSegmentP1 )
+      {
+        result._p2 = segment._p1;
+        result._isP2Excluded = segment._isP1Excluded || !this.Contains( segment._p1 );
+      }
+      else
+      {
+        result._p2 = segment._p2;
+        result._isP2Excluded = segment._isP2Excluded || !this.Contains( segment._p2 );
+      }
+      return result;
+    }
+
+    public override string ToString()
+    {
+      string s = base.ToString();
+
+      if( this.IsEmpty )
+      {
+        s = s + ": {Empty}";
+      }
+      else if( this.IsPoint )
+      {
+        s = s + ", Point: " + _p1.ToString();
+      }
+      else
+      {
+        s = s + ": " + _p1.ToString() + ( _isP1Excluded ? " (excl)" : " (incl)" )
+            + " to " + _p2.ToString() + ( _isP2Excluded ? " (excl)" : " (incl)" );
+      }
+
+      return s;
+    }
+
+    #region Operators Methods
+
+    public static bool operator ==( Segment s1, Segment s2 )
+    {
+      if( ( object )s1 == null )
+        return ( object )s2 == null;
+
+      if( ( object )s2 == null )
+        return ( object )s1 == null;
+
+      return s1.Equals( s2 );
+    }
+
+    public static bool operator !=( Segment s1, Segment s2 )
+    {
+      return !( s1 == s2 );
+    }
+
+    #endregion
+
+    #region Private Fields
+
+    private bool _isP1Excluded;
+    private bool _isP2Excluded;
+    private Point _p1;
+    private Point _p2;
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/VisualTreeHelperEx.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/VisualTreeHelperEx.cs
new file mode 100644
index 00000000..b9d42b71
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/VisualTreeHelperEx.cs
@@ -0,0 +1,138 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Media;
+
+namespace Xceed.Wpf.Toolkit.Core.Utilities
+{
+  internal static class VisualTreeHelperEx
+  {
+    public static DependencyObject FindAncestorByType( DependencyObject element, Type type, bool specificTypeOnly )
+    {
+      if( element == null )
+        return null;
+
+      if( specificTypeOnly ? ( element.GetType() == type )
+          : ( element.GetType() == type ) || ( element.GetType().IsSubclassOf( type ) ) )
+        return element;
+
+      return VisualTreeHelperEx.FindAncestorByType( VisualTreeHelper.GetParent( element ), type, specificTypeOnly );
+    }
+
+    public static T FindAncestorByType<T>( DependencyObject depObj ) where T : DependencyObject
+    {
+      if( depObj == null )
+      {
+        return default( T );
+      }
+      if( depObj is T )
+      {
+        return ( T )depObj;
+      }
+
+      T parent = default( T );
+
+      parent = VisualTreeHelperEx.FindAncestorByType<T>( VisualTreeHelper.GetParent( depObj ) );
+
+      return parent;
+    }
+
+    public static Visual FindDescendantByName( Visual element, string name )
+    {
+      if( element != null && ( element is FrameworkElement ) && ( element as FrameworkElement ).Name == name )
+        return element;
+
+      Visual foundElement = null;
+      if( element is FrameworkElement )
+        ( element as FrameworkElement ).ApplyTemplate();
+
+      for( int i = 0; i < VisualTreeHelper.GetChildrenCount( element ); i++ )
+      {
+        Visual visual = VisualTreeHelper.GetChild( element, i ) as Visual;
+        foundElement = VisualTreeHelperEx.FindDescendantByName( visual, name );
+        if( foundElement != null )
+          break;
+      }
+
+      return foundElement;
+    }
+
+    public static Visual FindDescendantByType( Visual element, Type type )
+    {
+      return VisualTreeHelperEx.FindDescendantByType( element, type, true );
+    }
+
+    public static Visual FindDescendantByType( Visual element, Type type, bool specificTypeOnly )
+    {
+      if( element == null )
+        return null;
+
+      if( specificTypeOnly ? ( element.GetType() == type )
+          : ( element.GetType() == type ) || ( element.GetType().IsSubclassOf( type ) ) )
+        return element;
+
+      Visual foundElement = null;
+      if( element is FrameworkElement )
+        ( element as FrameworkElement ).ApplyTemplate();
+
+      for( int i = 0; i < VisualTreeHelper.GetChildrenCount( element ); i++ )
+      {
+        Visual visual = VisualTreeHelper.GetChild( element, i ) as Visual;
+        foundElement = VisualTreeHelperEx.FindDescendantByType( visual, type, specificTypeOnly );
+        if( foundElement != null )
+          break;
+      }
+
+      return foundElement;
+    }
+
+    public static T FindDescendantByType<T>( Visual element ) where T : Visual
+    {
+      Visual temp = VisualTreeHelperEx.FindDescendantByType( element, typeof( T ) );
+
+      return ( T )temp;
+    }
+
+    public static Visual FindDescendantWithPropertyValue( Visual element,
+        DependencyProperty dp, object value )
+    {
+      if( element == null )
+        return null;
+
+      if( element.GetValue( dp ).Equals( value ) )
+        return element;
+
+      Visual foundElement = null;
+      if( element is FrameworkElement )
+        ( element as FrameworkElement ).ApplyTemplate();
+
+      for( int i = 0; i < VisualTreeHelper.GetChildrenCount( element ); i++ )
+      {
+        Visual visual = VisualTreeHelper.GetChild( element, i ) as Visual;
+        foundElement = VisualTreeHelperEx.FindDescendantWithPropertyValue( visual, dp, value );
+        if( foundElement != null )
+          break;
+      }
+
+      return foundElement;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimePicker/Implementation/DateTimePicker.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimePicker/Implementation/DateTimePicker.cs
new file mode 100644
index 00000000..3c7b4ad0
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimePicker/Implementation/DateTimePicker.cs
@@ -0,0 +1,242 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+#if VS2008
+using Microsoft.Windows.Controls;
+using Microsoft.Windows.Controls.Primitives;
+#else
+using System.Windows.Controls.Primitives;
+#endif
+
+namespace Xceed.Wpf.Toolkit
+{
+  [TemplatePart( Name = PART_Calendar, Type = typeof( Calendar ) )]
+  public class DateTimePicker : DateTimeUpDown
+  {
+    private const string PART_Calendar = "PART_Calendar";
+
+    #region Members
+
+    private Calendar _calendar;
+
+    #endregion //Members
+
+    #region Properties
+
+    #region IsOpen
+
+    public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register( "IsOpen", typeof( bool ), typeof( DateTimePicker ), new UIPropertyMetadata( false ) );
+    public bool IsOpen
+    {
+      get
+      {
+        return ( bool )GetValue( IsOpenProperty );
+      }
+      set
+      {
+        SetValue( IsOpenProperty, value );
+      }
+    }
+
+    #endregion //IsOpen
+
+    #region TimeFormat
+
+    public static readonly DependencyProperty TimeFormatProperty = DependencyProperty.Register( "TimeFormat", typeof( TimeFormat ), typeof( DateTimePicker ), new UIPropertyMetadata( TimeFormat.ShortTime ) );
+    public TimeFormat TimeFormat
+    {
+      get
+      {
+        return ( TimeFormat )GetValue( TimeFormatProperty );
+      }
+      set
+      {
+        SetValue( TimeFormatProperty, value );
+      }
+    }
+
+    #endregion //TimeFormat
+
+    #region TimeFormatString
+
+    public static readonly DependencyProperty TimeFormatStringProperty = DependencyProperty.Register( "TimeFormatString", typeof( string ), typeof( DateTimePicker ), new UIPropertyMetadata( default( String ) ) );
+    public string TimeFormatString
+    {
+      get
+      {
+        return ( string )GetValue( TimeFormatStringProperty );
+      }
+      set
+      {
+        SetValue( TimeFormatStringProperty, value );
+      }
+    }
+
+    #endregion //TimeFormatString
+
+    #region TimeWatermark
+
+    public static readonly DependencyProperty TimeWatermarkProperty = DependencyProperty.Register( "TimeWatermark", typeof( object ), typeof( DateTimePicker ), new UIPropertyMetadata( null ) );
+    public object TimeWatermark
+    {
+      get
+      {
+        return ( object )GetValue( TimeWatermarkProperty );
+      }
+      set
+      {
+        SetValue( TimeWatermarkProperty, value );
+      }
+    }
+
+    #endregion //TimeWatermark
+
+    #region TimeWatermarkTemplate
+
+    public static readonly DependencyProperty TimeWatermarkTemplateProperty = DependencyProperty.Register( "TimeWatermarkTemplate", typeof( DataTemplate ), typeof( DateTimePicker ), new UIPropertyMetadata( null ) );
+    public DataTemplate TimeWatermarkTemplate
+    {
+      get
+      {
+        return ( DataTemplate )GetValue( TimeWatermarkTemplateProperty );
+      }
+      set
+      {
+        SetValue( TimeWatermarkTemplateProperty, value );
+      }
+    }
+
+    #endregion //TimeWatermarkTemplate
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static DateTimePicker()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( DateTimePicker ), new FrameworkPropertyMetadata( typeof( DateTimePicker ) ) );
+    }
+
+    public DateTimePicker()
+    {
+      Keyboard.AddKeyDownHandler( this, OnKeyDown );
+      Mouse.AddPreviewMouseDownOutsideCapturedElementHandler( this, OnMouseDownOutsideCapturedElement );
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+
+      if( _calendar != null )
+      {
+        _calendar.SelectedDatesChanged -= Calendar_SelectedDatesChanged;
+      }
+
+      _calendar = GetTemplateChild( PART_Calendar ) as Calendar;
+
+      if( _calendar != null )
+      {
+        _calendar.SelectedDatesChanged += Calendar_SelectedDatesChanged;
+        _calendar.SelectedDate = Value ?? null;
+        _calendar.DisplayDate = Value ?? DateTime.Now;
+      }
+    }
+
+    protected override void OnPreviewMouseUp( MouseButtonEventArgs e )
+    {
+      if( Mouse.Captured is CalendarItem )
+        Mouse.Capture( null );
+    }
+
+    protected override void OnValueChanged( DateTime? oldValue, DateTime? newValue )
+    {
+      if( _calendar != null && _calendar.SelectedDate != newValue )
+      {
+        _calendar.SelectedDate = newValue;
+        _calendar.DisplayDate = newValue ?? DateTime.Now;
+      }
+
+      base.OnValueChanged( oldValue, newValue );
+    }
+
+    protected override void OnPreviewKeyDown( KeyEventArgs e )
+    {
+      //if the calendar is open then we don't want to modify the behavior of navigating the calendar control with the Up/Down keys.
+      if( !IsOpen )
+        base.OnPreviewKeyDown( e );
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Event Handlers
+
+    private void OnKeyDown( object sender, KeyEventArgs e )
+    {
+      switch( e.Key )
+      {
+        case Key.Escape:
+        case Key.Tab:
+          {
+            CloseDateTimePicker();
+            break;
+          }
+      }
+    }
+
+    private void OnMouseDownOutsideCapturedElement( object sender, MouseButtonEventArgs e )
+    {
+      CloseDateTimePicker();
+    }
+
+    void Calendar_SelectedDatesChanged( object sender, SelectionChangedEventArgs e )
+    {
+      if( e.AddedItems.Count > 0 )
+      {
+        var newDate = ( DateTime? )e.AddedItems[ 0 ];
+
+        if( (Value != null) && (newDate != null) && newDate.HasValue )
+          newDate = new DateTime( newDate.Value.Year, newDate.Value.Month, newDate.Value.Day, Value.Value.Hour, Value.Value.Minute, Value.Value.Second );
+
+        if( !object.Equals( newDate, Value ) )
+          Value = newDate;
+      }
+    }
+
+    #endregion //Event Handlers
+
+    #region Methods
+
+    private void CloseDateTimePicker()
+    {
+      if( IsOpen )
+        IsOpen = false;
+      ReleaseMouseCapture();
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimePicker/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimePicker/Themes/Generic.xaml
new file mode 100644
index 00000000..92bb3a18
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimePicker/Themes/Generic.xaml
@@ -0,0 +1,165 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
+
+   <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+
+   <DataTemplate x:Key="DefaultWatermarkTemplate">
+      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
+   </DataTemplate>
+
+   <LinearGradientBrush x:Key="PopupDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="1" Color="#FFE8EBED" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <Style x:Key="DateTimePickerToggleButtonStyle" TargetType="ToggleButton">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="ToggleButton">
+               <Grid SnapsToDevicePixels="True">
+                  <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                       CornerRadius="0,2.75,2.75,0"
+                                       RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:DateTimePicker}}"
+                                       RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:DateTimePicker}}"
+											      RenderMouseOver="{TemplateBinding IsMouseOver}"
+											      RenderPressed="{TemplateBinding IsPressed}">
+
+                     <Grid>
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="*" />
+                           <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+
+                        <ContentPresenter HorizontalAlignment="Stretch" VerticalAlignment="Stretch" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+
+                        <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
+                           <Path x:Name="Arrow" Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000" />
+                        </Grid>
+                     </Grid>
+                  </chrome:ButtonChrome>
+               </Grid>
+                <ControlTemplate.Triggers>
+                    <Trigger Property="IsEnabled" Value="False">
+                        <Setter Property="Fill" TargetName="Arrow" Value="#AFAFAF" />
+                    </Trigger>
+                </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <!-- =============================================================================== -->
+   <!-- DateTimePicker                                                                  -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type local:DateTimePicker}">
+      <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+      <Setter Property="HorizontalContentAlignment" Value="Right" />
+      <Setter Property="TextAlignment" Value="Right" />
+      <Setter Property="TimeWatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+      <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:DateTimePicker}">
+               <Border>
+                  <Grid>
+                     <Grid>
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="*" />
+                           <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <local:ButtonSpinner x:Name="PART_Spinner"
+                                             IsTabStop="False"
+                                             Background="{TemplateBinding Background}"
+                                             BorderThickness="{TemplateBinding BorderThickness}"
+                                             BorderBrush="{TemplateBinding BorderBrush}"
+                                             AllowSpin="{TemplateBinding AllowSpin}"
+                                             ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
+                           <local:WatermarkTextBox x:Name="PART_TextBox"
+                                                   BorderThickness="0" 
+                                                   Background="Transparent"
+                                                   FontFamily="{TemplateBinding FontFamily}" 
+                                                   FontSize="{TemplateBinding FontSize}" 
+                                                   FontStretch="{TemplateBinding FontStretch}"
+                                                   FontStyle="{TemplateBinding FontStyle}" 
+                                                   FontWeight="{TemplateBinding FontWeight}" 
+                                                   Foreground="{TemplateBinding Foreground}" 
+                                                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                   IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
+                                                   MinWidth="20"
+                                                   AcceptsReturn="False"
+                                                   Padding="0"
+                                                   TextAlignment="{TemplateBinding TextAlignment}"
+                                                   TextWrapping="NoWrap" 
+                                                   TabIndex="{TemplateBinding TabIndex}"
+                                                   Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
+                                                   Watermark="{TemplateBinding Watermark}"
+                                                   WatermarkTemplate="{TemplateBinding WatermarkTemplate}" />
+                        </local:ButtonSpinner>
+                        <ToggleButton x:Name="_calendarToggleButton"
+                                      Grid.Column="1"
+                                      Background="White"
+                                      IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                                      Style="{StaticResource DateTimePickerToggleButtonStyle}"
+                                      IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
+                                      IsEnabled="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}" />
+                     </Grid>
+                     <Popup IsOpen="{Binding IsChecked, ElementName=_calendarToggleButton}" StaysOpen="False">
+                        <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}" Padding="3">
+                           <StackPanel>
+                              <Calendar x:Name="PART_Calendar" BorderThickness="0" />
+                              <local:TimePicker x:Name="PART_TimeUpDown"
+                                                Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"
+                                                Foreground="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" 
+                                                Format="{TemplateBinding TimeFormat}"
+                                                FormatString="{TemplateBinding TimeFormatString}"
+                                                Value="{Binding Value, RelativeSource={RelativeSource TemplatedParent}}"
+                                                Watermark="{TemplateBinding TimeWatermark}"
+                                                WatermarkTemplate="{TemplateBinding TimeWatermarkTemplate}" />
+                           </StackPanel>
+                        </Border>
+                     </Popup>
+                  </Grid>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeFormat.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeFormat.cs
new file mode 100644
index 00000000..8e8a2e81
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeFormat.cs
@@ -0,0 +1,36 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit
+{
+  public enum DateTimeFormat
+  {
+    Custom,
+    FullDateTime,
+    LongDate,
+    LongTime,
+    MonthDay,
+    RFC1123,
+    ShortDate,
+    ShortTime,
+    SortableDateTime,
+    UniversalSortableDateTime,
+    YearMonth
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeInfo.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeInfo.cs
new file mode 100644
index 00000000..0c1fdf84
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeInfo.cs
@@ -0,0 +1,55 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit
+{
+  internal class DateTimeInfo
+  {
+    public string Content
+    {
+      get;
+      set;
+    }
+    public string Format
+    {
+      get;
+      set;
+    }
+    public bool IsReadOnly
+    {
+      get;
+      set;
+    }
+    public int Length
+    {
+      get;
+      set;
+    }
+    public int StartPosition
+    {
+      get;
+      set;
+    }
+    public DateTimePart Type
+    {
+      get;
+      set;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeParser.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeParser.cs
new file mode 100644
index 00000000..2539efab
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeParser.cs
@@ -0,0 +1,140 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+
+namespace Xceed.Wpf.Toolkit
+{
+  internal class DateTimeParser
+  {
+    public static bool TryParse( string value, string format, DateTime currentDate, CultureInfo cultureInfo, out DateTime result )
+    {
+      bool success = false;
+      result = currentDate;
+
+      if( string.IsNullOrEmpty( value ) || string.IsNullOrEmpty( format ) )
+        return false;
+
+      var dateTimeString = ResolveDateTimeString( value, format, currentDate, cultureInfo ).Trim();
+
+      if( !String.IsNullOrEmpty( dateTimeString ) )
+        success = DateTime.TryParse( dateTimeString, cultureInfo.DateTimeFormat, DateTimeStyles.None, out result );
+
+      if( !success )
+        result = currentDate;
+
+      return success;
+    }
+
+    private static string ResolveDateTimeString( string dateTime, string format, DateTime currentDate, CultureInfo cultureInfo )
+    {
+      Dictionary<string, string> dateParts = GetDateParts( currentDate, cultureInfo );
+      string[] timeParts = new string[ 3 ] { currentDate.Hour.ToString(), currentDate.Minute.ToString(), currentDate.Second.ToString() };
+      string designator = "";
+      string[] dateTimeSeparators = new string[] { ",", " ", "-", ".", "/", cultureInfo.DateTimeFormat.DateSeparator, cultureInfo.DateTimeFormat.TimeSeparator };
+
+      ResolveSortableDateTimeString( ref dateTime, ref format, cultureInfo );
+
+      var dateTimeParts = dateTime.Split( dateTimeSeparators, StringSplitOptions.RemoveEmptyEntries ).ToList();
+      var formats = format.Split( dateTimeSeparators, StringSplitOptions.RemoveEmptyEntries ).ToList();
+
+      //something went wrong
+      if( dateTimeParts.Count != formats.Count )
+        return string.Empty;
+
+      for( int i = 0; i < formats.Count; i++ )
+      {
+        var f = formats[ i ];
+        if( !f.Contains( "ddd" ) && !f.Contains( "GMT" ) )
+        {
+          if( f.Contains( "M" ) )
+            dateParts[ "Month" ] = dateTimeParts[ i ];
+          else if( f.Contains( "d" ) )
+            dateParts[ "Day" ] = dateTimeParts[ i ];
+          else if( f.Contains( "y" ) )
+          {
+            dateParts[ "Year" ] = dateTimeParts[ i ];
+
+            if( dateParts[ "Year" ].Length == 2 )
+              dateParts[ "Year" ] = string.Format( "{0}{1}", currentDate.Year / 100, dateParts[ "Year" ] );
+          }
+          else if( f.Contains( "h" ) || f.Contains( "H" ) )
+            timeParts[ 0 ] = dateTimeParts[ i ];
+          else if( f.Contains( "m" ) )
+            timeParts[ 1 ] = dateTimeParts[ i ];
+          else if( f.Contains( "s" ) )
+            timeParts[ 2 ] = dateTimeParts[ i ];
+          else if( f.Contains( "t" ) )
+            designator = dateTimeParts[ i ];
+        }
+      }
+
+      var date = string.Join( cultureInfo.DateTimeFormat.DateSeparator, dateParts.Select( x => x.Value ).ToArray() );
+      var time = string.Join( cultureInfo.DateTimeFormat.TimeSeparator, timeParts );
+
+      return String.Format( "{0} {1} {2}", date, time, designator );
+    }
+
+    private static void ResolveSortableDateTimeString( ref string dateTime, ref string format, CultureInfo cultureInfo )
+    {
+      if( format == cultureInfo.DateTimeFormat.SortableDateTimePattern )
+      {
+        format = format.Replace( "'", "" ).Replace( "T", " " );
+        dateTime = dateTime.Replace( "'", "" ).Replace( "T", " " );
+      }
+      else if( format == cultureInfo.DateTimeFormat.UniversalSortableDateTimePattern )
+      {
+        format = format.Replace( "'", "" ).Replace( "Z", "" );
+        dateTime = dateTime.Replace( "'", "" ).Replace( "Z", "" );
+      }
+    }
+
+    private static Dictionary<string, string> GetDateParts( DateTime currentDate, CultureInfo cultureInfo )
+    {
+      Dictionary<string, string> dateParts = new Dictionary<string, string>();
+      var dateFormatParts = cultureInfo.DateTimeFormat.ShortDatePattern.Split( new string[] { cultureInfo.DateTimeFormat.DateSeparator }, StringSplitOptions.RemoveEmptyEntries ).ToList();
+      dateFormatParts.ForEach( item =>
+      {
+        string key = string.Empty;
+        string value = string.Empty;
+
+        if( item.Contains( "M" ) )
+        {
+          key = "Month";
+          value = currentDate.Month.ToString();
+        }
+        else if( item.Contains( "d" ) )
+        {
+          key = "Day";
+          value = currentDate.Day.ToString();
+        }
+        else if( item.Contains( "y" ) )
+        {
+          key = "Year";
+          value = currentDate.Year.ToString();
+        }
+        dateParts.Add( key, value );
+      } );
+      return dateParts;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimePart.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimePart.cs
new file mode 100644
index 00000000..be69eb5b
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimePart.cs
@@ -0,0 +1,39 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit
+{
+  public enum DateTimePart
+  {
+    Day,
+    DayName,
+    AmPmDesignator,
+    Millisecond,
+    Hour12,
+    Hour24,
+    Minute,
+    Month,
+    MonthName,
+    Other,
+    Period,
+    TimeZone,
+    Second,
+    Year
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeUpDown.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeUpDown.cs
new file mode 100644
index 00000000..e3d85839
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeUpDown.cs
@@ -0,0 +1,703 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+using System.Windows.Input;
+using Xceed.Wpf.Toolkit.Primitives;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class DateTimeUpDown : UpDownBase<DateTime?>
+  {
+    #region Members
+
+    private List<DateTimeInfo> _dateTimeInfoList = new List<DateTimeInfo>();
+    private DateTimeInfo _selectedDateTimeInfo;
+    private bool _fireSelectionChangedEvent = true;
+    private bool _processTextChanged = true;
+
+    #endregion //Members
+
+    #region Properties
+
+    #region DefaultValue
+
+    public static readonly DependencyProperty DefaultValueProperty = DependencyProperty.Register( "DefaultValue", typeof( DateTime ), typeof( DateTimeUpDown ), new UIPropertyMetadata( DateTime.Now ) );
+    public DateTime DefaultValue
+    {
+      get
+      {
+        return ( DateTime )GetValue( DefaultValueProperty );
+      }
+      set
+      {
+        SetValue( DefaultValueProperty, value );
+      }
+    }
+
+    #endregion //DefaultValue
+
+    #region Format
+
+    public static readonly DependencyProperty FormatProperty = DependencyProperty.Register( "Format", typeof( DateTimeFormat ), typeof( DateTimeUpDown ), new UIPropertyMetadata( DateTimeFormat.FullDateTime, OnFormatChanged ) );
+    public DateTimeFormat Format
+    {
+      get
+      {
+        return ( DateTimeFormat )GetValue( FormatProperty );
+      }
+      set
+      {
+        SetValue( FormatProperty, value );
+      }
+    }
+
+    private static void OnFormatChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      DateTimeUpDown dateTimeUpDown = o as DateTimeUpDown;
+      if( dateTimeUpDown != null )
+        dateTimeUpDown.OnFormatChanged( ( DateTimeFormat )e.OldValue, ( DateTimeFormat )e.NewValue );
+    }
+
+    protected virtual void OnFormatChanged( DateTimeFormat oldValue, DateTimeFormat newValue )
+    {
+      InitializeDateTimeInfoListAndParseValue();
+      UpdateTextFormatting();
+    }
+
+    #endregion //Format
+
+    #region FormatString
+
+    public static readonly DependencyProperty FormatStringProperty = DependencyProperty.Register( "FormatString", typeof( string ), typeof( DateTimeUpDown ), new UIPropertyMetadata( default( String ), OnFormatStringChanged ) );
+    public string FormatString
+    {
+      get
+      {
+        return ( string )GetValue( FormatStringProperty );
+      }
+      set
+      {
+        SetValue( FormatStringProperty, value );
+      }
+    }
+
+    private static void OnFormatStringChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      DateTimeUpDown dateTimeUpDown = o as DateTimeUpDown;
+      if( dateTimeUpDown != null )
+        dateTimeUpDown.OnFormatStringChanged( ( string )e.OldValue, ( string )e.NewValue );
+    }
+
+    protected virtual void OnFormatStringChanged( string oldValue, string newValue )
+    {
+      InitializeDateTimeInfoListAndParseValue();
+      UpdateTextFormatting();
+    }
+
+    #endregion //FormatString
+
+    #region Maximum
+
+
+
+    #endregion //Maximum
+
+    #region Minimum
+
+
+
+    #endregion //Minimum
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static DateTimeUpDown()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( DateTimeUpDown ), new FrameworkPropertyMetadata( typeof( DateTimeUpDown ) ) );
+    }
+
+    public DateTimeUpDown()
+    {
+      InitializeDateTimeInfoList();
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    public override void OnApplyTemplate()
+    {
+      if( TextBox != null )
+        TextBox.SelectionChanged -= TextBox_SelectionChanged;
+
+      base.OnApplyTemplate();
+
+      if( TextBox != null )
+        TextBox.SelectionChanged += TextBox_SelectionChanged;
+    }
+
+    protected override void OnCultureInfoChanged( CultureInfo oldValue, CultureInfo newValue )
+    {
+      InitializeDateTimeInfoList();
+    }
+
+    protected override DateTime? CoerceValue( DateTime? value )
+    {
+      //TODO: implement Minimum and Maximum
+      return value;
+    }
+
+    protected override void OnIncrement()
+    {
+      if( Value.HasValue )
+        UpdateDateTime( 1 );
+      else
+        Value = DefaultValue;
+    }
+
+    protected override void OnDecrement()
+    {
+      if( Value.HasValue )
+        UpdateDateTime( -1 );
+      else
+        Value = DefaultValue;
+    }
+
+    protected override void OnPreviewKeyDown( KeyEventArgs e )
+    {
+      switch( e.Key )
+      {
+        case Key.Enter:
+          {
+            if( !IsReadOnly )
+            {
+              _fireSelectionChangedEvent = false;
+              BindingExpression binding = BindingOperations.GetBindingExpression( TextBox, System.Windows.Controls.TextBox.TextProperty );
+              binding.UpdateSource();
+              _fireSelectionChangedEvent = true;
+              e.Handled = true;
+            }
+            return;
+          }
+        default:
+          {
+            _fireSelectionChangedEvent = false;
+            break;
+          }
+      }
+
+      base.OnPreviewKeyDown( e );
+    }
+
+    protected override void OnTextChanged( string previousValue, string currentValue )
+    {
+      if( !_processTextChanged )
+        return;
+
+      //TODO: clean this up and make sure it doesn't fire recursively
+      if( String.IsNullOrEmpty( currentValue ) )
+      {
+        Value = null;
+        return;
+      }
+
+      DateTime current = Value.HasValue ? Value.Value : DateTime.Parse( DateTime.Now.ToString(), CultureInfo.DateTimeFormat );
+      DateTime result;
+      var success = DateTimeParser.TryParse( currentValue, GetFormatString( Format ), current, CultureInfo, out result );
+
+      SyncTextAndValueProperties( InputBase.TextProperty, result.ToString( CultureInfo ) );
+    }
+
+    protected override DateTime? ConvertTextToValue( string text )
+    {
+      if( string.IsNullOrEmpty( text ) )
+        return null;
+
+      return DateTime.Parse( text, CultureInfo );
+    }
+
+    protected override string ConvertValueToText()
+    {
+      if( Value == null )
+        return string.Empty;
+
+      return Value.Value.ToString( GetFormatString( Format ), CultureInfo );
+    }
+
+    protected override void SetValidSpinDirection()
+    {
+      //TODO: implement Minimum and Maximum
+    }
+
+    protected override void OnValueChanged( DateTime? oldValue, DateTime? newValue )
+    {
+      //whenever the value changes we need to parse out the value into out DateTimeInfo segments so we can keep track of the individual pieces
+      //but only if it is not null
+      if( newValue != null )
+        ParseValueIntoDateTimeInfo();
+
+      base.OnValueChanged( oldValue, newValue );
+    }
+
+    protected override void ValidateValue( DateTime? value )
+    {
+      //TODO: implement min/max
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Event Hanlders
+
+    void TextBox_SelectionChanged( object sender, RoutedEventArgs e )
+    {
+      if( _fireSelectionChangedEvent )
+        PerformMouseSelection();
+      else
+        _fireSelectionChangedEvent = true;
+    }
+
+    #endregion //Event Hanlders
+
+    #region Methods
+
+    private void InitializeDateTimeInfoListAndParseValue()
+    {
+      InitializeDateTimeInfoList();
+      if( Value != null )
+        ParseValueIntoDateTimeInfo();
+    }
+
+    private void InitializeDateTimeInfoList()
+    {
+      _dateTimeInfoList.Clear();
+
+      string format = GetFormatString( Format );
+
+      if( string.IsNullOrEmpty( format ) )
+        return;
+
+      while( format.Length > 0 )
+      {
+        int elementLength = GetElementLengthByFormat( format );
+        DateTimeInfo info = null;
+
+        switch( format[ 0 ] )
+        {
+          case '"':
+          case '\'':
+            {
+              int closingQuotePosition = format.IndexOf( format[ 0 ], 1 );
+              info = new DateTimeInfo
+              {
+                IsReadOnly = true,
+                Type = DateTimePart.Other,
+                Length = 1,
+                Content = format.Substring( 1, Math.Max( 1, closingQuotePosition - 1 ) )
+              };
+              elementLength = Math.Max( 1, closingQuotePosition + 1 );
+              break;
+            }
+          case 'D':
+          case 'd':
+            {
+              string d = format.Substring( 0, elementLength );
+              if( elementLength == 1 )
+                d = "%" + d;
+
+              if( elementLength > 2 )
+                info = new DateTimeInfo
+                {
+                  IsReadOnly = true,
+                  Type = DateTimePart.DayName,
+                  Format = d
+                };
+              else
+                info = new DateTimeInfo
+                {
+                  IsReadOnly = false,
+                  Type = DateTimePart.Day,
+                  Format = d
+                };
+              break;
+            }
+          case 'F':
+          case 'f':
+            {
+              string f = format.Substring( 0, elementLength );
+              if( elementLength == 1 )
+                f = "%" + f;
+
+              info = new DateTimeInfo
+              {
+                IsReadOnly = false,
+                Type = DateTimePart.Millisecond,
+                Format = f
+              };
+              break;
+            }
+          case 'h':
+            {
+              string h = format.Substring( 0, elementLength );
+              if( elementLength == 1 )
+                h = "%" + h;
+
+              info = new DateTimeInfo
+              {
+                IsReadOnly = false,
+                Type = DateTimePart.Hour12,
+                Format = h
+              };
+              break;
+            }
+          case 'H':
+            {
+              string H = format.Substring( 0, elementLength );
+              if( elementLength == 1 )
+                H = "%" + H;
+
+              info = new DateTimeInfo
+              {
+                IsReadOnly = false,
+                Type = DateTimePart.Hour24,
+                Format = H
+              };
+              break;
+            }
+          case 'M':
+            {
+              string M = format.Substring( 0, elementLength );
+              if( elementLength == 1 )
+                M = "%" + M;
+
+              if( elementLength >= 3 )
+                info = new DateTimeInfo
+                {
+                  IsReadOnly = false,
+                  Type = DateTimePart.MonthName,
+                  Format = M
+                };
+              else
+                info = new DateTimeInfo
+                {
+                  IsReadOnly = false,
+                  Type = DateTimePart.Month,
+                  Format = M
+                };
+              break;
+            }
+          case 'S':
+          case 's':
+            {
+              string s = format.Substring( 0, elementLength );
+              if( elementLength == 1 )
+                s = "%" + s;
+
+              info = new DateTimeInfo
+              {
+                IsReadOnly = false,
+                Type = DateTimePart.Second,
+                Format = s
+              };
+              break;
+            }
+          case 'T':
+          case 't':
+            {
+              string t = format.Substring( 0, elementLength );
+              if( elementLength == 1 )
+                t = "%" + t;
+
+              info = new DateTimeInfo
+              {
+                IsReadOnly = false,
+                Type = DateTimePart.AmPmDesignator,
+                Format = t
+              };
+              break;
+            }
+          case 'Y':
+          case 'y':
+            {
+              string y = format.Substring( 0, elementLength );
+              if( elementLength == 1 )
+                y = "%" + y;
+
+              info = new DateTimeInfo
+              {
+                IsReadOnly = false,
+                Type = DateTimePart.Year,
+                Format = y
+              };
+              break;
+            }
+          case '\\':
+            {
+              if( format.Length >= 2 )
+              {
+                info = new DateTimeInfo
+                {
+                  IsReadOnly = true,
+                  Content = format.Substring( 1, 1 ),
+                  Length = 1,
+                  Type = DateTimePart.Other
+                };
+                elementLength = 2;
+              }
+              break;
+            }
+          case 'g':
+            {
+              string g = format.Substring( 0, elementLength );
+              if( elementLength == 1 )
+                g = "%" + g;
+
+              info = new DateTimeInfo
+              {
+                IsReadOnly = true,
+                Type = DateTimePart.Period,
+                Format = format.Substring( 0, elementLength )
+              };
+              break;
+            }
+          case 'm':
+            {
+              string m = format.Substring( 0, elementLength );
+              if( elementLength == 1 )
+                m = "%" + m;
+
+              info = new DateTimeInfo
+              {
+                IsReadOnly = false,
+                Type = DateTimePart.Minute,
+                Format = m
+              };
+              break;
+            }
+          case 'z':
+            {
+              string z = format.Substring( 0, elementLength );
+              if( elementLength == 1 )
+                z = "%" + z;
+
+              info = new DateTimeInfo
+              {
+                IsReadOnly = true,
+                Type = DateTimePart.TimeZone,
+                Format = z
+              };
+              break;
+            }
+          default:
+            {
+              elementLength = 1;
+              info = new DateTimeInfo
+              {
+                IsReadOnly = true,
+                Length = 1,
+                Content = format[ 0 ].ToString(),
+                Type = DateTimePart.Other
+              };
+              break;
+            }
+        }
+
+        _dateTimeInfoList.Add( info );
+        format = format.Substring( elementLength );
+      }
+    }
+
+    private static int GetElementLengthByFormat( string format )
+    {
+      for( int i = 1; i < format.Length; i++ )
+      {
+        if( String.Compare( format[ i ].ToString(), format[ 0 ].ToString(), false ) != 0 )
+        {
+          return i;
+        }
+      }
+      return format.Length;
+    }
+
+    private void ParseValueIntoDateTimeInfo()
+    {
+      string text = string.Empty;
+
+      _dateTimeInfoList.ForEach( info =>
+      {
+        if( info.Format == null )
+        {
+          info.StartPosition = text.Length;
+          info.Length = info.Content.Length;
+          text += info.Content;
+        }
+        else
+        {
+          DateTime date = DateTime.Parse( Value.ToString() );
+          info.StartPosition = text.Length;
+          info.Content = date.ToString( info.Format, CultureInfo.DateTimeFormat );
+          info.Length = info.Content.Length;
+          text += info.Content;
+        }
+      } );
+    }
+
+    private void PerformMouseSelection()
+    {
+      _dateTimeInfoList.ForEach( info =>
+      {
+        if( ( info.StartPosition <= TextBox.SelectionStart ) && ( TextBox.SelectionStart < ( info.StartPosition + info.Length ) ) )
+        {
+          Select( info );
+          return;
+        }
+      } );
+    }
+
+    private void Select( DateTimeInfo info )
+    {
+      _fireSelectionChangedEvent = false;
+      TextBox.Select( info.StartPosition, info.Length );
+      _fireSelectionChangedEvent = true;
+      _selectedDateTimeInfo = info;
+    }
+
+    private string GetFormatString( DateTimeFormat dateTimeFormat )
+    {
+      switch( dateTimeFormat )
+      {
+        case DateTimeFormat.ShortDate:
+          return CultureInfo.DateTimeFormat.ShortDatePattern;
+        case DateTimeFormat.LongDate:
+          return CultureInfo.DateTimeFormat.LongDatePattern;
+        case DateTimeFormat.ShortTime:
+          return CultureInfo.DateTimeFormat.ShortTimePattern;
+        case DateTimeFormat.LongTime:
+          return CultureInfo.DateTimeFormat.LongTimePattern;
+        case DateTimeFormat.FullDateTime:
+          return CultureInfo.DateTimeFormat.FullDateTimePattern;
+        case DateTimeFormat.MonthDay:
+          return CultureInfo.DateTimeFormat.MonthDayPattern;
+        case DateTimeFormat.RFC1123:
+          return CultureInfo.DateTimeFormat.RFC1123Pattern;
+        case DateTimeFormat.SortableDateTime:
+          return CultureInfo.DateTimeFormat.SortableDateTimePattern;
+        case DateTimeFormat.UniversalSortableDateTime:
+          return CultureInfo.DateTimeFormat.UniversalSortableDateTimePattern;
+        case DateTimeFormat.YearMonth:
+          return CultureInfo.DateTimeFormat.YearMonthPattern;
+        case DateTimeFormat.Custom:
+          return FormatString;
+        default:
+          throw new ArgumentException( "Not a supported format" );
+      }
+    }
+
+    private void UpdateDateTime( int value )
+    {
+      _fireSelectionChangedEvent = false;
+      DateTimeInfo info = _selectedDateTimeInfo;
+
+      //this only occurs when the user manually type in a value for the Value Property
+      if( info == null )
+        info = _dateTimeInfoList[ 0 ];
+
+      try
+      {
+        switch( info.Type )
+        {
+          case DateTimePart.Year:
+            {
+              Value = ( ( DateTime )Value ).AddYears( value );
+              break;
+            }
+          case DateTimePart.Month:
+          case DateTimePart.MonthName:
+            {
+              Value = ( ( DateTime )Value ).AddMonths( value );
+              break;
+            }
+          case DateTimePart.Day:
+          case DateTimePart.DayName:
+            {
+              Value = ( ( DateTime )Value ).AddDays( value );
+              break;
+            }
+          case DateTimePart.Hour12:
+          case DateTimePart.Hour24:
+            {
+              Value = ( ( DateTime )Value ).AddHours( value );
+              break;
+            }
+          case DateTimePart.Minute:
+            {
+              Value = ( ( DateTime )Value ).AddMinutes( value );
+              break;
+            }
+          case DateTimePart.Second:
+            {
+              Value = ( ( DateTime )Value ).AddSeconds( value );
+              break;
+            }
+          case DateTimePart.Millisecond:
+            {
+              Value = ( ( DateTime )Value ).AddMilliseconds( value );
+              break;
+            }
+          case DateTimePart.AmPmDesignator:
+            {
+              Value = ( ( DateTime )Value ).AddHours( value * 12 );
+              break;
+            }
+          default:
+            {
+              break;
+            }
+        }
+      }
+      catch
+      {
+        //this can occur if the date/time = 1/1/0001 12:00:00 AM which is the smallest date allowed.
+        //I could write code that would validate the date each and everytime but I think that it would be more
+        //efficient if I just handle the edge case and allow an exeption to occur and swallow it instead.
+      }
+
+      //we loose our selection when the Value is set so we need to reselect it without firing the selection changed event
+      TextBox.Select( info.StartPosition, info.Length );
+      _fireSelectionChangedEvent = true;
+    }
+
+    private void UpdateTextFormatting()
+    {
+      _processTextChanged = false;
+
+      if( Value.HasValue )
+        Text = ConvertValueToText();
+
+      _processTextChanged = true;
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Themes/Generic.xaml
new file mode 100644
index 00000000..0b4fd315
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Themes/Generic.xaml
@@ -0,0 +1,76 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
+
+   <DataTemplate x:Key="DefaultWatermarkTemplate">
+      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
+   </DataTemplate>
+
+   <!-- =============================================================================== -->
+   <!-- DateTimeUpDown                                                                  -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type local:DateTimeUpDown}">
+      <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+      <Setter Property="HorizontalContentAlignment" Value="Right" />
+      <Setter Property="TextAlignment" Value="Right" />
+      <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:DateTimeUpDown}">
+               <local:ButtonSpinner x:Name="PART_Spinner"
+                                    IsTabStop="False"
+                                    Background="{TemplateBinding Background}"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                    AllowSpin="{TemplateBinding AllowSpin}"
+                                    ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
+                  <local:WatermarkTextBox x:Name="PART_TextBox"
+                                          BorderThickness="0" 
+                                          Background="Transparent"
+                                          ContextMenu="{TemplateBinding ContextMenu}"
+                                          FontFamily="{TemplateBinding FontFamily}" 
+                                          FontSize="{TemplateBinding FontSize}" 
+                                          FontStretch="{TemplateBinding FontStretch}"
+                                          FontStyle="{TemplateBinding FontStyle}" 
+                                          FontWeight="{TemplateBinding FontWeight}" 
+                                          Foreground="{TemplateBinding Foreground}" 
+                                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
+                                          MinWidth="20"
+                                          AcceptsReturn="False"
+                                          Padding="0"
+                                          TextAlignment="{TemplateBinding TextAlignment}"
+                                          TextWrapping="NoWrap" 
+                                          TabIndex="{TemplateBinding TabIndex}"
+                                          Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
+                                          Watermark="{TemplateBinding Watermark}"
+                                          WatermarkTemplate="{TemplateBinding WatermarkTemplate}" />
+               </local:ButtonSpinner>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DropDownButton/Implementation/DropDownButton.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DropDownButton/Implementation/DropDownButton.cs
new file mode 100644
index 00000000..9fa8ba67
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DropDownButton/Implementation/DropDownButton.cs
@@ -0,0 +1,370 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Input;
+
+namespace Xceed.Wpf.Toolkit
+{
+  [TemplatePart( Name = PART_DropDownButton, Type = typeof( ToggleButton ) )]
+  public class DropDownButton : ContentControl, ICommandSource
+  {
+    private const string PART_DropDownButton = "PART_DropDownButton";
+
+    #region Constructors
+
+    static DropDownButton()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( DropDownButton ), new FrameworkPropertyMetadata( typeof( DropDownButton ) ) );
+    }
+
+    public DropDownButton()
+    {
+      Keyboard.AddKeyDownHandler( this, OnKeyDown );
+      Mouse.AddPreviewMouseDownOutsideCapturedElementHandler( this, OnMouseDownOutsideCapturedElement );
+    }
+
+    #endregion //Constructors
+
+    #region Properties
+
+    private System.Windows.Controls.Primitives.ButtonBase _button;
+    protected System.Windows.Controls.Primitives.ButtonBase Button
+    {
+      get
+      {
+        return _button;
+      }
+      set
+      {
+        if( _button != null )
+          _button.Click -= DropDownButton_Click;
+
+        _button = value;
+
+        if( _button != null )
+          _button.Click += DropDownButton_Click;
+      }
+    }
+
+    #region DropDownContent
+
+    public static readonly DependencyProperty DropDownContentProperty = DependencyProperty.Register( "DropDownContent", typeof( object ), typeof( DropDownButton ), new UIPropertyMetadata( null, OnDropDownContentChanged ) );
+    public object DropDownContent
+    {
+      get
+      {
+        return ( object )GetValue( DropDownContentProperty );
+      }
+      set
+      {
+        SetValue( DropDownContentProperty, value );
+      }
+    }
+
+    private static void OnDropDownContentChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      DropDownButton dropDownButton = o as DropDownButton;
+      if( dropDownButton != null )
+        dropDownButton.OnDropDownContentChanged( ( object )e.OldValue, ( object )e.NewValue );
+    }
+
+    protected virtual void OnDropDownContentChanged( object oldValue, object newValue )
+    {
+      // TODO: Add your property changed side-effects. Descendants can override as well.
+    }
+
+    #endregion //DropDownContent
+
+    #region IsOpen
+
+    public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register( "IsOpen", typeof( bool ), typeof( DropDownButton ), new UIPropertyMetadata( false, OnIsOpenChanged ) );
+    public bool IsOpen
+    {
+      get
+      {
+        return ( bool )GetValue( IsOpenProperty );
+      }
+      set
+      {
+        SetValue( IsOpenProperty, value );
+      }
+    }
+
+    private static void OnIsOpenChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      DropDownButton dropDownButton = o as DropDownButton;
+      if( dropDownButton != null )
+        dropDownButton.OnIsOpenChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnIsOpenChanged( bool oldValue, bool newValue )
+    {
+      if( newValue )
+        RaiseRoutedEvent( DropDownButton.OpenedEvent );
+      else
+        RaiseRoutedEvent( DropDownButton.ClosedEvent );
+    }
+
+    #endregion //IsOpen
+
+    #endregion //Properties
+
+    #region Base Class Overrides
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+      Button = GetTemplateChild( PART_DropDownButton ) as ToggleButton;
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Events
+
+    public static readonly RoutedEvent ClickEvent = EventManager.RegisterRoutedEvent( "Click", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( DropDownButton ) );
+    public event RoutedEventHandler Click
+    {
+      add
+      {
+        AddHandler( ClickEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( ClickEvent, value );
+      }
+    }
+
+    public static readonly RoutedEvent OpenedEvent = EventManager.RegisterRoutedEvent( "Opened", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( DropDownButton ) );
+    public event RoutedEventHandler Opened
+    {
+      add
+      {
+        AddHandler( OpenedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( OpenedEvent, value );
+      }
+    }
+
+    public static readonly RoutedEvent ClosedEvent = EventManager.RegisterRoutedEvent( "Closed", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( DropDownButton ) );
+    public event RoutedEventHandler Closed
+    {
+      add
+      {
+        AddHandler( ClosedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( ClosedEvent, value );
+      }
+    }
+
+    #endregion //Events
+
+    #region Event Handlers
+
+    private void OnKeyDown( object sender, KeyEventArgs e )
+    {
+      switch( e.Key )
+      {
+        case Key.Escape:
+          {
+            CloseDropDown();
+            break;
+          }
+      }
+    }
+
+    private void OnMouseDownOutsideCapturedElement( object sender, MouseButtonEventArgs e )
+    {
+      CloseDropDown();
+    }
+
+    private void DropDownButton_Click( object sender, RoutedEventArgs e )
+    {
+      OnClick();
+    }
+
+    void CanExecuteChanged( object sender, EventArgs e )
+    {
+      CanExecuteChanged();
+    }
+
+    #endregion //Event Handlers
+
+    #region Methods
+
+    private void CanExecuteChanged()
+    {
+      if( Command != null )
+      {
+        RoutedCommand command = Command as RoutedCommand;
+
+        // If a RoutedCommand.
+        if( command != null )
+          IsEnabled = command.CanExecute( CommandParameter, CommandTarget ) ? true : false;
+        // If a not RoutedCommand.
+        else
+          IsEnabled = Command.CanExecute( CommandParameter ) ? true : false;
+      }
+    }
+
+    /// <summary>
+    /// Closes the drop down.
+    /// </summary>
+    private void CloseDropDown()
+    {
+      if( IsOpen )
+        IsOpen = false;
+      ReleaseMouseCapture();
+    }
+
+    protected virtual void OnClick()
+    {
+      RaiseRoutedEvent( DropDownButton.ClickEvent );
+      RaiseCommand();
+    }
+
+    /// <summary>
+    /// Raises routed events.
+    /// </summary>
+    private void RaiseRoutedEvent( RoutedEvent routedEvent )
+    {
+      RoutedEventArgs args = new RoutedEventArgs( routedEvent, this );
+      RaiseEvent( args );
+    }
+
+    /// <summary>
+    /// Raises the command's Execute event.
+    /// </summary>
+    private void RaiseCommand()
+    {
+      if( Command != null )
+      {
+        RoutedCommand routedCommand = Command as RoutedCommand;
+
+        if( routedCommand == null )
+          ( ( ICommand )Command ).Execute( CommandParameter );
+        else
+          routedCommand.Execute( CommandParameter, CommandTarget );
+      }
+    }
+
+    /// <summary>
+    /// Unhooks a command from the Command property.
+    /// </summary>
+    /// <param name="oldCommand">The old command.</param>
+    /// <param name="newCommand">The new command.</param>
+    private void UnhookCommand( ICommand oldCommand, ICommand newCommand )
+    {
+      EventHandler handler = CanExecuteChanged;
+      oldCommand.CanExecuteChanged -= handler;
+    }
+
+    /// <summary>
+    /// Hooks up a command to the CanExecuteChnaged event handler.
+    /// </summary>
+    /// <param name="oldCommand">The old command.</param>
+    /// <param name="newCommand">The new command.</param>
+    private void HookUpCommand( ICommand oldCommand, ICommand newCommand )
+    {
+      EventHandler handler = new EventHandler( CanExecuteChanged );
+      canExecuteChangedHandler = handler;
+      if( newCommand != null )
+        newCommand.CanExecuteChanged += canExecuteChangedHandler;
+    }
+
+    #endregion //Methods
+
+    #region ICommandSource Members
+
+    // Keeps a copy of the CanExecuteChnaged handler so it doesn't get garbage collected.
+    private EventHandler canExecuteChangedHandler;
+
+    #region Command
+
+    public static readonly DependencyProperty CommandProperty = DependencyProperty.Register( "Command", typeof( ICommand ), typeof( DropDownButton ), new PropertyMetadata( ( ICommand )null, OnCommandChanged ) );
+    [TypeConverter( typeof( CommandConverter ) )]
+    public ICommand Command
+    {
+      get
+      {
+        return ( ICommand )GetValue( CommandProperty );
+      }
+      set
+      {
+        SetValue( CommandProperty, value );
+      }
+    }
+
+    private static void OnCommandChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      DropDownButton dropDownButton = d as DropDownButton;
+      if( dropDownButton != null )
+        dropDownButton.OnCommandChanged( ( ICommand )e.OldValue, ( ICommand )e.NewValue );
+    }
+
+    protected virtual void OnCommandChanged( ICommand oldValue, ICommand newValue )
+    {
+      // If old command is not null, then we need to remove the handlers.
+      if( oldValue != null )
+        UnhookCommand( oldValue, newValue );
+
+      HookUpCommand( oldValue, newValue );
+
+      CanExecuteChanged(); //may need to call this when changing the command parameter or target.
+    }
+
+    #endregion //Command
+
+    public static readonly DependencyProperty CommandParameterProperty = DependencyProperty.Register( "CommandParameter", typeof( object ), typeof( DropDownButton ), new PropertyMetadata( null ) );
+    public object CommandParameter
+    {
+      get
+      {
+        return GetValue( CommandParameterProperty );
+      }
+      set
+      {
+        SetValue( CommandParameterProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CommandTargetProperty = DependencyProperty.Register( "CommandTarget", typeof( IInputElement ), typeof( DropDownButton ), new PropertyMetadata( null ) );
+    public IInputElement CommandTarget
+    {
+      get
+      {
+        return ( IInputElement )GetValue( CommandTargetProperty );
+      }
+      set
+      {
+        SetValue( CommandTargetProperty, value );
+      }
+    }
+
+    #endregion //ICommandSource Members
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DropDownButton/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DropDownButton/Themes/Generic.xaml
new file mode 100644
index 00000000..c751a687
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DropDownButton/Themes/Generic.xaml
@@ -0,0 +1,108 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
+
+   <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+
+   <LinearGradientBrush x:Key="PopupDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="1" Color="#FFE8EBED" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <Style TargetType="{x:Type local:DropDownButton}">
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="IsTabStop" Value="False" />
+      <Setter Property="HorizontalContentAlignment" Value="Center" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Padding" Value="3" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:DropDownButton}">
+               <Grid x:Name="MainGrid" SnapsToDevicePixels="True">
+                  <ToggleButton x:Name="PART_DropDownButton"
+                                Grid.Column="1"
+                                IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}">
+                     <ToggleButton.Template>
+                        <ControlTemplate TargetType="ToggleButton">
+                           <ContentPresenter />
+                        </ControlTemplate>
+                     </ToggleButton.Template>
+                     <Grid>
+                        <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                             CornerRadius="2.75"
+                                             RenderChecked="{TemplateBinding IsOpen}"
+                                             RenderEnabled="{TemplateBinding IsEnabled}"
+											            RenderMouseOver="{Binding IsMouseOver, ElementName=PART_DropDownButton}"
+											            RenderPressed="{Binding IsPressed, ElementName=PART_DropDownButton}">
+                           <Grid>
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="*" />
+                                 <ColumnDefinition Width="Auto" />
+                              </Grid.ColumnDefinitions>
+                              <ContentPresenter Margin="{TemplateBinding Padding}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" RecognizesAccessKey="true" />
+                              <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Margin="4,3,4,3" Grid.Column="1">
+                                 <Path x:Name="Arrow"  Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000" />
+                              </Grid>
+                           </Grid>
+                        </chrome:ButtonChrome>
+                     </Grid>
+                  </ToggleButton>
+
+                  <Popup x:Name="PART_Popup" 
+                         HorizontalOffset="1"
+                         VerticalOffset="1"
+                         AllowsTransparency="True"
+                         StaysOpen="False"
+                         Placement="Bottom"
+                         Focusable="False"
+                         IsOpen="{Binding IsChecked, ElementName=PART_DropDownButton}">
+                     <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}">
+                        <ContentPresenter Content="{TemplateBinding DropDownContent}" />
+                     </Border>
+                  </Popup>
+
+               </Grid>
+                <ControlTemplate.Triggers>
+                    <Trigger Property="IsEnabled" Value="False">
+                        <Setter Property="Fill" TargetName="Arrow" Value="#AFAFAF" />
+                    </Trigger>
+                </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/Converters/BorderThicknessToStrokeThicknessConverter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/Converters/BorderThicknessToStrokeThicknessConverter.cs
new file mode 100644
index 00000000..a726a9c0
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/Converters/BorderThicknessToStrokeThicknessConverter.cs
@@ -0,0 +1,43 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.Mag.Converters
+{
+  internal class BorderThicknessToStrokeThicknessConverter : IValueConverter
+  {
+    #region IValueConverter Members
+
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      Thickness thickness = ( Thickness )value;
+      return ( thickness.Bottom + thickness.Left + thickness.Right + thickness.Top ) / 4;
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/Converters/RadiusConverter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/Converters/RadiusConverter.cs
new file mode 100644
index 00000000..3f661c06
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/Converters/RadiusConverter.cs
@@ -0,0 +1,41 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.Mag.Converters
+{
+  internal class RadiusConverter : IValueConverter
+  {
+    #region IValueConverter Members
+
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      return ( double )value * 2;
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/FrameType.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/FrameType.cs
new file mode 100644
index 00000000..e839573d
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/FrameType.cs
@@ -0,0 +1,27 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit
+{
+  public enum FrameType
+  {
+    Circle,
+    Rectangle
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/Magnifier.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/Magnifier.cs
new file mode 100644
index 00000000..e2c6f1ce
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/Magnifier.cs
@@ -0,0 +1,255 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+
+namespace Xceed.Wpf.Toolkit
+{
+  [TemplatePart( Name = PART_VisualBrush, Type = typeof( VisualBrush ) )]
+  public class Magnifier : Control
+  {
+    private const double DEFAULT_SIZE = 100d;
+    private const string PART_VisualBrush = "PART_VisualBrush";
+
+    #region Private Members
+
+    private VisualBrush _visualBrush = new VisualBrush();
+
+    #endregion //Private Members
+
+    #region Properties
+
+    #region FrameType
+
+    public static readonly DependencyProperty FrameTypeProperty = DependencyProperty.Register( "FrameType", typeof( FrameType ), typeof( Magnifier ), new UIPropertyMetadata( FrameType.Circle, OnFrameTypeChanged ) );
+    public FrameType FrameType
+    {
+      get
+      {
+        return ( FrameType )GetValue( FrameTypeProperty );
+      }
+      set
+      {
+        SetValue( FrameTypeProperty, value );
+      }
+    }
+
+    private static void OnFrameTypeChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      Magnifier m = ( Magnifier )d;
+      m.OnFrameTypeChanged( ( FrameType )e.OldValue, ( FrameType )e.NewValue );
+    }
+
+    protected virtual void OnFrameTypeChanged( FrameType oldValue, FrameType newValue )
+    {
+      this.UpdateSizeFromRadius();
+    }
+
+    #endregion //FrameType
+
+    #region Radius
+
+    public static readonly DependencyProperty RadiusProperty = DependencyProperty.Register( "Radius", typeof( double ), typeof( Magnifier ), new FrameworkPropertyMetadata( ( Magnifier.DEFAULT_SIZE / 2 ), new PropertyChangedCallback( OnRadiusPropertyChanged ) ) );
+    public double Radius
+    {
+      get
+      {
+        return ( double )GetValue( RadiusProperty );
+      }
+      set
+      {
+        SetValue( RadiusProperty, value );
+      }
+    }
+
+    private static void OnRadiusPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      Magnifier m = ( Magnifier )d;
+      m.OnRadiusChanged( e );
+    }
+
+    protected virtual void OnRadiusChanged( DependencyPropertyChangedEventArgs e )
+    {
+      this.UpdateSizeFromRadius();
+    }
+
+    #endregion
+
+    #region Target
+
+    public static readonly DependencyProperty TargetProperty = DependencyProperty.Register( "Target", typeof( UIElement ), typeof( Magnifier ) );
+    public UIElement Target
+    {
+      get
+      {
+        return ( UIElement )GetValue( TargetProperty );
+      }
+      set
+      {
+        SetValue( TargetProperty, value );
+      }
+    }
+
+    #endregion //Target
+
+    #region ViewBox
+
+    internal Rect ViewBox
+    {
+      get
+      {
+        return _visualBrush.Viewbox;
+      }
+      set
+      {
+        _visualBrush.Viewbox = value;
+      }
+    }
+
+    #endregion
+
+    #region ZoomFactor
+
+    public static readonly DependencyProperty ZoomFactorProperty = DependencyProperty.Register( "ZoomFactor", typeof( double ), typeof( Magnifier ), new FrameworkPropertyMetadata( 0.5, OnZoomFactorPropertyChanged, OnCoerceZoomFactorProperty ) );
+    public double ZoomFactor
+    {
+      get
+      {
+        return ( double )GetValue( ZoomFactorProperty );
+      }
+      set
+      {
+        SetValue( ZoomFactorProperty, value );
+      }
+    }
+
+    private static void OnZoomFactorPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      Magnifier m = ( Magnifier )d;
+      m.OnZoomFactorChanged( e );
+    }
+
+    protected virtual void OnZoomFactorChanged( DependencyPropertyChangedEventArgs e )
+    {
+      ResolveViewBox();
+    }
+
+    private static object OnCoerceZoomFactorProperty( DependencyObject d, object value )
+    {
+      Magnifier m = ( Magnifier )d;
+      return m.OnCoerceZoomFactor( value );
+    }
+
+    protected virtual object OnCoerceZoomFactor( object value )
+    {
+      double zoomFactor = ( double )value;
+
+      if( zoomFactor > 1 )
+        zoomFactor = 1;
+      else if( zoomFactor < 0 )
+        zoomFactor = 0;
+
+      return zoomFactor;
+    }
+
+    #endregion //ZoomFactor
+
+    #endregion //Properties
+
+    #region Constructors
+
+    /// <summary>
+    /// Initializes static members of the <see cref="Magnifier"/> class.
+    /// </summary>
+    static Magnifier()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( Magnifier ), new FrameworkPropertyMetadata( typeof( Magnifier ) ) );
+      HeightProperty.OverrideMetadata( typeof( Magnifier ), new FrameworkPropertyMetadata( Magnifier.DEFAULT_SIZE ) );
+      WidthProperty.OverrideMetadata( typeof( Magnifier ), new FrameworkPropertyMetadata( Magnifier.DEFAULT_SIZE ) );
+    }
+
+    public Magnifier()
+    {
+      this.SizeChanged += new SizeChangedEventHandler( OnSizeChangedEvent );
+    }
+
+    private void OnSizeChangedEvent( object sender, SizeChangedEventArgs e )
+    {
+      ResolveViewBox();
+    }
+
+    private void UpdateSizeFromRadius()
+    {
+      if( this.FrameType == Toolkit.FrameType.Circle )
+      {
+        double newSize = Radius * 2;
+        if(!DoubleHelper.AreVirtuallyEqual( Width, newSize ))
+        {
+          Width = newSize;
+        }
+
+        if(!DoubleHelper.AreVirtuallyEqual( Height, newSize ))
+        {
+          Height = newSize;
+        }
+      }
+    }
+
+    #endregion
+
+    #region Base Class Overrides
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+
+      VisualBrush newBrush = GetTemplateChild( PART_VisualBrush ) as VisualBrush;
+
+      // Just create a brush as placeholder even if there is no such brush
+      // this avoid having to "if" each access to the _visualBrush member.
+      // Do not keep the current _visualBrush whatsoever to avoid memory leaks.
+      if( newBrush == null )
+      {
+        newBrush = new VisualBrush();
+      }
+
+      newBrush.Viewbox = _visualBrush.Viewbox;
+      _visualBrush = newBrush;
+    }
+
+    #endregion // Base Class Overrides
+
+    #region Methods
+
+    private void ResolveViewBox()
+    {
+      if( !IsInitialized )
+        return;
+
+      ViewBox = new Rect( 
+        ViewBox.Location, 
+        new Size( ActualWidth * ZoomFactor , ActualHeight * ZoomFactor ) );
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/MagnifierAdorner.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/MagnifierAdorner.cs
new file mode 100644
index 00000000..e6e56bb5
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/MagnifierAdorner.cs
@@ -0,0 +1,119 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class MagnifierAdorner : Adorner
+  {
+    #region Members
+
+    private Magnifier _magnifier;
+    private Point _currentMousePosition;
+
+    #endregion
+
+    #region Constructors
+
+    public MagnifierAdorner( UIElement element, Magnifier magnifier )
+      : base( element )
+    {
+      _magnifier = magnifier;
+      UpdateViewBox();
+      AddVisualChild( _magnifier );
+
+      Loaded += ( s, e ) => InputManager.Current.PostProcessInput += OnProcessInput;
+      Unloaded += ( s, e ) => InputManager.Current.PostProcessInput -= OnProcessInput;
+    }
+
+    #endregion
+
+    #region Private/Internal methods
+
+    private void OnProcessInput( object sender, ProcessInputEventArgs e )
+    {
+      Point pt = Mouse.GetPosition( this );
+
+      if( _currentMousePosition == pt )
+        return;
+
+      _currentMousePosition = pt;
+      UpdateViewBox();
+      InvalidateArrange();
+    }
+
+    internal void UpdateViewBox()
+    {
+      var viewBoxLocation = CalculateViewBoxLocation();
+      _magnifier.ViewBox = new Rect( viewBoxLocation, _magnifier.ViewBox.Size );
+    }
+
+    private Point CalculateViewBoxLocation()
+    {
+      double offsetX = 0, offsetY = 0;
+
+      Point adorner = Mouse.GetPosition( this );
+      Point element = Mouse.GetPosition( AdornedElement );
+
+      offsetX = element.X - adorner.X;
+      offsetY = element.Y - adorner.Y;
+
+      double left = _currentMousePosition.X - ( ( _magnifier.ViewBox.Width / 2 ) + offsetX );
+      double top = _currentMousePosition.Y - ( ( _magnifier.ViewBox.Height / 2 ) + offsetY );
+      return new Point( left, top );
+    }
+
+    #endregion
+
+    #region Overrides
+
+    protected override Visual GetVisualChild( int index )
+    {
+      return _magnifier;
+    }
+
+    protected override int VisualChildrenCount
+    {
+      get
+      {
+        return 1;
+      }
+    }
+
+    protected override Size MeasureOverride( Size constraint )
+    {
+      _magnifier.Measure( constraint );
+      return base.MeasureOverride( constraint );
+    }
+
+    protected override Size ArrangeOverride( Size finalSize )
+    {
+      double x = _currentMousePosition.X - ( _magnifier.Width / 2 );
+      double y = _currentMousePosition.Y - ( _magnifier.Height / 2 );
+      _magnifier.Arrange( new Rect( x, y, _magnifier.Width, _magnifier.Height ) );
+      return base.ArrangeOverride( finalSize );
+    }
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/MagnifierManager.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/MagnifierManager.cs
new file mode 100644
index 00000000..ac8d0c9d
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/MagnifierManager.cs
@@ -0,0 +1,117 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Documents;
+using System.Windows.Input;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class MagnifierManager : DependencyObject
+  {
+    #region Members
+
+    private MagnifierAdorner _adorner;
+    private UIElement _element;
+
+    #endregion //Members
+
+    #region Properties
+
+    public static readonly DependencyProperty CurrentProperty = DependencyProperty.RegisterAttached( "Magnifier", typeof( Magnifier ), typeof( UIElement ), new FrameworkPropertyMetadata( null, OnMagnifierChanged ) );
+    public static void SetMagnifier( UIElement element, Magnifier value )
+    {
+      element.SetValue( CurrentProperty, value );
+    }
+    public static Magnifier GetMagnifier( UIElement element )
+    {
+      return ( Magnifier )element.GetValue( CurrentProperty );
+    }
+
+    private static void OnMagnifierChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      UIElement target = d as UIElement;
+
+      if( target == null )
+        throw new ArgumentException( "Magnifier can only be attached to a UIElement." );
+
+      MagnifierManager manager = new MagnifierManager();
+      manager.AttachToMagnifier( target, e.NewValue as Magnifier );
+    }
+
+    #endregion //Properties
+
+    #region Event Handlers
+
+    void Element_MouseLeave( object sender, MouseEventArgs e )
+    {
+      HideAdorner();
+    }
+
+    void Element_MouseEnter( object sender, MouseEventArgs e )
+    {
+      ShowAdorner();
+    }
+
+    #endregion //Event Handlers
+
+    #region Methods
+
+    private void AttachToMagnifier( UIElement element, Magnifier magnifier )
+    {
+      _element = element;
+      _element.MouseEnter += Element_MouseEnter;
+      _element.MouseLeave += Element_MouseLeave;
+
+      magnifier.Target = _element;
+
+      _adorner = new MagnifierAdorner( _element, magnifier );
+    }
+
+    void ShowAdorner()
+    {
+      VerifyAdornerLayer();
+      _adorner.Visibility = Visibility.Visible;
+    }
+
+    bool VerifyAdornerLayer()
+    {
+      if( _adorner.Parent != null )
+        return true;
+
+      AdornerLayer layer = AdornerLayer.GetAdornerLayer( _element );
+      if( layer == null )
+        return false;
+
+      layer.Add( _adorner );
+      return true;
+    }
+
+    void HideAdorner()
+    {
+      if( _adorner.Visibility == Visibility.Visible )
+      {
+        _adorner.Visibility = Visibility.Collapsed;
+      }
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Themes/Generic.xaml
new file mode 100644
index 00000000..62ab1775
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Themes/Generic.xaml
@@ -0,0 +1,71 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Mag.Converters">
+
+   <!-- =============================================================================== -->
+   <!-- Magnifier                                                                       -->
+   <!-- =============================================================================== -->
+
+   <conv:RadiusConverter x:Key="RadiusConverter" />
+   <conv:BorderThicknessToStrokeThicknessConverter x:Key="BorderThicknessToStrokeThicknessConverter" />
+
+   <ControlTemplate x:Key="CircleTemplate" TargetType="{x:Type local:Magnifier}">
+      <Grid>
+         <Ellipse Fill="{TemplateBinding Background}" />
+         <Ellipse Stroke="{Binding Path=BorderBrush, RelativeSource={RelativeSource TemplatedParent}}" 
+                  StrokeThickness="{Binding Path=BorderThickness, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BorderThicknessToStrokeThicknessConverter}}">
+            <Ellipse.Fill>
+               <VisualBrush x:Name="PART_VisualBrush"
+                            ViewboxUnits="Absolute"
+                            Visual="{Binding Path=Target, RelativeSource={RelativeSource TemplatedParent}}" />
+            </Ellipse.Fill>
+         </Ellipse>
+      </Grid>
+   </ControlTemplate>
+
+   <ControlTemplate x:Key="RectangleTemplate" TargetType="{x:Type local:Magnifier}">
+      <Grid Background="{TemplateBinding Background}" >
+         <Rectangle Stroke="{Binding Path=BorderBrush, RelativeSource={RelativeSource TemplatedParent}}"
+                    StrokeThickness="{Binding Path=BorderThickness, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BorderThicknessToStrokeThicknessConverter}}">
+            <Rectangle.Fill>
+               <VisualBrush x:Name="PART_VisualBrush"
+                            ViewboxUnits="Absolute"
+                            Visual="{Binding Path=Target, RelativeSource={RelativeSource TemplatedParent}}" />
+            </Rectangle.Fill>
+         </Rectangle>
+      </Grid>
+   </ControlTemplate>
+
+   <Style TargetType="{x:Type local:Magnifier}">
+      <Setter Property="IsHitTestVisible" Value="False" />
+      <Style.Triggers>
+         <Trigger Property="FrameType" Value="Circle">
+            <Setter Property="Template" Value="{StaticResource CircleTemplate}" />
+         </Trigger>
+         <Trigger Property="FrameType" Value="Rectangle">
+            <Setter Property="Template" Value="{StaticResource RectangleTemplate}" />
+         </Trigger>
+      </Style.Triggers>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MaskedTextBox/Implementation/MaskedTextBox.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MaskedTextBox/Implementation/MaskedTextBox.cs
new file mode 100644
index 00000000..734a8209
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MaskedTextBox/Implementation/MaskedTextBox.cs
@@ -0,0 +1,725 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class MaskedTextBox : TextBox
+  {
+    #region Members
+
+    /// <summary>
+    /// Flags if the Text and Value properties are in the process of being sync'd
+    /// </summary>
+    private bool _isSyncingTextAndValueProperties;
+    private bool _isInitialized;
+    private bool _convertExceptionOccurred = false;
+
+    #endregion //Members
+
+    #region Properties
+
+    protected MaskedTextProvider MaskProvider
+    {
+      get;
+      set;
+    }
+
+    #region IncludePrompt
+
+    public static readonly DependencyProperty IncludePromptProperty = DependencyProperty.Register( "IncludePrompt", typeof( bool ), typeof( MaskedTextBox ), new UIPropertyMetadata( false, OnIncludePromptPropertyChanged ) );
+    public bool IncludePrompt
+    {
+      get
+      {
+        return ( bool )GetValue( IncludePromptProperty );
+      }
+      set
+      {
+        SetValue( IncludePromptProperty, value );
+      }
+    }
+
+    private static void OnIncludePromptPropertyChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      MaskedTextBox maskedTextBox = o as MaskedTextBox;
+      if( maskedTextBox != null )
+        maskedTextBox.OnIncludePromptChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnIncludePromptChanged( bool oldValue, bool newValue )
+    {
+      ResolveMaskProvider( Mask );
+    }
+
+    #endregion //IncludePrompt
+
+    #region IncludeLiterals
+
+    public static readonly DependencyProperty IncludeLiteralsProperty = DependencyProperty.Register( "IncludeLiterals", typeof( bool ), typeof( MaskedTextBox ), new UIPropertyMetadata( true, OnIncludeLiteralsPropertyChanged ) );
+    public bool IncludeLiterals
+    {
+      get
+      {
+        return ( bool )GetValue( IncludeLiteralsProperty );
+      }
+      set
+      {
+        SetValue( IncludeLiteralsProperty, value );
+      }
+    }
+
+    private static void OnIncludeLiteralsPropertyChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      MaskedTextBox maskedTextBox = o as MaskedTextBox;
+      if( maskedTextBox != null )
+        maskedTextBox.OnIncludeLiteralsChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnIncludeLiteralsChanged( bool oldValue, bool newValue )
+    {
+      ResolveMaskProvider( Mask );
+    }
+
+    #endregion //IncludeLiterals
+
+    #region Mask
+
+    public static readonly DependencyProperty MaskProperty = DependencyProperty.Register( "Mask", typeof( string ), typeof( MaskedTextBox ), new UIPropertyMetadata( "<>", OnMaskPropertyChanged ) );
+    public string Mask
+    {
+      get
+      {
+        return ( string )GetValue( MaskProperty );
+      }
+      set
+      {
+        SetValue( MaskProperty, value );
+      }
+    }
+
+    private static void OnMaskPropertyChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      MaskedTextBox maskedTextBox = o as MaskedTextBox;
+      if( maskedTextBox != null )
+        maskedTextBox.OnMaskChanged( ( string )e.OldValue, ( string )e.NewValue );
+    }
+
+    protected virtual void OnMaskChanged( string oldValue, string newValue )
+    {
+      ResolveMaskProvider( newValue );
+      UpdateText( 0 );
+    }
+
+    #endregion //Mask
+
+    #region PromptChar
+
+    public static readonly DependencyProperty PromptCharProperty = DependencyProperty.Register( "PromptChar", typeof( char ), typeof( MaskedTextBox ), new UIPropertyMetadata( '_', OnPromptCharChanged ) );
+    public char PromptChar
+    {
+      get
+      {
+        return ( char )GetValue( PromptCharProperty );
+      }
+      set
+      {
+        SetValue( PromptCharProperty, value );
+      }
+    }
+
+    private static void OnPromptCharChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      MaskedTextBox maskedTextBox = o as MaskedTextBox;
+      if( maskedTextBox != null )
+        maskedTextBox.OnPromptCharChanged( ( char )e.OldValue, ( char )e.NewValue );
+    }
+
+    protected virtual void OnPromptCharChanged( char oldValue, char newValue )
+    {
+      ResolveMaskProvider( Mask );
+    }
+
+    #endregion //PromptChar
+
+    #region SelectAllOnGotFocus
+
+    public static readonly DependencyProperty SelectAllOnGotFocusProperty = DependencyProperty.Register( "SelectAllOnGotFocus", typeof( bool ), typeof( MaskedTextBox ), new PropertyMetadata( false ) );
+    public bool SelectAllOnGotFocus
+    {
+      get
+      {
+        return ( bool )GetValue( SelectAllOnGotFocusProperty );
+      }
+      set
+      {
+        SetValue( SelectAllOnGotFocusProperty, value );
+      }
+    }
+
+    #endregion //SelectAllOnGotFocus
+
+    #region Text
+
+    private static void OnTextChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      MaskedTextBox inputBase = o as MaskedTextBox;
+      if( inputBase != null )
+        inputBase.OnTextChanged( ( string )e.OldValue, ( string )e.NewValue );
+    }
+
+    protected virtual void OnTextChanged( string oldValue, string newValue )
+    {
+      if( _isInitialized )
+        SyncTextAndValueProperties( MaskedTextBox.TextProperty, newValue );
+    }
+
+    #endregion //Text
+
+    #region Value
+
+    public static readonly DependencyProperty ValueProperty = DependencyProperty.Register( "Value", typeof( object ), typeof( MaskedTextBox ), new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnValueChanged ) );
+    public object Value
+    {
+      get
+      {
+        return ( object )GetValue( ValueProperty );
+      }
+      set
+      {
+        SetValue( ValueProperty, value );
+      }
+    }
+
+    private static void OnValueChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      MaskedTextBox maskedTextBox = o as MaskedTextBox;
+      if( maskedTextBox != null )
+        maskedTextBox.OnValueChanged( ( object )e.OldValue, ( object )e.NewValue );
+    }
+
+    protected virtual void OnValueChanged( object oldValue, object newValue )
+    {
+      if( _isInitialized )
+        SyncTextAndValueProperties( MaskedTextBox.ValueProperty, newValue );
+
+      RoutedPropertyChangedEventArgs<object> args = new RoutedPropertyChangedEventArgs<object>( oldValue, newValue );
+      args.RoutedEvent = MaskedTextBox.ValueChangedEvent;
+      RaiseEvent( args );
+    }
+
+    #endregion //Value
+
+    #region ValueType
+
+    public static readonly DependencyProperty ValueTypeProperty = DependencyProperty.Register( "ValueType", typeof( Type ), typeof( MaskedTextBox ), new UIPropertyMetadata( typeof( String ), OnValueTypeChanged ) );
+    public Type ValueType
+    {
+      get
+      {
+        return ( Type )GetValue( ValueTypeProperty );
+      }
+      set
+      {
+        SetValue( ValueTypeProperty, value );
+      }
+    }
+
+    private static void OnValueTypeChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      MaskedTextBox maskedTextBox = o as MaskedTextBox;
+      if( maskedTextBox != null )
+        maskedTextBox.OnValueTypeChanged( ( Type )e.OldValue, ( Type )e.NewValue );
+    }
+
+    protected virtual void OnValueTypeChanged( Type oldValue, Type newValue )
+    {
+      if( _isInitialized )
+        SyncTextAndValueProperties( MaskedTextBox.TextProperty, Text );
+    }
+
+    #endregion //ValueType
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static MaskedTextBox()
+    {
+      TextProperty.OverrideMetadata( typeof( MaskedTextBox ), new FrameworkPropertyMetadata( OnTextChanged ) );
+    }
+
+    public MaskedTextBox()
+    {
+      CommandBindings.Add( new CommandBinding( ApplicationCommands.Paste, Paste ) ); //handle paste
+      CommandBindings.Add( new CommandBinding( ApplicationCommands.Cut, null, CanCut ) ); //surpress cut
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+
+      ResolveMaskProvider( Mask );
+      UpdateText( 0 );
+    }
+
+    protected override void OnInitialized( EventArgs e )
+    {
+      base.OnInitialized( e );
+
+      if( !_isInitialized )
+      {
+        _isInitialized = true;
+        SyncTextAndValueProperties( ValueProperty, Value );
+      }
+    }
+
+    protected override void OnGotKeyboardFocus( KeyboardFocusChangedEventArgs e )
+    {
+      if( SelectAllOnGotFocus )
+      {
+        SelectAll();
+      }
+
+      base.OnGotKeyboardFocus( e );
+    }
+
+    protected override void OnPreviewKeyDown( KeyEventArgs e )
+    {
+      if( !e.Handled )
+      {
+        HandlePreviewKeyDown( e );
+      }
+
+      base.OnPreviewKeyDown( e );
+    }
+
+    protected override void OnPreviewTextInput( TextCompositionEventArgs e )
+    {
+      if( !e.Handled )
+      {
+        HandlePreviewTextInput( e );
+      }
+
+      base.OnPreviewTextInput( e );
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Events
+
+    public static readonly RoutedEvent ValueChangedEvent = EventManager.RegisterRoutedEvent( "ValueChanged", RoutingStrategy.Bubble, typeof( RoutedPropertyChangedEventHandler<object> ), typeof( MaskedTextBox ) );
+    public event RoutedPropertyChangedEventHandler<object> ValueChanged
+    {
+      add
+      {
+        AddHandler( ValueChangedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( ValueChangedEvent, value );
+      }
+    }
+
+    #endregion //Events
+
+    #region Methods
+
+    #region Private
+
+    private void UpdateText()
+    {
+      UpdateText( SelectionStart );
+    }
+
+    private void UpdateText( int position )
+    {
+      MaskedTextProvider provider = MaskProvider;
+      if( provider == null )
+        throw new InvalidOperationException();
+
+      Text = provider.ToDisplayString();
+      SelectionLength = 0;
+      SelectionStart = position;
+    }
+
+    private int GetNextCharacterPosition( int startPosition )
+    {
+      int position = MaskProvider.FindEditPositionFrom( startPosition, true );
+      return position == -1 ? startPosition : position;
+    }
+
+    private void ResolveMaskProvider( string mask )
+    {
+      //do not create a mask provider if the Mask is empty, which can occur if the IncludePrompt and IncludeLiterals properties
+      //are set prior to the Mask.
+      if( String.IsNullOrEmpty( mask ) )
+        return;
+
+      MaskProvider = new MaskedTextProvider( mask )
+      {
+        IncludePrompt = this.IncludePrompt,
+        IncludeLiterals = this.IncludeLiterals,
+        PromptChar = this.PromptChar,
+        ResetOnSpace = false //should make this a property
+      };
+    }
+
+    private object ConvertTextToValue( string text )
+    {
+      object convertedValue = null;
+
+      Type dataType = ValueType;
+
+      string valueToConvert = MaskProvider.ToString().Trim();
+
+      try
+      {
+        if( valueToConvert.GetType() == dataType || dataType.IsInstanceOfType( valueToConvert ) )
+        {
+          convertedValue = valueToConvert;
+        }
+#if !VS2008
+        else if( String.IsNullOrWhiteSpace( valueToConvert ) )
+        {
+          convertedValue = Activator.CreateInstance( dataType );
+        }
+#else
+        else if ( String.IsNullOrEmpty( valueToConvert ) )
+        {
+          convertedValue = Activator.CreateInstance( dataType );
+        }
+#endif
+        else if( null == convertedValue && valueToConvert is IConvertible )
+        {
+          convertedValue = Convert.ChangeType( valueToConvert, dataType );
+        }
+      }
+      catch
+      {
+        //if an excpetion occurs revert back to original value
+        _convertExceptionOccurred = true;
+        return Value;
+      }
+
+      return convertedValue;
+    }
+
+    private string ConvertValueToText( object value )
+    {
+      if( value == null )
+        value = string.Empty;
+
+      if( _convertExceptionOccurred )
+      {
+        value = Value;
+        _convertExceptionOccurred = false;
+      }
+
+      //I have only seen this occur while in Blend, but we need it here so the Blend designer doesn't crash.
+      if( MaskProvider == null )
+        return value.ToString();
+
+      MaskProvider.Set( value.ToString() );
+      return MaskProvider.ToDisplayString();
+    }
+
+    private void SyncTextAndValueProperties( DependencyProperty p, object newValue )
+    {
+      //prevents recursive syncing properties
+      if( _isSyncingTextAndValueProperties )
+        return;
+
+      _isSyncingTextAndValueProperties = true;
+
+      //this only occures when the user typed in the value
+      if( MaskedTextBox.TextProperty == p )
+      {
+        if( newValue != null )
+          SetValue( MaskedTextBox.ValueProperty, ConvertTextToValue( newValue.ToString() ) );
+      }
+
+      SetValue( MaskedTextBox.TextProperty, ConvertValueToText( newValue ) );
+
+      _isSyncingTextAndValueProperties = false;
+    }
+
+    private void HandlePreviewTextInput( TextCompositionEventArgs e )
+    {
+      if( !IsReadOnly )
+      {
+        this.InsertText( e.Text );
+      }
+
+      e.Handled = true;
+    }
+
+    private void HandlePreviewKeyDown( KeyEventArgs e )
+    {
+      if( e.Key == Key.Delete )
+      {
+        e.Handled = IsReadOnly
+                 || HandleKeyDownDelete();
+      }
+      else if( e.Key == Key.Back )
+      {
+        e.Handled = IsReadOnly
+                 || HandleKeyDownBack();
+      }
+      else if( e.Key == Key.Space )
+      {
+        if( !IsReadOnly )
+        {
+          InsertText( " " );
+        }
+
+        e.Handled = true;
+      }
+      else if( e.Key == Key.Return || e.Key == Key.Enter )
+      {
+        if( !IsReadOnly && AcceptsReturn )
+        {
+          this.InsertText( "\r" );
+        }
+
+        // We don't want the OnPreviewTextInput to be triggered for the Return/Enter key
+        // when it is not accepted.
+        e.Handled = true;
+      }
+      else if( e.Key == Key.Escape )
+      {
+        // We don't want the OnPreviewTextInput to be triggered at all for the Escape key.
+        e.Handled = true;
+      }
+      else if( e.Key == Key.Tab )
+      {
+        if( AcceptsTab )
+        {
+          if( !IsReadOnly )
+          {
+            this.InsertText( "\t" );
+          }
+
+          e.Handled = true;
+        }
+      }
+    }
+
+    private bool HandleKeyDownDelete()
+    {
+      ModifierKeys modifiers = Keyboard.Modifiers;
+      bool handled = true;
+
+      if( modifiers == ModifierKeys.None )
+      {
+        if( !RemoveSelectedText() )
+        {
+          int position = SelectionStart;
+
+          if( position < Text.Length )
+          {
+            RemoveText( position, 1 );
+            UpdateText( position );
+          }
+        }
+        else
+        {
+          UpdateText();
+        }
+      }
+      else if( modifiers == ModifierKeys.Control )
+      {
+        if( !RemoveSelectedText() )
+        {
+          int position = SelectionStart;
+
+          RemoveTextToEnd( position );
+          UpdateText( position );
+        }
+        else
+        {
+          UpdateText();
+        }
+      }
+      else if( modifiers == ModifierKeys.Shift )
+      {
+        if( RemoveSelectedText() )
+        {
+          UpdateText();
+        }
+        else
+        {
+          handled = false;
+        }
+      }
+      else
+      {
+        handled = false;
+      }
+
+      return handled;
+    }
+
+    private bool HandleKeyDownBack()
+    {
+      ModifierKeys modifiers = Keyboard.Modifiers;
+      bool handled = true;
+
+      if( modifiers == ModifierKeys.None || modifiers == ModifierKeys.Shift )
+      {
+        if( !RemoveSelectedText() )
+        {
+          int position = SelectionStart;
+
+          if( position > 0 )
+          {
+            int newPosition = position - 1;
+
+            RemoveText( newPosition, 1 );
+            UpdateText( newPosition );
+          }
+        }
+        else
+        {
+          UpdateText();
+        }
+      }
+      else if( modifiers == ModifierKeys.Control )
+      {
+        if( !RemoveSelectedText() )
+        {
+          RemoveTextFromStart( SelectionStart );
+          UpdateText( 0 );
+        }
+        else
+        {
+          UpdateText();
+        }
+      }
+      else
+      {
+        handled = false;
+      }
+
+      return handled;
+    }
+
+    private void InsertText( string text )
+    {
+      int position = SelectionStart;
+      MaskedTextProvider provider = MaskProvider;
+
+      bool textRemoved = this.RemoveSelectedText();
+
+      position = GetNextCharacterPosition( position );
+
+      if( !textRemoved && Keyboard.IsKeyToggled( Key.Insert ) )
+      {
+        if( provider.Replace( text, position ) )
+        {
+          position += text.Length;
+        }
+      }
+      else
+      {
+        if( provider.InsertAt( text, position ) )
+        {
+          position += text.Length;
+        }
+      }
+
+      position = GetNextCharacterPosition( position );
+
+      this.UpdateText( position );
+    }
+
+    private void RemoveTextFromStart( int endPosition )
+    {
+      RemoveText( 0, endPosition );
+    }
+
+    private void RemoveTextToEnd( int startPosition )
+    {
+      RemoveText( startPosition, Text.Length - startPosition );
+    }
+
+    private void RemoveText( int position, int length )
+    {
+      if( length == 0 )
+        return;
+
+      MaskProvider.RemoveAt( position, position + length - 1 );
+    }
+
+    private bool RemoveSelectedText()
+    {
+      int length = SelectionLength;
+
+      if( length == 0 )
+        return false;
+
+      int position = SelectionStart;
+
+      return MaskProvider.RemoveAt( position, position + length - 1 );
+    }
+
+    #endregion //Private
+
+    #endregion //Methods
+
+    #region Commands
+
+    private void Paste( object sender, RoutedEventArgs e )
+    {
+      if( IsReadOnly )
+        return;
+
+      object data = Clipboard.GetData( DataFormats.Text );
+      if( data != null )
+      {
+        string text = data.ToString().Trim();
+        if( text.Length > 0 )
+        {
+          int position = SelectionStart;
+
+          MaskProvider.Set( text );
+
+          UpdateText( position );
+        }
+      }
+    }
+
+    private void CanCut( object sender, CanExecuteRoutedEventArgs e )
+    {
+      e.CanExecute = false;
+      e.Handled = true;
+    }
+
+    #endregion //Commands
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Icons/Error48.png b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Icons/Error48.png
new file mode 100644
index 00000000..4304d43b
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Icons/Error48.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Icons/Information48.png b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Icons/Information48.png
new file mode 100644
index 00000000..35075187
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Icons/Information48.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Icons/Question48.png b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Icons/Question48.png
new file mode 100644
index 00000000..dad7dd09
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Icons/Question48.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Icons/Warning48.png b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Icons/Warning48.png
new file mode 100644
index 00000000..ecb7fe86
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Icons/Warning48.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Implementation/MessageBox.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Implementation/MessageBox.cs
new file mode 100644
index 00000000..bd3b58e4
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Implementation/MessageBox.cs
@@ -0,0 +1,720 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Media;
+
+namespace Xceed.Wpf.Toolkit
+{
+  [TemplateVisualState( Name = VisualStates.OK, GroupName = VisualStates.MessageBoxButtonsGroup )]
+  [TemplateVisualState( Name = VisualStates.OKCancel, GroupName = VisualStates.MessageBoxButtonsGroup )]
+  [TemplateVisualState( Name = VisualStates.YesNo, GroupName = VisualStates.MessageBoxButtonsGroup )]
+  [TemplateVisualState( Name = VisualStates.YesNoCancel, GroupName = VisualStates.MessageBoxButtonsGroup )]
+  [TemplatePart( Name = PART_DragWidget, Type = typeof( Thumb ) )]
+  [TemplatePart( Name = PART_CancelButton, Type = typeof( Button ) )]
+  [TemplatePart( Name = PART_NoButton, Type = typeof( Button ) )]
+  [TemplatePart( Name = PART_OkButton, Type = typeof( Button ) )]
+  [TemplatePart( Name = PART_YesButton, Type = typeof( Button ) )]
+  public class MessageBox : Control
+  {
+    private const string PART_DragWidget = "PART_DragWidget";
+    private const string PART_CancelButton = "PART_CancelButton";
+    private const string PART_NoButton = "PART_NoButton";
+    private const string PART_OkButton = "PART_OkButton";
+    private const string PART_YesButton = "PART_YesButton";
+    private const string PART_CloseButton = "PART_CloseButton";
+
+    #region Private Members
+
+    /// <summary>
+    /// Tracks the MessageBoxButon value passed into the InitializeContainer method
+    /// </summary>
+    private MessageBoxButton _button = MessageBoxButton.OK;
+
+    /// <summary>
+    /// Tracks the MessageBoxResult to set as the default and focused button
+    /// </summary>
+    private MessageBoxResult _defaultResult = MessageBoxResult.None;
+
+    /// <summary>
+    /// Tracks the owner of the MessageBox
+    /// </summary>
+    private Window _owner;
+
+    #endregion //Private Members
+
+    #region Constructors
+
+    static MessageBox()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( MessageBox ), new FrameworkPropertyMetadata( typeof( MessageBox ) ) );
+    }
+
+    internal MessageBox()
+    {
+      /*user cannot create instance */
+      AddHandler( ButtonBase.ClickEvent, new RoutedEventHandler( Button_Click ) );
+    }
+
+    #endregion //Constructors
+
+    #region Properties
+
+    #region Protected Properties
+
+    /// <summary>
+    /// A System.Windows.MessageBoxResult value that specifies which message box button was clicked by the user.
+    /// </summary>
+    protected MessageBoxResult MessageBoxResult = MessageBoxResult.None;
+
+    protected Window Container
+    {
+      get;
+      private set;
+    }
+    protected Thumb DragWidget
+    {
+      get;
+      private set;
+    }
+
+    #endregion //Protected Properties
+
+    #region Dependency Properties
+
+    public static readonly DependencyProperty CaptionProperty = DependencyProperty.Register( "Caption", typeof( string ), typeof( MessageBox ), new UIPropertyMetadata( String.Empty ) );
+    public string Caption
+    {
+      get
+      {
+        return ( string )GetValue( CaptionProperty );
+      }
+      set
+      {
+        SetValue( CaptionProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CaptionForegroundProperty = DependencyProperty.Register( "CaptionForeground", typeof( Brush ), typeof( MessageBox ), new UIPropertyMetadata( null ) );
+    public Brush CaptionForeground
+    {
+      get
+      {
+        return ( Brush )GetValue( CaptionForegroundProperty );
+      }
+      set
+      {
+        SetValue( CaptionForegroundProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CancelButtonContentProperty = DependencyProperty.Register( "CancelButtonContent", typeof( object ), typeof( MessageBox ), new UIPropertyMetadata( "Cancel" ) );
+    public object CancelButtonContent
+    {
+      get
+      {
+        return ( object )GetValue( CancelButtonContentProperty );
+      }
+      set
+      {
+        SetValue( CancelButtonContentProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CloseButtonStyleProperty = DependencyProperty.Register( "CloseButtonStyle", typeof( Style ), typeof( MessageBox ), new PropertyMetadata( null ) );
+    public Style CloseButtonStyle
+    {
+      get
+      {
+        return ( Style )GetValue( CloseButtonStyleProperty );
+      }
+      set
+      {
+        SetValue( CloseButtonStyleProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty ImageSourceProperty = DependencyProperty.Register( "ImageSource", typeof( ImageSource ), typeof( MessageBox ), new UIPropertyMetadata( default( ImageSource ) ) );
+    public ImageSource ImageSource
+    {
+      get
+      {
+        return ( ImageSource )GetValue( ImageSourceProperty );
+      }
+      set
+      {
+        SetValue( ImageSourceProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty NoButtonContentProperty = DependencyProperty.Register( "NoButtonContent", typeof( object ), typeof( MessageBox ), new UIPropertyMetadata( "No" ) );
+    public object NoButtonContent
+    {
+      get
+      {
+        return ( object )GetValue( NoButtonContentProperty );
+      }
+      set
+      {
+        SetValue( NoButtonContentProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty OkButtonContentProperty = DependencyProperty.Register( "OkButtonContent", typeof( object ), typeof( MessageBox ), new UIPropertyMetadata( "OK" ) );
+    public object OkButtonContent
+    {
+      get
+      {
+        return ( object )GetValue( OkButtonContentProperty );
+      }
+      set
+      {
+        SetValue( OkButtonContentProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty TextProperty = DependencyProperty.Register( "Text", typeof( string ), typeof( MessageBox ), new UIPropertyMetadata( String.Empty ) );
+    public string Text
+    {
+      get
+      {
+        return ( string )GetValue( TextProperty );
+      }
+      set
+      {
+        SetValue( TextProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty WindowBackgroundProperty = DependencyProperty.Register( "WindowBackground", typeof( Brush ), typeof( MessageBox ), new PropertyMetadata( null ) );
+    public Brush WindowBackground
+    {
+      get
+      {
+        return ( Brush )GetValue( WindowBackgroundProperty );
+      }
+      set
+      {
+        SetValue( WindowBackgroundProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty WindowBorderBrushProperty = DependencyProperty.Register( "WindowBorderBrush", typeof( Brush ), typeof( MessageBox ), new PropertyMetadata( null ) );
+    public Brush WindowBorderBrush
+    {
+      get
+      {
+        return ( Brush )GetValue( WindowBorderBrushProperty );
+      }
+      set
+      {
+        SetValue( WindowBorderBrushProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty WindowOpacityProperty = DependencyProperty.Register( "WindowOpacity", typeof( double ), typeof( MessageBox ), new PropertyMetadata( null ) );
+    public double WindowOpacity
+    {
+      get
+      {
+        return ( double )GetValue( WindowOpacityProperty );
+      }
+      set
+      {
+        SetValue( WindowOpacityProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty YesButtonContentProperty = DependencyProperty.Register( "YesButtonContent", typeof( object ), typeof( MessageBox ), new UIPropertyMetadata( "Yes" ) );
+    public object YesButtonContent
+    {
+      get
+      {
+        return ( object )GetValue( YesButtonContentProperty );
+      }
+      set
+      {
+        SetValue( YesButtonContentProperty, value );
+      }
+    }
+
+    #endregion //Dependency Properties
+
+    #endregion //Properties
+
+    #region Base Class Overrides
+
+    /// <summary>
+    /// Overrides the OnApplyTemplate method.
+    /// </summary>
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+
+      if( DragWidget != null )
+        DragWidget.DragDelta -= ( o, e ) => ProcessMove( e );
+
+      DragWidget = GetTemplateChild( PART_DragWidget ) as Thumb;
+
+      if( DragWidget != null )
+        DragWidget.DragDelta += ( o, e ) => ProcessMove( e );
+
+      ChangeVisualState( _button.ToString(), true );
+
+      SetDefaultResult();
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Methods
+
+    #region Public Static
+
+
+    /// <summary>
+    /// Displays a message box that has a message and that returns a result.
+    /// </summary>
+    /// <param name="messageText">A System.String that specifies the text to display.</param>
+    /// <param name="messageBoxStyle">A Style that will be applied to the MessageBox instance.</param>
+    /// <returns>A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user.</returns>
+    public static MessageBoxResult Show( string messageText )
+    {
+      return Show( messageText, string.Empty, MessageBoxButton.OK, (Style)null );
+    }
+
+    /// <summary>
+    /// Displays a message box that has a message and that returns a result.
+    /// </summary>
+    /// <param name="owner">A System.Windows.Window that represents the owner of the MessageBox</param>
+    /// <param name="messageText">A System.String that specifies the text to display.</param>
+    /// <param name="messageBoxStyle">A Style that will be applied to the MessageBox instance.</param>
+    /// <returns>A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user.</returns>
+    public static MessageBoxResult Show( Window owner, string messageText )
+    {
+      return Show( owner, messageText, string.Empty, MessageBoxButton.OK, (Style) null );
+    }
+
+    /// <summary>
+    /// Displays a message box that has a message and title bar caption; and that returns a result.
+    /// </summary>
+    /// <param name="messageText">A System.String that specifies the text to display.</param>
+    /// <param name="caption">A System.String that specifies the title bar caption to display.</param>
+    /// <param name="messageBoxStyle">A Style that will be applied to the MessageBox instance.</param>
+    /// <returns>A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user.</returns>
+    public static MessageBoxResult Show( string messageText, string caption )
+    {
+        return Show(messageText, caption, MessageBoxButton.OK, (Style)null);
+    }
+
+    public static MessageBoxResult Show( Window owner, string messageText, string caption )
+    {
+        return Show(owner, messageText, caption, (Style)null);
+    }
+
+    public static MessageBoxResult Show( Window owner, string messageText, string caption, Style messageBoxStyle )
+    {
+      return Show( owner, messageText, caption, MessageBoxButton.OK, messageBoxStyle );
+    }
+
+    public static MessageBoxResult Show( string messageText, string caption, MessageBoxButton button )
+    {
+        return Show(messageText, caption, button, (Style)null);
+    }
+
+    /// <summary>
+    /// Displays a message box that has a message and that returns a result.
+    /// </summary>
+    /// <param name="messageText">A System.String that specifies the text to display.</param>
+    /// <param name="caption">A System.String that specifies the title bar caption to display.</param>
+    /// <param name="button">A System.Windows.MessageBoxButton value that specifies which button or buttons to display.</param>
+    /// <param name="messageBoxStyle">A Style that will be applied to the MessageBox instance.</param>
+    /// <returns>A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user.</returns>
+    public static MessageBoxResult Show( string messageText, string caption, MessageBoxButton button, Style messageBoxStyle )
+    {
+      return ShowCore( null, messageText, caption, button, MessageBoxImage.None, MessageBoxResult.None, messageBoxStyle );
+    }
+
+
+    public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button )
+    {
+        return Show(owner, messageText, caption, button, (Style)null);
+    }
+
+    public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button, Style messageBoxStyle )
+    {
+      return ShowCore( owner, messageText, caption, button, MessageBoxImage.None, MessageBoxResult.None, messageBoxStyle );
+    }
+
+
+    public static MessageBoxResult Show( string messageText, string caption, MessageBoxButton button, MessageBoxImage icon )
+    {
+        return Show(messageText, caption, button, icon, (Style)null);
+    }
+
+    /// <summary>
+    /// Displays a message box that has a message and that returns a result.
+    /// </summary>
+    /// <param name="messageText">A System.String that specifies the text to display.</param>
+    /// <param name="caption">A System.String that specifies the title bar caption to display.</param>
+    /// <param name="button">A System.Windows.MessageBoxButton value that specifies which button or buttons to display.</param>
+    /// <param name="image"> A System.Windows.MessageBoxImage value that specifies the icon to display.</param>
+    /// <param name="messageBoxStyle">A Style that will be applied to the MessageBox instance.</param>
+    /// <returns>A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user.</returns>
+    public static MessageBoxResult Show( string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, Style messageBoxStyle )
+    {
+      return ShowCore( null, messageText, caption, button, icon, MessageBoxResult.None, messageBoxStyle );
+    }
+
+    public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon )
+    {
+        return Show(owner, messageText, caption, button, icon, (Style)null);
+    }
+
+    public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, Style messageBoxStyle )
+    {
+      return ShowCore( owner, messageText, caption, button, icon, MessageBoxResult.None, messageBoxStyle );
+    }
+
+
+    public static MessageBoxResult Show( string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult )
+    {
+        return Show(messageText, caption, button, icon, defaultResult, (Style)null);
+    }
+    /// <summary>
+    /// Displays a message box that has a message and that returns a result.
+    /// </summary>
+    /// <param name="messageText">A System.String that specifies the text to display.</param>
+    /// <param name="caption">A System.String that specifies the title bar caption to display.</param>
+    /// <param name="button">A System.Windows.MessageBoxButton value that specifies which button or buttons to display.</param>
+    /// <param name="image"> A System.Windows.MessageBoxImage value that specifies the icon to display.</param>
+    /// <param name="defaultResult">A System.Windows.MessageBoxResult value that specifies the default result of the MessageBox.</param>
+    /// <param name="messageBoxStyle">A Style that will be applied to the MessageBox instance.</param>
+    /// <returns>A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user.</returns>
+    public static MessageBoxResult Show( string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult, Style messageBoxStyle )
+    {
+      return ShowCore( null, messageText, caption, button, icon, defaultResult, messageBoxStyle );
+    }
+
+    public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult )
+    {
+        return Show(owner, messageText, caption, button, icon, defaultResult, (Style) null);
+    }
+
+
+    public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult, Style messageBoxStyle )
+    {
+      return ShowCore( owner, messageText, caption, button, icon, defaultResult, messageBoxStyle );
+    }
+
+    #endregion //Public Static
+
+    #region Protected
+
+    /// <summary>
+    /// Shows the container which contains the MessageBox.
+    /// </summary>
+    protected void Show()
+    {
+      Container.ShowDialog();
+    }
+
+    /// <summary>
+    /// Initializes the MessageBox.
+    /// </summary>
+    /// <param name="text">The text.</param>
+    /// <param name="caption">The caption.</param>
+    /// <param name="button">The button.</param>
+    /// <param name="image">The image.</param>
+    protected void InitializeMessageBox( Window owner, string text, string caption, MessageBoxButton button, MessageBoxImage image, MessageBoxResult defaultResult )
+    {
+      Text = text;
+      Caption = caption;
+      _button = button;
+      _defaultResult = defaultResult;
+      _owner = owner;
+      SetImageSource( image );
+      Container = CreateContainer();
+    }
+
+    /// <summary>
+    /// Changes the control's visual state(s).
+    /// </summary>
+    /// <param name="name">name of the state</param>
+    /// <param name="useTransitions">True if state transitions should be used.</param>
+    protected void ChangeVisualState( string name, bool useTransitions )
+    {
+      VisualStateManager.GoToState( this, name, useTransitions );
+    }
+
+    #endregion //Protected
+
+    #region Private
+
+    /// <summary>
+    /// Sets the button that represents the _defaultResult to the default button and gives it focus.
+    /// </summary>
+    private void SetDefaultResult()
+    {
+      var defaultButton = GetDefaultButtonFromDefaultResult();
+      if( defaultButton != null )
+      {
+        defaultButton.IsDefault = true;
+        defaultButton.Focus();
+      }
+    }
+
+    /// <summary>
+    /// Gets the default button from the _defaultResult.
+    /// </summary>
+    /// <returns>The default button that represents the defaultResult</returns>
+    private Button GetDefaultButtonFromDefaultResult()
+    {
+      Button defaultButton = null;
+      switch( _defaultResult )
+      {
+        case MessageBoxResult.Cancel:
+          defaultButton = GetMessageBoxButton( PART_CancelButton );
+          break;
+        case MessageBoxResult.No:
+          defaultButton = GetMessageBoxButton( PART_NoButton );
+          break;
+        case MessageBoxResult.OK:
+          defaultButton = GetMessageBoxButton( PART_OkButton );
+          break;
+        case MessageBoxResult.Yes:
+          defaultButton = GetMessageBoxButton( PART_YesButton );
+          break;
+        case MessageBoxResult.None:
+          defaultButton = GetDefaultButton();
+          break;
+      }
+      return defaultButton;
+    }
+
+    /// <summary>
+    /// Gets the default button.
+    /// </summary>
+    /// <remarks>Used when the _defaultResult is set to None</remarks>
+    /// <returns>The button to use as the default</returns>
+    private Button GetDefaultButton()
+    {
+      Button defaultButton = null;
+      switch( _button )
+      {
+        case MessageBoxButton.OK:
+        case MessageBoxButton.OKCancel:
+          defaultButton = GetMessageBoxButton( PART_OkButton );
+          break;
+        case MessageBoxButton.YesNo:
+        case MessageBoxButton.YesNoCancel:
+          defaultButton = GetMessageBoxButton( PART_YesButton );
+          break;
+      }
+      return defaultButton;
+    }
+
+    /// <summary>
+    /// Gets a message box button.
+    /// </summary>
+    /// <param name="name">The name of the button to get.</param>
+    /// <returns>The button</returns>
+    private Button GetMessageBoxButton( string name )
+    {
+      Button button = GetTemplateChild( name ) as Button;
+      return button;
+    }
+
+    /// <summary>
+    /// Shows the MessageBox.
+    /// </summary>
+    /// <param name="messageText">The message text.</param>
+    /// <param name="caption">The caption.</param>
+    /// <param name="button">The button.</param>
+    /// <param name="icon">The icon.</param>
+    /// <param name="defaultResult">The default result.</param>
+    /// <returns></returns>
+    private static MessageBoxResult ShowCore( Window owner, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult, Style messageBoxStyle )
+    {
+      MessageBox msgBox = new MessageBox();
+      msgBox.InitializeMessageBox( owner, messageText, caption, button, icon, defaultResult );
+
+      // Setting the style to null will inhibit any implicit styles      
+      if( messageBoxStyle != null )
+      {
+        msgBox.Style = messageBoxStyle;
+      }
+
+      msgBox.Show();
+      return msgBox.MessageBoxResult;
+    }
+
+    /// <summary>
+    /// Resolves the owner Window of the MessageBox.
+    /// </summary>
+    /// <returns>the owner Window</returns>
+    private static Window ResolveOwnerWindow()
+    {
+      Window owner = null;
+      if( Application.Current != null )
+      {
+        foreach( Window w in Application.Current.Windows )
+        {
+          if( w.IsActive )
+          {
+            owner = w;
+            break;
+          }
+        }
+      }
+      return owner;
+    }
+
+    /// <summary>
+    /// Sets the message image source.
+    /// </summary>
+    /// <param name="image">The image to show.</param>
+    private void SetImageSource( MessageBoxImage image )
+    {
+      String iconName = String.Empty;
+
+      switch( image )
+      {
+        case MessageBoxImage.Error:
+          {
+            iconName = "Error48.png";
+            break;
+          }
+        case MessageBoxImage.Information:
+          {
+            iconName = "Information48.png";
+            break;
+          }
+        case MessageBoxImage.Question:
+          {
+            iconName = "Question48.png";
+            break;
+          }
+        case MessageBoxImage.Warning:
+          {
+            iconName = "Warning48.png";
+            break;
+          }
+        case MessageBoxImage.None:
+        default:
+          {
+            return;
+          }
+      }
+
+      ImageSource = ( ImageSource )new ImageSourceConverter().ConvertFromString( String.Format( "pack://application:,,,/WPFToolkit.Extended;component/MessageBox/Icons/{0}", iconName ) );
+    }
+
+    /// <summary>
+    /// Creates the container which will host the MessageBox control.
+    /// </summary>
+    /// <returns></returns>
+    private Window CreateContainer()
+    {
+      var newWindow = new Window();
+      newWindow.AllowsTransparency = true;
+      newWindow.Background = Brushes.Transparent;
+      newWindow.Content = this;
+      newWindow.Owner = _owner ?? ResolveOwnerWindow();
+
+      if( newWindow.Owner != null )
+        newWindow.WindowStartupLocation = System.Windows.WindowStartupLocation.CenterOwner;
+      else
+        newWindow.WindowStartupLocation = System.Windows.WindowStartupLocation.CenterScreen;
+
+      newWindow.ShowInTaskbar = false;
+      newWindow.SizeToContent = System.Windows.SizeToContent.WidthAndHeight;
+      newWindow.ResizeMode = System.Windows.ResizeMode.NoResize;
+      newWindow.WindowStyle = System.Windows.WindowStyle.None;
+      return newWindow;
+    }
+
+    #endregion //Private
+
+    #endregion //Methods
+
+    #region Event Handlers
+
+    /// <summary>
+    /// Processes the move of a drag operation on the header.
+    /// </summary>
+    /// <param name="e">The <see cref="System.Windows.Controls.Primitives.DragDeltaEventArgs"/> instance containing the event data.</param>
+    private void ProcessMove( DragDeltaEventArgs e )
+    {
+      double left = 0.0;
+
+      if( FlowDirection == System.Windows.FlowDirection.RightToLeft )
+        left = Container.Left - e.HorizontalChange;
+      else
+        left = Container.Left + e.HorizontalChange;
+
+      Container.Left = left;
+      Container.Top = Container.Top + e.VerticalChange;
+    }
+
+    /// <summary>
+    /// Sets the MessageBoxResult according to the button pressed and then closes the MessageBox.
+    /// </summary>
+    /// <param name="sender">The source of the event.</param>
+    /// <param name="e">The <see cref="System.Windows.RoutedEventArgs"/> instance containing the event data.</param>
+    private void Button_Click( object sender, RoutedEventArgs e )
+    {
+      Button button = e.OriginalSource as Button;
+
+      if( button == null )
+        return;
+
+      switch( button.Name )
+      {
+        case PART_NoButton:
+          MessageBoxResult = MessageBoxResult.No;
+          break;
+        case PART_YesButton:
+          MessageBoxResult = MessageBoxResult.Yes;
+          break;
+        case PART_CloseButton:
+        case PART_CancelButton:
+          MessageBoxResult = MessageBoxResult.Cancel;
+          break;
+        case PART_OkButton:
+          MessageBoxResult = MessageBoxResult.OK;
+          break;
+      }
+
+      Close();
+    }
+
+    /// <summary>
+    /// Closes the MessageBox.
+    /// </summary>
+    private void Close()
+    {
+      Container.Close();
+    }
+
+    #endregion //Event Handlers
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Implementation/VisualStates.MessageBox.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Implementation/VisualStates.MessageBox.cs
new file mode 100644
index 00000000..f7ff3f15
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Implementation/VisualStates.MessageBox.cs
@@ -0,0 +1,30 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit
+{
+  internal static partial class VisualStates
+  {
+    public const string MessageBoxButtonsGroup = "MessageBoxButtonsGroup";
+    public const string OK = "OK";
+    public const string OKCancel = "OKCancel";
+    public const string YesNo = "YesNo";
+    public const string YesNoCancel = "YesNoCancel";
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Themes/Generic.xaml
new file mode 100644
index 00000000..9f38df83
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Themes/Generic.xaml
@@ -0,0 +1,330 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
+
+   <LinearGradientBrush x:Key="WindowDarkBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="WindowBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="0.479" Color="#FFf4f5f6" />
+            <GradientStop Offset="1" Color="#FFd0d6db" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="WindowButtonHoverBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFb5bdc8" />
+            <GradientStop Offset="0.370" Color="#FF8399a9" />
+            <GradientStop Offset="0.370" Color="#FF718597" />
+            <GradientStop Offset="0.906" Color="#FFb9c1ca" />
+            <GradientStop Offset="1" Color="#FFb9c1ca" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="WindowButtonPressedBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FF6b7c8d" />
+            <GradientStop Offset="0.370" Color="#FF4d606f" />
+            <GradientStop Offset="0.370" Color="#FF465460" />
+            <GradientStop Offset="0.906" Color="#FF262d33" />
+            <GradientStop Offset="1" Color="#FF262d33" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <Style x:Key="WindowCloseButtonStyle" TargetType="Button">
+      <Setter Property="Foreground" Value="#FF000000" />
+      <Setter Property="Padding" Value="3" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="Button">
+               <Grid>
+                  <VisualStateManager.VisualStateGroups>
+                     <VisualStateGroup x:Name="CommonStates">
+                        <VisualState x:Name="Normal" />
+                        <VisualState x:Name="MouseOver">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonHoverBrush}" />
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Pressed">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonPressedBrush}" />
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                     </VisualStateGroup>
+                  </VisualStateManager.VisualStateGroups>
+                  <Border x:Name="Background" CornerRadius="0,0,2,0" Background="{StaticResource WindowDarkBrush}">
+                     <Border Margin="1,0,1,1" BorderBrush="#59FFFFFF" BorderThickness="1" CornerRadius="0,0,1,0" />
+                  </Border>
+                  <ContentPresenter x:Name="contentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
+                  <Path x:Name="path"
+								Height="6"
+								Width="7"
+								Stretch="Fill"
+								Opacity="1"
+								Data="M 2,6 C2,6 3,6 3,6 3,6 3,5 3,5 3,5 4,5 4,5 4,5 4,6 4,6 4,6 5,6 5,6 5,6 7,6 7,6 7,6 7,5 7,5 7,5 6,5 6,5 6,5 6,4 6,4 6,4 5,4 5,4 5,4 5,2 5,2 5,2 6,2 6,2 6,2 6,1 6,1 6,1 7,1 7,1 7,1 7,0 7,0 7,0 5,0 5,0 5,0 4,0 4,0 4,0 4,1 4,1 4,1 3,1 3,1 3,1 3,0 3,0 3,0 2,0 2,0 2,0 0,0 0,0 0,0 0,1 0,1 0,1 1,1 1,1 1,1 1,2 1,2 1,2 2,2 2,2 2,2 2,4 2,4 2,4 1,4 1,4 1,4 1,5 1,5 1,5 0,5 0,5 0,5 0,6 0,6 0,6 2,6 2,6 z"
+								Fill="White"
+                        Margin="0,0,0,1"
+                        Visibility="Collapsed" />
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <!-- =============================================================================== -->
+   <!-- MessageBox                                                                      -->
+   <!-- =============================================================================== -->
+
+   <ControlTemplate x:Key="MessageBoxDragWidgetTemplate" TargetType="{x:Type Thumb}">
+      <Border Background="Transparent" />
+   </ControlTemplate>
+
+   <Style TargetType="{x:Type local:MessageBox}">
+      <Setter Property="Background" Value="#FFFFFFFF" />
+      <Setter Property="BorderBrush" Value="{StaticResource WindowDarkBrush}" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="CaptionForeground" Value="#FF000000" />
+      <Setter Property="CloseButtonStyle" Value="{StaticResource WindowCloseButtonStyle}" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="HorizontalAlignment" Value="Left" />
+      <Setter Property="HorizontalContentAlignment" Value="Left" />
+      <Setter Property="IsEnabled" Value="true" />
+      <Setter Property="MinWidth" Value="350" />
+      <Setter Property="MinHeight" Value="50" />
+      <Setter Property="MaxHeight" Value="250" />
+      <Setter Property="VerticalAlignment" Value="Top" />
+      <Setter Property="VerticalContentAlignment" Value="Top" />
+      <Setter Property="WindowBorderBrush" Value="{StaticResource WindowDarkBrush}" />
+      <Setter Property="WindowBackground" Value="{StaticResource WindowBackgroundBrush}" />
+      <Setter Property="WindowOpacity" Value="1.0" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:MessageBox}">
+               <Grid x:Name="Root">
+                  <VisualStateManager.VisualStateGroups>
+                     <VisualStateGroup x:Name="group1">
+                        <VisualState x:Name="OK">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_OkButton" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="OKCancel">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_OkButton" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_CancelButton" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="YesNo">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_YesButton" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_NoButton" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+
+                        <VisualState x:Name="YesNoCancel">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_YesButton" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_NoButton" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_CancelButton" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                     </VisualStateGroup>
+                  </VisualStateManager.VisualStateGroups>
+
+                  <!-- Borders -->
+                  <Grid  x:Name="MessageBoxWindowGrid">
+                     <Border BorderBrush="{TemplateBinding WindowBorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="5,5,0,0" Opacity="{TemplateBinding WindowOpacity}" />
+                     <Grid Margin="0" Background="{x:Null}">
+                        <Border x:Name="MessageBoxWindow" Margin="1,1,1,1" Background="{TemplateBinding WindowBackground}" CornerRadius="4,4,0,0" Opacity="{TemplateBinding WindowOpacity}" />
+                        <Border BorderBrush="White" BorderThickness="1" CornerRadius="4,4,0,0" Margin="1" Opacity="0.7" />
+                     </Grid>
+                  </Grid>
+
+                  <Grid>
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" MinHeight="26" />
+                        <RowDefinition />
+                     </Grid.RowDefinitions>
+
+                     <!-- Content Border -->
+                     <Grid Margin="6,0,6,6" x:Name="ContentGrid" Grid.Row="1">
+                        <Grid.RowDefinitions>
+                           <RowDefinition />
+                           <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <Border BorderBrush="#FFFFFFFF" BorderThickness="1" CornerRadius="1" />
+                        <Border Margin="1"  BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="0.1" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}">
+
+                           <Grid MinWidth="350">
+                              <Grid.RowDefinitions>
+                                 <RowDefinition />
+                                 <RowDefinition Height="Auto" />
+                              </Grid.RowDefinitions>
+
+                              <Grid Margin="24,16,24,22">
+                                 <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="*" />
+                                 </Grid.ColumnDefinitions>
+
+                                 <!-- Message Image -->
+                                 <Image x:Name="MessageBoxImage" VerticalAlignment="Top" SnapsToDevicePixels="True" Stretch="None"  Margin="-6,-1,10,-4" Source="{TemplateBinding ImageSource}" />
+
+                                 <!-- Message Text -->
+                                 <ScrollViewer Grid.Column="1" VerticalScrollBarVisibility="Auto">
+                                    <TextBlock x:Name="MessageText"
+                                               TextWrapping="Wrap"
+                                               VerticalAlignment="Center"
+                                               MaxWidth="450"
+                                               Text="{TemplateBinding Text}" 
+                                               FontFamily="{TemplateBinding FontFamily}"
+                                               FontSize="{TemplateBinding FontSize}"
+                                               FontStyle="{TemplateBinding FontStyle}"
+                                               FontWeight="{TemplateBinding FontWeight}"
+                                               Foreground="{TemplateBinding Foreground}" />
+                                 </ScrollViewer>
+
+                              </Grid>
+
+                              <!-- Buttons -->
+                              <Grid Grid.Row="1" HorizontalAlignment="Right" Margin="12,0,12,12">
+                                 <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
+                                 </Grid.ColumnDefinitions>
+                                 <Button Grid.Column="0" x:Name="PART_YesButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding YesButtonContent}" />
+                                 <Button Grid.Column="1" x:Name="PART_NoButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding NoButtonContent}" />
+                                 <Button Grid.Column="2" x:Name="PART_OkButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding OkButtonContent}" />
+                                 <Button Grid.Column="3" x:Name="PART_CancelButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding CancelButtonContent}" IsCancel="True" />
+                              </Grid>
+                           </Grid>
+                        </Border>
+                     </Grid>
+
+                     <!-- Header -->
+                     <Border x:Name="HeaderArea" Background="Transparent" Grid.Column="1" CornerRadius="5,5,0,0" Margin="1,1,1,0">
+                        <Grid>
+                           <Grid x:Name="CaptionHeader"  Margin="1,1,105,0" VerticalAlignment="Center">
+                              <!-- Caption -->
+                              <ContentControl x:Name="Caption"
+                                              Margin="5,0,0,0"
+                                              IsTabStop="False"
+                                              HorizontalAlignment="Stretch"
+                                              Content="{TemplateBinding Caption}"
+                                              Foreground="{TemplateBinding CaptionForeground}" />
+                           </Grid>
+                           <Thumb x:Name="PART_DragWidget" Template="{StaticResource MessageBoxDragWidgetTemplate}" IsTabStop="False" />
+                        </Grid>
+                     </Border>
+
+                  </Grid>
+
+                  <Border x:Name="Resize" BorderThickness="7" BorderBrush="Transparent" />
+
+                  <!-- Close Button -->
+                  <Border BorderBrush="#A5FFFFFF" BorderThickness="1,0,1,1" CornerRadius="0,0,3,3" VerticalAlignment="Top" Margin="0,1,7,0" HorizontalAlignment="Right">
+                     <Button x:Name="PART_CloseButton" Style="{TemplateBinding CloseButtonStyle}" Height="17" Width="43" IsTabStop="False" IsCancel="True">
+                        <Path Height="10"
+                              HorizontalAlignment="Center"
+                              VerticalAlignment="Center"
+                              Width="12"
+                              Fill="#E4FFFFFF"
+                              Stretch="Fill"
+                              Stroke="#FF535666" 
+                              Data="M0.5,0.5 L4.5178828,0.5 L6.0620003,3.125 L7.4936447,0.5 L11.5,0.5 L11.5,1.5476431 L8.7425003,6.1201854 L11.5,10.359666 L11.5,11.5 L7.4941902,11.5 L6.0620003,8.8740005 L4.5172949,11.5 L0.5,11.5 L0.5,10.43379 L3.3059995,6.1201582 L0.5,1.4676378 L0.5,0.5 z" />
+                     </Button>
+                  </Border>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MultiLineTextEditor/Images/Notes16.png b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MultiLineTextEditor/Images/Notes16.png
new file mode 100644
index 00000000..ebfaee36
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MultiLineTextEditor/Images/Notes16.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs
new file mode 100644
index 00000000..3e99f507
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs
@@ -0,0 +1,245 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Input;
+
+namespace Xceed.Wpf.Toolkit
+{
+  [TemplatePart( Name = PART_ResizeThumb, Type = typeof( Thumb ) )]
+  public class MultiLineTextEditor : ContentControl
+  {
+    private const string PART_ResizeThumb = "PART_ResizeThumb";
+
+    #region Members
+
+    Thumb _resizeThumb;
+
+    #endregion //Members
+
+    #region Properties
+
+    public static readonly DependencyProperty DropDownHeightProperty = DependencyProperty.Register( "DropDownHeight", typeof( double ), typeof( MultiLineTextEditor ), new UIPropertyMetadata( 150.0 ) );
+    public double DropDownHeight
+    {
+      get
+      {
+        return ( double )GetValue( DropDownHeightProperty );
+      }
+      set
+      {
+        SetValue( DropDownHeightProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty DropDownWidthProperty = DependencyProperty.Register( "DropDownWidth", typeof( double ), typeof( MultiLineTextEditor ), new UIPropertyMetadata( 200.0 ) );
+    public double DropDownWidth
+    {
+      get
+      {
+        return ( double )GetValue( DropDownWidthProperty );
+      }
+      set
+      {
+        SetValue( DropDownWidthProperty, value );
+      }
+    }
+
+    #region IsOpen
+
+    public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register( "IsOpen", typeof( bool ), typeof( MultiLineTextEditor ), new UIPropertyMetadata( false, OnIsOpenChanged ) );
+    public bool IsOpen
+    {
+      get
+      {
+        return ( bool )GetValue( IsOpenProperty );
+      }
+      set
+      {
+        SetValue( IsOpenProperty, value );
+      }
+    }
+
+    private static void OnIsOpenChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      MultiLineTextEditor multiLineTextEditor = o as MultiLineTextEditor;
+      if( multiLineTextEditor != null )
+        multiLineTextEditor.OnIsOpenChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnIsOpenChanged( bool oldValue, bool newValue )
+    {
+
+    }
+
+    #endregion //IsOpen
+
+    public static readonly DependencyProperty IsSpellCheckEnabledProperty = DependencyProperty.Register( "IsSpellCheckEnabled", typeof( bool ), typeof( MultiLineTextEditor ), new UIPropertyMetadata( false ) );
+    public bool IsSpellCheckEnabled
+    {
+      get
+      {
+        return ( bool )GetValue( IsSpellCheckEnabledProperty );
+      }
+      set
+      {
+        SetValue( IsSpellCheckEnabledProperty, value );
+      }
+    }
+
+
+    #region Text
+
+    public static readonly DependencyProperty TextProperty = DependencyProperty.Register( "Text", typeof( string ), typeof( MultiLineTextEditor ), new FrameworkPropertyMetadata( String.Empty, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnTextChanged ) );
+    public string Text
+    {
+      get
+      {
+        return ( string )GetValue( TextProperty );
+      }
+      set
+      {
+        SetValue( TextProperty, value );
+      }
+    }
+
+    private static void OnTextChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      MultiLineTextEditor textEditor = o as MultiLineTextEditor;
+      if( textEditor != null )
+        textEditor.OnTextChanged( ( string )e.OldValue, ( string )e.NewValue );
+    }
+
+    protected virtual void OnTextChanged( string oldValue, string newValue )
+    {
+
+    }
+
+    #endregion //Text
+
+    public static readonly DependencyProperty TextAlignmentProperty = DependencyProperty.Register( "TextAlignment", typeof( TextAlignment ), typeof( MultiLineTextEditor ), new UIPropertyMetadata( TextAlignment.Left ) );
+    public TextAlignment TextAlignment
+    {
+      get
+      {
+        return ( TextAlignment )GetValue( TextAlignmentProperty );
+      }
+      set
+      {
+        SetValue( TextAlignmentProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty TextWrappingProperty = DependencyProperty.Register( "TextWrapping", typeof( TextWrapping ), typeof( MultiLineTextEditor ), new UIPropertyMetadata( TextWrapping.NoWrap ) );
+    public TextWrapping TextWrapping
+    {
+      get
+      {
+        return ( TextWrapping )GetValue( TextWrappingProperty );
+      }
+      set
+      {
+        SetValue( TextWrappingProperty, value );
+      }
+    }
+
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static MultiLineTextEditor()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( MultiLineTextEditor ), new FrameworkPropertyMetadata( typeof( MultiLineTextEditor ) ) );
+    }
+
+    public MultiLineTextEditor()
+    {
+      Keyboard.AddKeyDownHandler( this, OnKeyDown );
+      Mouse.AddPreviewMouseDownOutsideCapturedElementHandler( this, OnMouseDownOutsideCapturedElement );
+    }
+
+    #endregion //Constructors
+
+    #region Bass Class Overrides
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+
+      if( _resizeThumb != null )
+        _resizeThumb.DragDelta -= ResizeThumb_DragDelta;
+
+      _resizeThumb = GetTemplateChild( PART_ResizeThumb ) as Thumb;
+
+      if( _resizeThumb != null )
+        _resizeThumb.DragDelta += ResizeThumb_DragDelta;
+    }
+
+    #endregion //Bass Class Overrides
+
+    #region Event Handlers
+
+    private void OnKeyDown( object sender, KeyEventArgs e )
+    {
+      switch( e.Key )
+      {
+        case Key.Escape:
+        case Key.Tab:
+          {
+            CloseEditor();
+            break;
+          }
+      }
+    }
+
+    private void OnMouseDownOutsideCapturedElement( object sender, MouseButtonEventArgs e )
+    {
+      CloseEditor();
+    }
+
+    void ResizeThumb_DragDelta( object sender, DragDeltaEventArgs e )
+    {
+      double yadjust = DropDownHeight + e.VerticalChange;
+      double xadjust = DropDownWidth + e.HorizontalChange;
+
+      if( ( xadjust >= 0 ) && ( yadjust >= 0 ) )
+      {
+        DropDownWidth = xadjust;
+        DropDownHeight = yadjust;
+      }
+    }
+
+    #endregion //Event Handlers
+
+    #region Methods
+
+    private void CloseEditor()
+    {
+      if( IsOpen )
+        IsOpen = false;
+      ReleaseMouseCapture();
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MultiLineTextEditor/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MultiLineTextEditor/Themes/Generic.xaml
new file mode 100644
index 00000000..65d80b8d
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MultiLineTextEditor/Themes/Generic.xaml
@@ -0,0 +1,169 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
+
+   <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+
+   <Image x:Key="DefaultContent" x:Shared="False" Height="16" Width="18" Source="/WPFToolkit.Extended;component/MultiLineTextEditor/Images/Notes16.png" />
+
+   <LinearGradientBrush x:Key="PopupDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="1" Color="#FFE8EBED" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <Style x:Key="ToggleButtonStyle" TargetType="ToggleButton">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="ToggleButton">
+               <Grid SnapsToDevicePixels="True">
+
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                     </Grid.ColumnDefinitions>
+
+                     <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
+                        <ContentPresenter Content="{TemplateBinding Content}"
+                                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                                          ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                     </Border>
+
+                     <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                          Grid.Column="1"
+                                          CornerRadius="0,2.75,2.75,0"
+                                          RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:MultiLineTextEditor}}"
+                                          RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:MultiLineTextEditor}}"
+											         RenderMouseOver="{TemplateBinding IsMouseOver}"
+											         RenderPressed="{TemplateBinding IsPressed}">
+                        <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
+                           <Path x:Name="Arrow"  Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000" />
+                        </Grid>
+                     </chrome:ButtonChrome>
+                  </Grid>
+
+               </Grid>
+                <ControlTemplate.Triggers>
+                    <Trigger Property="IsEnabled" Value="False">
+                        <Setter Property="Fill" TargetName="Arrow" Value="#AFAFAF" />
+                        <Setter Property="Foreground" Value="Gray" />
+                    </Trigger>
+                </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style TargetType="{x:Type local:MultiLineTextEditor}">
+      <Setter Property="Background" Value="White"/>
+      <Setter Property="BorderBrush">
+         <Setter.Value>
+            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+               <GradientStop Color="#FFA3AEB9" Offset="0" />
+               <GradientStop Color="#FF8399A9" Offset="0.375" />
+               <GradientStop Color="#FF718597" Offset="0.375" />
+               <GradientStop Color="#FF617584" Offset="1" />
+            </LinearGradientBrush>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="BorderThickness" Value="1,1,0,1" />
+      <Setter Property="Content" Value="{StaticResource DefaultContent}" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Padding" Value="2,0,0,0" />
+      <Setter Property="HorizontalContentAlignment" Value="Center" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:MultiLineTextEditor}">
+               <Grid x:Name="Root">
+                  <ToggleButton x:Name="PART_DropDownButton"
+                                Grid.Column="1"
+                                IsTabStop="True"
+                                MinHeight="22"
+                                SnapsToDevicePixels="True"
+                                Background="{TemplateBinding Background}" 
+                                BorderBrush="{TemplateBinding BorderBrush}" 
+                                BorderThickness="{TemplateBinding BorderThickness}" 
+                                Padding="{TemplateBinding Padding}"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                                Style="{StaticResource ToggleButtonStyle}"
+                                IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                  <Popup IsOpen="{Binding IsChecked, ElementName=PART_DropDownButton}"
+                         StaysOpen="False"
+                         Placement="Bottom"
+                         SnapsToDevicePixels="True"
+                         AllowsTransparency="True"
+                         Focusable="False"
+                         PopupAnimation="Slide"
+                         Width="{TemplateBinding DropDownWidth}"
+                         Height="{TemplateBinding DropDownHeight}">
+                     <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}">
+                        <Grid>
+                           <TextBox x:Name="PART_TextBox"
+                                    AcceptsReturn="true"
+                                    TextWrapping="{TemplateBinding TextWrapping}"
+                                    Padding="{TemplateBinding Padding}"
+                                    VerticalScrollBarVisibility="Auto"
+                                    HorizontalScrollBarVisibility="Auto"
+                                    SpellCheck.IsEnabled="{TemplateBinding IsSpellCheckEnabled}"
+                                    Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
+                                    TextAlignment="{TemplateBinding TextAlignment}"
+                                    Margin="3" />
+                           <Thumb x:Name="PART_ResizeThumb" HorizontalAlignment="Right" VerticalAlignment="Bottom" Cursor="SizeNWSE">
+                              <Thumb.Template>
+                                 <ControlTemplate TargetType="{x:Type Thumb}">
+                                    <Grid Background="Transparent">
+                                       <Path Data="M0.5,6.5 L6.5,0.5 M6.5,3.5 L3.5,6.5" Stroke="Black" StrokeThickness="1" />
+                                    </Grid>
+                                 </ControlTemplate>
+                              </Thumb.Template>
+                           </Thumb>
+                        </Grid>
+                     </Border>
+                  </Popup>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/DecimalUpDown.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/DecimalUpDown.cs
new file mode 100644
index 00000000..75f7317f
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/DecimalUpDown.cs
@@ -0,0 +1,121 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class DecimalUpDown : NumericUpDown<decimal?>
+  {
+    #region Constructors
+
+    static DecimalUpDown()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( DecimalUpDown ), new FrameworkPropertyMetadata( typeof( DecimalUpDown ) ) );
+      DefaultValueProperty.OverrideMetadata( typeof( DecimalUpDown ), new FrameworkPropertyMetadata( default( decimal ) ) );
+      IncrementProperty.OverrideMetadata( typeof( DecimalUpDown ), new FrameworkPropertyMetadata( 1m ) );
+      MaximumProperty.OverrideMetadata( typeof( DecimalUpDown ), new FrameworkPropertyMetadata( decimal.MaxValue ) );
+      MinimumProperty.OverrideMetadata( typeof( DecimalUpDown ), new FrameworkPropertyMetadata( decimal.MinValue ) );
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    protected override decimal? CoerceValue( decimal? value )
+    {
+      if( value < Minimum )
+        return Minimum;
+      else if( value > Maximum )
+        return Maximum;
+      else
+        return value;
+    }
+
+    protected override void OnIncrement()
+    {
+      if( Value.HasValue )
+        Value += Increment;
+      else
+        Value = DefaultValue;
+    }
+
+    protected override void OnDecrement()
+    {
+      if( Value.HasValue )
+        Value -= Increment;
+      else
+        Value = DefaultValue;
+    }
+
+    protected override decimal? ConvertTextToValue( string text )
+    {
+      decimal? result = null;
+
+      if( String.IsNullOrEmpty( text ) )
+        return result;
+
+      try
+      {
+        result = FormatString.Contains( "P" ) ? ParsePercent( text, CultureInfo ) : ParseDecimal( text, CultureInfo );
+        result = CoerceValue( result );
+      }
+      catch
+      {
+        Text = ConvertValueToText();
+        return Value;
+      }
+
+      return result;
+    }
+
+    protected override string ConvertValueToText()
+    {
+      if( Value == null )
+        return string.Empty;
+
+      return Value.Value.ToString( FormatString, CultureInfo );
+    }
+
+    protected override void SetValidSpinDirection()
+    {
+      ValidSpinDirections validDirections = ValidSpinDirections.None;
+
+      if( Value < Maximum || !Value.HasValue )
+        validDirections = validDirections | ValidSpinDirections.Increase;
+
+      if( Value > Minimum || !Value.HasValue )
+        validDirections = validDirections | ValidSpinDirections.Decrease;
+
+      if( Spinner != null )
+        Spinner.ValidSpinDirection = validDirections;
+    }
+
+    protected override void ValidateValue( decimal? value )
+    {
+      if( value < Minimum )
+        Value = Minimum;
+      else if( value > Maximum )
+        Value = Maximum;
+    }
+
+    #endregion //Base Class Overrides
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/DoubleUpDown.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/DoubleUpDown.cs
new file mode 100644
index 00000000..228ed2e6
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/DoubleUpDown.cs
@@ -0,0 +1,121 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class DoubleUpDown : NumericUpDown<double?>
+  {
+    #region Constructors
+
+    static DoubleUpDown()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( DoubleUpDown ), new FrameworkPropertyMetadata( typeof( DoubleUpDown ) ) );
+      DefaultValueProperty.OverrideMetadata( typeof( DoubleUpDown ), new FrameworkPropertyMetadata( default( double ) ) );
+      IncrementProperty.OverrideMetadata( typeof( DoubleUpDown ), new FrameworkPropertyMetadata( 1d ) );
+      MaximumProperty.OverrideMetadata( typeof( DoubleUpDown ), new FrameworkPropertyMetadata( double.MaxValue ) );
+      MinimumProperty.OverrideMetadata( typeof( DoubleUpDown ), new FrameworkPropertyMetadata( double.MinValue ) );
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    protected override double? CoerceValue( double? value )
+    {
+      if( value < Minimum )
+        return Minimum;
+      else if( value > Maximum )
+        return Maximum;
+      else
+        return value;
+    }
+
+    protected override void OnIncrement()
+    {
+      if( Value.HasValue )
+        Value += Increment;
+      else
+        Value = DefaultValue;
+    }
+
+    protected override void OnDecrement()
+    {
+      if( Value.HasValue )
+        Value -= Increment;
+      else
+        Value = DefaultValue;
+    }
+
+    protected override double? ConvertTextToValue( string text )
+    {
+      double? result = null;
+
+      if( String.IsNullOrEmpty( text ) )
+        return result;
+
+      try
+      {
+        result = FormatString.Contains( "P" ) ? Decimal.ToDouble( ParsePercent( text, CultureInfo ) ) : ParseDouble( text, CultureInfo );
+        result = CoerceValue( result );
+      }
+      catch
+      {
+        Text = ConvertValueToText();
+        return Value;
+      }
+
+      return result;
+    }
+
+    protected override string ConvertValueToText()
+    {
+      if( Value == null )
+        return string.Empty;
+
+      return Value.Value.ToString( FormatString, CultureInfo );
+    }
+
+    protected override void SetValidSpinDirection()
+    {
+      ValidSpinDirections validDirections = ValidSpinDirections.None;
+
+      if( Value < Maximum || !Value.HasValue )
+        validDirections = validDirections | ValidSpinDirections.Increase;
+
+      if( Value > Minimum || !Value.HasValue )
+        validDirections = validDirections | ValidSpinDirections.Decrease;
+
+      if( Spinner != null )
+        Spinner.ValidSpinDirection = validDirections;
+    }
+
+    protected override void ValidateValue( double? value )
+    {
+      if( value < Minimum )
+        Value = Minimum;
+      else if( value > Maximum )
+        Value = Maximum;
+    }
+
+    #endregion //Base Class Overrides
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/IntegerUpDown.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/IntegerUpDown.cs
new file mode 100644
index 00000000..cc14d3fb
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/IntegerUpDown.cs
@@ -0,0 +1,122 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class IntegerUpDown : NumericUpDown<int?>
+  {
+    #region Constructors
+
+    static IntegerUpDown()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( IntegerUpDown ), new FrameworkPropertyMetadata( typeof( IntegerUpDown ) ) );
+      DefaultValueProperty.OverrideMetadata( typeof( IntegerUpDown ), new FrameworkPropertyMetadata( 0 ) );
+      IncrementProperty.OverrideMetadata( typeof( IntegerUpDown ), new FrameworkPropertyMetadata( 1 ) );
+      MaximumProperty.OverrideMetadata( typeof( IntegerUpDown ), new FrameworkPropertyMetadata( int.MaxValue ) );
+      MinimumProperty.OverrideMetadata( typeof( IntegerUpDown ), new FrameworkPropertyMetadata( int.MinValue ) );
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    protected override int? CoerceValue( int? value )
+    {
+      if( value < Minimum )
+        return Minimum;
+      else if( value > Maximum )
+        return Maximum;
+      else
+        return value;
+    }
+
+    protected override void OnIncrement()
+    {
+      if( Value.HasValue )
+        Value += Increment;
+      else
+        Value = DefaultValue;
+    }
+
+    protected override void OnDecrement()
+    {
+      if( Value.HasValue )
+        Value -= Increment;
+      else
+        Value = DefaultValue;
+    }
+
+    protected override int? ConvertTextToValue( string text )
+    {
+      int? result = null;
+
+      if( String.IsNullOrEmpty( text ) )
+        return result;
+
+      try
+      {
+        //don't know why someone would format an integer as %, but just in case they do.
+        result = FormatString.Contains( "P" ) ? Decimal.ToInt32( ParsePercent( text, CultureInfo ) ) : ParseInt( text, CultureInfo );
+        result = CoerceValue( result );
+      }
+      catch
+      {
+        Text = ConvertValueToText();
+        return Value;
+      }
+
+      return result;
+    }
+
+    protected override string ConvertValueToText()
+    {
+      if( Value == null )
+        return string.Empty;
+
+      return Value.Value.ToString( FormatString, CultureInfo );
+    }
+
+    protected override void SetValidSpinDirection()
+    {
+      ValidSpinDirections validDirections = ValidSpinDirections.None;
+
+      if( Value < Maximum || !Value.HasValue )
+        validDirections = validDirections | ValidSpinDirections.Increase;
+
+      if( Value > Minimum || !Value.HasValue )
+        validDirections = validDirections | ValidSpinDirections.Decrease;
+
+      if( Spinner != null )
+        Spinner.ValidSpinDirection = validDirections;
+    }
+
+    protected override void ValidateValue( int? value )
+    {
+      if( value < Minimum )
+        Value = Minimum;
+      else if( value > Maximum )
+        Value = Maximum;
+    }
+
+    #endregion //Base Class Overrides
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/NumericUpDown.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/NumericUpDown.cs
new file mode 100644
index 00000000..7a1d2506
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/NumericUpDown.cs
@@ -0,0 +1,203 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Globalization;
+using System.Windows;
+using Xceed.Wpf.Toolkit.Primitives;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public abstract class NumericUpDown<T> : UpDownBase<T>
+  {
+    #region Properties
+
+    #region DefaultValue
+
+    public static readonly DependencyProperty DefaultValueProperty = DependencyProperty.Register( "DefaultValue", typeof( T ), typeof( NumericUpDown<T> ), new UIPropertyMetadata( default( T ) ) );
+    public T DefaultValue
+    {
+      get
+      {
+        return ( T )GetValue( DefaultValueProperty );
+      }
+      set
+      {
+        SetValue( DefaultValueProperty, value );
+      }
+    }
+
+    #endregion //DefaultValue
+
+    #region FormatString
+
+    public static readonly DependencyProperty FormatStringProperty = DependencyProperty.Register( "FormatString", typeof( string ), typeof( NumericUpDown<T> ), new UIPropertyMetadata( String.Empty, OnFormatStringChanged ) );
+    public string FormatString
+    {
+      get
+      {
+        return ( string )GetValue( FormatStringProperty );
+      }
+      set
+      {
+        SetValue( FormatStringProperty, value );
+      }
+    }
+
+    private static void OnFormatStringChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      NumericUpDown<T> numericUpDown = o as NumericUpDown<T>;
+      if( numericUpDown != null )
+        numericUpDown.OnFormatStringChanged( ( string )e.OldValue, ( string )e.NewValue );
+    }
+
+    protected virtual void OnFormatStringChanged( string oldValue, string newValue )
+    {
+      if( IsInitialized )
+        Text = ConvertValueToText();
+    }
+
+    #endregion //FormatString
+
+    #region Increment
+
+    public static readonly DependencyProperty IncrementProperty = DependencyProperty.Register( "Increment", typeof( T ), typeof( NumericUpDown<T> ), new PropertyMetadata( default( T ) ) );
+    public T Increment
+    {
+      get
+      {
+        return ( T )GetValue( IncrementProperty );
+      }
+      set
+      {
+        SetValue( IncrementProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region Maximum
+
+    public static readonly DependencyProperty MaximumProperty = DependencyProperty.Register( "Maximum", typeof( T ), typeof( NumericUpDown<T> ), new UIPropertyMetadata( default( T ), OnMaximumChanged ) );
+    public T Maximum
+    {
+      get
+      {
+        return ( T )GetValue( MaximumProperty );
+      }
+      set
+      {
+        SetValue( MaximumProperty, value );
+      }
+    }
+
+    private static void OnMaximumChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      NumericUpDown<T> numericUpDown = o as NumericUpDown<T>;
+      if( numericUpDown != null )
+        numericUpDown.OnMaximumChanged( ( T )e.OldValue, ( T )e.NewValue );
+    }
+
+    protected virtual void OnMaximumChanged( T oldValue, T newValue )
+    {
+      SetValidSpinDirection();
+    }
+
+    #endregion //Maximum
+
+    #region Minimum
+
+    public static readonly DependencyProperty MinimumProperty = DependencyProperty.Register( "Minimum", typeof( T ), typeof( NumericUpDown<T> ), new UIPropertyMetadata( default( T ), OnMinimumChanged ) );
+    public T Minimum
+    {
+      get
+      {
+        return ( T )GetValue( MinimumProperty );
+      }
+      set
+      {
+        SetValue( MinimumProperty, value );
+      }
+    }
+
+    private static void OnMinimumChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      NumericUpDown<T> numericUpDown = o as NumericUpDown<T>;
+      if( numericUpDown != null )
+        numericUpDown.OnMinimumChanged( ( T )e.OldValue, ( T )e.NewValue );
+    }
+
+    protected virtual void OnMinimumChanged( T oldValue, T newValue )
+    {
+      SetValidSpinDirection();
+    }
+
+    #endregion //Minimum
+
+    #region SelectAllOnGotFocus
+
+    public static readonly DependencyProperty SelectAllOnGotFocusProperty = DependencyProperty.Register( "SelectAllOnGotFocus", typeof( bool ), typeof( NumericUpDown<T> ), new PropertyMetadata( false ) );
+    public bool SelectAllOnGotFocus
+    {
+      get
+      {
+        return ( bool )GetValue( SelectAllOnGotFocusProperty );
+      }
+      set
+      {
+        SetValue( SelectAllOnGotFocusProperty, value );
+      }
+    }
+
+    #endregion //SelectAllOnGotFocus
+
+    #endregion //Properties
+
+    #region Methods
+
+    protected static decimal ParseDecimal( string text, IFormatProvider cultureInfo )
+    {
+      return Decimal.Parse( text, NumberStyles.Any, cultureInfo );
+    }
+
+    protected static double ParseDouble( string text, IFormatProvider cultureInfo )
+    {
+      return Double.Parse( text, NumberStyles.Any, cultureInfo );
+    }
+
+    protected static int ParseInt( string text, IFormatProvider cultureInfo )
+    {
+      return Int32.Parse( text, NumberStyles.Any, cultureInfo );
+    }
+
+    protected static decimal ParsePercent( string text, IFormatProvider cultureInfo )
+    {
+      NumberFormatInfo info = NumberFormatInfo.GetInstance( cultureInfo );
+
+      text = text.Replace( info.PercentSymbol, null );
+
+      decimal result = Decimal.Parse( text, NumberStyles.Any, info );
+      result = result / 100;
+
+      return result;
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Themes/Generic.xaml
new file mode 100644
index 00000000..a267d4a7
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Themes/Generic.xaml
@@ -0,0 +1,108 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
+
+   <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+
+   <DataTemplate x:Key="DefaultWatermarkTemplate">
+      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
+   </DataTemplate>
+
+   <Style x:Key="NumericUpDown" TargetType="Control">
+      <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+      <Setter Property="HorizontalContentAlignment" Value="Right" />
+      <Setter Property="IsTabStop" Value="False" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="Control">
+               <local:ButtonSpinner x:Name="PART_Spinner"
+                                    IsTabStop="False"
+                                    Background="{TemplateBinding Background}"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                    AllowSpin="{Binding AllowSpin, RelativeSource={RelativeSource TemplatedParent}}"
+                                    ShowButtonSpinner="{Binding ShowButtonSpinner, RelativeSource={RelativeSource TemplatedParent}}">
+                  <local:WatermarkTextBox x:Name="PART_TextBox"
+                                          BorderThickness="0"
+                                          Background="{TemplateBinding Background}"
+                                          ContextMenu="{TemplateBinding ContextMenu}"
+                                          FontFamily="{TemplateBinding FontFamily}" 
+                                          FontSize="{TemplateBinding FontSize}" 
+                                          FontStretch="{TemplateBinding FontStretch}"
+                                          FontStyle="{TemplateBinding FontStyle}" 
+                                          FontWeight="{TemplateBinding FontWeight}" 
+                                          Foreground="{TemplateBinding Foreground}" 
+                                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
+                                          MinWidth="20"
+                                          AcceptsReturn="False"
+                                          Padding="0"
+                                          SelectAllOnGotFocus="{Binding SelectAllOnGotFocus, RelativeSource={RelativeSource TemplatedParent}}"
+                                          TextAlignment="{Binding TextAlignment, RelativeSource={RelativeSource TemplatedParent}}"
+                                          TextWrapping="NoWrap" 
+                                          TabIndex="{TemplateBinding TabIndex}"
+                                          Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}, UpdateSourceTrigger=PropertyChanged}"
+                                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          Watermark="{Binding Watermark, RelativeSource={RelativeSource TemplatedParent}}"
+                                          WatermarkTemplate="{Binding WatermarkTemplate, RelativeSource={RelativeSource TemplatedParent}}" />
+               </local:ButtonSpinner>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsEnabled" Value="False">
+                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <!-- =============================================================================== -->
+   <!-- DecimalUpDown                                                                   -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type local:DecimalUpDown}" BasedOn="{StaticResource NumericUpDown}">
+      <Setter Property="TextAlignment" Value="Right" />
+      <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+   </Style>
+
+   <!-- =============================================================================== -->
+   <!-- DoubleUpDown                                                                    -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type local:DoubleUpDown}" BasedOn="{StaticResource NumericUpDown}">
+      <Setter Property="TextAlignment" Value="Right" />
+      <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+   </Style>
+
+   <!-- =============================================================================== -->
+   <!-- IntegerUpDown                                                                   -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type local:IntegerUpDown}" BasedOn="{StaticResource NumericUpDown}">
+      <Setter Property="TextAlignment" Value="Right" />
+      <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Pie/Implementation/Pie.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Pie/Implementation/Pie.cs
new file mode 100644
index 00000000..7325395f
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Pie/Implementation/Pie.cs
@@ -0,0 +1,630 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections.Specialized;
+using System.Windows;
+using System.Windows.Media;
+using Xceed.Wpf.Toolkit.Primitives;
+using Xceed.Wpf.Toolkit.Core;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public sealed class Pie : ShapeBase
+  {
+    #region Constructors
+
+    static Pie()
+    {
+      // The default stretch mode of Pie is Fill
+      Pie.StretchProperty.OverrideMetadata( typeof( Pie ), new FrameworkPropertyMetadata( Stretch.Fill ) );
+      Pie.StrokeLineJoinProperty.OverrideMetadata( typeof( Pie ), new FrameworkPropertyMetadata( PenLineJoin.Round ) );
+    }
+
+    public Pie()
+      : base()
+    {
+    }
+
+    #endregion
+
+    #region EndAngle Property
+
+    public static readonly DependencyProperty EndAngleProperty =
+      DependencyProperty.Register( "EndAngle", typeof( double ), typeof( Pie ),
+        new FrameworkPropertyMetadata( 360d, FrameworkPropertyMetadataOptions.AffectsRender | FrameworkPropertyMetadataOptions.BindsTwoWayByDefault,
+          new PropertyChangedCallback( Pie.OnEndAngleChanged ), new CoerceValueCallback( Pie.CoerceEndAngleValue ) ) );
+
+    public double EndAngle
+    {
+      get
+      {
+        return ( double )this.GetValue( Pie.EndAngleProperty );
+      }
+      set
+      {
+        this.SetValue( Pie.EndAngleProperty, value );
+      }
+    }
+
+    private static void OnEndAngleChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( Pie )d ).OnEndAngleChanged( e );
+    }
+
+    private void OnEndAngleChanged( DependencyPropertyChangedEventArgs e )
+    {
+      // avoid re-entrancy
+      if( this.IsUpdatingEndAngle )
+        return;
+
+      if( !( this.IsUpdatingStartAngle || this.IsUpdatingSlice || this.IsUpdatingSweepDirection ) )
+      {
+        switch( this.Mode )
+        {
+          case PieMode.Slice:
+            throw new InvalidOperationException( ErrorMessages.GetMessage( "EndAngleCannotBeSetDirectlyInSlice" ) );
+        }
+      }
+
+      // EndAngle, Slice, and SweepDirection are interrelated and must be kept in sync
+      this.IsUpdatingEndAngle = true;
+      try
+      {
+        if( this.Mode == PieMode.EndAngle )
+        {
+          this.CoerceValue( Pie.SweepDirectionProperty );
+        }
+        this.CoerceValue( Pie.SliceProperty );
+      }
+      finally
+      {
+        this.IsUpdatingEndAngle = false;
+      }
+    }
+
+    private static object CoerceEndAngleValue( DependencyObject d, object value )
+    {
+      // keep EndAngle in sync with Slice and SweepDirection
+      Pie pie = ( Pie )d;
+      if( pie.IsUpdatingSlice || pie.IsUpdatingSweepDirection
+          || ( pie.IsUpdatingStartAngle && pie.Mode == PieMode.Slice ) )
+      {
+        double newValue = pie.StartAngle + ( ( pie.SweepDirection == SweepDirection.Clockwise ) ? 1.0 : -1.0 ) * pie.Slice * 360;
+        if( !DoubleHelper.AreVirtuallyEqual( ( double )value, newValue ) )
+        {
+          value = newValue;
+        }
+      }
+      return value;
+    }
+
+    #endregion
+
+    #region Mode Property
+
+    public static readonly DependencyProperty ModeProperty =
+      DependencyProperty.Register( "Mode", typeof( PieMode ), typeof( Pie ),
+        new FrameworkPropertyMetadata( PieMode.Manual, new PropertyChangedCallback( Pie.OnModeChanged ) ) );
+
+    public PieMode Mode
+    {
+      get
+      {
+        return ( PieMode )this.GetValue( Pie.ModeProperty );
+      }
+      set
+      {
+        this.SetValue( Pie.ModeProperty, value );
+      }
+    }
+
+    private static void OnModeChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( Pie )d ).OnModeChanged( e );
+    }
+
+    private void OnModeChanged( DependencyPropertyChangedEventArgs e )
+    {
+      // disallow reentrancy
+      if( this.IsUpdatingMode )
+        return;
+
+      this.IsUpdatingMode = true;
+      try
+      {
+        if( this.Mode == PieMode.EndAngle )
+        {
+          this.CoerceValue( Pie.SweepDirectionProperty );
+        }
+      }
+      finally
+      {
+        this.IsUpdatingMode = false;
+      }
+    }
+
+    #endregion
+
+    #region Slice Property
+
+    public static readonly DependencyProperty SliceProperty =
+      DependencyProperty.Register( "Slice", typeof( double ), typeof( Pie ),
+        new FrameworkPropertyMetadata( 1d, FrameworkPropertyMetadataOptions.AffectsRender | FrameworkPropertyMetadataOptions.BindsTwoWayByDefault,
+          new PropertyChangedCallback( Pie.OnSliceChanged ), new CoerceValueCallback( Pie.CoerceSliceValue ) ), new ValidateValueCallback( Pie.ValidateSlice ) );
+
+    public double Slice
+    {
+      get
+      {
+        return ( double )this.GetValue( Pie.SliceProperty );
+      }
+      set
+      {
+        this.SetValue( Pie.SliceProperty, value );
+      }
+    }
+
+    private static void OnSliceChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( Pie )d ).OnSliceChanged( e );
+    }
+
+    private void OnSliceChanged( DependencyPropertyChangedEventArgs e )
+    {
+      // avoid re-entrancy
+      if( this.IsUpdatingSlice )
+        return;
+
+      if( !( this.IsUpdatingStartAngle || this.IsUpdatingEndAngle || this.IsUpdatingSweepDirection ) )
+      {
+        if( this.Mode == PieMode.EndAngle )
+          throw new InvalidOperationException( ErrorMessages.GetMessage( "SliceCannotBeSetDirectlyInEndAngle" ) );
+      }
+
+      // EndAngle and Slice are interrelated and must be kept in sync
+      this.IsUpdatingSlice = true;
+      try
+      {
+        if( !( this.IsUpdatingStartAngle || this.IsUpdatingEndAngle || ( this.Mode == PieMode.Manual && this.IsUpdatingSweepDirection ) ) )
+        {
+          this.CoerceValue( Pie.EndAngleProperty );
+        }
+      }
+      finally
+      {
+        this.IsUpdatingSlice = false;
+      }
+    }
+
+    private static object CoerceSliceValue( DependencyObject d, object value )
+    {
+      // keep Slice in sync with EndAngle, StartAngle, and SweepDirection
+      Pie pie = ( Pie )d;
+      if( pie.IsUpdatingEndAngle || pie.IsUpdatingStartAngle || pie.IsUpdatingSweepDirection )
+      {
+
+        double slice = Math.Max( -360.0, Math.Min( 360.0, ( pie.EndAngle - pie.StartAngle ) ) ) / ( ( pie.SweepDirection == SweepDirection.Clockwise ) ? 360.0 : -360.0 );
+        double newValue = DoubleHelper.AreVirtuallyEqual( slice, 0 ) ? 0 : ( slice < 0 ) ? slice + 1 : slice;
+        if( !DoubleHelper.AreVirtuallyEqual( ( double )value, newValue ) )
+        {
+          value = newValue;
+        }
+      }
+      return value;
+    }
+
+    private static bool ValidateSlice( object value )
+    {
+      double newValue = ( double )value;
+      if( newValue < 0 || newValue > 1 || DoubleHelper.IsNaN( newValue ) )
+        throw new ArgumentException( ErrorMessages.GetMessage( "SliceOOR" ) );
+
+      return true;
+    }
+
+    #endregion
+
+    #region StartAngle Property
+
+    public static readonly DependencyProperty StartAngleProperty =
+      DependencyProperty.Register( "StartAngle", typeof( double ), typeof( Pie ),
+        new FrameworkPropertyMetadata( 360d, FrameworkPropertyMetadataOptions.AffectsRender | FrameworkPropertyMetadataOptions.BindsTwoWayByDefault,
+          new PropertyChangedCallback( Pie.OnStartAngleChanged ) ) );
+
+    public double StartAngle
+    {
+      get
+      {
+        return ( double )this.GetValue( Pie.StartAngleProperty );
+      }
+      set
+      {
+        this.SetValue( Pie.StartAngleProperty, value );
+      }
+    }
+
+    private static void OnStartAngleChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( Pie )d ).OnStartAngleChanged( e );
+    }
+
+    private void OnStartAngleChanged( DependencyPropertyChangedEventArgs e )
+    {
+      // avoid re-entrancy
+      if( this.IsUpdatingStartAngle )
+        return;
+
+      // StartAngle, Slice, and SweepDirection are interrelated and must be kept in sync
+      this.IsUpdatingStartAngle = true;
+      try
+      {
+        switch( Mode )
+        {
+          case PieMode.Manual:
+            this.CoerceValue( Pie.SliceProperty );
+            break;
+
+          case PieMode.EndAngle:
+            this.CoerceValue( Pie.SweepDirectionProperty );
+            this.CoerceValue( Pie.SliceProperty );
+            break;
+
+          case PieMode.Slice:
+            this.CoerceValue( Pie.EndAngleProperty );
+            break;
+        }
+      }
+      finally
+      {
+        this.IsUpdatingStartAngle = false;
+      }
+    }
+
+    #endregion
+
+    #region SweepDirection Property
+
+    public static readonly DependencyProperty SweepDirectionProperty =
+      DependencyProperty.Register( "SweepDirection", typeof( SweepDirection ), typeof( Pie ),
+        new FrameworkPropertyMetadata( ( SweepDirection )SweepDirection.Clockwise, FrameworkPropertyMetadataOptions.AffectsRender,
+          new PropertyChangedCallback( Pie.OnSweepDirectionChanged ), new CoerceValueCallback( Pie.CoerceSweepDirectionValue ) ) );
+
+    public SweepDirection SweepDirection
+    {
+      get
+      {
+        return ( SweepDirection )this.GetValue( Pie.SweepDirectionProperty );
+      }
+      set
+      {
+        this.SetValue( Pie.SweepDirectionProperty, value );
+      }
+    }
+
+    private static void OnSweepDirectionChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( Pie )d ).OnSweepDirectionChanged( e );
+    }
+
+    private void OnSweepDirectionChanged( DependencyPropertyChangedEventArgs e )
+    {
+      // avoid re-entrancy
+      if( this.IsUpdatingSweepDirection )
+        return;
+
+      // EndAngle, Slice, and SweepDirection are interrelated and must be kept in sync
+      this.IsUpdatingSweepDirection = true;
+      try
+      {
+        switch( Mode )
+        {
+          case PieMode.Slice:
+            this.CoerceValue( Pie.EndAngleProperty );
+            break;
+
+          default:
+            this.CoerceValue( Pie.SliceProperty );
+            break;
+        }
+      }
+      finally
+      {
+        this.IsUpdatingSweepDirection = false;
+      }
+    }
+
+    private static object CoerceSweepDirectionValue( DependencyObject d, object value )
+    {
+      // keep SweepDirection in sync with EndAngle and StartAngle
+      Pie pie = ( Pie )d;
+      if( pie.IsUpdatingEndAngle || pie.IsUpdatingStartAngle || pie.IsUpdatingMode )
+      {
+        if( DoubleHelper.AreVirtuallyEqual( pie.StartAngle, pie.EndAngle ) )
+        {
+          // if the values are equal, use previously coerced value
+          value = pie.SweepDirection;
+        }
+        else
+        {
+          value = ( pie.EndAngle < pie.StartAngle ) ? SweepDirection.Counterclockwise : SweepDirection.Clockwise;
+        }
+      }
+      return value;
+    }
+
+    #endregion
+
+    #region GeometryTransform Property
+
+    public override Transform GeometryTransform
+    {
+      get
+      {
+        return Transform.Identity;
+      }
+    }
+
+    #endregion
+
+    #region RenderedGeometry Property
+
+    public override Geometry RenderedGeometry
+    {
+      get
+      {
+        // for a Pie, the RenderedGeometry is the same as the DefiningGeometry
+        return this.DefiningGeometry;
+      }
+    }
+
+    #endregion
+
+    #region DefiningGeometry Protected Property
+
+    protected override Geometry DefiningGeometry
+    {
+      get
+      {
+        double slice = Slice;
+        if( _rect.IsEmpty || slice <= 0 )
+          return Geometry.Empty;
+
+        if( slice >= 1 )
+          return new EllipseGeometry( _rect );
+
+        // direction of flow is determined by the SweepDirection property
+        double directionalFactor = ( this.SweepDirection == SweepDirection.Clockwise ) ? 1.0 : -1.0;
+        double startAngle = StartAngle;
+
+        Point pointA = EllipseHelper.PointOfRadialIntersection( _rect, startAngle );
+        Point pointB = EllipseHelper.PointOfRadialIntersection( _rect, startAngle + directionalFactor * slice * 360 );
+        PathSegmentCollection segments = new PathSegmentCollection();
+        segments.Add( new LineSegment( pointA, true ) );
+        ArcSegment arc = new ArcSegment();
+        arc.Point = pointB;
+        arc.Size = new Size( _rect.Width / 2, _rect.Height / 2 );
+        arc.IsLargeArc = slice > 0.5;
+        arc.SweepDirection = SweepDirection;
+        segments.Add( arc );
+        PathFigureCollection figures = new PathFigureCollection();
+        figures.Add( new PathFigure( RectHelper.Center( _rect ), segments, true ) );
+        return new PathGeometry( figures );
+      }
+    }
+
+    #endregion
+
+    #region IsUpdatingEndAngle Private Property
+
+    private bool IsUpdatingEndAngle
+    {
+      get
+      {
+        return _cacheBits[ ( int )CacheBits.IsUpdatingEndAngle ];
+      }
+      set
+      {
+        _cacheBits[ ( int )CacheBits.IsUpdatingEndAngle ] = value;
+      }
+    }
+
+    #endregion
+
+    #region IsUpdatingMode Private Property
+
+    private bool IsUpdatingMode
+    {
+      get
+      {
+        return _cacheBits[ ( int )CacheBits.IsUpdatingMode ];
+      }
+      set
+      {
+        _cacheBits[ ( int )CacheBits.IsUpdatingMode ] = value;
+      }
+    }
+
+    #endregion
+
+    #region IsUpdatingSlice Private Property
+
+    private bool IsUpdatingSlice
+    {
+      get
+      {
+        return _cacheBits[ ( int )CacheBits.IsUpdatingSlice ];
+      }
+      set
+      {
+        _cacheBits[ ( int )CacheBits.IsUpdatingSlice ] = value;
+      }
+    }
+
+    #endregion
+
+    #region IsUpdatingStartAngle Private Property
+
+    private bool IsUpdatingStartAngle
+    {
+      get
+      {
+        return _cacheBits[ ( int )CacheBits.IsUpdatingStartAngle ];
+      }
+      set
+      {
+        _cacheBits[ ( int )CacheBits.IsUpdatingStartAngle ] = value;
+      }
+    }
+
+    #endregion
+
+    #region IsUpdatingSweepDirection Private Property
+
+    private bool IsUpdatingSweepDirection
+    {
+      get
+      {
+        return _cacheBits[ ( int )CacheBits.IsUpdatingSweepDirection ];
+      }
+      set
+      {
+        _cacheBits[ ( int )CacheBits.IsUpdatingSweepDirection ] = value;
+      }
+    }
+
+    #endregion
+
+    internal override Size GetNaturalSize()
+    {
+      double strokeThickness = this.GetStrokeThickness();
+      return new Size( strokeThickness, strokeThickness );
+    }
+
+    internal override Rect GetDefiningGeometryBounds()
+    {
+      return _rect;
+    }
+
+    protected override Size ArrangeOverride( Size finalSize )
+    {
+      double penThickness = this.GetStrokeThickness();
+      double margin = penThickness / 2;
+
+      _rect = new Rect( margin, margin,
+          Math.Max( 0, finalSize.Width - penThickness ),
+          Math.Max( 0, finalSize.Height - penThickness ) );
+
+      switch( Stretch )
+      {
+        case Stretch.None:
+          // empty rectangle
+          _rect.Width = _rect.Height = 0;
+          break;
+
+        case Stretch.Fill:
+          // already initialized for Fill
+          break;
+
+        case Stretch.Uniform:
+          // largest square that fits in the final size
+          if( _rect.Width > _rect.Height )
+          {
+            _rect.Width = _rect.Height;
+          }
+          else
+          {
+            _rect.Height = _rect.Width;
+          }
+          break;
+
+        case Stretch.UniformToFill:
+
+          // smallest square that fills the final size
+          if( _rect.Width < _rect.Height )
+          {
+            _rect.Width = _rect.Height;
+          }
+          else
+          {
+            _rect.Height = _rect.Width;
+          }
+          break;
+      }
+
+      return finalSize;
+    }
+
+    protected override Size MeasureOverride( Size constraint )
+    {
+      if( this.Stretch == Stretch.UniformToFill )
+      {
+        double width = constraint.Width;
+        double height = constraint.Height;
+
+        if( Double.IsInfinity( width ) && Double.IsInfinity( height ) )
+        {
+          return this.GetNaturalSize();
+        }
+        else if( Double.IsInfinity( width ) || Double.IsInfinity( height ) )
+        {
+          width = Math.Min( width, height );
+        }
+        else
+        {
+          width = Math.Max( width, height );
+        }
+
+        return new Size( width, width );
+      }
+
+      return this.GetNaturalSize();
+    }
+
+    protected override void OnRender( DrawingContext drawingContext )
+    {
+      if( !_rect.IsEmpty )
+      {
+        Pen pen = this.GetPen();
+        drawingContext.DrawGeometry( this.Fill, pen, this.RenderedGeometry );
+      }
+    }
+
+    #region Private Fields
+
+    private Rect _rect = Rect.Empty;
+    private BitVector32 _cacheBits = new BitVector32( 0 );
+
+    #endregion
+
+    #region CacheBits Nested Type
+
+    private enum CacheBits
+    {
+      IsUpdatingEndAngle = 0x00000001,
+      IsUpdatingMode = 0x00000002,
+      IsUpdatingSlice = 0x00000004,
+      IsUpdatingStartAngle = 0x00000008,
+      IsUpdatingSweepDirection = 0x00000010,
+    }
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Pie/Implementation/PieModeEnum.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Pie/Implementation/PieModeEnum.cs
new file mode 100644
index 00000000..5f4a973a
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Pie/Implementation/PieModeEnum.cs
@@ -0,0 +1,28 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit
+{
+  public enum PieMode
+  {
+    Manual,
+    EndAngle,
+    Slice,
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Properties/AssemblyInfo.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..ad13a5f6
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Properties/AssemblyInfo.cs
@@ -0,0 +1,93 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+#region Using directives
+
+using System;
+using System.Globalization;
+using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Security;
+using System.Windows;
+using System.Windows.Markup;
+
+#endregion
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle( "Xceed Extended WPF Toolkit" )]
+[assembly: AssemblyDescription("This assembly implements various Windows Presentation Framework controls.")]
+
+[assembly: AssemblyCompany("Xceed Software Inc.")]
+[assembly: AssemblyProduct( "Xceed Extended WPF Toolkit" )]
+[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
+[assembly: AssemblyCulture( "" )]
+
+
+// Needed to enable xbap scenarios
+[assembly: AllowPartiallyTrustedCallers]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+[assembly: CLSCompliant(true)]
+
+//In order to begin building localizable applications, set 
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.SourceAssembly, //where theme specific resource dictionaries are located
+    //(used if a resource is not found in the page, 
+    // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+    //(used if a resource is not found in the page, 
+    // app, or any theme specific resource dictionaries)
+)]
+
+[assembly: XmlnsPrefix("http://schemas.xceed.com/wpf/xaml/toolkit", "xctk")]
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit")]
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Core.Converters" )]
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Core.Input" )]
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Primitives")]
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.PropertyGrid")]
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.PropertyGrid.Attributes")]
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.PropertyGrid.Commands")]
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.PropertyGrid.Converters")]
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.PropertyGrid.Editors")]
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Zoombox" )]
+
+
+#pragma warning disable 1699
+[assembly: AssemblyDelaySign( false )]
+[assembly: AssemblyKeyFile( @"sn.snk" )]
+[assembly: AssemblyKeyName( "" )]
+#pragma warning restore 1699
+
+
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/AdvancedProperties11.png b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/AdvancedProperties11.png
new file mode 100644
index 00000000..0146e932
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/AdvancedProperties11.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/Categorize16.png b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/Categorize16.png
new file mode 100644
index 00000000..51510df8
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/Categorize16.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/ClearFilter16.png b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/ClearFilter16.png
new file mode 100644
index 00000000..aeaeab8d
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/ClearFilter16.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/Database11.png b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/Database11.png
new file mode 100644
index 00000000..0f523fbd
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/Database11.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/Inheritance11.png b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/Inheritance11.png
new file mode 100644
index 00000000..7dd3b491
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/Inheritance11.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/Local11.png b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/Local11.png
new file mode 100644
index 00000000..ec521dd4
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/Local11.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/Resource11.png b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/Resource11.png
new file mode 100644
index 00000000..7275c981
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/Resource11.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/SortAscending16.png b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/SortAscending16.png
new file mode 100644
index 00000000..b3138ba3
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/SortAscending16.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/Style11.png b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/Style11.png
new file mode 100644
index 00000000..7a6005d6
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Images/Style11.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs
new file mode 100644
index 00000000..f036c681
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs
@@ -0,0 +1,30 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Attributes
+{
+  public class ExpandableObjectAttribute : Attribute
+  {
+    public ExpandableObjectAttribute()
+    {
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/IItemsSource.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/IItemsSource.cs
new file mode 100644
index 00000000..5b60f073
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/IItemsSource.cs
@@ -0,0 +1,61 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Collections.Generic;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Attributes
+{
+  public interface IItemsSource
+  {
+    ItemCollection GetValues();
+  }
+
+  public class Item
+  {
+    public string DisplayName
+    {
+      get;
+      set;
+    }
+    public object Value
+    {
+      get;
+      set;
+    }
+  }
+
+  public class ItemCollection : List<Item>
+  {
+    public void Add( object value )
+    {
+      Item item = new Item();
+      item.DisplayName = value.ToString();
+      item.Value = value;
+      base.Add( item );
+    }
+
+    public void Add( object value, string displayName )
+    {
+      Item newItem = new Item();
+      newItem.DisplayName = displayName;
+      newItem.Value = value;
+      base.Add( newItem );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs
new file mode 100644
index 00000000..305bcc57
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs
@@ -0,0 +1,41 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Attributes
+{
+  public class ItemsSourceAttribute : Attribute
+  {
+    public Type Type
+    {
+      get;
+      set;
+    }
+
+    public ItemsSourceAttribute( Type type )
+    {
+      var valueSourceInterface = type.GetInterface( typeof( IItemsSource ).FullName );
+      if( valueSourceInterface == null )
+        throw new ArgumentException( "Type must implement the IItemsSource interface.", "type" );
+
+      Type = type;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs
new file mode 100644
index 00000000..9cebc17f
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs
@@ -0,0 +1,38 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Attributes
+{
+  [AttributeUsage( AttributeTargets.Property, AllowMultiple = false, Inherited = true )]
+  public class PropertyOrderAttribute : Attribute
+  {
+    public int Order
+    {
+      get;
+      set;
+    }
+
+    public PropertyOrderAttribute( int order )
+    {
+      Order = order;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs
new file mode 100644
index 00000000..8679b57b
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs
@@ -0,0 +1,35 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows.Input;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Commands
+{
+  public class PropertyGridCommands
+  {
+    private static RoutedCommand _clearFilterCommand = new RoutedCommand();
+    public static RoutedCommand ClearFilter
+    {
+      get
+      {
+        return _clearFilterCommand;
+      }
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs
new file mode 100644
index 00000000..c2245b48
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs
@@ -0,0 +1,35 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows.Input;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Commands
+{
+  public static class PropertyItemCommands
+  {
+    private static RoutedCommand _resetValueCommand = new RoutedCommand();
+    public static RoutedCommand ResetValue
+    {
+      get
+      {
+        return _resetValueCommand;
+      }
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs
new file mode 100644
index 00000000..f2b1377e
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs
@@ -0,0 +1,39 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Converters
+{
+  public class ExpandableObjectMarginConverter : IValueConverter
+  {
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      int childLevel = ( int )value;
+      return new Thickness( childLevel * 15, 0, 0, 0 );
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/ValueSourceToImagePathConverter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/ValueSourceToImagePathConverter.cs
new file mode 100644
index 00000000..14dd8f34
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/ValueSourceToImagePathConverter.cs
@@ -0,0 +1,67 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Data;
+using System.Windows.Media.Imaging;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Converters
+{
+  public class ValueSourceToImagePathConverter : IValueConverter
+  {
+    #region IValueConverter Members
+
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      BaseValueSource bvs = ( BaseValueSource )value;
+
+      string uriPrefix = "/WPFToolkit.Extended;component/PropertyGrid/Images/";
+      string imageName = "AdvancedProperties11";
+
+      switch( bvs )
+      {
+        case BaseValueSource.Inherited:
+        case BaseValueSource.DefaultStyle:
+        case BaseValueSource.ImplicitStyleReference:
+          imageName = "Inheritance11";
+          break;
+        case BaseValueSource.DefaultStyleTrigger:
+          break;
+        case BaseValueSource.Style:
+          imageName = "Style11";
+          break;
+
+        case BaseValueSource.Local:
+          imageName = "Local11";
+          break;
+      }
+
+
+      return new BitmapImage( new Uri( String.Format( "{0}{1}.png", uriPrefix, imageName ), UriKind.RelativeOrAbsolute ) );
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/ValueSourceToToolTipConverter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/ValueSourceToToolTipConverter.cs
new file mode 100644
index 00000000..07b6bf0f
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/ValueSourceToToolTipConverter.cs
@@ -0,0 +1,61 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Converters
+{
+  public class ValueSourceToToolTipConverter : IValueConverter
+  {
+    #region IValueConverter Members
+
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      BaseValueSource bvs = ( BaseValueSource )value;
+      string toolTip = "Advanced Properties";
+
+      switch( bvs )
+      {
+        case BaseValueSource.Inherited:
+        case BaseValueSource.DefaultStyle:
+        case BaseValueSource.ImplicitStyleReference:
+          toolTip = "Inheritance";
+          break;
+        case BaseValueSource.Style:
+          toolTip = "Style Setter";
+          break;
+
+        case BaseValueSource.Local:
+          toolTip = "Local";
+          break;
+      }
+
+      return toolTip;
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorDefinition.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorDefinition.cs
new file mode 100644
index 00000000..bf5bc3fc
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorDefinition.cs
@@ -0,0 +1,52 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  public class EditorDefinition
+  {
+    public DataTemplate EditorTemplate
+    {
+      get;
+      set;
+    }
+
+    private PropertyDefinitionCollection _properties = new PropertyDefinitionCollection();
+    public PropertyDefinitionCollection PropertiesDefinitions
+    {
+      get
+      {
+        return _properties;
+      }
+      set
+      {
+        _properties = value;
+      }
+    }
+
+    public Type TargetType
+    {
+      get;
+      set;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorDefinitionCollection.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorDefinitionCollection.cs
new file mode 100644
index 00000000..94459d7f
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorDefinitionCollection.cs
@@ -0,0 +1,56 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  public class EditorDefinitionCollection : ObservableCollection<EditorDefinition>
+  {
+    public EditorDefinition this[ string propertyName ]
+    {
+      get
+      {
+        foreach( var item in Items )
+        {
+          if( item.PropertiesDefinitions.Where( x => x.Name == propertyName ).Any() )
+            return item;
+        }
+
+        return null;
+      }
+    }
+
+    public EditorDefinition this[ Type targetType ]
+    {
+      get
+      {
+        foreach( var item in Items )
+        {
+          if( item.TargetType == targetType )
+            return item;
+        }
+
+        return null;
+      }
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs
new file mode 100644
index 00000000..4db6ecc7
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs
@@ -0,0 +1,37 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
+{
+  public class CheckBoxEditor : TypeEditor<CheckBox>
+  {
+    protected override void SetControlProperties()
+    {
+      Editor.Margin = new Thickness( 5, 0, 0, 0 );
+    }
+
+    protected override void SetValueDependencyProperty()
+    {
+      ValueProperty = CheckBox.IsCheckedProperty;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/CollectionEditor.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/CollectionEditor.xaml
new file mode 100644
index 00000000..388fdb52
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/CollectionEditor.xaml
@@ -0,0 +1,82 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<UserControl x:Class="Xceed.Wpf.Toolkit.PropertyGrid.Editors.CollectionEditor"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes">
+
+   <UserControl.Resources>
+      <Style x:Key="ButtonStyle" TargetType="Button">
+         <Setter Property="Background" Value="White" />
+         <Setter Property="BorderThickness" Value="0" />
+         <Setter Property="Padding" Value="2,0,0,0" />
+         <Setter Property="HorizontalContentAlignment" Value="Left" />
+         <Setter Property="VerticalContentAlignment" Value="Center" />
+         <Setter Property="Template">
+            <Setter.Value>
+               <ControlTemplate TargetType="Button">
+                  <Grid SnapsToDevicePixels="True">
+
+                     <Grid>
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="*" />
+                           <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+
+                        <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
+                           <ContentPresenter Content="{TemplateBinding Content}"
+                                             ContentTemplate="{TemplateBinding ContentTemplate}"
+                                             ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                        </Border>
+
+                        <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                             Grid.Column="1"
+                                             CornerRadius="0,2.75,2.75,0"
+                                             RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}"
+											            RenderMouseOver="{TemplateBinding IsMouseOver}">
+                           <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
+                              <Path x:Name="Arrow" Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000" />
+                           </Grid>
+                        </chrome:ButtonChrome>
+                     </Grid>
+
+                  </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Fill" TargetName="Arrow" Value="#AFAFAF" />
+                            <Setter Property="Foreground" Value="Gray" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+         </Setter>
+      </Style>
+   </UserControl.Resources>
+
+   <Button Grid.Column="1"
+           IsTabStop="True"
+           MinHeight="22"
+           SnapsToDevicePixels="True"
+           Content="(Collection)"
+           Style="{StaticResource ButtonStyle}"
+           Click="Button_Click" />
+</UserControl>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/CollectionEditor.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/CollectionEditor.xaml.cs
new file mode 100644
index 00000000..79026ad2
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/CollectionEditor.xaml.cs
@@ -0,0 +1,54 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
+{
+  /// <summary>
+  /// Interaction logic for CollectionEditor.xaml
+  /// </summary>
+  public partial class CollectionEditor : UserControl, ITypeEditor
+  {
+    PropertyItem _item;
+
+    public CollectionEditor()
+    {
+      InitializeComponent();
+    }
+
+    private void Button_Click( object sender, RoutedEventArgs e )
+    {
+      CollectionEditorDialog editor = new CollectionEditorDialog( _item.PropertyType );
+      Binding binding = new Binding( "Value" );
+      binding.Source = _item;
+      binding.Mode = _item.IsReadOnly ? BindingMode.OneWay : BindingMode.TwoWay;
+      BindingOperations.SetBinding( editor, CollectionEditorDialog.ItemsSourceProperty, binding );
+      editor.ShowDialog();
+    }
+
+    public FrameworkElement ResolveEditor( PropertyItem propertyItem )
+    {
+      _item = propertyItem;
+      return this;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ColorEditor.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ColorEditor.cs
new file mode 100644
index 00000000..ed1e829f
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ColorEditor.cs
@@ -0,0 +1,34 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
+{
+  public class ColorEditor : TypeEditor<ColorPicker>
+  {
+    protected override void SetControlProperties()
+    {
+      Editor.BorderThickness = new System.Windows.Thickness( 0 );
+      Editor.DisplayColorAndName = true;
+    }
+    protected override void SetValueDependencyProperty()
+    {
+      ValueProperty = ColorPicker.SelectedColorProperty;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs
new file mode 100644
index 00000000..91081037
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs
@@ -0,0 +1,44 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Collections.Generic;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
+{
+  public abstract class ComboBoxEditor : TypeEditor<System.Windows.Controls.ComboBox>
+  {
+    protected override void SetValueDependencyProperty()
+    {
+      ValueProperty = System.Windows.Controls.ComboBox.SelectedItemProperty;
+    }
+
+    protected override void ResolveValueBinding( PropertyItem propertyItem )
+    {
+      SetItemsSource( propertyItem );
+      base.ResolveValueBinding( propertyItem );
+    }
+
+    protected abstract IList<object> CreateItemsSource( PropertyItem propertyItem );
+
+    private void SetItemsSource( PropertyItem propertyItem )
+    {
+      Editor.ItemsSource = CreateItemsSource( propertyItem );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DateTimeUpDownEditor.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DateTimeUpDownEditor.cs
new file mode 100644
index 00000000..1aafa787
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DateTimeUpDownEditor.cs
@@ -0,0 +1,33 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
+{
+  public class DateTimeUpDownEditor : TypeEditor<DateTimeUpDown>
+  {
+    protected override void SetControlProperties()
+    {
+      Editor.BorderThickness = new System.Windows.Thickness( 0 );
+    }
+    protected override void SetValueDependencyProperty()
+    {
+      ValueProperty = DateTimeUpDown.ValueProperty;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DecimalUpDownEditor.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DecimalUpDownEditor.cs
new file mode 100644
index 00000000..b778bcfc
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DecimalUpDownEditor.cs
@@ -0,0 +1,34 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
+{
+  public class DecimalUpDownEditor : TypeEditor<DecimalUpDown>
+  {
+    protected override void SetControlProperties()
+    {
+      Editor.BorderThickness = new System.Windows.Thickness( 0 );
+    }
+
+    protected override void SetValueDependencyProperty()
+    {
+      ValueProperty = DecimalUpDown.ValueProperty;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DoubleUpDownEditor.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DoubleUpDownEditor.cs
new file mode 100644
index 00000000..ce2b6ded
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DoubleUpDownEditor.cs
@@ -0,0 +1,34 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
+{
+  public class DoubleUpDownEditor : TypeEditor<DoubleUpDown>
+  {
+    protected override void SetControlProperties()
+    {
+      Editor.BorderThickness = new System.Windows.Thickness( 0 );
+    }
+
+    protected override void SetValueDependencyProperty()
+    {
+      ValueProperty = DoubleUpDown.ValueProperty;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs
new file mode 100644
index 00000000..cdd39006
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs
@@ -0,0 +1,58 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Reflection;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
+{
+  public class EnumComboBoxEditor : ComboBoxEditor
+  {
+    protected override IList<object> CreateItemsSource( PropertyItem propertyItem )
+    {
+      return GetValues( propertyItem.PropertyType );
+    }
+
+    private static object[] GetValues( Type enumType )
+    {
+      List<object> values = new List<object>();
+
+      var fields = enumType.GetFields().Where( x => x.IsLiteral );
+      foreach( FieldInfo field in fields )
+      {
+        // Get array of BrowsableAttribute attributes
+        object[] attrs = field.GetCustomAttributes( typeof( BrowsableAttribute ), false );
+        if( attrs.Length == 1 )
+        {
+          // If attribute exists and its value is false continue to the next field...
+          BrowsableAttribute brAttr = ( BrowsableAttribute )attrs[ 0 ];
+          if( brAttr.Browsable == false )
+            continue;
+        }
+
+        values.Add( field.GetValue( enumType ) );
+      }
+
+      return values.ToArray();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs
new file mode 100644
index 00000000..aaa22de5
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs
@@ -0,0 +1,94 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows;
+using System.Windows.Media;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
+{
+  public class FontComboBoxEditor : ComboBoxEditor
+  {
+    protected override IList<object> CreateItemsSource( PropertyItem propertyItem )
+    {
+      if( propertyItem.PropertyType == typeof( FontFamily ) )
+        return GetFontFamilies();
+      else if( propertyItem.PropertyType == typeof( FontWeight ) )
+        return GetFontWeights();
+      else if( propertyItem.PropertyType == typeof( FontStyle ) )
+        return GetFontStyles();
+      else if( propertyItem.PropertyType == typeof( FontStretch ) )
+        return GetFontStretches();
+
+      return null;
+    }
+
+    private static IList<object> GetFontFamilies()
+    {
+#if !VS2008
+      return Fonts.SystemFontFamilies.ToList<object>();
+#else
+      return Fonts.SystemFontFamilies.Cast<object>().ToList();
+#endif
+    }
+
+    private static IList<object> GetFontWeights()
+    {
+      return new List<object>()
+            {
+                FontWeights.Black, 
+                FontWeights.Bold, 
+                FontWeights.ExtraBlack, 
+                FontWeights.ExtraBold,
+                FontWeights.ExtraLight, 
+                FontWeights.Light, 
+                FontWeights.Medium, 
+                FontWeights.Normal, 
+                FontWeights.SemiBold,
+                FontWeights.Thin
+            };
+    }
+
+    private static IList<object> GetFontStyles()
+    {
+      return new List<object>()
+            {
+                FontStyles.Italic,
+                FontStyles.Normal
+            };
+    }
+
+    private static IList<object> GetFontStretches()
+    {
+      return new List<object>()
+            {
+                FontStretches.Condensed,
+                FontStretches.Expanded,
+                FontStretches.ExtraCondensed,
+                FontStretches.ExtraExpanded,
+                FontStretches.Normal,
+                FontStretches.SemiCondensed,
+                FontStretches.SemiExpanded,
+                FontStretches.UltraCondensed,
+                FontStretches.UltraExpanded
+            };
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ITypeEditor.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ITypeEditor.cs
new file mode 100644
index 00000000..0970fb15
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ITypeEditor.cs
@@ -0,0 +1,28 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
+{
+  public interface ITypeEditor
+  {
+    FrameworkElement ResolveEditor( PropertyItem propertyItem );
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/IntegerUpDownEditor.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/IntegerUpDownEditor.cs
new file mode 100644
index 00000000..6d4c6491
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/IntegerUpDownEditor.cs
@@ -0,0 +1,33 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
+{
+  public class IntegerUpDownEditor : TypeEditor<IntegerUpDown>
+  {
+    protected override void SetControlProperties()
+    {
+      Editor.BorderThickness = new System.Windows.Thickness( 0 );
+    }
+    protected override void SetValueDependencyProperty()
+    {
+      ValueProperty = IntegerUpDown.ValueProperty;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs
new file mode 100644
index 00000000..f3ab9dd6
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs
@@ -0,0 +1,62 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
+{
+  public class ItemsSourceAttributeEditor : TypeEditor<System.Windows.Controls.ComboBox>
+  {
+    private readonly ItemsSourceAttribute _attribute;
+
+    public ItemsSourceAttributeEditor( ItemsSourceAttribute attribute )
+    {
+      _attribute = attribute;
+    }
+
+    protected override void SetValueDependencyProperty()
+    {
+      ValueProperty = System.Windows.Controls.ComboBox.SelectedValueProperty;
+    }
+
+    protected override void ResolveValueBinding( PropertyItem propertyItem )
+    {
+      SetItemsSource();
+      base.ResolveValueBinding( propertyItem );
+    }
+
+    protected override void SetControlProperties()
+    {
+      Editor.DisplayMemberPath = "DisplayName";
+      Editor.SelectedValuePath = "Value";
+    }
+
+    private void SetItemsSource()
+    {
+      Editor.ItemsSource = CreateItemsSource();
+    }
+
+    private System.Collections.IEnumerable CreateItemsSource()
+    {
+      var instance = Activator.CreateInstance( _attribute.Type );
+      return ( instance as IItemsSource ).GetValues();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs
new file mode 100644
index 00000000..bfdf013d
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs
@@ -0,0 +1,42 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
+{
+  public class PrimitiveTypeCollectionEditor : TypeEditor<Xceed.Wpf.Toolkit.PrimitiveTypeCollectionEditor>
+  {
+    protected override void SetControlProperties()
+    {
+      Editor.BorderThickness = new System.Windows.Thickness( 0 );
+      Editor.Content = "(Collection)";
+    }
+
+    protected override void SetValueDependencyProperty()
+    {
+      ValueProperty = Xceed.Wpf.Toolkit.PrimitiveTypeCollectionEditor.ItemsSourceProperty;
+    }
+
+    protected override void ResolveValueBinding( PropertyItem propertyItem )
+    {
+      Editor.ItemsSourceType = propertyItem.PropertyType;
+      Editor.ItemType = propertyItem.PropertyType.GetGenericArguments()[ 0 ];
+      base.ResolveValueBinding( propertyItem );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TextBlockEditor.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TextBlockEditor.cs
new file mode 100644
index 00000000..13479320
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TextBlockEditor.cs
@@ -0,0 +1,36 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows.Controls;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
+{
+  public class TextBlockEditor : TypeEditor<TextBlock>
+  {
+    protected override void SetValueDependencyProperty()
+    {
+      ValueProperty = TextBlock.TextProperty;
+    }
+
+    protected override void SetControlProperties()
+    {
+      Editor.Margin = new System.Windows.Thickness( 5, 0, 0, 0 );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TextBoxEditor.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TextBoxEditor.cs
new file mode 100644
index 00000000..8c87df41
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TextBoxEditor.cs
@@ -0,0 +1,36 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows.Controls;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
+{
+  public class TextBoxEditor : TypeEditor<WatermarkTextBox>
+  {
+    protected override void SetControlProperties()
+    {
+      Editor.BorderThickness = new System.Windows.Thickness( 0 );
+    }
+
+    protected override void SetValueDependencyProperty()
+    {
+      ValueProperty = TextBox.TextProperty;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TimeSpanEditor.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TimeSpanEditor.cs
new file mode 100644
index 00000000..1f7d1aec
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TimeSpanEditor.cs
@@ -0,0 +1,51 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Globalization;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
+{
+  public class TimeSpanEditor : DateTimeUpDownEditor
+  {
+    private sealed class TimeSpanConverter : IValueConverter
+    {
+      object IValueConverter.Convert( object value, Type targetType, object parameter, CultureInfo culture )
+      {
+        return DateTime.Today + ( TimeSpan )value;
+      }
+
+      object IValueConverter.ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
+      {
+        return ( ( DateTime )value ).TimeOfDay;
+      }
+    }
+
+    protected override void SetControlProperties()
+    {
+      Editor.Format = DateTimeFormat.LongTime;
+    }
+
+    protected override IValueConverter CreateValueConverter()
+    {
+      return new TimeSpanConverter();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TypeEditor.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TypeEditor.cs
new file mode 100644
index 00000000..791b5b29
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TypeEditor.cs
@@ -0,0 +1,82 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
+{
+  public abstract class TypeEditor<T> : ITypeEditor where T : FrameworkElement, new()
+  {
+    #region Properties
+
+    protected T Editor
+    {
+      get;
+      set;
+    }
+    protected DependencyProperty ValueProperty
+    {
+      get;
+      set;
+    }
+
+    #endregion //Properties
+
+    #region ITypeEditor Members
+
+    public virtual FrameworkElement ResolveEditor( PropertyItem propertyItem )
+    {
+      Editor = new T();
+      SetValueDependencyProperty();
+      SetControlProperties();
+      ResolveValueBinding( propertyItem );
+      return Editor;
+    }
+
+    #endregion //ITypeEditor Members
+
+    #region Methods
+
+    protected virtual IValueConverter CreateValueConverter()
+    {
+      return null;
+    }
+
+    protected virtual void ResolveValueBinding( PropertyItem propertyItem )
+    {
+      var _binding = new Binding( "Value" );
+      _binding.Source = propertyItem;
+      _binding.ValidatesOnExceptions = true;
+      _binding.ValidatesOnDataErrors = true;
+      _binding.Mode = propertyItem.IsReadOnly ? BindingMode.OneWay : BindingMode.TwoWay;
+      _binding.Converter = CreateValueConverter();
+      BindingOperations.SetBinding( Editor, ValueProperty, _binding );
+    }
+
+    protected virtual void SetControlProperties()
+    {
+      //TODO: implement in derived class
+    }
+
+    protected abstract void SetValueDependencyProperty();
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyDefinition.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyDefinition.cs
new file mode 100644
index 00000000..fb299b11
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyDefinition.cs
@@ -0,0 +1,30 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  public class PropertyDefinition
+  {
+    public string Name
+    {
+      get;
+      set;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyDefinitionCollection.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyDefinitionCollection.cs
new file mode 100644
index 00000000..e4c44c5b
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyDefinitionCollection.cs
@@ -0,0 +1,40 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Collections.ObjectModel;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  public class PropertyDefinitionCollection : ObservableCollection<PropertyDefinition>
+  {
+    public PropertyDefinition this[ string propertyName ]
+    {
+      get
+      {
+        foreach( var item in Items )
+        {
+          if( item.Name == propertyName )
+            return item;
+        }
+
+        return null;
+      }
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGrid.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGrid.cs
new file mode 100644
index 00000000..5c0d65c3
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGrid.cs
@@ -0,0 +1,819 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Input;
+using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
+using System.Collections.Specialized;
+using System.Windows.Media;
+using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  [TemplatePart( Name = PART_DragThumb, Type = typeof( Thumb ) )]
+  public class PropertyGrid : Control, ISupportInitialize
+  {
+    private const string PART_DragThumb = "PART_DragThumb";
+
+    #region Members
+
+    private Thumb _dragThumb;
+    private List<PropertyItem> _propertyItemsCache;
+    private bool _hasPendingSelectedObjectChanged;
+    private int _initializationCount;
+
+    #endregion //Members
+
+    #region Properties
+
+    #region AdvancedOptionsMenu
+
+    public static readonly DependencyProperty AdvancedOptionsMenuProperty = DependencyProperty.Register( "AdvancedOptionsMenu", typeof( ContextMenu ), typeof( PropertyGrid ), new UIPropertyMetadata( null ) );
+    public ContextMenu AdvancedOptionsMenu
+    {
+      get
+      {
+        return ( ContextMenu )GetValue( AdvancedOptionsMenuProperty );
+      }
+      set
+      {
+        SetValue( AdvancedOptionsMenuProperty, value );
+      }
+    }
+
+    #endregion //AdvancedOptionsMenu
+
+    #region AutoGenerateProperties
+
+    public static readonly DependencyProperty AutoGeneratePropertiesProperty = DependencyProperty.Register( "AutoGenerateProperties", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( true ) );
+    public bool AutoGenerateProperties
+    {
+      get
+      {
+        return ( bool )GetValue( AutoGeneratePropertiesProperty );
+      }
+      set
+      {
+        SetValue( AutoGeneratePropertiesProperty, value );
+      }
+    }
+
+    #endregion //AutoGenerateProperties
+
+    #region ShowSummary
+
+    public static readonly DependencyProperty ShowSummaryProperty = DependencyProperty.Register( "ShowSummary", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( true ) );
+    public bool ShowSummary
+    {
+      get
+      {
+        return ( bool )GetValue( ShowSummaryProperty );
+      }
+      set
+      {
+        SetValue( ShowSummaryProperty, value );
+      }
+    }
+
+    #endregion //ShowSummary
+
+    #region EditorDefinitions
+
+    public static readonly DependencyProperty EditorDefinitionsProperty = DependencyProperty.Register( "EditorDefinitions", typeof( EditorDefinitionCollection ), typeof( PropertyGrid ), new UIPropertyMetadata( null, OnEditorDefinitionsChanged) );
+    public EditorDefinitionCollection EditorDefinitions
+    {
+      get
+      {
+        return ( EditorDefinitionCollection )GetValue( EditorDefinitionsProperty );
+      }
+      set
+      {
+        SetValue( EditorDefinitionsProperty, value );
+      }
+    }
+
+    private static void OnEditorDefinitionsChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PropertyGrid propertyGrid = o as PropertyGrid;
+      if( propertyGrid != null )
+        propertyGrid.OnEditorDefinitionsChanged( ( EditorDefinitionCollection )e.OldValue, ( EditorDefinitionCollection )e.NewValue );
+    }
+
+    protected virtual void OnEditorDefinitionsChanged( EditorDefinitionCollection oldValue, EditorDefinitionCollection newValue )
+    {
+      if( oldValue != null )
+        oldValue.CollectionChanged -= new NotifyCollectionChangedEventHandler( OnEditorDefinitionsCollectionChanged );
+
+      if( newValue != null )
+        newValue.CollectionChanged += new NotifyCollectionChangedEventHandler( OnEditorDefinitionsCollectionChanged );
+
+      RefreshPropertyGrid();
+    }
+
+    #endregion //EditorDefinitions
+
+    #region Filter
+
+    public static readonly DependencyProperty FilterProperty = DependencyProperty.Register( "Filter", typeof( string ), typeof( PropertyGrid ), new UIPropertyMetadata( null, OnFilterChanged ) );
+    public string Filter
+    {
+      get
+      {
+        return ( string )GetValue( FilterProperty );
+      }
+      set
+      {
+        SetValue( FilterProperty, value );
+      }
+    }
+
+    private static void OnFilterChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PropertyGrid propertyGrid = o as PropertyGrid;
+      if( propertyGrid != null )
+        propertyGrid.OnFilterChanged( ( string )e.OldValue, ( string )e.NewValue );
+    }
+
+    protected virtual void OnFilterChanged( string oldValue, string newValue )
+    {
+      if( Properties != null )
+        Properties.Filter( newValue );
+    }
+
+    #endregion //Filter
+
+    #region FilterWatermark
+
+    public static readonly DependencyProperty FilterWatermarkProperty = DependencyProperty.Register( "FilterWatermark", typeof( string ), typeof( PropertyGrid ), new UIPropertyMetadata( "Search" ) );
+    public string FilterWatermark
+    {
+      get
+      {
+        return ( string )GetValue( FilterWatermarkProperty );
+      }
+      set
+      {
+        SetValue( FilterWatermarkProperty, value );
+      }
+    }
+
+    #endregion //FilterWatermark
+
+    #region IsCategorized
+
+    public static readonly DependencyProperty IsCategorizedProperty = DependencyProperty.Register( "IsCategorized", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( true, OnIsCategorizedChanged ) );
+    public bool IsCategorized
+    {
+      get
+      {
+        return ( bool )GetValue( IsCategorizedProperty );
+      }
+      set
+      {
+        SetValue( IsCategorizedProperty, value );
+      }
+    }
+
+    private static void OnIsCategorizedChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PropertyGrid propertyGrid = o as PropertyGrid;
+      if( propertyGrid != null )
+        propertyGrid.OnIsCategorizedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnIsCategorizedChanged( bool oldValue, bool newValue )
+    {
+      InitializePropertyGrid( newValue );
+    }
+
+    #endregion //IsCategorized
+
+    #region NameColumnWidth
+
+    public static readonly DependencyProperty NameColumnWidthProperty = DependencyProperty.Register( "NameColumnWidth", typeof( double ), typeof( PropertyGrid ), new UIPropertyMetadata( 150.0, OnNameColumnWidthChanged ) );
+    public double NameColumnWidth
+    {
+      get
+      {
+        return ( double )GetValue( NameColumnWidthProperty );
+      }
+      set
+      {
+        SetValue( NameColumnWidthProperty, value );
+      }
+    }
+
+    private static void OnNameColumnWidthChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PropertyGrid propertyGrid = o as PropertyGrid;
+      if( propertyGrid != null )
+        propertyGrid.OnNameColumnWidthChanged( ( double )e.OldValue, ( double )e.NewValue );
+    }
+
+    protected virtual void OnNameColumnWidthChanged( double oldValue, double newValue )
+    {
+      ( ( TranslateTransform )_dragThumb.RenderTransform ).X = newValue;
+    }
+
+    #endregion //NameColumnWidth
+
+    #region Properties
+
+    private static readonly DependencyPropertyKey PropertiesPropertyKey = DependencyProperty.RegisterReadOnly( "Properties", typeof( PropertyItemCollection ), typeof( PropertyGrid ), new UIPropertyMetadata( null ) );
+    public PropertyItemCollection Properties
+    {
+      get
+      {
+        return ( PropertyItemCollection )GetValue( PropertiesPropertyKey.DependencyProperty );
+      }
+      private set
+      {
+        SetValue( PropertiesPropertyKey, value );
+      }
+    }
+
+    #endregion //Properties
+
+    #region PropertyDefinitions
+
+    public static readonly DependencyProperty PropertyDefinitionsProperty = DependencyProperty.Register( "PropertyDefinitions", typeof( PropertyDefinitionCollection ), typeof( PropertyGrid ), new UIPropertyMetadata( null, OnPropertyDefinitionsChanged ) );
+    public PropertyDefinitionCollection PropertyDefinitions
+    {
+      get
+      {
+        return ( PropertyDefinitionCollection )GetValue( PropertyDefinitionsProperty );
+      }
+      set
+      {
+        SetValue( PropertyDefinitionsProperty, value );
+      }
+    }
+
+    private static void OnPropertyDefinitionsChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PropertyGrid propertyGrid = o as PropertyGrid;
+      if( propertyGrid != null )
+        propertyGrid.OnPropertyDefinitionsChanged( ( PropertyDefinitionCollection )e.OldValue, ( PropertyDefinitionCollection )e.NewValue );
+    }
+
+    protected virtual void OnPropertyDefinitionsChanged( PropertyDefinitionCollection oldValue, PropertyDefinitionCollection newValue )
+    {
+      if( oldValue != null )
+        oldValue.CollectionChanged -= new NotifyCollectionChangedEventHandler( OnPropertyDefinitionsCollectionChanged );
+
+      if( newValue != null )
+        newValue.CollectionChanged += new NotifyCollectionChangedEventHandler( OnPropertyDefinitionsCollectionChanged );
+
+      RefreshPropertyGrid();
+    }
+
+    #endregion //PropertyDefinitions
+
+    #region SelectedObject
+
+    public static readonly DependencyProperty SelectedObjectProperty = DependencyProperty.Register( "SelectedObject", typeof( object ), typeof( PropertyGrid ), new UIPropertyMetadata( null, OnSelectedObjectChanged ) );
+    public object SelectedObject
+    {
+      get
+      {
+        return ( object )GetValue( SelectedObjectProperty );
+      }
+      set
+      {
+        SetValue( SelectedObjectProperty, value );
+      }
+    }
+
+    private static void OnSelectedObjectChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PropertyGrid propertyInspector = o as PropertyGrid;
+      if( propertyInspector != null )
+        propertyInspector.OnSelectedObjectChanged( ( object )e.OldValue, ( object )e.NewValue );
+    }
+
+    protected virtual void OnSelectedObjectChanged( object oldValue, object newValue )
+    {
+      // We do not want to process the change now if the grid is initializing (ie. BeginInit/EndInit).
+      _hasPendingSelectedObjectChanged = IsInitializing();
+
+      if( IsInitializing() )
+        return;
+
+      if( newValue == null )
+        ResetPropertyGrid();
+      else
+      {
+        SetSelectedObjectNameBinding( newValue );
+        SelectedObjectType = newValue.GetType();
+        _propertyItemsCache = GetObjectProperties( newValue );
+        InitializePropertyGrid( IsCategorized );
+      }
+    }
+
+    #endregion //SelectedObject
+
+    #region SelectedObjectType
+
+    public static readonly DependencyProperty SelectedObjectTypeProperty = DependencyProperty.Register( "SelectedObjectType", typeof( Type ), typeof( PropertyGrid ), new UIPropertyMetadata( null, OnSelectedObjectTypeChanged ) );
+    public Type SelectedObjectType
+    {
+      get
+      {
+        return ( Type )GetValue( SelectedObjectTypeProperty );
+      }
+      private set
+      {
+        SetValue( SelectedObjectTypeProperty, value );
+      }
+    }
+
+    private static void OnSelectedObjectTypeChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PropertyGrid propertyGrid = o as PropertyGrid;
+      if( propertyGrid != null )
+        propertyGrid.OnSelectedObjectTypeChanged( ( Type )e.OldValue, ( Type )e.NewValue );
+    }
+
+    protected virtual void OnSelectedObjectTypeChanged( Type oldValue, Type newValue )
+    {
+      if( newValue == null )
+        SelectedObjectTypeName = string.Empty;
+      else
+      {
+        DisplayNameAttribute displayNameAttribute = newValue.GetCustomAttributes( false ).OfType<DisplayNameAttribute>().FirstOrDefault();
+        SelectedObjectTypeName = displayNameAttribute == null ? newValue.Name : displayNameAttribute.DisplayName;
+      }
+    }
+
+    #endregion //SelectedObjectType
+
+    #region SelectedObjectTypeName
+
+    public static readonly DependencyProperty SelectedObjectTypeNameProperty = DependencyProperty.Register( "SelectedObjectTypeName", typeof( string ), typeof( PropertyGrid ), new UIPropertyMetadata( string.Empty ) );
+    public string SelectedObjectTypeName
+    {
+      get
+      {
+        return ( string )GetValue( SelectedObjectTypeNameProperty );
+      }
+      private set
+      {
+        SetValue( SelectedObjectTypeNameProperty, value );
+      }
+    }
+
+    #endregion //SelectedObjectTypeName
+
+    #region SelectedObjectName
+
+    public static readonly DependencyProperty SelectedObjectNameProperty = DependencyProperty.Register( "SelectedObjectName", typeof( string ), typeof( PropertyGrid ), new UIPropertyMetadata( string.Empty, OnSelectedObjectNameChanged ) );
+    public string SelectedObjectName
+    {
+      get
+      {
+        return ( string )GetValue( SelectedObjectNameProperty );
+      }
+      private set
+      {
+        SetValue( SelectedObjectNameProperty, value );
+      }
+    }
+
+    private static void OnSelectedObjectNameChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PropertyGrid propertyGrid = o as PropertyGrid;
+      if( propertyGrid != null )
+        propertyGrid.SelectedObjectNameChanged( ( string )e.OldValue, ( string )e.NewValue );
+    }
+
+    protected virtual void SelectedObjectNameChanged( string oldValue, string newValue )
+    {
+
+    }
+
+    #endregion //SelectedObjectName
+
+    #region SelectedPropertyItem
+
+    public static readonly DependencyProperty SelectedPropertyItemProperty = DependencyProperty.Register( "SelectedPropertyItem", typeof( PropertyItem ), typeof( PropertyGrid ), new UIPropertyMetadata( null, OnSelectedPropertyItemChanged ) );
+    public PropertyItem SelectedPropertyItem
+    {
+      get
+      {
+        return ( PropertyItem )GetValue( SelectedPropertyItemProperty );
+      }
+      internal set
+      {
+        SetValue( SelectedPropertyItemProperty, value );
+      }
+    }
+
+    private static void OnSelectedPropertyItemChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PropertyGrid propertyGrid = o as PropertyGrid;
+      if( propertyGrid != null )
+        propertyGrid.OnSelectedPropertyItemChanged( ( PropertyItem )e.OldValue, ( PropertyItem )e.NewValue );
+    }
+
+    protected virtual void OnSelectedPropertyItemChanged( PropertyItem oldValue, PropertyItem newValue )
+    {
+      if( oldValue != null )
+        oldValue.IsSelected = false;
+
+      //if (newValue != null)
+      //    newValue.IsSelected = true;
+
+      RaiseEvent( new RoutedEventArgs( PropertyGrid.SelectedPropertyItemChangedEvent, newValue ) );
+    }
+
+    #endregion //SelectedPropertyItem
+
+    #region ShowAdvancedOptions
+
+    public static readonly DependencyProperty ShowAdvancedOptionsProperty = DependencyProperty.Register( "ShowAdvancedOptions", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( false ) );
+    public bool ShowAdvancedOptions
+    {
+      get
+      {
+        return ( bool )GetValue( ShowAdvancedOptionsProperty );
+      }
+      set
+      {
+        SetValue( ShowAdvancedOptionsProperty, value );
+      }
+    }
+
+    #endregion //ShowAdvancedOptions
+
+    #region ShowSearchBox
+
+    public static readonly DependencyProperty ShowSearchBoxProperty = DependencyProperty.Register( "ShowSearchBox", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( true ) );
+    public bool ShowSearchBox
+    {
+      get
+      {
+        return ( bool )GetValue( ShowSearchBoxProperty );
+      }
+      set
+      {
+        SetValue( ShowSearchBoxProperty, value );
+      }
+    }
+
+    #endregion //ShowSearchBox
+
+    #region ShowSortOptions
+
+    public static readonly DependencyProperty ShowSortOptionsProperty = DependencyProperty.Register( "ShowSortOptions", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( true ) );
+    public bool ShowSortOptions
+    {
+      get
+      {
+        return ( bool )GetValue( ShowSortOptionsProperty );
+      }
+      set
+      {
+        SetValue( ShowSortOptionsProperty, value );
+      }
+    }
+
+    #endregion //ShowSortOptions
+
+    #region ShowTitle
+
+    public static readonly DependencyProperty ShowTitleProperty = DependencyProperty.Register( "ShowTitle", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( true ) );
+    public bool ShowTitle
+    {
+      get
+      {
+        return ( bool )GetValue( ShowTitleProperty );
+      }
+      set
+      {
+        SetValue( ShowTitleProperty, value );
+      }
+    }
+
+    #endregion //ShowTitle
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static PropertyGrid()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGrid ), new FrameworkPropertyMetadata( typeof( PropertyGrid ) ) );
+    }
+
+    public PropertyGrid()
+    {
+      EditorDefinitions = new EditorDefinitionCollection();
+      PropertyDefinitions = new PropertyDefinitionCollection();
+      CommandBindings.Add( new CommandBinding( PropertyGridCommands.ClearFilter, ClearFilter, CanClearFilter ) );
+    }
+
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+
+      if( _dragThumb != null )
+        _dragThumb.DragDelta -= DragThumb_DragDelta;
+      _dragThumb = GetTemplateChild( PART_DragThumb ) as Thumb;
+      if( _dragThumb != null )
+        _dragThumb.DragDelta += DragThumb_DragDelta;
+
+      //Update TranslateTransform in code-behind instead of XAML to remove the
+      //output window error.
+      //When we use FindAncesstor in custom control template for binding internal elements property 
+      //into its ancestor element, Visual Studio displays data warning messages in output window when 
+      //binding engine meets unmatched target type during visual tree traversal though it does the proper 
+      //binding when it receives expected target type during visual tree traversal
+      //ref : http://www.codeproject.com/Tips/124556/How-to-suppress-the-System-Windows-Data-Error-warn
+      TranslateTransform _moveTransform = new TranslateTransform();
+      _moveTransform.X = NameColumnWidth;
+      _dragThumb.RenderTransform = _moveTransform;
+    }
+
+    protected override void OnPreviewKeyDown( KeyEventArgs e )
+    {
+      //hitting enter on textbox will update value of underlying source
+      if( this.SelectedPropertyItem != null && e.Key == Key.Enter && e.OriginalSource is TextBox )
+      {
+        if( !( e.OriginalSource as TextBox ).AcceptsReturn )
+        {
+          BindingExpression be = ( ( TextBox )e.OriginalSource ).GetBindingExpression( TextBox.TextProperty );
+          be.UpdateSource();
+        }
+      }
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Event Handlers
+
+    void DragThumb_DragDelta( object sender, DragDeltaEventArgs e )
+    {
+      NameColumnWidth = Math.Max( 0, NameColumnWidth + e.HorizontalChange );
+    }
+
+    #endregion //Event Handlers
+
+    #region Commands
+
+    private void ClearFilter( object sender, ExecutedRoutedEventArgs e )
+    {
+      Filter = String.Empty;
+    }
+
+    private void CanClearFilter( object sender, CanExecuteRoutedEventArgs e )
+    {
+      e.CanExecute = !String.IsNullOrEmpty( Filter );
+    }
+
+    #endregion //Commands
+
+    #region Methods
+
+    private void InitializePropertyGrid( bool isCategorized )
+    {
+      LoadProperties( isCategorized );
+      SetDragThumbMargin( isCategorized );
+    }
+
+    private void LoadProperties( bool isCategorized )
+    {
+      if( _propertyItemsCache == null )
+        return;
+
+      //clear any filters first
+      Filter = String.Empty;
+
+      if( isCategorized )
+        Properties = PropertyGridUtilities.GetCategorizedProperties( _propertyItemsCache );
+      else
+        Properties = PropertyGridUtilities.GetAlphabetizedProperties( _propertyItemsCache );
+    }
+
+    private List<PropertyItem> GetObjectProperties( object instance )
+    {
+      var propertyItems = new List<PropertyItem>();
+      if( instance == null )
+        return propertyItems;
+
+      try
+      {
+        PropertyDescriptorCollection descriptors = PropertyGridUtilities.GetPropertyDescriptors( instance );
+
+        if( !AutoGenerateProperties )
+        {
+          List<PropertyDescriptor> specificProperties = new List<PropertyDescriptor>();
+          if( PropertyDefinitions != null )
+          {
+            foreach( PropertyDefinition pd in PropertyDefinitions )
+            {
+              foreach( PropertyDescriptor descriptor in descriptors )
+              {
+                if( descriptor.Name == pd.Name )
+                {
+                  specificProperties.Add( descriptor );
+                  break;
+                }
+              }
+            }
+          }
+
+          descriptors = new PropertyDescriptorCollection( specificProperties.ToArray() );
+        }
+
+        foreach( PropertyDescriptor descriptor in descriptors )
+        {
+          if( descriptor.IsBrowsable )
+            propertyItems.Add( PropertyGridUtilities.CreatePropertyItem( descriptor, instance, this, descriptor.Name ) );
+        }
+      }
+      catch( Exception )
+      {
+        //TODO: handle this some how
+      }
+
+      return propertyItems;
+    }
+
+    private void SetSelectedObjectNameBinding( object selectedObject )
+    {
+      if( selectedObject is FrameworkElement )
+      {
+        var binding = new Binding( "Name" );
+        binding.Source = selectedObject;
+        binding.Mode = BindingMode.OneWay;
+        BindingOperations.SetBinding( this, PropertyGrid.SelectedObjectNameProperty, binding );
+      }
+    }
+
+    private void SetDragThumbMargin( bool isCategorized )
+    {
+      if( _dragThumb == null )
+        return;
+
+      if( isCategorized )
+        _dragThumb.Margin = new Thickness( 6, 0, 0, 0 );
+      else
+        _dragThumb.Margin = new Thickness( -1, 0, 0, 0 );
+    }
+
+    private void ResetPropertyGrid()
+    {
+      SelectedObjectName = String.Empty;
+      SelectedObjectType = null;
+      _propertyItemsCache = null;
+      SelectedPropertyItem = null;
+      Properties = null;
+    }
+
+    private void OnEditorDefinitionsCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
+    {
+      RefreshPropertyGrid();
+    }
+
+    private void OnPropertyDefinitionsCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
+    {
+      RefreshPropertyGrid();
+    }
+
+    private void RefreshPropertyGrid()
+    {
+      _propertyItemsCache = GetObjectProperties( SelectedObject );
+      InitializePropertyGrid( IsCategorized );
+    }
+
+    private bool IsInitializing()
+    {
+      return _initializationCount != 0;
+    }
+
+    /// <summary>
+    /// Updates all property values in the PropertyGrid with the data from the SelectedObject
+    /// </summary>
+    public void Update()
+    {
+      foreach( var item in Properties )
+      {
+        BindingOperations.GetBindingExpressionBase( item, PropertyItem.ValueProperty ).UpdateTarget();
+      }
+    }
+
+    #endregion //Methods
+
+    #region Events
+
+    public static readonly RoutedEvent PropertyValueChangedEvent = EventManager.RegisterRoutedEvent( "PropertyValueChanged", RoutingStrategy.Bubble, typeof( PropertyValueChangedEventHandler ), typeof( PropertyGrid ) );
+    public event PropertyValueChangedEventHandler PropertyValueChanged
+    {
+      add
+      {
+        AddHandler( PropertyValueChangedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( PropertyValueChangedEvent, value );
+      }
+    }
+
+    public static readonly RoutedEvent SelectedPropertyItemChangedEvent = EventManager.RegisterRoutedEvent( "SelectedPropertyItemChanged", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( PropertyGrid ) );
+    public event RoutedEventHandler SelectedPropertyItemChanged
+    {
+      add
+      {
+        AddHandler( SelectedPropertyItemChangedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( SelectedPropertyItemChangedEvent, value );
+      }
+    }
+
+    #endregion //Events
+
+    #region Interfaces
+
+    #region ISupportInitialize Members
+
+    public override void BeginInit()
+    {
+      base.BeginInit();
+      _initializationCount++;
+    }
+
+    public override void EndInit()
+    {
+      base.EndInit();
+      if( --_initializationCount == 0 )
+      {
+        ProcessInitializationParameters();
+      }
+    }
+
+    private void ProcessInitializationParameters()
+    {
+      if( _hasPendingSelectedObjectChanged )
+      {
+        //This will update SelectedObject, Type, Name based on the actual config.
+        OnSelectedObjectChanged( SelectedObject, SelectedObject );
+      }
+    }
+
+    #endregion
+
+    #endregion
+  }
+
+  public delegate void PropertyValueChangedEventHandler( object sender, PropertyValueChangedEventArgs e );
+  public class PropertyValueChangedEventArgs : RoutedEventArgs
+  {
+    public object NewValue
+    {
+      get;
+      set;
+    }
+    public object OldValue
+    {
+      get;
+      set;
+    }
+
+    public PropertyValueChangedEventArgs( RoutedEvent routedEvent, object source, object oldValue, object newValue )
+      : base( routedEvent, source )
+    {
+      NewValue = newValue;
+      OldValue = oldValue;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGridUtilities.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGridUtilities.cs
new file mode 100644
index 00000000..b8ffc753
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGridUtilities.cs
@@ -0,0 +1,219 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Windows;
+using System.Windows.Data;
+using System.Windows.Media;
+using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
+using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  internal class PropertyGridUtilities
+  {
+    internal static T GetAttribute<T>( PropertyDescriptor property ) where T : Attribute
+    {
+      foreach( Attribute att in property.Attributes )
+      {
+        var tAtt = att as T;
+        if( tAtt != null )
+          return tAtt;
+      }
+      return null;
+    }
+
+    internal static PropertyItemCollection GetAlphabetizedProperties( List<PropertyItem> propertyItems )
+    {
+      PropertyItemCollection propertyCollection = new PropertyItemCollection( propertyItems );
+      propertyCollection.SortBy( "DisplayName", ListSortDirection.Ascending );
+      return propertyCollection;
+    }
+
+    internal static PropertyItemCollection GetCategorizedProperties( List<PropertyItem> propertyItems )
+    {
+      PropertyItemCollection propertyCollection = new PropertyItemCollection( propertyItems );
+      propertyCollection.GroupBy( "Category" );
+      propertyCollection.SortBy( "Category", ListSortDirection.Ascending );
+
+      propertyCollection.SortBy( "PropertyOrder", ListSortDirection.Ascending );
+      propertyCollection.SortBy( "DisplayName", ListSortDirection.Ascending );
+      return propertyCollection;
+    }
+
+
+    internal static PropertyDescriptorCollection GetPropertyDescriptors( object instance )
+    {
+      PropertyDescriptorCollection descriptors;
+
+      TypeConverter tc = TypeDescriptor.GetConverter( instance );
+      if( tc == null || !tc.GetPropertiesSupported() )
+      {
+
+        if( instance is ICustomTypeDescriptor )
+          descriptors = ( ( ICustomTypeDescriptor )instance ).GetProperties();
+        else
+          descriptors = TypeDescriptor.GetProperties( instance.GetType() );
+      }
+      else
+      {
+        descriptors = tc.GetProperties( instance );
+      }
+
+      return descriptors;
+    }
+
+    internal static PropertyItem CreatePropertyItem( PropertyDescriptor property, object instance, PropertyGrid grid, string bindingPath )
+    {
+        return CreatePropertyItem(property, instance, grid, bindingPath, 0);
+    }
+
+    internal static PropertyItem CreatePropertyItem( PropertyDescriptor property, object instance, PropertyGrid grid, string bindingPath, int level )
+    {
+      PropertyItem propertyItem = new PropertyItem( instance, property, grid, bindingPath, level );
+
+      var binding = new Binding( bindingPath )
+      {
+        Source = instance,
+        ValidatesOnExceptions = true,
+        ValidatesOnDataErrors = true,
+        Mode = propertyItem.IsReadOnly ? BindingMode.OneWay : BindingMode.TwoWay
+      };
+      propertyItem.SetBinding( PropertyItem.ValueProperty, binding );
+
+      propertyItem.Editor = PropertyGridUtilities.GetTypeEditor( propertyItem
+                                                                , grid.EditorDefinitions
+                                                                );
+      return propertyItem;
+    }
+
+    internal static FrameworkElement GetTypeEditor( PropertyItem propertyItem
+                                                    , EditorDefinitionCollection editorDefinitions
+                                                    )
+    {
+      FrameworkElement editor = null;
+
+      //first check for an attribute editor
+      if( editor == null )
+        editor = PropertyGridUtilities.GetAttibuteEditor( propertyItem );
+
+      //now look for a custom editor based on editor definitions
+      if( editor == null )
+        editor = PropertyGridUtilities.GetCustomEditor( propertyItem, editorDefinitions );
+
+      //guess we have to use the default editor
+      if( editor == null )
+        editor = PropertyGridUtilities.CreateDefaultEditor( propertyItem );
+
+      return editor;
+    }
+
+    internal static FrameworkElement GetAttibuteEditor( PropertyItem propertyItem )
+    {
+      FrameworkElement editor = null;
+
+      var itemsSourceAttribute = GetAttribute<ItemsSourceAttribute>( propertyItem.PropertyDescriptor );
+      if( itemsSourceAttribute != null )
+        editor = new ItemsSourceAttributeEditor( itemsSourceAttribute ).ResolveEditor( propertyItem );
+
+      var editorAttribute = GetAttribute<EditorAttribute>( propertyItem.PropertyDescriptor );
+      if( editorAttribute != null )
+      {
+        Type type = Type.GetType( editorAttribute.EditorTypeName );
+        var instance = Activator.CreateInstance( type );
+        if( instance is ITypeEditor )
+          editor = ( instance as ITypeEditor ).ResolveEditor( propertyItem );
+      }
+
+      return editor;
+    }
+
+    internal static FrameworkElement GetCustomEditor( PropertyItem propertyItem, EditorDefinitionCollection customTypeEditors )
+    {
+      FrameworkElement editor = null;
+
+      //check for custom editor
+      if( (customTypeEditors != null) && (customTypeEditors.Count > 0) )
+      {
+        //first check if the custom editor is type based
+        EditorDefinition customEditor = customTypeEditors[ propertyItem.PropertyType ];
+        if( customEditor == null )
+        {
+          //must be property based
+          customEditor = customTypeEditors[ propertyItem.Name ];
+        }
+
+        if( customEditor != null )
+        {
+          if( customEditor.EditorTemplate != null )
+            editor = customEditor.EditorTemplate.LoadContent() as FrameworkElement;
+        }
+      }
+
+      return editor;
+    }
+
+    internal static FrameworkElement CreateDefaultEditor( PropertyItem propertyItem )
+    {
+      ITypeEditor editor = null;
+
+
+      if( propertyItem.IsReadOnly )
+        editor = new TextBlockEditor();
+      else if( propertyItem.PropertyType == typeof( bool ) || propertyItem.PropertyType == typeof( bool? ) )
+        editor = new CheckBoxEditor();
+      else if( propertyItem.PropertyType == typeof( decimal ) || propertyItem.PropertyType == typeof( decimal? ) )
+        editor = new DecimalUpDownEditor();
+      else if( propertyItem.PropertyType == typeof( double ) || propertyItem.PropertyType == typeof( double? ) )
+        editor = new DoubleUpDownEditor();
+      else if( propertyItem.PropertyType == typeof( int ) || propertyItem.PropertyType == typeof( int? ) )
+        editor = new IntegerUpDownEditor();
+      else if( propertyItem.PropertyType == typeof( DateTime ) || propertyItem.PropertyType == typeof( DateTime? ) )
+        editor = new DateTimeUpDownEditor();
+      else if( ( propertyItem.PropertyType == typeof( Color ) ) )
+        editor = new ColorEditor();
+      else if( propertyItem.PropertyType.IsEnum )
+        editor = new EnumComboBoxEditor();
+      else if( propertyItem.PropertyType == typeof( TimeSpan ) )
+        editor = new TimeSpanEditor();
+      else if( propertyItem.PropertyType == typeof( FontFamily ) || propertyItem.PropertyType == typeof( FontWeight ) || propertyItem.PropertyType == typeof( FontStyle ) || propertyItem.PropertyType == typeof( FontStretch ) )
+        editor = new FontComboBoxEditor();
+      else
+      {
+        Type listType = CollectionEditor.GetListItemType(propertyItem.PropertyType);
+
+        if(listType != null)
+        {
+          if( !listType.IsPrimitive && !listType.Equals( typeof( String ) ) )
+            editor = new Xceed.Wpf.Toolkit.PropertyGrid.Editors.CollectionEditor();
+          else
+            editor = new Xceed.Wpf.Toolkit.PropertyGrid.Editors.PrimitiveTypeCollectionEditor();
+        }
+        else
+          editor = new TextBoxEditor();
+      }
+
+      return editor.ResolveEditor( propertyItem );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItem.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItem.cs
new file mode 100644
index 00000000..1684b3e4
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItem.cs
@@ -0,0 +1,548 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Input;
+using System.Windows.Markup.Primitives;
+using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
+using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  public class PropertyItem : Control
+  {
+    #region Members
+
+    private DependencyPropertyDescriptor _dpDescriptor;
+    private MarkupObject _markupObject;
+
+    #endregion //Members
+
+    #region Properties
+
+    public string BindingPath
+    {
+      get;
+      private set;
+    }
+
+    #region Category
+
+    public static readonly DependencyProperty CategoryProperty = DependencyProperty.Register( "Category", typeof( string ), typeof( PropertyItem ), new UIPropertyMetadata( string.Empty ) );
+    public string Category
+    {
+      get
+      {
+        return ( string )GetValue( CategoryProperty );
+      }
+      set
+      {
+        SetValue( CategoryProperty, value );
+      }
+    }
+
+    #endregion //Category
+
+    #region Description
+
+    public string Description
+    {
+      get
+      {
+        return PropertyDescriptor.Description;
+      }
+    }
+
+    #endregion //Description
+
+    #region DisplayName
+
+    public static readonly DependencyProperty DisplayNameProperty = DependencyProperty.Register( "DisplayName", typeof( string ), typeof( PropertyItem ), new UIPropertyMetadata( null ) );
+    public string DisplayName
+    {
+      get
+      {
+        return ( string )GetValue( DisplayNameProperty );
+      }
+      set
+      {
+        SetValue( DisplayNameProperty, value );
+      }
+    }
+
+    #endregion //DisplayName
+
+    #region Editor
+
+    public static readonly DependencyProperty EditorProperty = DependencyProperty.Register( "Editor", typeof( FrameworkElement ), typeof( PropertyItem ), new UIPropertyMetadata( null, OnEditorChanged ) );
+    public FrameworkElement Editor
+    {
+      get
+      {
+        return ( FrameworkElement )GetValue( EditorProperty );
+      }
+      set
+      {
+        SetValue( EditorProperty, value );
+      }
+    }
+
+    private static void OnEditorChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PropertyItem propertyItem = o as PropertyItem;
+      if( propertyItem != null )
+        propertyItem.OnEditorChanged( ( FrameworkElement )e.OldValue, ( FrameworkElement )e.NewValue );
+    }
+
+    protected virtual void OnEditorChanged( FrameworkElement oldValue, FrameworkElement newValue )
+    {
+      if( oldValue != null )
+        oldValue.DataContext = null;
+
+      if( newValue != null )
+        newValue.DataContext = this;
+    }
+
+    #endregion //Editor
+
+    #region Instance
+
+    private object _instance;
+    public object Instance
+    {
+      get
+      {
+        return _instance;
+      }
+      private set
+      {
+        _instance = value;
+        _markupObject = MarkupWriter.GetMarkupObjectFor( _instance );
+      }
+    }
+
+    #endregion //Instance
+
+    #region IsDataBound
+
+    /// <summary>
+    /// Gets if the property is data bound
+    /// </summary>
+    public bool IsDataBound
+    {
+      get
+      {
+        var dependencyObject = Instance as DependencyObject;
+        if( dependencyObject != null && _dpDescriptor != null )
+          return BindingOperations.GetBindingExpressionBase( dependencyObject, _dpDescriptor.DependencyProperty ) != null;
+
+        return false;
+      }
+    }
+
+    #endregion //IsDataBound
+
+    #region IsDynamicResource
+
+    public bool IsDynamicResource
+    {
+      get
+      {
+        var markupProperty = _markupObject.Properties.Where( p => p.Name == PropertyDescriptor.Name ).FirstOrDefault();
+        if( markupProperty != null )
+          return markupProperty.Value is DynamicResourceExtension;
+        return false;
+      }
+    }
+
+    #endregion //IsDynamicResource
+
+    #region IsExpanded
+
+    public static readonly DependencyProperty IsExpandedProperty = DependencyProperty.Register( "IsExpanded", typeof( bool ), typeof( PropertyItem ), new UIPropertyMetadata( false, OnIsExpandedChanged ) );
+    public bool IsExpanded
+    {
+      get
+      {
+        return ( bool )GetValue( IsExpandedProperty );
+      }
+      set
+      {
+        SetValue( IsExpandedProperty, value );
+      }
+    }
+
+    private static void OnIsExpandedChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PropertyItem propertyItem = o as PropertyItem;
+      if( propertyItem != null )
+        propertyItem.OnIsExpandedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnIsExpandedChanged( bool oldValue, bool newValue )
+    {
+      if( newValue && ( Properties == null || Properties.Count == 0 ) )
+      {
+        GetChildProperties();
+      }
+    }
+
+    #endregion IsExpanded
+
+    #region HasChildProperties
+
+    public static readonly DependencyProperty HasChildPropertiesProperty = DependencyProperty.Register( "HasChildProperties", typeof( bool ), typeof( PropertyItem ), new UIPropertyMetadata( false ) );
+    public bool HasChildProperties
+    {
+      get
+      {
+        return ( bool )GetValue( HasChildPropertiesProperty );
+      }
+      set
+      {
+        SetValue( HasChildPropertiesProperty, value );
+      }
+    }
+
+    #endregion HasChildProperties
+
+    #region HasResourceApplied
+
+    public bool HasResourceApplied
+    {
+      //TODO: need to find a better way to determine if a StaticResource has been applied to any property not just a style
+      get
+      {
+        var markupProperty = _markupObject.Properties.Where( p => p.Name == PropertyDescriptor.Name ).FirstOrDefault();
+        if( markupProperty != null )
+          return markupProperty.Value is Style;
+
+        return false;
+      }
+    }
+
+    #endregion //HasResourceApplied
+
+    public bool IsReadOnly
+    {
+      get;
+      private set;
+    }
+
+    #region IsSelected
+
+    public static readonly DependencyProperty IsSelectedProperty = DependencyProperty.Register( "IsSelected", typeof( bool ), typeof( PropertyItem ), new UIPropertyMetadata( false, OnIsSelectedChanged ) );
+    public bool IsSelected
+    {
+      get
+      {
+        return ( bool )GetValue( IsSelectedProperty );
+      }
+      set
+      {
+        SetValue( IsSelectedProperty, value );
+      }
+    }
+
+    private static void OnIsSelectedChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PropertyItem propertyItem = o as PropertyItem;
+      if( propertyItem != null )
+        propertyItem.OnIsSelectedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnIsSelectedChanged( bool oldValue, bool newValue )
+    {
+      if( newValue )
+        PropertyGrid.SelectedPropertyItem = this;
+    }
+
+    #endregion //IsSelected
+
+    #region Level
+
+    public static readonly DependencyProperty LevelProperty = DependencyProperty.Register( "Level", typeof( int ), typeof( PropertyItem ), new UIPropertyMetadata( 0 ) );
+    public int Level
+    {
+      get
+      {
+        return ( int )GetValue( LevelProperty );
+      }
+      set
+      {
+        SetValue( LevelProperty, value );
+      }
+    }
+
+    #endregion //Level
+
+    #region Properties
+
+    public static readonly DependencyProperty PropertiesProperty = DependencyProperty.Register( "Properties", typeof( PropertyItemCollection ), typeof( PropertyItem ), new UIPropertyMetadata( null ) );
+    public PropertyItemCollection Properties
+    {
+      get
+      {
+        return ( PropertyItemCollection )GetValue( PropertiesProperty );
+      }
+      set
+      {
+        SetValue( PropertiesProperty, value );
+      }
+    }
+
+    #endregion //Properties
+
+    #region PropertyDescriptor
+
+    private PropertyDescriptor _propertyDescriptor;
+    public PropertyDescriptor PropertyDescriptor
+    {
+      get
+      {
+        return _propertyDescriptor;
+      }
+      private set
+      {
+        _propertyDescriptor = value;
+        _dpDescriptor = DependencyPropertyDescriptor.FromProperty( _propertyDescriptor );
+      }
+    }
+
+    #endregion //PropertyDescriptor
+
+    public PropertyGrid PropertyGrid
+    {
+      get;
+      private set;
+    }
+
+    public int PropertyOrder
+    {
+      get;
+      set;
+    } //maybe make a DP
+
+    #region PropertyType
+
+    public Type PropertyType
+    {
+      get
+      {
+        return PropertyDescriptor.PropertyType;
+      }
+    }
+
+    #endregion //PropertyType
+
+    public ICommand ResetValueCommand
+    {
+      get;
+      private set;
+    }
+
+    #region Value
+
+    public static readonly DependencyProperty ValueProperty = DependencyProperty.Register( "Value", typeof( object ), typeof( PropertyItem ), new UIPropertyMetadata( null, OnValueChanged ) );
+    public object Value
+    {
+      get
+      {
+        return ( object )GetValue( ValueProperty );
+      }
+      set
+      {
+        SetValue( ValueProperty, value );
+      }
+    }
+
+    private static void OnValueChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PropertyItem propertyItem = o as PropertyItem;
+      if( propertyItem != null )
+      {
+        propertyItem.OnValueChanged( ( object )e.OldValue, ( object )e.NewValue );
+      }
+    }
+
+    protected virtual void OnValueChanged( object oldValue, object newValue )
+    {
+      if( IsInitialized )
+      {
+        PropertyGrid.RaiseEvent( new PropertyValueChangedEventArgs( PropertyGrid.PropertyValueChangedEvent, this, oldValue, newValue ) );
+      }
+    }
+
+    #endregion //Value
+
+    #region ValueSource
+
+    /// <summary>
+    /// Gets the value source.
+    /// </summary>
+    public BaseValueSource ValueSource
+    {
+      get
+      {
+        var dependencyObject = Instance as DependencyObject;
+        if( _dpDescriptor != null && dependencyObject != null )
+          return DependencyPropertyHelper.GetValueSource( dependencyObject, _dpDescriptor.DependencyProperty ).BaseValueSource;
+
+        return BaseValueSource.Unknown;
+      }
+    }
+
+    #endregion //ValueSource
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static PropertyItem()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyItem ), new FrameworkPropertyMetadata( typeof( PropertyItem ) ) );
+    }
+
+    public PropertyItem( object instance, PropertyDescriptor property, PropertyGrid propertyGrid, string bindingPath, int level )
+    {
+      PropertyDescriptor = property;
+      PropertyGrid = propertyGrid;
+      Instance = instance;
+      BindingPath = bindingPath;
+      Level = level;
+
+      SetPropertyDescriptorProperties();
+      ResolveParenthesisPropertyName();
+      ResolveExpandableObject();
+      ResolvePropertyOrder();
+
+      CommandBindings.Add( new CommandBinding( PropertyItemCommands.ResetValue, ExecuteResetValueCommand, CanExecuteResetValueCommand ) );
+      AddHandler( Mouse.PreviewMouseDownEvent, new MouseButtonEventHandler( PropertyItem_PreviewMouseDown ), true );
+    }
+
+    #endregion //Constructors
+
+    #region Event Handlers
+
+    void PropertyItem_PreviewMouseDown( object sender, MouseButtonEventArgs e )
+    {
+      IsSelected = true;
+    }
+
+    #endregion  //Event Handlers
+
+    #region Commands
+
+    private void ExecuteResetValueCommand( object sender, ExecutedRoutedEventArgs e )
+    {
+      if( PropertyDescriptor.CanResetValue( Instance ) )
+        PropertyDescriptor.ResetValue( Instance );
+
+      //TODO: notify UI that the ValueSource may have changed to update the icon
+    }
+
+    private void CanExecuteResetValueCommand( object sender, CanExecuteRoutedEventArgs e )
+    {
+      bool canExecute = false;
+
+      if( PropertyDescriptor.CanResetValue( Instance ) && !PropertyDescriptor.IsReadOnly )
+      {
+        canExecute = true;
+      }
+
+      e.CanExecute = canExecute;
+    }
+
+    #endregion //Commands
+
+    #region Methods
+
+    private void GetChildProperties()
+    {
+      if( Value == null )
+        return;
+
+      var propertyItems = new List<PropertyItem>();
+
+      try
+      {
+        PropertyDescriptorCollection descriptors = PropertyGridUtilities.GetPropertyDescriptors( Value );
+
+        foreach( PropertyDescriptor descriptor in descriptors )
+        {
+          if( descriptor.IsBrowsable )
+          {
+            PropertyItem childPropertyItem = PropertyGridUtilities.CreatePropertyItem( descriptor, Instance, PropertyGrid, String.Format( "{0}.{1}", BindingPath, descriptor.Name ), Level + 1 );
+            propertyItems.Add( childPropertyItem );
+          }
+        }
+      }
+      catch( Exception )
+      {
+        //TODO: handle this some how
+      }
+
+      Properties = PropertyGridUtilities.GetAlphabetizedProperties( propertyItems );
+    }
+
+    private void ResolveParenthesisPropertyName()
+    {
+      var attribute = PropertyGridUtilities.GetAttribute<ParenthesizePropertyNameAttribute>( PropertyDescriptor );
+      if( (attribute != null) && attribute.NeedParenthesis )
+      {
+        DisplayName = "(" + DisplayName + ")";
+      }
+    }
+
+    private void ResolveExpandableObject()
+    {
+      var attribute = PropertyGridUtilities.GetAttribute<ExpandableObjectAttribute>( PropertyDescriptor );
+      if( attribute != null )
+      {
+        HasChildProperties = true;
+        IsReadOnly = true;
+      }
+    }
+
+    private void ResolvePropertyOrder()
+    {
+      var attrs = PropertyDescriptor.Attributes.OfType<PropertyOrderAttribute>();
+      if( attrs.Any() )
+        PropertyOrder = attrs.First().Order;
+      else
+        PropertyOrder = 0;
+    }
+
+    private void SetPropertyDescriptorProperties()
+    {
+      Name = PropertyDescriptor.Name;
+      DisplayName = PropertyDescriptor.DisplayName;
+      Category = PropertyDescriptor.Category;
+      IsReadOnly = PropertyDescriptor.IsReadOnly;
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItemCollection.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItemCollection.cs
new file mode 100644
index 00000000..53961ee1
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItemCollection.cs
@@ -0,0 +1,72 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  public class PropertyItemCollection : ObservableCollection<PropertyItem>
+  {
+    public PropertyItemCollection()
+    {
+
+    }
+
+    public PropertyItemCollection( List<PropertyItem> list )
+      : base( list )
+    {
+
+    }
+    public PropertyItemCollection( IEnumerable<PropertyItem> collection )
+      : base( collection )
+    {
+
+    }
+
+    private ICollectionView GetDefaultView()
+    {
+      return CollectionViewSource.GetDefaultView( this );
+    }
+
+    public void GroupBy( string name )
+    {
+      GetDefaultView().GroupDescriptions.Add( new PropertyGroupDescription( name ) );
+    }
+
+    public void SortBy( string name, ListSortDirection sortDirection )
+    {
+      GetDefaultView().SortDescriptions.Add( new SortDescription( name, sortDirection ) );
+    }
+
+    public void Filter( string text )
+    {
+      if( text == null )
+        return;
+
+      GetDefaultView().Filter = ( item ) =>
+      {
+        var property = item as PropertyItem;
+        return property.DisplayName.ToLower().StartsWith( text.ToLower() );
+      };
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Themes/Generic.xaml
new file mode 100644
index 00000000..2f8c6e0c
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Themes/Generic.xaml
@@ -0,0 +1,535 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:pg="clr-namespace:Xceed.Wpf.Toolkit.PropertyGrid"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
+                    xmlns:pgconv="clr-namespace:Xceed.Wpf.Toolkit.PropertyGrid.Converters"
+                    xmlns:utilities="clr-namespace:Xceed.Wpf.Toolkit.Core.Utilities"
+                    xmlns:commands="clr-namespace:Xceed.Wpf.Toolkit.PropertyGrid.Commands">
+
+   <!-- =============================================================================== -->
+   <!-- PropertyGrid                                                                    -->
+   <!-- =============================================================================== -->
+
+   <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+   <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+   <pgconv:ExpandableObjectMarginConverter x:Key="ExpandableObjectMarginConverter" />
+   <pgconv:ValueSourceToImagePathConverter x:Key="ValueSourceToImagePathConverter" />
+   <pgconv:ValueSourceToToolTipConverter x:Key="ValueSourceToToolTipConverter" />
+
+   <SolidColorBrush x:Key="MouseOverBorderBrush" Color="#FFFFB700" />
+   <LinearGradientBrush x:Key="MouseOverBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <GradientStop Offset="0" Color="#FFFEFBF4" />
+      <GradientStop Offset="0.19" Color="#FFFDE7CE" />
+      <GradientStop Offset="0.39" Color="#FFFDDEB8" />
+      <GradientStop Offset="0.39" Color="#FFFFCE6B" />
+      <GradientStop Offset="0.79" Color="#FFFFDE9A" />
+      <GradientStop Offset="1" Color="#FFFFEBAA" />
+   </LinearGradientBrush>
+
+   <SolidColorBrush x:Key="CheckedBorderBrush" Color="#FFC29B29" />
+   <LinearGradientBrush x:Key="CheckedBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <GradientStop Offset="0" Color="#FFFFDCA0" />
+      <GradientStop Offset="0.18" Color="#FFFFD692" />
+      <GradientStop Offset="0.39" Color="#FFFFC45D" />
+      <GradientStop Offset="1" Color="#FFFFD178" />
+   </LinearGradientBrush>
+
+   <SolidColorBrush x:Key="PressedBorderBrush" Color="#FFC29B29" />
+   <LinearGradientBrush x:Key="PressedBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <GradientStop Offset="0" Color="#FFE3C085" />
+      <GradientStop Offset="0.19" Color="#FFF4CC89" />
+      <GradientStop Offset="0.36" Color="#FFF5C777" />
+      <GradientStop Offset="0.36" Color="#FFF5BB56" />
+      <GradientStop Offset="0.79" Color="#FFF4CE9A" />
+      <GradientStop Offset="1" Color="#FFF3E28D" />
+   </LinearGradientBrush>
+
+   <Style x:Key="OptionsToggleButtonStyle" TargetType="{x:Type RadioButton}">
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="BorderBrush" Value="Transparent" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+      <Setter Property="Height" Value="22" />
+      <Setter Property="HorizontalContentAlignment" Value="Center" />
+      <Setter Property="ToolTipService.InitialShowDelay" Value="900" />
+      <Setter Property="ToolTipService.ShowDuration" Value="20000" />
+      <Setter Property="ToolTipService.BetweenShowDelay" Value="0" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type RadioButton}">
+               <Grid SnapsToDevicePixels="True">
+                  <Border x:Name="OuterBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="2" />
+                  <Border x:Name="MiddleBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2">
+                     <Border x:Name="InnerBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2" Padding="{TemplateBinding Padding}">
+                        <StackPanel x:Name="StackPanel" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
+                           <ContentPresenter x:Name="Content"
+                                             Content="{TemplateBinding Content}"
+                                             Margin="1"
+                                             RenderOptions.BitmapScalingMode="NearestNeighbor"
+                                             VerticalAlignment="Center"
+                                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                        </StackPanel>
+                     </Border>
+                  </Border>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsMouseOver" Value="True">
+                     <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource MouseOverBackgroundBrush}" />
+                     <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource MouseOverBorderBrush}" />
+                     <Setter Property="BorderBrush" TargetName="InnerBorder" Value="#80FFFFFF" />
+                  </Trigger>
+
+                  <Trigger Property="IsEnabled" Value="False">
+                     <Setter Property="Opacity" TargetName="Content" Value="0.5" />
+                     <Setter Property="TextElement.Foreground" TargetName="OuterBorder" Value="#FF9E9E9E" />
+                  </Trigger>
+
+                  <Trigger Property="IsChecked" Value="True">
+                     <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource CheckedBackgroundBrush}" />
+                     <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource CheckedBorderBrush}" />
+                     <Setter Property="BorderBrush" TargetName="InnerBorder">
+                        <Setter.Value>
+                           <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
+                              <GradientStop Color="#FFE7CBAD" Offset="0" />
+                              <GradientStop Color="#FFF7D7B5" Offset="0.1" />
+                              <GradientStop Color="#FFFFD38C" Offset="0.36" />
+                              <GradientStop Color="#FFFFC75A" Offset="0.36" />
+                              <GradientStop Color="#FFFFEFA5" Offset="1" />
+                           </LinearGradientBrush>
+                        </Setter.Value>
+                     </Setter>
+                  </Trigger>
+
+                  <Trigger Property="IsPressed" Value="True">
+                     <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource PressedBackgroundBrush}" />
+                     <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource PressedBorderBrush}" />
+                     <Setter Property="BorderBrush" TargetName="InnerBorder" Value="Transparent" />
+                  </Trigger>
+
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="IsChecked" Value="True" />
+                        <Condition Property="IsMouseOver" Value="True" />
+                     </MultiTrigger.Conditions>
+                     <Setter Property="Background" TargetName="MiddleBorder">
+                        <Setter.Value>
+                           <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
+                              <GradientStop Color="#40FFFEFE" Offset="0" />
+                              <GradientStop Color="#40FFFEFE" Offset="0.39" />
+                              <GradientStop Color="#20FFCE68" Offset="0.39" />
+                              <GradientStop Color="#20FFCE68" Offset="0.69" />
+                              <GradientStop Color="#10FFFFFF" Offset="1" />
+                           </LinearGradientBrush>
+                        </Setter.Value>
+                     </Setter>
+                  </MultiTrigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="ClearFilterButtonStyle" TargetType="{x:Type Button}">
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="BorderBrush" Value="Transparent" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Height" Value="22" />
+      <Setter Property="HorizontalContentAlignment" Value="Center" />
+      <Setter Property="ToolTipService.InitialShowDelay" Value="900" />
+      <Setter Property="ToolTipService.ShowDuration" Value="20000" />
+      <Setter Property="ToolTipService.BetweenShowDelay" Value="0" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Button}">
+               <Grid SnapsToDevicePixels="True">
+                  <Border x:Name="OuterBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="2" />
+                  <Border x:Name="MiddleBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2">
+                     <Border x:Name="InnerBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2" Padding="{TemplateBinding Padding}">
+                        <StackPanel x:Name="StackPanel" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
+                           <ContentPresenter x:Name="Content"
+                                             Content="{TemplateBinding Content}"
+                                             Margin="1"
+                                             RenderOptions.BitmapScalingMode="NearestNeighbor"
+                                             VerticalAlignment="Center"
+                                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                        </StackPanel>
+                     </Border>
+                  </Border>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsMouseOver" Value="True">
+                     <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource MouseOverBackgroundBrush}" />
+                     <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource MouseOverBorderBrush}" />
+                     <Setter Property="BorderBrush" TargetName="InnerBorder" Value="#80FFFFFF" />
+                  </Trigger>
+
+                  <Trigger Property="IsEnabled" Value="False">
+                     <Setter Property="Opacity" TargetName="Content" Value="0.5" />
+                     <Setter Property="TextElement.Foreground" TargetName="OuterBorder" Value="#FF9E9E9E" />
+                  </Trigger>
+
+                  <Trigger Property="IsPressed" Value="True">
+                     <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource PressedBackgroundBrush}" />
+                     <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource PressedBorderBrush}" />
+                     <Setter Property="BorderBrush" TargetName="InnerBorder" Value="Transparent" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <SolidColorBrush x:Key="GlyphBrush" Color="#FF31347C" />
+
+   <ControlTemplate x:Key="ExpanderToggleButton" TargetType="{x:Type ToggleButton}">
+      <Grid>
+         <Rectangle Margin="0,0,0,0" x:Name="Rectangle" Fill="Transparent" />
+         <Path HorizontalAlignment="Center" x:Name="Up_Arrow" VerticalAlignment="Center" Fill="{StaticResource GlyphBrush}" Data="M 0 0 L 4 4 L 8 0 Z" RenderTransformOrigin="0.5,0.5">
+            <Path.RenderTransform>
+               <TransformGroup>
+                  <ScaleTransform ScaleX="1" ScaleY="1" />
+                  <SkewTransform AngleX="0" AngleY="0" />
+                  <RotateTransform Angle="-90" />
+                  <TranslateTransform X="0" Y="0" />
+               </TransformGroup>
+            </Path.RenderTransform>
+         </Path>
+         <Path Visibility="Collapsed" HorizontalAlignment="Center" x:Name="Down_Arrow" VerticalAlignment="Center" Fill="{StaticResource GlyphBrush}" Data="M 0 4 L 4 0 L 8 4 Z" RenderTransformOrigin="0.5,0.5">
+            <Path.RenderTransform>
+               <TransformGroup>
+                  <ScaleTransform ScaleX="1" ScaleY="1" />
+                  <SkewTransform AngleX="0" AngleY="0" />
+                  <RotateTransform Angle="135" />
+                  <TranslateTransform X="0" Y="0" />
+               </TransformGroup>
+            </Path.RenderTransform>
+         </Path>
+      </Grid>
+      <ControlTemplate.Triggers>
+         <Trigger Property="IsChecked" Value="true">
+            <Setter Property="Visibility" Value="Visible" TargetName="Down_Arrow" />
+            <Setter Property="Visibility" Value="Collapsed" TargetName="Up_Arrow" />
+            <Setter Property="OpacityMask" TargetName="Down_Arrow" Value="#FF000000" />
+         </Trigger>
+      </ControlTemplate.Triggers>
+   </ControlTemplate>
+
+   <Style x:Key="ExpanderStyle" TargetType="{x:Type Expander}">
+      <Setter Property="Padding" Value="0" />
+      <Setter Property="Background" Value="#FFF0F0F0" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Expander}">
+               <Grid>
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="Auto" />
+                     <RowDefinition Height="*" x:Name="ContentRow" />
+                  </Grid.RowDefinitions>
+                  <Border x:Name="Border" Background="{TemplateBinding Background}" BorderBrush="#FFF0F0F0">
+                     <Grid>
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="20" />
+                           <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <ToggleButton Template="{StaticResource ExpanderToggleButton}" IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" OverridesDefaultStyle="True" />
+                        <ContentPresenter Grid.Column="1" Margin="1" RecognizesAccessKey="True" ContentSource="Header" TextElement.FontWeight="Bold" />
+                     </Grid>
+                  </Border>
+                  <Border Visibility="Collapsed" Grid.Row="1" x:Name="ExpandSite" Background="#FFF0F0F0" Padding="10 0 0 0">
+                     <Border Background="#FFFFFF" BorderThickness="0" Margin="0" Padding="0" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Focusable="false" />
+                     </Border>
+                  </Border>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsExpanded" Value="True">
+                     <Setter Property="Visibility" Value="Visible" TargetName="ExpandSite" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="PropertyExpanderStyle" TargetType="{x:Type Expander}">
+      <Setter Property="Padding" Value="10 0 0 0" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Expander}">
+               <Grid>
+                  <Border Visibility="Collapsed" Grid.Row="1" x:Name="ExpandSite" Padding="0 0 0 0">
+                     <Border BorderThickness="0" Margin="0" Padding="0" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+												      VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+												      Focusable="false" />
+                     </Border>
+                  </Border>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsExpanded" Value="True">
+                     <Setter Property="Visibility" Value="Visible" TargetName="ExpandSite" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <ContextMenu x:Key="DefaultAdvancedOptionsMenu">
+      <MenuItem Header="Reset Value" Command="commands:PropertyItemCommands.ResetValue" />
+   </ContextMenu>
+
+   <Style TargetType="{x:Type pg:PropertyItem}">
+      <Setter Property="BorderBrush" Value="#FFF0F0F0" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Focusable" Value="True" />
+      <Setter Property="IsTabStop" Value="False" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type pg:PropertyItem}">
+               <Border Background="White" ContextMenu="{Binding AdvancedOptionsMenu, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}}" ContextMenuService.Placement="Bottom">
+                  <Grid VerticalAlignment="Center" HorizontalAlignment="Stretch">
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="{Binding NameColumnWidth, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type pg:PropertyGrid}}}" />
+                        <ColumnDefinition Width="*" />
+                     </Grid.ColumnDefinitions>
+                     <Grid.RowDefinitions>
+                        <RowDefinition />
+                        <RowDefinition />
+                     </Grid.RowDefinitions>
+
+                     <Border BorderThickness="0.5" BorderBrush="#FFF0F0F0" x:Name="PART_Name">
+                        <Grid Margin="2,2,2,2">
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="*" />
+                              <ColumnDefinition Width="Auto" />
+                           </Grid.ColumnDefinitions>
+
+                           <Grid Margin="{Binding Level, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ExpandableObjectMarginConverter}}">
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="15" />
+                                 <ColumnDefinition Width="*" />
+                              </Grid.ColumnDefinitions>
+
+                              <Border Grid.Column="0">
+                                 <ToggleButton Template="{StaticResource ExpanderToggleButton}"
+                                               OverridesDefaultStyle="True"
+                                               IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}"
+                                               Visibility="{Binding HasChildProperties, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                              </Border>
+
+                              <TextBlock Grid.Column="1" Text="{Binding DisplayName, RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" TextTrimming="CharacterEllipsis" />
+                           </Grid>
+
+                           <Grid Grid.Column="1"
+                                 HorizontalAlignment="Right"
+                                 Margin="5,0,5,0"
+                                 Visibility="{Binding ShowAdvancedOptions, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}, Converter={StaticResource BooleanToVisibilityConverter}}"
+                                 utilities:ContextMenuUtilities.OpenOnMouseLeftButtonClick="True"
+                                 ContextMenu="{Binding AdvancedOptionsMenu, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}}">
+
+                              <Image x:Name="_optionsImage"
+                                     Width="11"
+                                     Height="11"
+                                     Source="{Binding ValueSource, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ValueSourceToImagePathConverter}}"
+                                     ToolTip="{Binding ValueSource, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ValueSourceToToolTipConverter}}" />
+                           </Grid>
+                        </Grid>
+                     </Border>
+
+                     <Border BorderThickness="0.5" BorderBrush="#FFF0F0F0" x:Name="PART_Editor" Grid.Column="1" Background="Transparent">
+                        <ContentControl Content="{TemplateBinding Editor}" VerticalAlignment="Center" Focusable="False" IsTabStop="False" />
+                     </Border>
+
+                     <Expander x:Name="_propertyExpander" Grid.ColumnSpan="2" Grid.Row="1" IsExpanded="{TemplateBinding IsExpanded}" Style="{StaticResource PropertyExpanderStyle}" IsEnabled="True">
+                        <ItemsControl ItemsSource="{Binding Properties, RelativeSource={RelativeSource TemplatedParent}}" IsTabStop="False" Focusable="False">
+                           <ItemsControl.ItemsPanel>
+                              <ItemsPanelTemplate>
+                                 <VirtualizingStackPanel />
+                              </ItemsPanelTemplate>
+                           </ItemsControl.ItemsPanel>
+                        </ItemsControl>
+                     </Expander>
+                  </Grid>
+               </Border>
+               <ControlTemplate.Triggers>
+                  <DataTrigger Binding="{Binding IsDataBound, RelativeSource={RelativeSource Self}}" Value="True">
+                     <Setter TargetName="_optionsImage" Property="Source" Value="/WPFToolkit.Extended;component/PropertyGrid/Images/Database11.png" />
+                     <Setter TargetName="_optionsImage" Property="ToolTip" Value="Databinding" />
+                  </DataTrigger>
+                  <DataTrigger Binding="{Binding IsDynamicResource, RelativeSource={RelativeSource Self}}" Value="True">
+                     <Setter TargetName="_optionsImage" Property="Source" Value="/WPFToolkit.Extended;component/PropertyGrid/Images/Resource11.png" />
+                     <Setter TargetName="_optionsImage" Property="ToolTip" Value="Resource" />
+                  </DataTrigger>
+                  <DataTrigger Binding="{Binding HasResourceApplied, RelativeSource={RelativeSource Self}}" Value="True">
+                     <Setter TargetName="_optionsImage" Property="Source" Value="/WPFToolkit.Extended;component/PropertyGrid/Images/Resource11.png" />
+                     <Setter TargetName="_optionsImage" Property="ToolTip" Value="Resource" />
+                  </DataTrigger>
+                  <Trigger Property="IsMouseOver" Value="True">
+                     <Setter TargetName="PART_Name" Property="Background" Value="#CED4DF" />
+                  </Trigger>
+                  <Trigger Property="IsSelected" Value="True">
+                     <Setter TargetName="PART_Name" Property="Background" Value="#43577B" />
+                     <Setter TargetName="PART_Name" Property="TextElement.Foreground" Value="White" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style TargetType="{x:Type pg:PropertyGrid}">
+      <Setter Property="AdvancedOptionsMenu" Value="{StaticResource DefaultAdvancedOptionsMenu}" />
+      <Setter Property="Background" Value="#CED4DF" />
+      <Setter Property="BorderBrush" Value="#43577B" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type pg:PropertyGrid}">
+               <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+                  <Grid>
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition />
+                        <RowDefinition Height="5" />
+                        <RowDefinition Height="Auto"/>
+                     </Grid.RowDefinitions>
+
+                     <StackPanel Orientation="Horizontal" Margin="6,2,0,4">
+                        <TextBlock Text="{TemplateBinding SelectedObjectTypeName}" FontWeight="Bold" Visibility="{Binding ShowTitle, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}"/>
+                        <TextBlock Text="{TemplateBinding SelectedObjectName}" Margin="5,0,0,0" Visibility="{Binding ShowTitle, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                     </StackPanel>
+
+                     <Grid Grid.Row="1" Margin="4,0,4,4">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="Auto" />
+                           <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <Grid Background="#BCC7D8" Margin="4" Visibility="{Binding ShowSortOptions, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
+                           <StackPanel Orientation="Horizontal" Margin="1" >
+                              <RadioButton IsChecked="{Binding IsCategorized, RelativeSource={RelativeSource TemplatedParent}}"
+                                           VerticalAlignment="Center"
+                                           Style="{StaticResource OptionsToggleButtonStyle}"
+                                           ToolTip="Categorized">
+                                 <Image Source="/WPFToolkit.Extended;component/PropertyGrid/Images/Categorize16.png" Width="16" Height="16" />
+                              </RadioButton>
+                              <RadioButton IsChecked="{Binding IsCategorized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}, Mode=OneWay}"
+                                           VerticalAlignment="Center"
+                                           Style="{StaticResource OptionsToggleButtonStyle}"
+                                           ToolTip="Alphabetical">
+                                 <Image Source="/WPFToolkit.Extended;component/PropertyGrid/Images/SortAscending16.png" Width="16" Height="16" />
+                              </RadioButton>
+                           </StackPanel>
+                        </Grid>
+
+                        <Border Grid.Column="1" Margin="4,4,0,4" Background="White" BorderBrush="Gray" BorderThickness="1" Visibility="{Binding ShowSearchBox, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
+                           <Grid>
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="*" />
+                                 <ColumnDefinition Width="Auto" />
+                              </Grid.ColumnDefinitions>
+                              <local:WatermarkTextBox x:Name="_txtFilter"
+                                                      Background="Transparent" 
+                                                      Text="{Binding Filter, RelativeSource={RelativeSource TemplatedParent}, UpdateSourceTrigger=PropertyChanged}"
+                                                      Watermark="{TemplateBinding FilterWatermark}">
+                                 <local:WatermarkTextBox.Style>
+                                    <Style TargetType="Control">
+                                       <Setter Property="BorderThickness" Value="0" />
+                                       <Style.Triggers>
+                                          <Trigger Property="IsMouseOver" Value="True">
+                                             <Setter Property="BorderThickness" Value="1" />
+                                          </Trigger>
+                                       </Style.Triggers>
+                                    </Style>
+                                 </local:WatermarkTextBox.Style>
+
+                              </local:WatermarkTextBox>
+
+                              <Button Grid.Column="1"
+                                      Command="commands:PropertyGridCommands.ClearFilter"
+                                      Style="{StaticResource ClearFilterButtonStyle}"
+                                      HorizontalAlignment="Left">
+                                 <Image Source="/WPFToolkit.Extended;component/PropertyGrid/Images/ClearFilter16.png" Width="16" Height="16" />
+                              </Button>
+                           </Grid>
+                        </Border>
+                     </Grid>
+
+                     <Grid Grid.Row="2" Background="White">
+                        <ScrollViewer VerticalScrollBarVisibility="Auto">
+                           <ItemsControl ItemsSource="{Binding Properties, RelativeSource={RelativeSource TemplatedParent}}" IsTabStop="False" Focusable="False">
+                              <ItemsControl.ItemsPanel>
+                                 <ItemsPanelTemplate>
+                                    <VirtualizingStackPanel />
+                                 </ItemsPanelTemplate>
+                              </ItemsControl.ItemsPanel>
+
+                              <ItemsControl.GroupStyle>
+                                 <GroupStyle>
+                                    <GroupStyle.ContainerStyle>
+                                       <Style TargetType="{x:Type GroupItem}">
+                                          <Setter Property="Template">
+                                             <Setter.Value>
+                                                <ControlTemplate>
+                                                   <Border Background="{TemplateBinding Background}"
+                                                           BorderBrush="{TemplateBinding BorderBrush}"
+                                                           BorderThickness="{TemplateBinding BorderThickness}">
+                                                      <Expander Header="{Binding Name}" Style="{StaticResource ExpanderStyle}" IsExpanded="True">
+                                                         <ItemsPresenter />
+                                                      </Expander>
+                                                   </Border>
+                                                </ControlTemplate>
+                                             </Setter.Value>
+                                          </Setter>
+                                       </Style>
+                                    </GroupStyle.ContainerStyle>
+                                 </GroupStyle>
+                              </ItemsControl.GroupStyle>
+
+                           </ItemsControl>
+                        </ScrollViewer>
+
+                         <Thumb x:Name="PART_DragThumb" HorizontalAlignment="Left" Width="5" Margin="6,0,0,0" Cursor="SizeWE">
+                           <Thumb.Template>
+                              <ControlTemplate>
+                                 <Border Background="Transparent" />
+                              </ControlTemplate>
+                           </Thumb.Template>
+                        </Thumb>
+
+                     </Grid>
+
+                     <GridSplitter Height="3" Grid.Row="3" HorizontalAlignment="Stretch" Visibility="{Binding ShowSummary, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                     <StackPanel Grid.Row="4" Margin="0,0,0,5" Visibility="{Binding ShowSummary, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
+                        <TextBlock Padding="2 2 2 0" FontWeight="Bold" Text="{Binding SelectedPropertyItem.DisplayName, RelativeSource={RelativeSource TemplatedParent}}" />
+                        <TextBlock Padding="5 2 2 0" TextWrapping="WrapWithOverflow" Text="{Binding SelectedPropertyItem.Description, RelativeSource={RelativeSource TemplatedParent}}" />
+                     </StackPanel>
+                  </Grid>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/Formatters/ITextFormatter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/Formatters/ITextFormatter.cs
new file mode 100644
index 00000000..85d07765
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/Formatters/ITextFormatter.cs
@@ -0,0 +1,29 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows.Documents;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public interface ITextFormatter
+  {
+    string GetText( FlowDocument document );
+    void SetText( FlowDocument document, string text );
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/Formatters/PlainTextFormatter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/Formatters/PlainTextFormatter.cs
new file mode 100644
index 00000000..2431b185
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/Formatters/PlainTextFormatter.cs
@@ -0,0 +1,39 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows.Documents;
+
+namespace Xceed.Wpf.Toolkit
+{
+  /// <summary>
+  /// Formats the RichTextBox text as plain text
+  /// </summary>
+  public class PlainTextFormatter : ITextFormatter
+  {
+    public string GetText( FlowDocument document )
+    {
+      return new TextRange( document.ContentStart, document.ContentEnd ).Text;
+    }
+
+    public void SetText( FlowDocument document, string text )
+    {
+      new TextRange( document.ContentStart, document.ContentEnd ).Text = text;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/Formatters/RtfFormatter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/Formatters/RtfFormatter.cs
new file mode 100644
index 00000000..733a82f7
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/Formatters/RtfFormatter.cs
@@ -0,0 +1,68 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.IO;
+using System.Text;
+using System.Windows;
+using System.Windows.Documents;
+
+namespace Xceed.Wpf.Toolkit
+{
+  /// <summary>
+  /// Formats the RichTextBox text as RTF
+  /// </summary>
+  public class RtfFormatter : ITextFormatter
+  {
+    public string GetText( FlowDocument document )
+    {
+      TextRange tr = new TextRange( document.ContentStart, document.ContentEnd );
+      using( MemoryStream ms = new MemoryStream() )
+      {
+        tr.Save( ms, DataFormats.Rtf );
+        return ASCIIEncoding.Default.GetString( ms.ToArray() );
+      }
+    }
+
+    public void SetText( FlowDocument document, string text )
+    {
+      try
+      {
+        //if the text is null/empty clear the contents of the RTB. If you were to pass a null/empty string
+        //to the TextRange.Load method an exception would occur.
+        if( String.IsNullOrEmpty( text ) )
+        {
+          document.Blocks.Clear();
+        }
+        else
+        {
+          TextRange tr = new TextRange( document.ContentStart, document.ContentEnd );
+          using( MemoryStream ms = new MemoryStream( Encoding.ASCII.GetBytes( text ) ) )
+          {
+            tr.Load( ms, DataFormats.Rtf );
+          }
+        }
+      }
+      catch
+      {
+        throw new InvalidDataException( "Data provided is not in the correct RTF format." );
+      }
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/Formatters/XamlFormatter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/Formatters/XamlFormatter.cs
new file mode 100644
index 00000000..769d5b0c
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/Formatters/XamlFormatter.cs
@@ -0,0 +1,68 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.IO;
+using System.Text;
+using System.Windows;
+using System.Windows.Documents;
+
+namespace Xceed.Wpf.Toolkit
+{
+  /// <summary>
+  /// Formats the RichTextBox text as Xaml
+  /// </summary>
+  public class XamlFormatter : ITextFormatter
+  {
+    public string GetText( System.Windows.Documents.FlowDocument document )
+    {
+      TextRange tr = new TextRange( document.ContentStart, document.ContentEnd );
+      using( MemoryStream ms = new MemoryStream() )
+      {
+        tr.Save( ms, DataFormats.Xaml );
+        return ASCIIEncoding.Default.GetString( ms.ToArray() );
+      }
+    }
+
+    public void SetText( System.Windows.Documents.FlowDocument document, string text )
+    {
+      try
+      {
+        //if the text is null/empty clear the contents of the RTB. If you were to pass a null/empty string
+        //to the TextRange.Load method an exception would occur.
+        if( String.IsNullOrEmpty( text ) )
+        {
+          document.Blocks.Clear();
+        }
+        else
+        {
+          TextRange tr = new TextRange( document.ContentStart, document.ContentEnd );
+          using( MemoryStream ms = new MemoryStream( Encoding.ASCII.GetBytes( text ) ) )
+          {
+            tr.Load( ms, DataFormats.Xaml );
+          }
+        }
+      }
+      catch
+      {
+        throw new InvalidDataException( "Data provided is not in the correct Xaml format." );
+      }
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/RichTextBox.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/RichTextBox.cs
new file mode 100644
index 00000000..8a100fe1
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/RichTextBox.cs
@@ -0,0 +1,170 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Data;
+using System.Windows.Threading;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class RichTextBox : System.Windows.Controls.RichTextBox
+  {
+    #region Private Members
+
+    private bool _textSetInternally;
+    bool _surpressGetText;
+
+    #endregion //Private Members
+
+    #region Constructors
+
+    public RichTextBox()
+    {
+      Loaded += RichTextBox_Loaded;
+    }
+
+    public RichTextBox( System.Windows.Documents.FlowDocument document )
+      : base( document )
+    {
+
+    }
+
+    #endregion //Constructors
+
+    #region Properties
+
+    #region Text
+
+    public static readonly DependencyProperty TextProperty = DependencyProperty.Register( "Text", typeof( string ), typeof( RichTextBox ), new FrameworkPropertyMetadata( String.Empty, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnTextPropertyChanged, CoerceTextProperty, true, UpdateSourceTrigger.LostFocus ) );
+    public string Text
+    {
+      get
+      {
+        return ( string )GetValue( TextProperty );
+      }
+      set
+      {
+        SetValue( TextProperty, value );
+      }
+    }
+
+    private static void OnTextPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      RichTextBox rtb = ( RichTextBox )d;
+
+      // if the text is not being set internally then load the text into the RichTextBox
+      if( !rtb._textSetInternally )
+      {
+        //to help with performance this is placed on the dispatcher for processing. For some reason when this is done the TextChanged event is fired multiple times
+        //forcing the UpdateText method to be called multiple times and the setter of the source property to be set multiple times. To fix this, we simply set the _surpressGetText
+        //member to true before the operation and set it to false when the operation completes. This will prevent the Text property from being set multiple times.
+        rtb._surpressGetText = true;
+        DispatcherOperation dop = Dispatcher.CurrentDispatcher.BeginInvoke( new Action( delegate()
+            {
+              rtb.TextFormatter.SetText( rtb.Document, ( string )e.NewValue );
+            } ), DispatcherPriority.Background );
+        dop.Completed += ( sender, ea ) =>
+            {
+              rtb._surpressGetText = false;
+            };
+      }
+    }
+
+    private static object CoerceTextProperty( DependencyObject d, object value )
+    {
+      return value ?? "";
+    }
+
+    #endregion //Text
+
+    #region TextFormatter
+
+    private ITextFormatter _textFormatter;
+    /// <summary>
+    /// The ITextFormatter the is used to format the text of the RichTextBox.
+    /// Deafult formatter is the RtfFormatter
+    /// </summary>
+    public ITextFormatter TextFormatter
+    {
+      get
+      {
+        if( _textFormatter == null )
+          _textFormatter = new RtfFormatter(); //default is rtf
+
+        return _textFormatter;
+      }
+      set
+      {
+        if( _textFormatter != value )
+        {
+          _textFormatter = value;
+          _textFormatter.SetText( Document, Text );
+        }
+      }
+    }
+
+    #endregion //TextFormatter
+
+    #endregion //Properties
+
+    #region Methods
+
+    private void UpdateText()
+    {
+      _textSetInternally = true;
+
+      if( !_surpressGetText )
+        Text = TextFormatter.GetText( Document );
+
+      _textSetInternally = false;
+    }
+
+    /// <summary>
+    /// Clears the content of the RichTextBox.
+    /// </summary>
+    public void Clear()
+    {
+      Document.Blocks.Clear();
+    }
+
+    #endregion //Methods
+
+    #region Event Hanlders
+
+    private void RichTextBox_Loaded( object sender, RoutedEventArgs e )
+    {
+      Binding binding = BindingOperations.GetBinding( this, TextProperty );
+
+      if( binding != null )
+      {
+        if( binding.UpdateSourceTrigger == UpdateSourceTrigger.Default || binding.UpdateSourceTrigger == UpdateSourceTrigger.LostFocus )
+        {
+          PreviewLostKeyboardFocus += ( o, ea ) => UpdateText();
+        }
+        else
+        {
+          TextChanged += ( o, ea ) => UpdateText();
+        }
+      }
+    }
+
+    #endregion //Event Hanlders
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs
new file mode 100644
index 00000000..2deeb9a4
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs
@@ -0,0 +1,38 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit
+{
+  public interface IRichTextBoxFormatBar
+  {
+    /// <summary>
+    /// Represents the RichTextBox that will be the target for all text manipulations in the format bar.
+    /// </summary>
+    System.Windows.Controls.RichTextBox Target
+    {
+      get;
+      set;
+    }
+
+    /// <summary>
+    /// Represents the Method that will be used to update the format bar values based on the Selection.
+    /// </summary>
+    void Update();
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Bold16.png b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Bold16.png
new file mode 100644
index 00000000..8fb36a1a
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Bold16.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Bullets16.png b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Bullets16.png
new file mode 100644
index 00000000..73e7c15e
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Bullets16.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/CenterAlign16.png b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/CenterAlign16.png
new file mode 100644
index 00000000..1030a021
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/CenterAlign16.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/FontColorPicker16.png b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/FontColorPicker16.png
new file mode 100644
index 00000000..d9207308
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/FontColorPicker16.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Italic16.png b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Italic16.png
new file mode 100644
index 00000000..8259a9e1
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Italic16.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/JustifyAlign16.png b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/JustifyAlign16.png
new file mode 100644
index 00000000..c5499bce
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/JustifyAlign16.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/LeftAlign16.png b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/LeftAlign16.png
new file mode 100644
index 00000000..51dffb73
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/LeftAlign16.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Numbering16.png b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Numbering16.png
new file mode 100644
index 00000000..03f6fde2
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Numbering16.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/RightAlign16.png b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/RightAlign16.png
new file mode 100644
index 00000000..cb8e400a
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/RightAlign16.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/TextHighlightColorPicker16.png b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/TextHighlightColorPicker16.png
new file mode 100644
index 00000000..4a3783f2
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/TextHighlightColorPicker16.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Underline16.png b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Underline16.png
new file mode 100644
index 00000000..72689482
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Underline16.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml
new file mode 100644
index 00000000..f9dbb581
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml
@@ -0,0 +1,478 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<UserControl x:Class="Xceed.Wpf.Toolkit.RichTextBoxFormatBar"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+             xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
+             Background="Transparent"
+             IsTabStop="False"
+             x:Name="_window">
+   <UserControl.Effect>
+      <DropShadowEffect BlurRadius="5" Opacity=".25" />
+   </UserControl.Effect>
+
+   <UserControl.Resources>
+
+      <conv:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
+
+      <Style TargetType="{x:Type Separator}" BasedOn="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}" />
+
+      <ControlTemplate x:Key="ThumbControlTemplate" TargetType="{x:Type Thumb}">
+         <Border Background="Transparent" Cursor="Hand" ToolTip="Click to Drag">
+            <StackPanel VerticalAlignment="Center" Width="75">
+               <Line SnapsToDevicePixels="True" Stretch="Fill" StrokeDashArray="1,2" StrokeThickness="1" X1="0" X2="1" Margin=".5">
+                  <Line.Stroke>
+                     <SolidColorBrush Color="Gray" />
+                  </Line.Stroke>
+               </Line>
+               <Line SnapsToDevicePixels="True" Stretch="Fill" StrokeDashArray="1,2" StrokeThickness="1" X1="0" X2="1" Margin=".5">
+                  <Line.Stroke>
+                     <SolidColorBrush Color="Gray" />
+                  </Line.Stroke>
+               </Line>
+               <Line SnapsToDevicePixels="True" Stretch="Fill" StrokeDashArray="1,2" StrokeThickness="1" X1="0" X2="1" Margin=".5">
+                  <Line.Stroke>
+                     <SolidColorBrush Color="Gray" />
+                  </Line.Stroke>
+               </Line>
+            </StackPanel>
+         </Border>
+      </ControlTemplate>
+
+      <SolidColorBrush x:Key="MouseOverBorderBrush" Color="#FFFFB700" />
+      <LinearGradientBrush x:Key="MouseOverBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+         <GradientStop Offset="0" Color="#FFFEFBF4" />
+         <GradientStop Offset="0.19" Color="#FFFDE7CE" />
+         <GradientStop Offset="0.39" Color="#FFFDDEB8" />
+         <GradientStop Offset="0.39" Color="#FFFFCE6B" />
+         <GradientStop Offset="0.79" Color="#FFFFDE9A" />
+         <GradientStop Offset="1" Color="#FFFFEBAA" />
+      </LinearGradientBrush>
+
+      <SolidColorBrush x:Key="CheckedBorderBrush" Color="#FFC29B29" />
+      <LinearGradientBrush x:Key="CheckedBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+         <GradientStop Offset="0" Color="#FFFFDCA0" />
+         <GradientStop Offset="0.18" Color="#FFFFD692" />
+         <GradientStop Offset="0.39" Color="#FFFFC45D" />
+         <GradientStop Offset="1" Color="#FFFFD178" />
+      </LinearGradientBrush>
+
+      <SolidColorBrush x:Key="PressedBorderBrush" Color="#FFC29B29" />
+      <LinearGradientBrush x:Key="PressedBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+         <GradientStop Offset="0" Color="#FFE3C085" />
+         <GradientStop Offset="0.19" Color="#FFF4CC89" />
+         <GradientStop Offset="0.36" Color="#FFF5C777" />
+         <GradientStop Offset="0.36" Color="#FFF5BB56" />
+         <GradientStop Offset="0.79" Color="#FFF4CE9A" />
+         <GradientStop Offset="1" Color="#FFF3E28D" />
+      </LinearGradientBrush>
+
+      <Style x:Key="FormatBarToggleButtonStyle" TargetType="{x:Type ToggleButton}">
+         <Setter Property="Background" Value="Transparent" />
+         <Setter Property="BorderBrush" Value="Transparent" />
+         <Setter Property="BorderThickness" Value="1" />
+         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+         <Setter Property="Height" Value="22" />
+         <Setter Property="HorizontalContentAlignment" Value="Center" />
+         <Setter Property="ToolTipService.InitialShowDelay" Value="900" />
+         <Setter Property="ToolTipService.ShowDuration" Value="20000" />
+         <Setter Property="ToolTipService.BetweenShowDelay" Value="0" />
+         <Setter Property="Template">
+            <Setter.Value>
+               <ControlTemplate TargetType="{x:Type ToggleButton}">
+                  <Grid SnapsToDevicePixels="True">
+                     <Border x:Name="OuterBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="2" />
+                     <Border x:Name="MiddleBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2">
+                        <Border x:Name="InnerBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2" Padding="{TemplateBinding Padding}">
+                           <StackPanel x:Name="StackPanel" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
+                              <ContentPresenter x:Name="Content"
+                                                Content="{TemplateBinding Content}"
+                                                Margin="1"
+                                                RenderOptions.BitmapScalingMode="NearestNeighbor"
+                                                VerticalAlignment="Center"
+                                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                           </StackPanel>
+                        </Border>
+                     </Border>
+                  </Grid>
+                  <ControlTemplate.Triggers>
+                     <Trigger Property="IsMouseOver" Value="True">
+                        <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource MouseOverBackgroundBrush}" />
+                        <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource MouseOverBorderBrush}" />
+                        <Setter Property="BorderBrush" TargetName="InnerBorder" Value="#80FFFFFF" />
+                     </Trigger>
+
+                     <Trigger Property="IsEnabled" Value="False">
+                        <Setter Property="Opacity" TargetName="Content" Value="0.5" />
+                        <Setter Property="TextElement.Foreground" TargetName="OuterBorder" Value="#FF9E9E9E" />
+                     </Trigger>
+
+                     <Trigger Property="IsChecked" Value="True">
+                        <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource CheckedBackgroundBrush}" />
+                        <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource CheckedBorderBrush}" />
+                        <Setter Property="BorderBrush" TargetName="InnerBorder">
+                           <Setter.Value>
+                              <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
+                                 <GradientStop Color="#FFE7CBAD" Offset="0" />
+                                 <GradientStop Color="#FFF7D7B5" Offset="0.1" />
+                                 <GradientStop Color="#FFFFD38C" Offset="0.36" />
+                                 <GradientStop Color="#FFFFC75A" Offset="0.36" />
+                                 <GradientStop Color="#FFFFEFA5" Offset="1" />
+                              </LinearGradientBrush>
+                           </Setter.Value>
+                        </Setter>
+                     </Trigger>
+
+                     <Trigger Property="IsPressed" Value="True">
+                        <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource PressedBackgroundBrush}" />
+                        <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource PressedBorderBrush}" />
+                        <Setter Property="BorderBrush" TargetName="InnerBorder" Value="Transparent" />
+                     </Trigger>
+
+                     <MultiTrigger>
+                        <MultiTrigger.Conditions>
+                           <Condition Property="IsChecked" Value="True" />
+                           <Condition Property="IsMouseOver" Value="True" />
+                        </MultiTrigger.Conditions>
+                        <Setter Property="Background" TargetName="MiddleBorder">
+                           <Setter.Value>
+                              <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
+                                 <GradientStop Color="#40FFFEFE" Offset="0" />
+                                 <GradientStop Color="#40FFFEFE" Offset="0.39" />
+                                 <GradientStop Color="#20FFCE68" Offset="0.39" />
+                                 <GradientStop Color="#20FFCE68" Offset="0.69" />
+                                 <GradientStop Color="#10FFFFFF" Offset="1" />
+                              </LinearGradientBrush>
+                           </Setter.Value>
+                        </Setter>
+                     </MultiTrigger>
+                  </ControlTemplate.Triggers>
+               </ControlTemplate>
+            </Setter.Value>
+         </Setter>
+      </Style>
+
+      <Style x:Key="FontColorButtonStyle" TargetType="{x:Type ToggleButton}">
+         <Setter Property="Background" Value="Transparent" />
+         <Setter Property="BorderBrush" Value="Transparent" />
+         <Setter Property="BorderThickness" Value="1" />
+         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+         <Setter Property="Height" Value="22" />
+         <Setter Property="HorizontalContentAlignment" Value="Center" />
+         <Setter Property="ToolTipService.InitialShowDelay" Value="900" />
+         <Setter Property="ToolTipService.ShowDuration" Value="20000" />
+         <Setter Property="ToolTipService.BetweenShowDelay" Value="0" />
+         <Setter Property="Template">
+            <Setter.Value>
+               <ControlTemplate TargetType="{x:Type ToggleButton}">
+                  <Grid SnapsToDevicePixels="True">
+                     <Border x:Name="OuterBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="2" />
+                     <Border x:Name="MiddleBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2">
+                        <Border x:Name="InnerBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2" Padding="{TemplateBinding Padding}">
+                           <Grid>
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="*" />
+                                 <ColumnDefinition />
+                              </Grid.ColumnDefinitions>
+
+                              <Grid>
+                                 <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/FontColorPicker16.png" Width="16" Height="16" />
+                                 <Rectangle Grid.Row="1"
+                                            Height="4"
+                                            Margin="0,12,0,0"
+                                            Fill="{Binding SelectedColor, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
+                              </Grid>
+
+                              <Path Grid.Column="1"
+                                    Width="7"
+                                    Height="4" 
+                                    Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000" />
+                           </Grid>
+                        </Border>
+                     </Border>
+                  </Grid>
+                  <ControlTemplate.Triggers>
+                     <Trigger Property="IsMouseOver" Value="True">
+                        <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource MouseOverBackgroundBrush}" />
+                        <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource MouseOverBorderBrush}" />
+                        <Setter Property="BorderBrush" TargetName="InnerBorder" Value="#80FFFFFF" />
+                     </Trigger>
+
+                     <Trigger Property="IsEnabled" Value="False">
+                        <Setter Property="TextElement.Foreground" TargetName="OuterBorder" Value="#FF9E9E9E" />
+                     </Trigger>
+
+                     <Trigger Property="IsChecked" Value="True">
+                        <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource CheckedBackgroundBrush}" />
+                        <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource CheckedBorderBrush}" />
+                        <Setter Property="BorderBrush" TargetName="InnerBorder">
+                           <Setter.Value>
+                              <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
+                                 <GradientStop Color="#FFE7CBAD" Offset="0" />
+                                 <GradientStop Color="#FFF7D7B5" Offset="0.1" />
+                                 <GradientStop Color="#FFFFD38C" Offset="0.36" />
+                                 <GradientStop Color="#FFFFC75A" Offset="0.36" />
+                                 <GradientStop Color="#FFFFEFA5" Offset="1" />
+                              </LinearGradientBrush>
+                           </Setter.Value>
+                        </Setter>
+                     </Trigger>
+
+                     <Trigger Property="IsPressed" Value="True">
+                        <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource PressedBackgroundBrush}" />
+                        <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource PressedBorderBrush}" />
+                        <Setter Property="BorderBrush" TargetName="InnerBorder" Value="Transparent" />
+                     </Trigger>
+
+                     <MultiTrigger>
+                        <MultiTrigger.Conditions>
+                           <Condition Property="IsChecked" Value="True" />
+                           <Condition Property="IsMouseOver" Value="True" />
+                        </MultiTrigger.Conditions>
+                        <Setter Property="Background" TargetName="MiddleBorder">
+                           <Setter.Value>
+                              <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
+                                 <GradientStop Color="#40FFFEFE" Offset="0" />
+                                 <GradientStop Color="#40FFFEFE" Offset="0.39" />
+                                 <GradientStop Color="#20FFCE68" Offset="0.39" />
+                                 <GradientStop Color="#20FFCE68" Offset="0.69" />
+                                 <GradientStop Color="#10FFFFFF" Offset="1" />
+                              </LinearGradientBrush>
+                           </Setter.Value>
+                        </Setter>
+                     </MultiTrigger>
+                  </ControlTemplate.Triggers>
+               </ControlTemplate>
+            </Setter.Value>
+         </Setter>
+      </Style>
+
+      <Style x:Key="FontBackgrounColorButtonStyle" TargetType="{x:Type ToggleButton}">
+         <Setter Property="Background" Value="White" />
+         <Setter Property="BorderBrush" Value="Transparent" />
+         <Setter Property="BorderThickness" Value="1" />
+         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+         <Setter Property="Height" Value="22" />
+         <Setter Property="HorizontalContentAlignment" Value="Center" />
+         <Setter Property="ToolTipService.InitialShowDelay" Value="900" />
+         <Setter Property="ToolTipService.ShowDuration" Value="20000" />
+         <Setter Property="ToolTipService.BetweenShowDelay" Value="0" />
+         <Setter Property="Template">
+            <Setter.Value>
+               <ControlTemplate TargetType="{x:Type ToggleButton}">
+                  <Grid SnapsToDevicePixels="True">
+                     <Border x:Name="OuterBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="2" />
+                     <Border x:Name="MiddleBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2">
+                        <Border x:Name="InnerBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2" Padding="{TemplateBinding Padding}">
+                           <Grid>
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="*" />
+                                 <ColumnDefinition />
+                              </Grid.ColumnDefinitions>
+
+                              <Grid>
+                                 <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/TextHighlightColorPicker16.png" Width="16" Height="16" />
+                                 <Rectangle Grid.Row="1"
+                                            Height="4"
+                                            Margin="0,12,0,0"
+                                            Fill="{Binding SelectedColor, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
+                              </Grid>
+
+                              <Path Grid.Column="1"
+                                    Width="7"
+                                    Height="4" 
+                                    Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000" />
+                           </Grid>
+                        </Border>
+                     </Border>
+                  </Grid>
+                  <ControlTemplate.Triggers>
+                     <Trigger Property="IsMouseOver" Value="True">
+                        <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource MouseOverBackgroundBrush}" />
+                        <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource MouseOverBorderBrush}" />
+                        <Setter Property="BorderBrush" TargetName="InnerBorder" Value="#80FFFFFF" />
+                     </Trigger>
+
+                     <Trigger Property="IsEnabled" Value="False">
+                        <Setter Property="TextElement.Foreground" TargetName="OuterBorder" Value="#FF9E9E9E" />
+                     </Trigger>
+
+                     <Trigger Property="IsChecked" Value="True">
+                        <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource CheckedBackgroundBrush}" />
+                        <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource CheckedBorderBrush}" />
+                        <Setter Property="BorderBrush" TargetName="InnerBorder">
+                           <Setter.Value>
+                              <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
+                                 <GradientStop Color="#FFE7CBAD" Offset="0" />
+                                 <GradientStop Color="#FFF7D7B5" Offset="0.1" />
+                                 <GradientStop Color="#FFFFD38C" Offset="0.36" />
+                                 <GradientStop Color="#FFFFC75A" Offset="0.36" />
+                                 <GradientStop Color="#FFFFEFA5" Offset="1" />
+                              </LinearGradientBrush>
+                           </Setter.Value>
+                        </Setter>
+                     </Trigger>
+
+                     <Trigger Property="IsPressed" Value="True">
+                        <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource PressedBackgroundBrush}" />
+                        <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource PressedBorderBrush}" />
+                        <Setter Property="BorderBrush" TargetName="InnerBorder" Value="Transparent" />
+                     </Trigger>
+
+                     <MultiTrigger>
+                        <MultiTrigger.Conditions>
+                           <Condition Property="IsChecked" Value="True" />
+                           <Condition Property="IsMouseOver" Value="True" />
+                        </MultiTrigger.Conditions>
+                        <Setter Property="Background" TargetName="MiddleBorder">
+                           <Setter.Value>
+                              <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
+                                 <GradientStop Color="#40FFFEFE" Offset="0" />
+                                 <GradientStop Color="#40FFFEFE" Offset="0.39" />
+                                 <GradientStop Color="#20FFCE68" Offset="0.39" />
+                                 <GradientStop Color="#20FFCE68" Offset="0.69" />
+                                 <GradientStop Color="#10FFFFFF" Offset="1" />
+                              </LinearGradientBrush>
+                           </Setter.Value>
+                        </Setter>
+                     </MultiTrigger>
+                  </ControlTemplate.Triggers>
+               </ControlTemplate>
+            </Setter.Value>
+         </Setter>
+      </Style>
+
+   </UserControl.Resources>
+
+   <Border CornerRadius="3" BorderThickness="1" BorderBrush="Gray" Background="WhiteSmoke">
+      <Grid Margin="5,0,5,5">
+         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+         </Grid.RowDefinitions>
+
+         <Thumb x:Name="_dragWidget" Height="10" 
+                   Template="{StaticResource ThumbControlTemplate}"
+                   DragDelta="DragWidget_DragDelta" />
+
+         <StackPanel Grid.Row="1">
+            <StackPanel Orientation="Horizontal">
+               <ComboBox x:Name="_cmbFontFamilies"
+                         IsEditable="True"
+                         Width="100"
+                         SelectionChanged="FontFamily_SelectionChanged"
+                         ToolTip="Font Family" />
+
+               <ComboBox x:Name="_cmbFontSizes"
+                         IsEditable="True"
+                         Width="43"
+                         SelectionChanged="FontSize_SelectionChanged"
+                         ToolTip="Font Size"/>
+
+               <Separator />
+
+               <ToggleButton x:Name="_btnBullets"
+                             Style="{StaticResource FormatBarToggleButtonStyle}"
+                             Command="EditingCommands.ToggleBullets"
+                             CommandTarget="{Binding ElementName=_window, Path=Target}"
+                             Click="Bullets_Clicked"
+                             ToolTip="Bullets">
+                  <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/Bullets16.png" />
+               </ToggleButton>
+
+               <ToggleButton x:Name="_btnNumbers"
+                             Style="{StaticResource FormatBarToggleButtonStyle}"
+                             Command="EditingCommands.ToggleNumbering"
+                             CommandTarget="{Binding ElementName=_window, Path=Target}"
+                             Click="Numbers_Clicked"
+                             ToolTip="Numbering">
+                  <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/Numbering16.png" />
+               </ToggleButton>
+
+            </StackPanel>
+
+            <StackPanel Orientation="Horizontal" Margin="0,3,0,0">
+               <ToggleButton x:Name="_btnBold"
+                             Style="{StaticResource FormatBarToggleButtonStyle}"
+                             Command="EditingCommands.ToggleBold"
+                             CommandTarget="{Binding ElementName=_window, Path=Target}"
+                             ToolTip="Bold">
+                  <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/Bold16.png" />
+               </ToggleButton>
+               <ToggleButton x:Name="_btnItalic"
+                             Style="{StaticResource FormatBarToggleButtonStyle}"
+                             Command="{x:Static EditingCommands.ToggleItalic}"
+                             CommandTarget="{Binding ElementName=_window, Path=Target}"
+                             ToolTip="Italic">
+                  <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/Italic16.png" />
+               </ToggleButton>
+               <ToggleButton x:Name="_btnUnderline"
+                             Style="{StaticResource FormatBarToggleButtonStyle}"
+                             Command="{x:Static EditingCommands.ToggleUnderline}"
+                             CommandTarget="{Binding ElementName=_window, Path=Target}"
+                             ToolTip="Underline">
+                  <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/Underline16.png" />
+               </ToggleButton>
+
+               <Separator />
+
+               <RadioButton x:Name="_btnAlignLeft"
+                            Style="{StaticResource FormatBarToggleButtonStyle}"
+                            Command="{x:Static EditingCommands.AlignLeft}"
+                            CommandTarget="{Binding ElementName=_window, Path=Target}"
+                            ToolTip="Align Left">
+                  <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/LeftAlign16.png" />
+               </RadioButton>
+               <RadioButton x:Name="_btnAlignCenter"
+                            Style="{StaticResource FormatBarToggleButtonStyle}"
+                            Command="{x:Static EditingCommands.AlignCenter}"
+                            CommandTarget="{Binding ElementName=_window, Path=Target}"
+                            ToolTip="Align Center">
+                  <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/CenterAlign16.png" />
+               </RadioButton>
+               <RadioButton x:Name="_btnAlignRight"
+                            Style="{StaticResource FormatBarToggleButtonStyle}"
+                            Command="{x:Static EditingCommands.AlignRight}"
+                            CommandTarget="{Binding ElementName=_window, Path=Target}"
+                            ToolTip="Align Right">
+                  <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/RightAlign16.png" />
+               </RadioButton>
+
+               <Separator />
+
+               <local:ColorPicker x:Name="_cmbFontBackgroundColor"
+                                  BorderThickness="0" 
+                                  ButtonStyle="{StaticResource FontBackgrounColorButtonStyle}"
+                                  SelectedColorChanged="FontBackgroundColor_SelectedColorChanged"
+                                  ToolTip="Text Highlight Color" />
+
+               <local:ColorPicker x:Name="_cmbFontColor"
+                                  BorderThickness="0" 
+                                  ButtonStyle="{StaticResource FontColorButtonStyle}"
+                                  SelectedColorChanged="FontColor_SelectedColorChanged"
+                                  ToolTip="Font Color" />
+
+            </StackPanel>
+
+         </StackPanel>
+      </Grid>
+   </Border>
+</UserControl>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml.cs
new file mode 100644
index 00000000..3cb1b06e
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml.cs
@@ -0,0 +1,257 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Documents;
+using System.Windows.Media;
+using Xceed.Wpf.Toolkit.Core;
+using System.Linq;
+
+namespace Xceed.Wpf.Toolkit
+{
+  /// <summary>
+  /// Interaction logic for RichTextBoxFormatBar.xaml
+  /// </summary>
+  public partial class RichTextBoxFormatBar : UserControl, IRichTextBoxFormatBar
+  {
+    #region Properties
+
+    #region RichTextBox
+
+    public static readonly DependencyProperty TargetProperty = DependencyProperty.Register( "Target", typeof( global::System.Windows.Controls.RichTextBox ), typeof( RichTextBoxFormatBar ), new PropertyMetadata( null, OnRichTextBoxPropertyChanged ) );
+    public global::System.Windows.Controls.RichTextBox Target
+    {
+      get
+      {
+        return ( global::System.Windows.Controls.RichTextBox )GetValue( TargetProperty );
+      }
+      set
+      {
+        SetValue( TargetProperty, value );
+      }
+    }
+
+    private static void OnRichTextBoxPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      RichTextBoxFormatBar formatBar = d as RichTextBoxFormatBar;
+    }
+
+    #endregion //RichTextBox
+
+    public static double[] FontSizes
+    {
+      get
+      {
+        return new double[] { 
+		            3.0, 4.0, 5.0, 6.0, 6.5, 7.0, 7.5, 8.0, 8.5, 9.0, 9.5, 
+		            10.0, 10.5, 11.0, 11.5, 12.0, 12.5, 13.0, 13.5, 14.0, 15.0,
+		            16.0, 17.0, 18.0, 19.0, 20.0, 22.0, 24.0, 26.0, 28.0, 30.0,
+		            32.0, 34.0, 36.0, 38.0, 40.0, 44.0, 48.0, 52.0, 56.0, 60.0, 64.0, 68.0, 72.0, 76.0,
+		            80.0, 88.0, 96.0, 104.0, 112.0, 120.0, 128.0, 136.0, 144.0
+		            };
+      }
+    }
+
+    #endregion
+
+    #region Constructors
+
+    public RichTextBoxFormatBar()
+    {
+      InitializeComponent();
+      Loaded += FormatToolbar_Loaded;
+
+      _cmbFontFamilies.ItemsSource = Fonts.SystemFontFamilies.OrderBy( fontFamily => fontFamily.Source );
+      _cmbFontSizes.ItemsSource = FontSizes;
+    }
+
+    #endregion //Constructors
+
+    #region Event Hanlders
+
+    void FormatToolbar_Loaded( object sender, RoutedEventArgs e )
+    {
+      Update();
+    }
+
+    private void FontFamily_SelectionChanged( object sender, SelectionChangedEventArgs e )
+    {
+      if( e.AddedItems.Count == 0 )
+        return;
+
+      FontFamily editValue = ( FontFamily )e.AddedItems[ 0 ];
+      ApplyPropertyValueToSelectedText( TextElement.FontFamilyProperty, editValue );
+    }
+
+    private void FontSize_SelectionChanged( object sender, SelectionChangedEventArgs e )
+    {
+      if( e.AddedItems.Count == 0 )
+        return;
+
+      ApplyPropertyValueToSelectedText( TextElement.FontSizeProperty, e.AddedItems[ 0 ] );
+    }
+
+    void FontColor_SelectedColorChanged( object sender, RoutedPropertyChangedEventArgs<Color> e )
+    {
+      Color selectedColor = ( Color )e.NewValue;
+      ApplyPropertyValueToSelectedText( TextElement.ForegroundProperty, new SolidColorBrush( selectedColor ) );
+    }
+
+    private void FontBackgroundColor_SelectedColorChanged( object sender, RoutedPropertyChangedEventArgs<Color> e )
+    {
+      Color selectedColor = ( Color )e.NewValue;
+      ApplyPropertyValueToSelectedText( TextElement.BackgroundProperty, new SolidColorBrush( selectedColor ) );
+    }
+
+    private void Bullets_Clicked( object sender, RoutedEventArgs e )
+    {
+      if( BothSelectionListsAreChecked() )
+      {
+        _btnNumbers.IsChecked = false;
+      }
+    }
+
+    private void Numbers_Clicked( object sender, RoutedEventArgs e )
+    {
+      if( BothSelectionListsAreChecked() )
+      {
+        _btnBullets.IsChecked = false;
+      }
+    }
+
+    private void DragWidget_DragDelta( object sender, DragDeltaEventArgs e )
+    {
+      ProcessMove( e );
+    }
+
+    #endregion //Event Hanlders
+
+    #region Methods
+
+    public void Update()
+    {
+      UpdateToggleButtonState();
+      UpdateSelectedFontFamily();
+      UpdateSelectedFontSize();
+      UpdateFontColor();
+      UpdateFontBackgroundColor();
+      UpdateSelectionListType();
+    }
+
+    private void UpdateToggleButtonState()
+    {
+      UpdateItemCheckedState( _btnBold, TextElement.FontWeightProperty, FontWeights.Bold );
+      UpdateItemCheckedState( _btnItalic, TextElement.FontStyleProperty, FontStyles.Italic );
+      UpdateItemCheckedState( _btnUnderline, Inline.TextDecorationsProperty, TextDecorations.Underline );
+
+      UpdateItemCheckedState( _btnAlignLeft, Paragraph.TextAlignmentProperty, TextAlignment.Left );
+      UpdateItemCheckedState( _btnAlignCenter, Paragraph.TextAlignmentProperty, TextAlignment.Center );
+      UpdateItemCheckedState( _btnAlignRight, Paragraph.TextAlignmentProperty, TextAlignment.Right );
+    }
+
+    void UpdateItemCheckedState( ToggleButton button, DependencyProperty formattingProperty, object expectedValue )
+    {
+      object currentValue = Target.Selection.GetPropertyValue( formattingProperty );
+      button.IsChecked = ( currentValue == DependencyProperty.UnsetValue ) ? false : currentValue != null && currentValue.Equals( expectedValue );
+    }
+
+    private void UpdateSelectedFontFamily()
+    {
+      object value = Target.Selection.GetPropertyValue( TextElement.FontFamilyProperty );
+      FontFamily currentFontFamily = ( FontFamily )( ( value == DependencyProperty.UnsetValue ) ? null : value );
+      if( currentFontFamily != null )
+      {
+        _cmbFontFamilies.SelectedItem = currentFontFamily;
+      }
+    }
+
+    private void UpdateSelectedFontSize()
+    {
+      object value = Target.Selection.GetPropertyValue( TextElement.FontSizeProperty );
+      _cmbFontSizes.SelectedValue = ( value == DependencyProperty.UnsetValue ) ? null : value;
+    }
+
+    private void UpdateFontColor()
+    {
+      object value = Target.Selection.GetPropertyValue( TextElement.ForegroundProperty );
+      Color currentColor = ( Color )( ( value == DependencyProperty.UnsetValue ) ? Colors.Black : ( ( SolidColorBrush )value ).Color );
+      _cmbFontColor.SelectedColor = currentColor;
+    }
+
+    private void UpdateFontBackgroundColor()
+    {
+      object value = Target.Selection.GetPropertyValue( TextElement.BackgroundProperty );
+      Color currentColor = ( Color )( ( value == null || value == DependencyProperty.UnsetValue ) ? Colors.Transparent : ( ( SolidColorBrush )value ).Color );
+      _cmbFontBackgroundColor.SelectedColor = currentColor;
+    }
+
+    /// <summary>
+    /// Updates the visual state of the List styles, such as Numbers and Bullets.
+    /// </summary>
+    private void UpdateSelectionListType()
+    {
+      //uncheck both
+      _btnBullets.IsChecked = false;
+      _btnNumbers.IsChecked = false;
+
+      Paragraph startParagraph = Target.Selection.Start.Paragraph;
+      Paragraph endParagraph = Target.Selection.End.Paragraph;
+      if( startParagraph != null && endParagraph != null && ( startParagraph.Parent is ListItem ) && ( endParagraph.Parent is ListItem ) && object.ReferenceEquals( ( ( ListItem )startParagraph.Parent ).List, ( ( ListItem )endParagraph.Parent ).List ) )
+      {
+        TextMarkerStyle markerStyle = ( ( ListItem )startParagraph.Parent ).List.MarkerStyle;
+        if( markerStyle == TextMarkerStyle.Disc ) //bullets
+        {
+          _btnBullets.IsChecked = true;
+        }
+        else if( markerStyle == TextMarkerStyle.Decimal ) //numbers
+        {
+          _btnNumbers.IsChecked = true;
+        }
+      }
+    }
+
+    /// <summary>
+    /// Checks to see if both selection lists are checked. (Bullets and Numbers)
+    /// </summary>
+    /// <returns></returns>
+    private bool BothSelectionListsAreChecked()
+    {
+      return _btnBullets.IsChecked == true && _btnNumbers.IsChecked == true;
+    }
+
+    void ApplyPropertyValueToSelectedText( DependencyProperty formattingProperty, object value )
+    {
+      if( value == null )
+        return;
+
+      Target.Selection.ApplyPropertyValue( formattingProperty, value );
+    }
+
+    private void ProcessMove( DragDeltaEventArgs e )
+    {
+      AdornerLayer layer = AdornerLayer.GetAdornerLayer( Target );
+      UIElementAdorner<Control> adorner = layer.GetAdorners( Target )[ 0 ] as UIElementAdorner<Control>;
+      adorner.SetOffsets( adorner.OffsetLeft + e.HorizontalChange, adorner.OffsetTop + e.VerticalChange );
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs
new file mode 100644
index 00000000..b1d4b687
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs
@@ -0,0 +1,220 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+using System.Windows.Input;
+using Xceed.Wpf.Toolkit.Core;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class RichTextBoxFormatBarManager : DependencyObject
+  {
+    #region Members
+
+    private global::System.Windows.Controls.RichTextBox _richTextBox;
+    private UIElementAdorner<Control> _adorner;
+    private IRichTextBoxFormatBar _toolbar;
+
+    #endregion //Members
+
+    #region Properties
+
+    #region FormatBar
+
+    public static readonly DependencyProperty FormatBarProperty = DependencyProperty.RegisterAttached( "FormatBar", typeof( IRichTextBoxFormatBar ), typeof( RichTextBox ), new PropertyMetadata( null, OnFormatBarPropertyChanged ) );
+    public static void SetFormatBar( UIElement element, IRichTextBoxFormatBar value )
+    {
+      element.SetValue( FormatBarProperty, value );
+    }
+    public static IRichTextBoxFormatBar GetFormatBar( UIElement element )
+    {
+      return ( IRichTextBoxFormatBar )element.GetValue( FormatBarProperty );
+    }
+
+    private static void OnFormatBarPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      global::System.Windows.Controls.RichTextBox rtb = d as global::System.Windows.Controls.RichTextBox;
+      if( rtb == null )
+        throw new Exception( "A FormatBar can only be applied to a RichTextBox." );
+
+      RichTextBoxFormatBarManager manager = new RichTextBoxFormatBarManager();
+      manager.AttachFormatBarToRichtextBox( rtb, e.NewValue as IRichTextBoxFormatBar );
+    }
+
+    #endregion //FormatBar
+
+    public bool IsAdornerVisible
+    {
+      get
+      {
+        return _adorner.Visibility == Visibility.Visible;
+      }
+    }
+
+    #endregion //Properties
+
+    #region Event Handlers
+
+    void RichTextBox_MouseButtonUp( object sender, MouseButtonEventArgs e )
+    {
+      if( e.ChangedButton == MouseButton.Left && e.LeftButton == MouseButtonState.Released )
+      {
+        TextRange selectedText = new TextRange( _richTextBox.Selection.Start, _richTextBox.Selection.End );
+#if !VS2008
+        if( selectedText.Text.Length > 0 && !String.IsNullOrWhiteSpace( selectedText.Text ) )
+          ShowAdorner();
+#else
+        if( selectedText.Text.Length > 0 && !String.IsNullOrEmpty( selectedText.Text ) )
+          ShowAdorner();
+#endif
+        else
+          HideAdorner();
+
+        e.Handled = true;
+      }
+      else
+        HideAdorner();
+    }
+
+    void RichTextBox_PreviewMouseMove( object sender, MouseEventArgs e )
+    {
+      //if the mouse moves outside the richtextbox bounds hide the adorner
+      //though this deosn't always work, especially if the user moves the mouse very quickly.
+      //need to find a better solution, but this will work for now.
+      Point p = e.GetPosition( _richTextBox );
+      if( p.X <= 5.0 || p.X >= _richTextBox.ActualWidth - 5 || p.Y <= 3.0 || p.Y >= _richTextBox.ActualHeight - 3 )
+        HideAdorner();
+    }
+
+    void RichTextBox_TextChanged( object sender, TextChangedEventArgs e )
+    {
+      //this fixes the bug when applying text transformations the text would lose it's highlight.  That was because the RichTextBox was losing focus
+      //so we just give it focus again and it seems to do the trick of re-highlighting it.
+      if( !_richTextBox.IsFocused && !_richTextBox.Selection.IsEmpty )
+        _richTextBox.Focus();
+    }
+
+    #endregion //Event Handlers
+
+    #region Methods
+
+    /// <summary>
+    /// Attaches a FormatBar to a RichtextBox
+    /// </summary>
+    /// <param name="richTextBox">The RichtextBox to attach to.</param>
+    /// <param name="formatBar">The Formatbar to attach.</param>
+    private void AttachFormatBarToRichtextBox( global::System.Windows.Controls.RichTextBox richTextBox, IRichTextBoxFormatBar formatBar )
+    {
+      _richTextBox = richTextBox;
+      _richTextBox.PreviewMouseMove += RichTextBox_PreviewMouseMove;
+      //we cannot use the PreviewMouseLeftButtonUp event because of selection bugs.
+      //we cannot use the MouseLeftButtonUp event because it is handled by the RichTextBox and does not bubble up to here, so we must
+      //add a hander to the MouseUpEvent using the Addhandler syntax, and specify to listen for handled events too.
+      _richTextBox.AddHandler( Mouse.MouseUpEvent, new MouseButtonEventHandler( RichTextBox_MouseButtonUp ), true );
+      _richTextBox.TextChanged += RichTextBox_TextChanged;
+
+      _adorner = new UIElementAdorner<Control>( _richTextBox );
+
+      formatBar.Target = _richTextBox;
+      _toolbar = formatBar;
+    }
+
+    /// <summary>
+    /// Shows the FormatBar
+    /// </summary>
+    void ShowAdorner()
+    {
+      if( _adorner.Visibility == Visibility.Visible )
+        return;
+
+      VerifyAdornerLayer();
+
+      _toolbar.Update();
+
+      Control adorningEditor = _toolbar as Control;
+
+      if( _adorner.Child == null )
+        _adorner.Child = adorningEditor;
+
+      _adorner.Visibility = Visibility.Visible;
+
+      PositionFormatBar( adorningEditor );
+    }
+
+    /// <summary>
+    /// Positions the FormatBar so that is does not go outside the bounds of the RichTextBox or covers the selected text
+    /// </summary>
+    /// <param name="adorningEditor"></param>
+    private void PositionFormatBar( Control adorningEditor )
+    {
+      Point mousePosition = Mouse.GetPosition( _richTextBox );
+
+      double left = mousePosition.X;
+      double top = ( mousePosition.Y - 15 ) - adorningEditor.ActualHeight;
+
+      //top
+      if( top < 0 )
+      {
+        top = mousePosition.Y + 10;
+      }
+
+      //right boundary
+      if( left + adorningEditor.ActualWidth > _richTextBox.ActualWidth - 20 )
+      {
+        left = left - ( adorningEditor.ActualWidth - ( _richTextBox.ActualWidth - left ) );
+      }
+
+      _adorner.SetOffsets( left, top );
+    }
+
+    /// <summary>
+    /// Ensures that the IRichTextFormatBar is in the adorner layer.
+    /// </summary>
+    /// <returns>True if the IRichTextFormatBar is in the adorner layer, else false.</returns>
+    bool VerifyAdornerLayer()
+    {
+      if( _adorner.Parent != null )
+        return true;
+
+      AdornerLayer layer = AdornerLayer.GetAdornerLayer( _richTextBox );
+      if( layer == null )
+        return false;
+
+      layer.Add( _adorner );
+      return true;
+    }
+
+    /// <summary>
+    /// Hides the IRichTextFormatBar that is in the adornor layer.
+    /// </summary>
+    void HideAdorner()
+    {
+      if( IsAdornerVisible )
+      {
+        _adorner.Visibility = Visibility.Collapsed;
+        //_adorner.Child = null;
+      }
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/SplitButton/Implementation/SplitButton.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/SplitButton/Implementation/SplitButton.cs
new file mode 100644
index 00000000..de6e5d03
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/SplitButton/Implementation/SplitButton.cs
@@ -0,0 +1,49 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Xceed.Wpf.Toolkit
+{
+  [TemplatePart( Name = PART_ActionButton, Type = typeof( Button ) )]
+  public class SplitButton : DropDownButton
+  {
+    private const string PART_ActionButton = "PART_ActionButton";
+
+    #region Constructors
+
+    static SplitButton()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( SplitButton ), new FrameworkPropertyMetadata( typeof( SplitButton ) ) );
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+      Button = GetTemplateChild( PART_ActionButton ) as Button;
+    }
+
+    #endregion //Base Class Overrides
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/SplitButton/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/SplitButton/Themes/Generic.xaml
new file mode 100644
index 00000000..abdf633f
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/SplitButton/Themes/Generic.xaml
@@ -0,0 +1,134 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
+
+   <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+
+   <LinearGradientBrush x:Key="ColorPickerDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="1" Color="#FFE8EBED" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <!-- =============================================================================== -->
+   <!-- SplitButton                                                                     -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type local:SplitButton}">
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="IsTabStop" Value="False" />
+      <Setter Property="HorizontalContentAlignment" Value="Center" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
+      <Setter Property="Padding" Value="3" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:SplitButton}">
+               <Grid x:Name="MainGrid" SnapsToDevicePixels="True">
+                  <chrome:ButtonChrome x:Name="ControlChrome" Background="{TemplateBinding Background}" RenderEnabled="{TemplateBinding IsEnabled}" CornerRadius="2.75">
+                     <Grid>
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="*" />
+                           <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <Button x:Name="PART_ActionButton" Margin="0" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Padding="{TemplateBinding Padding}" >
+                           <Button.Template>
+                              <ControlTemplate TargetType="Button">
+                                 <ContentPresenter />
+                              </ControlTemplate>
+                           </Button.Template>
+                           <Grid>
+                              <chrome:ButtonChrome x:Name="ActionButtonChrome"
+                                                   CornerRadius="2.75, 0, 0, 2.75"                                                         
+                                                   RenderNormal="False"
+                                                   RenderEnabled="{TemplateBinding IsEnabled}"
+											                  RenderMouseOver="{Binding IsMouseOver, ElementName=PART_ActionButton}"
+											                  RenderPressed="{Binding IsPressed, ElementName=PART_ActionButton}">
+                                 <ContentPresenter Name="ActionButtonContent" Margin="{TemplateBinding Padding}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" RecognizesAccessKey="true" />
+                              </chrome:ButtonChrome>
+                           </Grid>
+                        </Button>
+                        <ToggleButton x:Name="PART_ToggleButton"
+                                      Grid.Column="1"
+                                      IsTabStop="False"
+                                      IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                      IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}">
+                           <ToggleButton.Template>
+                              <ControlTemplate TargetType="ToggleButton">
+                                 <ContentPresenter />
+                              </ControlTemplate>
+                           </ToggleButton.Template>
+                           <Grid>
+                              <chrome:ButtonChrome x:Name="ToggleButtonChrome"                                                         
+                                                   CornerRadius="0, 2.75, 2.75, 0"
+                                                   RenderNormal="False"
+                                                   RenderChecked="{TemplateBinding IsOpen}"
+                                                   RenderEnabled="{TemplateBinding IsEnabled}"
+											                  RenderMouseOver="{Binding IsMouseOver, ElementName=PART_ToggleButton}"
+											                  RenderPressed="{Binding IsPressed, ElementName=PART_ToggleButton}">
+                                 <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Margin="4,3,4,3">
+                                    <Path x:Name="Arrow" Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000" />
+                                 </Grid>
+                              </chrome:ButtonChrome>
+                           </Grid>
+                        </ToggleButton>
+                     </Grid>
+                  </chrome:ButtonChrome>
+
+                  <Popup x:Name="PART_Popup" 
+                         HorizontalOffset="1"
+                         VerticalOffset="1"
+                         AllowsTransparency="True"
+                         StaysOpen="False"
+                         Placement="Bottom"
+                         Focusable="False"
+                         IsOpen="{Binding IsChecked, ElementName=PART_ToggleButton}">
+                     <!-- TODO: Create Popup Styles that can be reused on all popups in the toolkit-->
+                     <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource ColorPickerDarkBorderBrush}">
+                        <ContentPresenter Content="{TemplateBinding DropDownContent}" />
+                     </Border>
+                  </Popup>
+
+               </Grid>
+                <ControlTemplate.Triggers>
+                    <Trigger Property="IsEnabled" Value="False">
+                        <Setter Property="Fill" TargetName="Arrow" Value="#AFAFAF" />
+                    </Trigger>
+                </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero.NormalColor.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero.NormalColor.xaml
new file mode 100644
index 00000000..ec435b28
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero.NormalColor.xaml
@@ -0,0 +1,28 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+   <ResourceDictionary.MergedDictionaries>
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/Themes/Aero/Brushes_NormalColor.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/Themes/Aero/Buttons_NormalColor.xaml" />
+   </ResourceDictionary.MergedDictionaries>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero/Brushes_NormalColor.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero/Brushes_NormalColor.xaml
new file mode 100644
index 00000000..e9cfb58f
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero/Brushes_NormalColor.xaml
@@ -0,0 +1,136 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:options="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes" >
+
+   <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ControlNormalBackgroundKey}" Color="#FFFFFF" options:Freeze="true" />
+   <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}" Color="#F4F4F4" options:Freeze="true" />
+   <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ControlNormalBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1" options:Freeze="true">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FFabadb3" Offset="0" />
+            <GradientStop Color="#FFdbdfe6" Offset="0.05000000074505806" />
+            <GradientStop Color="#FFdbdfe6" Offset="0.949999988079071" />
+            <GradientStop Color="#FFe3e9ef" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ControlMouseOverBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1" options:Freeze="true">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FF3d7bad" Offset="0" />
+            <GradientStop Color="#FFa4c9e3" Offset="0.05000000074505806" />
+            <GradientStop Color="#FFa4c9e3" Offset="0.949999988079071" />
+            <GradientStop Color="#FFb7d9ed" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ControlFocusedBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1" options:Freeze="true">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FF3d7bad" Offset="0" />
+            <GradientStop Color="#FFa4c9e3" Offset="0.05000000074505806" />
+            <GradientStop Color="#FFa4c9e3" Offset="0.949999988079071" />
+            <GradientStop Color="#FFb7d9ed" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <SolidColorBrush options:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}" Color="#FFABADB3" />
+   <LinearGradientBrush options:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonNormalInnerBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFfcfcfc" />
+            <GradientStop Offset="0.69" Color="#FFf9f9f9" />
+            <GradientStop Offset="0.69" Color="#FFf3f3f3" />
+            <GradientStop Offset="1" Color="#FFf3f3f3" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush options:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}" StartPoint="0.5,0" EndPoint="0.5,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFf2f2f2" />
+            <GradientStop Offset="0.69" Color="#FFe8e8e8" />
+            <GradientStop Offset="0.69" Color="#FFd1d1d1" />
+            <GradientStop Offset="1" Color="#FFd1d1d1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <SolidColorBrush options:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}" Color="#FF3C7FB1" />
+   <LinearGradientBrush options:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverInnerBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FFfafdfe" Offset="0" />
+            <GradientStop Color="#FFf5fbfe" Offset="0.5" />
+            <GradientStop Color="#FFeff9fe" Offset="0.5009999871253967" />
+            <GradientStop Color="#FFe8f5fc" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush options:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}" StartPoint="0.5,0" EndPoint="0.5,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FFeaf6fd" Offset="0" />
+            <GradientStop Color="#FFd9f0fc" Offset="0.5" />
+            <GradientStop Color="#FFbee6fd" Offset="0.5009999871253967" />
+            <GradientStop Color="#FFa7d9f5" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <SolidColorBrush options:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}" Color="#FF2C628B" />
+   <LinearGradientBrush options:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonPressedInnerBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FF9eb0ba" Offset="0" />
+            <GradientStop Color="#FF9abacb" Offset="0.5" />
+            <GradientStop Color="#FF78aac5" Offset="0.5008999705314636" />
+            <GradientStop Color="#FF5a96b8" Offset="0.8999999761581421" />
+            <GradientStop Color="#FF68b2da" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush options:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}" StartPoint="0.5,0" EndPoint="0.5,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FFe5f4fc" Offset="0" />
+            <GradientStop Color="#FFc4e5f6" Offset="0.5" />
+            <GradientStop Color="#FF98d1ef" Offset="0.5009999871253967" />
+            <GradientStop Color="#FF68b3db" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <LinearGradientBrush options:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonFocusedOuterBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FF3d7bad" Offset="0" />
+            <GradientStop Color="#FFa4c9e3" Offset="0.05000000074505806" />
+            <GradientStop Color="#FFa4c9e3" Offset="0.949999988079071" />
+            <GradientStop Color="#FFb7d9ed" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero/Buttons_NormalColor.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero/Buttons_NormalColor.xaml
new file mode 100644
index 00000000..6287f5d0
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero/Buttons_NormalColor.xaml
@@ -0,0 +1,53 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
+                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes">
+
+   <Style x:Key="{x:Static themes:ResourceKeys.SpinnerButtonStyleKey}" TargetType="RepeatButton">
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="BorderBrush" Value="Transparent" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Padding" Value="2,2" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="RepeatButton">
+               <Grid>
+                  <chrome:ButtonChrome x:Name="Chrome"
+                                       BorderBrush="{TemplateBinding BorderBrush}" 
+                                       Background="{TemplateBinding Background}"                                                                  
+                                       CornerRadius="{DynamicResource {x:Static themes:ResourceKeys.SpinButtonCornerRadiusKey}}"
+                                       RenderEnabled="{TemplateBinding IsEnabled}"
+                                       RenderMouseOver="{TemplateBinding IsMouseOver}"
+                                       RenderNormal="False"
+                                       RenderPressed="{TemplateBinding IsPressed}"
+                                       SnapsToDevicePixels="true" />
+
+                  <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    Margin="{TemplateBinding Padding}" />
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic.xaml
new file mode 100644
index 00000000..90588ebe
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic.xaml
@@ -0,0 +1,55 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+   <ResourceDictionary.MergedDictionaries>
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/Themes/Generic/Brushes.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/Themes/Generic/Buttons.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/Themes/Generic/Common.xaml" />
+
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/Chromes/Themes/Generic.xaml" />
+
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/BusyIndicator/Themes/Generic.xaml" />
+
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/ButtonSpinner/Themes/Generic.xaml" />
+
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/Calculator/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/CalculatorUpDown/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/CheckComboBox/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/CheckListBox/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/ChildWindow/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/CollectionEditors/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/ColorCanvas/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/ColorPicker/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/DropDownButton/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/Magnifier/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/MessageBox/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/DateTimeUpDown/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/DateTimePicker/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/MultiLineTextEditor/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/NumericUpDown/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/SplitButton/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/PropertyGrid/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/TimePicker/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/WatermarkTextBox/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/Wizard/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/Zoombox/Themes/Generic.xaml" />
+   </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Brushes.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Brushes.xaml
new file mode 100644
index 00000000..d5daf541
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Brushes.xaml
@@ -0,0 +1,128 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:options="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes">
+
+   <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ControlNormalBackgroundKey}" Color="#FFFFFFFF" options:Freeze="true" />
+   <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}" Color="#F4F4F4" options:Freeze="true" />
+
+
+   <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ControlNormalBorderKey}" EndPoint="0,20" MappingMode="Absolute" StartPoint="0,0" options:Freeze="true">
+      <GradientStop Color="#ABADB3" Offset="0.05" />
+      <GradientStop Color="#E2E3EA" Offset="0.07" />
+      <GradientStop Color="#E3E9EF" Offset="1" />
+   </LinearGradientBrush>
+   <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ControlMouseOverBorderKey}" StartPoint="0,0" EndPoint="0,1" options:Freeze="true">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#5794BF" Offset="0.05" />
+            <GradientStop Color="#B7D5EA" Offset="0.07" />
+            <GradientStop Color="#C7E2F1" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ControlFocusedBorderKey}" StartPoint="0,0" EndPoint="0,1" options:Freeze="true">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#3D7BAD" Offset="0.05" />
+            <GradientStop Color="#A4C9E3" Offset="0.07" />
+            <GradientStop Color="#B7D9ED" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}" Color="#FF707070" options:Freeze="true" />
+   <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ButtonNormalInnerBorderKey}" EndPoint="0,1" StartPoint="0,0" options:Freeze="true">
+      <GradientStop Color="#FAFFFFFF" Offset="0" />
+      <GradientStop Color="#85FFFFFF" Offset="1" />
+   </LinearGradientBrush>
+   <LinearGradientBrush options:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#F3F3F3" Offset="0" />
+            <GradientStop Color="#EBEBEB" Offset="0.5" />
+            <GradientStop Color="#DDDDDD" Offset="0.5" />
+            <GradientStop Color="#CDCDCD" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <SolidColorBrush options:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}" Color="#3C7FB1" />
+   <LinearGradientBrush options:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverInnerBorderKey}" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FAFFFFFF" Offset="0" />
+            <GradientStop Color="#85FFFFFF" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush options:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FFEAF6FD" Offset="0" />
+            <GradientStop Color="#FFD9F0FC" Offset="0.50" />
+            <GradientStop Color="#FFBEE6FD" Offset="0.50" />
+            <GradientStop Color="#FFA7D9F5" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <SolidColorBrush options:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}" Color="#2C628B" />
+   <LinearGradientBrush options:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonPressedInnerBorderKey}" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FAFFFFFF" Offset="0" />
+            <GradientStop Color="#85FFFFFF" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush options:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}" StartPoint="0.5,0" EndPoint="0.5,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#C2E4F6" Offset="0.5" />
+            <GradientStop Color="#ABDAF3" Offset="0.5" />
+            <GradientStop Color="#90CBEB" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ButtonFocusedOuterBorderKey}" Color="#FF707070" options:Freeze="true" />
+   <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ButtonFocusedInnerBorderKey}" Color="#F900CCFF" options:Freeze="true" />
+   <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ButtonFocusedBackgroundKey}" EndPoint="0,1" StartPoint="0,0" options:Freeze="true">
+      <GradientStop Color="#FFEAF6FD" Offset="0" />
+      <GradientStop Color="#FFD9F0FC" Offset="0.50" />
+      <GradientStop Color="#FFBEE6FD" Offset="0.50" />
+      <GradientStop Color="#FFA7D9F5" Offset="1" />
+   </LinearGradientBrush>
+
+   <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ButtonDisabledOuterBorderKey}" Color="#ADB2B5" options:Freeze="true" />
+   <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ButtonInnerBorderDisabledKey}" EndPoint="0,1" StartPoint="0,0" options:Freeze="true">
+      <GradientStop Color="#FAFFFFFF" Offset="0" />
+      <GradientStop Color="#85FFFFFF" Offset="1" />
+   </LinearGradientBrush>
+
+   <SolidColorBrush options:Freeze="true" x:Key="{x:Static themes:ResourceKeys.GlyphNormalForegroundKey}" Color="#FF000000" />
+   <SolidColorBrush options:Freeze="true" x:Key="{x:Static themes:ResourceKeys.GlyphDisabledForegroundKey}" Color="#A9A9A9" />
+
+   <CornerRadius x:Key="{x:Static themes:ResourceKeys.SpinButtonCornerRadiusKey}" TopLeft="0" TopRight="0" BottomRight="0" BottomLeft="0" options:Freeze="true" />
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Buttons.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Buttons.xaml
new file mode 100644
index 00000000..36157d3f
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Buttons.xaml
@@ -0,0 +1,51 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
+                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes">
+
+   <Style x:Key="{x:Static themes:ResourceKeys.SpinnerButtonStyleKey}" TargetType="RepeatButton">
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Padding" Value="2,2" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="RepeatButton">
+               <Grid>
+                  <chrome:ButtonChrome x:Name="Chrome"
+                                       BorderBrush="{TemplateBinding BorderBrush}" 
+                                       Background="{TemplateBinding Background}"                                                                  
+                                       CornerRadius="{DynamicResource {x:Static themes:ResourceKeys.SpinButtonCornerRadiusKey}}"
+                                       RenderEnabled="{TemplateBinding IsEnabled}"
+                                       RenderMouseOver="{TemplateBinding IsMouseOver}"
+                                       RenderNormal="True"
+                                       RenderPressed="{TemplateBinding IsPressed}"
+                                       SnapsToDevicePixels="true" />
+
+                  <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    Margin="{TemplateBinding Padding}" />
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Common.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Common.xaml
new file mode 100644
index 00000000..552687e9
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Common.xaml
@@ -0,0 +1,154 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:primitives="clr-namespace:Xceed.Wpf.Toolkit.Primitives">
+
+   <!-- =============================================================================== -->
+   <!-- Common Styles                                                                   -->
+   <!-- Need to find a way to share these for ChildWIndow and MessageBox                -->
+   <!-- =============================================================================== -->
+
+   <LinearGradientBrush x:Key="WindowDarkBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="WindowBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="0.479" Color="#FFf4f5f6" />
+            <GradientStop Offset="1" Color="#FFd0d6db" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="WindowButtonHoverBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFb5bdc8" />
+            <GradientStop Offset="0.370" Color="#FF8399a9" />
+            <GradientStop Offset="0.370" Color="#FF718597" />
+            <GradientStop Offset="0.906" Color="#FFb9c1ca" />
+            <GradientStop Offset="1" Color="#FFb9c1ca" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="WindowButtonPressedBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FF6b7c8d" />
+            <GradientStop Offset="0.370" Color="#FF4d606f" />
+            <GradientStop Offset="0.370" Color="#FF465460" />
+            <GradientStop Offset="0.906" Color="#FF262d33" />
+            <GradientStop Offset="1" Color="#FF262d33" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <Style x:Key="WindowCloseButtonStyle" TargetType="Button">
+      <Setter Property="Foreground" Value="#FF000000" />
+      <Setter Property="Padding" Value="3" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="Button">
+               <Grid>
+                  <VisualStateManager.VisualStateGroups>
+                     <VisualStateGroup x:Name="CommonStates">
+                        <VisualState x:Name="Normal" />
+                        <VisualState x:Name="MouseOver">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonHoverBrush}" />
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Pressed">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonPressedBrush}" />
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                     </VisualStateGroup>
+                  </VisualStateManager.VisualStateGroups>
+                  <Border x:Name="Background" CornerRadius="0,0,2,0" Background="{StaticResource WindowDarkBrush}">
+                     <Border Margin="1,0,1,1" BorderBrush="#59FFFFFF" BorderThickness="1" CornerRadius="0,0,1,0" />
+                  </Border>
+                  <ContentPresenter x:Name="contentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
+                  <Path x:Name="path"
+                        Height="6"
+                        Width="7"
+                        Stretch="Fill"
+                        Opacity="1"
+                        Data="M 2,6 C2,6 3,6 3,6 3,6 3,5 3,5 3,5 4,5 4,5 4,5 4,6 4,6 4,6 5,6 5,6 5,6 7,6 7,6 7,6 7,5 7,5 7,5 6,5 6,5 6,5 6,4 6,4 6,4 5,4 5,4 5,4 5,2 5,2 5,2 6,2 6,2 6,2 6,1 6,1 6,1 7,1 7,1 7,1 7,0 7,0 7,0 5,0 5,0 5,0 4,0 4,0 4,0 4,1 4,1 4,1 3,1 3,1 3,1 3,0 3,0 3,0 2,0 2,0 2,0 0,0 0,0 0,0 0,1 0,1 0,1 1,1 1,1 1,1 1,2 1,2 1,2 2,2 2,2 2,2 2,4 2,4 2,4 1,4 1,4 1,4 1,5 1,5 1,5 0,5 0,5 0,5 0,6 0,6 0,6 2,6 2,6 z"
+                        Fill="White"
+                        Margin="0,0,0,1"
+                        Visibility="Collapsed" />
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+
+    <!-- =============================================================================== -->
+   <!-- SelectorItem                                                                    -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type primitives:SelectorItem}">
+        <Setter Property="Background"
+           Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+
+        <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type primitives:SelectorItem}">
+               <Border x:Name="_background"
+                       Background="{TemplateBinding Background}"
+                       BorderBrush="{TemplateBinding BorderBrush}"
+                       BorderThickness="{TemplateBinding BorderThickness}">
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                     </Grid.ColumnDefinitions>
+                     <CheckBox Name="PART_CheckBox" IsChecked="{Binding IsSelected, RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="Center" Focusable="False"  Margin="3,1,5,1" />
+                     <Border Grid.Column="1">
+                        <ContentPresenter Margin="2" ContentSource="Content" />
+                     </Border>
+                  </Grid>
+               </Border>
+               <ControlTemplate.Triggers>
+                 <Trigger Property="IsMouseOver" Value="true">
+                    <Setter TargetName="_background" Property="Background" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
+                    <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
+                </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Glyphs.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Glyphs.xaml
new file mode 100644
index 00000000..8dc22a60
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Glyphs.xaml
@@ -0,0 +1,70 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes">
+
+   <Geometry x:Key="UpArrowGeometry">M 0,3 C0,3 0,4 0,4 0,4 3,4 3,4 3,4 3,3 3,3 3,3 4,3 4,3 4,3 4,4 4,4 4,4 7,4 7,4 7,4 7,3 7,3 7,3 6,3 6,3 6,3 6,2 6,2 6,2 5,2 5,2 5,2 5,1 5,1 5,1 4,1 4,1 4,1 4,0 4,0 4,0 3,0 3,0 3,0 3,1 3,1 3,1 2,1 2,1 2,1 2,2 2,2 2,2 1,2 1,2 1,2 1,3 1,3 1,3 0,3 0,3 z</Geometry>
+   <Geometry x:Key="DownArrowGeometry">M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z</Geometry>
+
+   <DataTemplate x:Key="IncreaseGlyphNormalKey">
+      <Path Width="7"
+            Height="4"
+            Data="{StaticResource UpArrowGeometry}"
+            Fill="{DynamicResource {x:Static themes:ResourceKeys.GlyphNormalForegroundKey}}"
+            SnapsToDevicePixels="True"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            Focusable="False" />
+   </DataTemplate>
+   <DataTemplate x:Key="IncreaseGlyphDisabledKey">
+      <Path	Width="7"
+            Height="4"
+            Data="{StaticResource UpArrowGeometry}"
+            Fill="{DynamicResource {x:Static themes:ResourceKeys.GlyphDisabledForegroundKey}}"
+            SnapsToDevicePixels="True"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            Focusable="False" />
+   </DataTemplate>
+
+   <DataTemplate x:Key="DecreaseGlyphNormalKey">
+      <Path Width="7"
+            Height="4"
+            Data="{StaticResource DownArrowGeometry}"
+            Fill="{DynamicResource {x:Static themes:ResourceKeys.GlyphNormalForegroundKey}}"
+            SnapsToDevicePixels="True"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            Focusable="False" />
+   </DataTemplate>
+
+   <DataTemplate x:Key="DecreaseGlyphDisabledKey">
+      <Path	Width="7"
+            Height="4"
+            Data="{StaticResource DownArrowGeometry}"
+            Fill="{DynamicResource {x:Static themes:ResourceKeys.GlyphDisabledForegroundKey}}"
+            SnapsToDevicePixels="True"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            Focusable="False" />
+   </DataTemplate>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimePicker/Implementation/TimeFormat.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimePicker/Implementation/TimeFormat.cs
new file mode 100644
index 00000000..93a77e12
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimePicker/Implementation/TimeFormat.cs
@@ -0,0 +1,28 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit
+{
+  public enum TimeFormat
+  {
+    Custom,
+    ShortTime,
+    LongTime
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimePicker/Implementation/TimeItem.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimePicker/Implementation/TimeItem.cs
new file mode 100644
index 00000000..1fe6d93e
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimePicker/Implementation/TimeItem.cs
@@ -0,0 +1,61 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class TimeItem
+  {
+    public string Display
+    {
+      get;
+      set;
+    }
+    public TimeSpan Time
+    {
+      get;
+      set;
+    }
+
+    public TimeItem( string display, TimeSpan time )
+    {
+      Display = display;
+      Time = time;
+    }
+
+    #region Base Class Overrides
+
+    public override bool Equals( object obj )
+    {
+      var item = obj as TimeItem;
+      if( item != null )
+        return Time == item.Time;
+      else
+        return false;
+    }
+
+    public override int GetHashCode()
+    {
+      return Time.GetHashCode();
+    }
+
+    #endregion //Base Class Overrides
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimePicker/Implementation/TimePicker.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimePicker/Implementation/TimePicker.cs
new file mode 100644
index 00000000..1cd8679c
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimePicker/Implementation/TimePicker.cs
@@ -0,0 +1,510 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace Xceed.Wpf.Toolkit
+{
+  [TemplatePart( Name = PART_TimeListItems, Type = typeof( ListBox ) )]
+  public class TimePicker : Control
+  {
+    private const string PART_TimeListItems = "PART_TimeListItems";
+
+    #region Members
+
+    ListBox _timeListBox;
+    private DateTimeFormatInfo DateTimeFormatInfo
+    {
+      get;
+      set;
+    }
+    internal static readonly TimeSpan EndTimeDefaultValue = new TimeSpan( 23, 59, 0 );
+    internal static readonly TimeSpan StartTimeDefaultValue = new TimeSpan( 0, 0, 0 );
+    internal static readonly TimeSpan TimeIntervalDefaultValue = new TimeSpan( 1, 0, 0 );
+
+    #endregion //Members
+
+    #region Properties
+
+    #region AllowSpin
+
+    public static readonly DependencyProperty AllowSpinProperty = DependencyProperty.Register( "AllowSpin", typeof( bool ), typeof( TimePicker ), new UIPropertyMetadata( true ) );
+    public bool AllowSpin
+    {
+      get
+      {
+        return ( bool )GetValue( AllowSpinProperty );
+      }
+      set
+      {
+        SetValue( AllowSpinProperty, value );
+      }
+    }
+
+    #endregion //AllowSpin
+
+    #region EndTime
+
+    public static readonly DependencyProperty EndTimeProperty = DependencyProperty.Register( "EndTime", typeof( TimeSpan ), typeof( TimePicker ), new UIPropertyMetadata( EndTimeDefaultValue, new PropertyChangedCallback( OnEndTimeChanged ), new CoerceValueCallback( OnCoerceEndTime ) ) );
+
+    private static object OnCoerceEndTime( DependencyObject o, object value )
+    {
+      TimePicker timePicker = o as TimePicker;
+      if( timePicker != null )
+        return timePicker.OnCoerceEndTime( ( TimeSpan )value );
+      else
+        return value;
+    }
+
+    private static void OnEndTimeChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      TimePicker timePicker = o as TimePicker;
+      if( timePicker != null )
+        timePicker.OnEndTimeChanged( ( TimeSpan )e.OldValue, ( TimeSpan )e.NewValue );
+    }
+
+    protected virtual TimeSpan OnCoerceEndTime( TimeSpan value )
+    {
+      // TODO: Keep the proposed value within the desired range.
+      return value;
+    }
+
+    protected virtual void OnEndTimeChanged( TimeSpan oldValue, TimeSpan newValue )
+    {
+      if( _timeListBox != null )
+        _timeListBox.ItemsSource = GenerateTimeListItemsSource();
+    }
+
+    public TimeSpan EndTime
+    {
+      // IMPORTANT: To maintain parity between setting a property in XAML and procedural code, do not touch the getter and setter inside this dependency property!
+      get
+      {
+        return ( TimeSpan )GetValue( EndTimeProperty );
+      }
+      set
+      {
+        SetValue( EndTimeProperty, value );
+      }
+    }
+
+
+    #endregion //EndTime
+
+    #region Format
+
+    public static readonly DependencyProperty FormatProperty = DependencyProperty.Register( "Format", typeof( TimeFormat ), typeof( TimePicker ), new UIPropertyMetadata( TimeFormat.ShortTime, OnFormatChanged ) );
+    public TimeFormat Format
+    {
+      get
+      {
+        return ( TimeFormat )GetValue( FormatProperty );
+      }
+      set
+      {
+        SetValue( FormatProperty, value );
+      }
+    }
+
+    private static void OnFormatChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      TimePicker timePicker = o as TimePicker;
+      if( timePicker != null )
+        timePicker.OnFormatChanged( ( TimeFormat )e.OldValue, ( TimeFormat )e.NewValue );
+    }
+
+    protected virtual void OnFormatChanged( TimeFormat oldValue, TimeFormat newValue )
+    {
+
+    }
+
+    #endregion //Format
+
+    #region FormatString
+
+    public static readonly DependencyProperty FormatStringProperty = DependencyProperty.Register( "FormatString", typeof( string ), typeof( TimePicker ), new UIPropertyMetadata( default( String ), OnFormatStringChanged ) );
+    public string FormatString
+    {
+      get
+      {
+        return ( string )GetValue( FormatStringProperty );
+      }
+      set
+      {
+        SetValue( FormatStringProperty, value );
+      }
+    }
+
+    private static void OnFormatStringChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      TimePicker timePicker = o as TimePicker;
+      if( timePicker != null )
+        timePicker.OnFormatStringChanged( ( string )e.OldValue, ( string )e.NewValue );
+    }
+
+    protected virtual void OnFormatStringChanged( string oldValue, string newValue )
+    {
+      if( string.IsNullOrEmpty( newValue ) )
+        throw new ArgumentException( "CustomFormat should be specified.", FormatString );
+    }
+
+    #endregion //FormatString
+
+    #region IsOpen
+
+    public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register( "IsOpen", typeof( bool ), typeof( TimePicker ), new UIPropertyMetadata( false ) );
+    public bool IsOpen
+    {
+      get
+      {
+        return ( bool )GetValue( IsOpenProperty );
+      }
+      set
+      {
+        SetValue( IsOpenProperty, value );
+      }
+    }
+
+    #endregion //IsOpen
+
+    #region ShowButtonSpinner
+
+    public static readonly DependencyProperty ShowButtonSpinnerProperty = DependencyProperty.Register( "ShowButtonSpinner", typeof( bool ), typeof( TimePicker ), new UIPropertyMetadata( true ) );
+    public bool ShowButtonSpinner
+    {
+      get
+      {
+        return ( bool )GetValue( ShowButtonSpinnerProperty );
+      }
+      set
+      {
+        SetValue( ShowButtonSpinnerProperty, value );
+      }
+    }
+
+    #endregion //ShowButtonSpinner
+
+    #region StartTime
+
+    public static readonly DependencyProperty StartTimeProperty = DependencyProperty.Register( "StartTime", typeof( TimeSpan ), typeof( TimePicker ), new UIPropertyMetadata( StartTimeDefaultValue, new PropertyChangedCallback( OnStartTimeChanged ), new CoerceValueCallback( OnCoerceStartTime ) ) );
+
+    private static object OnCoerceStartTime( DependencyObject o, object value )
+    {
+      TimePicker timePicker = o as TimePicker;
+      if( timePicker != null )
+        return timePicker.OnCoerceStartTime( ( TimeSpan )value );
+      else
+        return value;
+    }
+
+    private static void OnStartTimeChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      TimePicker timePicker = o as TimePicker;
+      if( timePicker != null )
+        timePicker.OnStartTimeChanged( ( TimeSpan )e.OldValue, ( TimeSpan )e.NewValue );
+    }
+
+    protected virtual TimeSpan OnCoerceStartTime( TimeSpan value )
+    {
+      // TODO: Keep the proposed value within the desired range.
+      return value;
+    }
+
+    protected virtual void OnStartTimeChanged( TimeSpan oldValue, TimeSpan newValue )
+    {
+      if( _timeListBox != null )
+        _timeListBox.ItemsSource = GenerateTimeListItemsSource();
+    }
+
+    public TimeSpan StartTime
+    {
+      // IMPORTANT: To maintain parity between setting a property in XAML and procedural code, do not touch the getter and setter inside this dependency property!
+      get
+      {
+        return ( TimeSpan )GetValue( StartTimeProperty );
+      }
+      set
+      {
+        SetValue( StartTimeProperty, value );
+      }
+    }
+
+
+    #endregion //StartTime
+
+    #region TimeInterval
+
+    public static readonly DependencyProperty TimeIntervalProperty = DependencyProperty.Register( "TimeInterval", typeof( TimeSpan ), typeof( TimePicker ), new UIPropertyMetadata( TimeIntervalDefaultValue, OnTimeIntervalChanged ) );
+    public TimeSpan TimeInterval
+    {
+      get
+      {
+        return ( TimeSpan )GetValue( TimeIntervalProperty );
+      }
+      set
+      {
+        SetValue( TimeIntervalProperty, value );
+      }
+    }
+
+    private static void OnTimeIntervalChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      TimePicker timePicker = o as TimePicker;
+      if( timePicker != null )
+        timePicker.OnTimeIntervalChanged( ( TimeSpan )e.OldValue, ( TimeSpan )e.NewValue );
+    }
+
+    protected virtual void OnTimeIntervalChanged( TimeSpan oldValue, TimeSpan newValue )
+    {
+      if( _timeListBox != null )
+        _timeListBox.ItemsSource = GenerateTimeListItemsSource();
+    }
+
+    #endregion //TimeInterval
+
+    #region Value
+
+    public static readonly DependencyProperty ValueProperty = DependencyProperty.Register( "Value", typeof( DateTime? ), typeof( TimePicker ), new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnValueChanged ) );
+    public DateTime? Value
+    {
+      get
+      {
+        return ( DateTime? )GetValue( ValueProperty );
+      }
+      set
+      {
+        SetValue( ValueProperty, value );
+      }
+    }
+
+    private static void OnValueChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      TimePicker timePicker = o as TimePicker;
+      if( timePicker != null )
+        timePicker.OnValueChanged( ( DateTime? )e.OldValue, ( DateTime? )e.NewValue );
+    }
+
+    protected virtual void OnValueChanged( DateTime? oldValue, DateTime? newValue )
+    {
+      //TODO: refactor this
+      if( newValue.HasValue && _timeListBox != null )
+      {
+        var items = _timeListBox.ItemsSource;
+        foreach( TimeItem item in items )
+        {
+          if( item.Time == newValue.Value.TimeOfDay )
+          {
+            int index = _timeListBox.Items.IndexOf( item );
+            if( _timeListBox.SelectedIndex != index )
+              _timeListBox.SelectedIndex = index;
+            break;
+          }
+        }
+      }
+
+      RoutedPropertyChangedEventArgs<object> args = new RoutedPropertyChangedEventArgs<object>( oldValue, newValue );
+      args.RoutedEvent = ValueChangedEvent;
+      RaiseEvent( args );
+    }
+
+    #endregion //Value
+
+    #region Watermark
+
+    public static readonly DependencyProperty WatermarkProperty = DependencyProperty.Register( "Watermark", typeof( object ), typeof( TimePicker ), new UIPropertyMetadata( null ) );
+    public object Watermark
+    {
+      get
+      {
+        return ( object )GetValue( WatermarkProperty );
+      }
+      set
+      {
+        SetValue( WatermarkProperty, value );
+      }
+    }
+
+    #endregion //Watermark
+
+    #region WatermarkTemplate
+
+    public static readonly DependencyProperty WatermarkTemplateProperty = DependencyProperty.Register( "WatermarkTemplate", typeof( DataTemplate ), typeof( TimePicker ), new UIPropertyMetadata( null ) );
+    public DataTemplate WatermarkTemplate
+    {
+      get
+      {
+        return ( DataTemplate )GetValue( WatermarkTemplateProperty );
+      }
+      set
+      {
+        SetValue( WatermarkTemplateProperty, value );
+      }
+    }
+
+    #endregion //WatermarkTemplate
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static TimePicker()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( TimePicker ), new FrameworkPropertyMetadata( typeof( TimePicker ) ) );
+    }
+
+    public TimePicker()
+    {
+      DateTimeFormatInfo = DateTimeFormatInfo.GetInstance( CultureInfo.CurrentCulture );
+      Keyboard.AddKeyDownHandler( this, OnKeyDown );
+      Mouse.AddPreviewMouseDownOutsideCapturedElementHandler( this, OnMouseDownOutsideCapturedElement );
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+
+      if( _timeListBox != null )
+        _timeListBox.SelectionChanged -= TimeListBox_SelectionChanged;
+
+      _timeListBox = GetTemplateChild( PART_TimeListItems ) as ListBox;
+
+      if( _timeListBox != null )
+      {
+        _timeListBox.SelectionChanged += TimeListBox_SelectionChanged;
+        _timeListBox.ItemsSource = GenerateTimeListItemsSource();
+      }
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Event Handlers
+
+    private void OnKeyDown( object sender, KeyEventArgs e )
+    {
+      switch( e.Key )
+      {
+        case Key.Escape:
+        case Key.Tab:
+          {
+            CloseTimePicker();
+            break;
+          }
+      }
+    }
+
+    private void OnMouseDownOutsideCapturedElement( object sender, MouseButtonEventArgs e )
+    {
+      CloseTimePicker();
+    }
+
+    void TimeListBox_SelectionChanged( object sender, SelectionChangedEventArgs e )
+    {
+      if( e.AddedItems.Count > 0 )
+      {
+        TimeItem selectedTimeListItem = ( TimeItem )e.AddedItems[ 0 ];
+        var time = selectedTimeListItem.Time;
+        ;
+        var date = Value ?? DateTime.MinValue;
+
+        Value = new DateTime( date.Year, date.Month, date.Day, time.Hours, time.Minutes, time.Seconds, time.Milliseconds );
+      }
+
+      CloseTimePicker();
+    }
+
+    #endregion //Event Handlers
+
+    #region Events
+
+    //Due to a bug in Visual Studio, you cannot create event handlers for nullable args in XAML, so I have to use object instead.
+    public static readonly RoutedEvent ValueChangedEvent = EventManager.RegisterRoutedEvent( "ValueChanged", RoutingStrategy.Bubble, typeof( RoutedPropertyChangedEventHandler<object> ), typeof( TimePicker ) );
+    public event RoutedPropertyChangedEventHandler<object> ValueChanged
+    {
+      add
+      {
+        AddHandler( ValueChangedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( ValueChangedEvent, value );
+      }
+    }
+
+    #endregion //Events
+
+    #region Methods
+
+    private void CloseTimePicker()
+    {
+      if( IsOpen )
+        IsOpen = false;
+      ReleaseMouseCapture();
+    }
+
+    public IEnumerable GenerateTimeListItemsSource()
+    {
+      TimeSpan time = StartTime;
+      TimeSpan endTime = EndTime;
+
+      if( endTime <= time )
+      {
+        endTime = EndTimeDefaultValue;
+        time = StartTimeDefaultValue;
+      }
+
+      TimeSpan timeInterval = TimeInterval;
+
+      if( time != null && endTime != null && timeInterval != null && timeInterval.Ticks > 0 )
+      {
+        while( time <= endTime )
+        {
+          yield return new TimeItem( DateTime.MinValue.Add( time ).ToString( GetTimeFormat(), CultureInfo.CurrentCulture ), time );
+          time = time.Add( timeInterval );
+        }
+        yield break;
+      }
+    }
+
+    private string GetTimeFormat()
+    {
+      switch( Format )
+      {
+        case TimeFormat.Custom:
+          return FormatString;
+        case TimeFormat.LongTime:
+          return DateTimeFormatInfo.LongTimePattern;
+        case TimeFormat.ShortTime:
+          return DateTimeFormatInfo.ShortTimePattern;
+        default:
+          return DateTimeFormatInfo.ShortTimePattern;
+      }
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimePicker/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimePicker/Themes/Generic.xaml
new file mode 100644
index 00000000..76dc028c
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimePicker/Themes/Generic.xaml
@@ -0,0 +1,166 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
+
+   <!-- =============================================================================== -->
+   <!-- ResourceDictionary for TimePicker and related controls                          -->
+   <!-- =============================================================================== -->
+
+   <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+   <conv:TimeFormatToDateTimeFormatConverter x:Key="TimeFormatToDateTimeFormatConverter" />
+
+   <DataTemplate x:Key="DefaultWatermarkTemplate">
+      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
+   </DataTemplate>
+
+   <LinearGradientBrush x:Key="PopupDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="1" Color="#FFE8EBED" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <Style x:Key="TimePickerToggleButtonStyle" TargetType="ToggleButton">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="ToggleButton">
+               <Grid SnapsToDevicePixels="True">
+                  <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                       CornerRadius="0,2.75,2.75,0"
+                                       RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:TimePicker}}"
+                                       RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:TimePicker}}"
+                                       RenderMouseOver="{TemplateBinding IsMouseOver}"
+                                       RenderPressed="{TemplateBinding IsPressed}">
+
+                     <Grid>
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="*" />
+                           <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+
+                        <ContentPresenter HorizontalAlignment="Stretch" VerticalAlignment="Stretch" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+
+                        <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
+                            <Path x:Name="Arrow" Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000" />
+                        </Grid>
+                     </Grid>
+                  </chrome:ButtonChrome>
+               </Grid>
+                <ControlTemplate.Triggers>
+                    <Trigger Property="IsEnabled" Value="False">
+                        <Setter Property="Fill" TargetName="Arrow" Value="#AFAFAF" />
+                    </Trigger>
+                </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <SolidColorBrush x:Key="ListItemHover" Color="#FFE7F5FD" />
+
+   <Style x:Key="TimeItemStyle" TargetType="ListBoxItem">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="ListBoxItem">
+               <Border Name="Border" SnapsToDevicePixels="true">
+                  <ContentPresenter Margin="4" />
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsMouseOver" Value="True">
+                     <Setter TargetName="Border" Property="Background" Value="{StaticResource ListItemHover}" />
+                  </Trigger>
+                  <Trigger Property="IsSelected" Value="True">
+                     <Setter TargetName="Border" Property="Background" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
+                     <Setter Property="Foreground" Value="White" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <!-- =============================================================================== -->
+   <!-- TimePicker                                                                      -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type local:TimePicker}">
+      <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:TimePicker}">
+               <Border>
+                  <Grid>
+                     <Grid>
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="*" />
+                           <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <local:DateTimeUpDown x:Name="PART_TimeUpDown" 
+                                              BorderThickness="1,1,0,1"
+                                              Background="{TemplateBinding Background}"
+                                              Foreground="{TemplateBinding Foreground}"
+                                              ContextMenu="{TemplateBinding ContextMenu}"
+                                              AllowSpin="{TemplateBinding AllowSpin}"
+                                              Format="{TemplateBinding Format, Converter={StaticResource TimeFormatToDateTimeFormatConverter}}"
+                                              FormatString="{TemplateBinding FormatString}"
+                                              ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}"
+                                              Value="{Binding Value, RelativeSource={RelativeSource TemplatedParent}}"
+                                              Watermark="{TemplateBinding Watermark}"
+                                              WatermarkTemplate="{TemplateBinding WatermarkTemplate}" />
+                        <ToggleButton x:Name="_timePickerToggleButton"
+                                      Grid.Column="1"
+                                      IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                                      Style="{StaticResource TimePickerToggleButtonStyle}"
+                                      IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}" />
+                     </Grid>
+                     <Popup IsOpen="{Binding IsChecked, ElementName=_timePickerToggleButton}"
+                            StaysOpen="False">
+                        <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}">
+                           <Grid>
+                              <ListBox x:Name="PART_TimeListItems"
+                                       BorderThickness="0"
+                                       Width="150"
+                                       Height="130"
+                                       DisplayMemberPath="Display"
+                                       ItemContainerStyle="{StaticResource TimeItemStyle}" />
+                           </Grid>
+                        </Border>
+                     </Popup>
+                  </Grid>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimelinePanel/Implementation/DateElement.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimelinePanel/Implementation/DateElement.cs
new file mode 100644
index 00000000..9422955a
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimelinePanel/Implementation/DateElement.cs
@@ -0,0 +1,94 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit
+{
+  internal sealed class DateElement : IComparable<DateElement>
+  {
+    #region Members
+
+    private readonly int _originalIndex;
+
+    #endregion //Members
+
+    #region Fields
+
+    public readonly UIElement Element;
+    public readonly DateTime Date;
+    public readonly DateTime DateEnd;
+    public Rect PlacementRectangle;
+
+    public int Column = 0;
+    public int ColumnSpan = 1;
+
+    #endregion //Fields
+
+    #region Constructors
+
+    internal DateElement( UIElement element, DateTime date, DateTime dateEnd )
+      : this( element, date, dateEnd, -1 )
+    {
+    }
+
+    internal DateElement( UIElement element, DateTime date, DateTime dateEnd, int originalIndex )
+    {
+      Element = element;
+      Date = date;
+      DateEnd = dateEnd;
+      _originalIndex = originalIndex;
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    public override string ToString()
+    {
+      var fe = Element as FrameworkElement;
+      if( fe == null )
+        return base.ToString();
+
+      if( fe.Tag != null )
+        return fe.Tag.ToString();
+
+      return fe.Name;
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Methods
+
+    public int CompareTo( DateElement d )
+    {
+      int dateCompare = Date.CompareTo( d.Date );
+      if( dateCompare != 0 )
+        return dateCompare;
+
+      if( _originalIndex >= 0 )
+        return ( _originalIndex < d._originalIndex ) ? -1 : 1;
+
+      return -DateEnd.CompareTo( d.DateEnd );
+    }
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimelinePanel/Implementation/OverlapBehavior.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimelinePanel/Implementation/OverlapBehavior.cs
new file mode 100644
index 00000000..e2964089
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimelinePanel/Implementation/OverlapBehavior.cs
@@ -0,0 +1,29 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit
+{
+  public enum OverlapBehavior
+  {
+    Stack,
+    Stretch,
+    Hide,
+    None
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimelinePanel/Implementation/TimelinePanel.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimelinePanel/Implementation/TimelinePanel.cs
new file mode 100644
index 00000000..f7789db4
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimelinePanel/Implementation/TimelinePanel.cs
@@ -0,0 +1,1312 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Media;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class TimelinePanel : Panel, IScrollInfo
+  {
+    #region Members
+
+    private List<DateElement> _visibleElements = null;
+
+    #endregion //Members
+
+    #region Properties
+
+    #region BeginDate Property
+
+    public static readonly DependencyProperty BeginDateProperty = DependencyProperty.Register( "BeginDate", typeof( DateTime ), typeof( TimelinePanel ), new FrameworkPropertyMetadata( DateTime.MinValue, FrameworkPropertyMetadataOptions.AffectsMeasure ) );
+    public DateTime BeginDate
+    {
+      get
+      {
+        return ( DateTime )GetValue( BeginDateProperty );
+      }
+      set
+      {
+        SetValue( BeginDateProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region EndDate Property
+
+    public static readonly DependencyProperty EndDateProperty = DependencyProperty.Register( "EndDate", typeof( DateTime ), typeof( TimelinePanel ), new FrameworkPropertyMetadata( DateTime.MinValue, FrameworkPropertyMetadataOptions.AffectsMeasure ) );
+    public DateTime EndDate
+    {
+      get
+      {
+        return ( DateTime )GetValue( EndDateProperty );
+      }
+      set
+      {
+        SetValue( EndDateProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region OverlapBehavior Property
+
+    public static readonly DependencyProperty OverlapBehaviorProperty = DependencyProperty.Register( "OverlapBehavior", typeof( OverlapBehavior ), typeof( TimelinePanel ), new FrameworkPropertyMetadata( default( OverlapBehavior ), FrameworkPropertyMetadataOptions.AffectsMeasure ) );
+    public OverlapBehavior OverlapBehavior
+    {
+      get
+      {
+        return ( OverlapBehavior )GetValue( OverlapBehaviorProperty );
+      }
+      set
+      {
+        SetValue( OverlapBehaviorProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region KeepOriginalOrderForOverlap Property
+
+    public static readonly DependencyProperty KeepOriginalOrderForOverlapProperty = DependencyProperty.Register( "KeepOriginalOrderForOverlap", typeof( bool ), typeof( TimelinePanel ), new FrameworkPropertyMetadata( false, FrameworkPropertyMetadataOptions.AffectsMeasure ) );
+    public bool KeepOriginalOrderForOverlap
+    {
+      get
+      {
+        return ( bool )GetValue( KeepOriginalOrderForOverlapProperty );
+      }
+      set
+      {
+        SetValue( KeepOriginalOrderForOverlapProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region Orientation Property
+
+    public static readonly DependencyProperty OrientationProperty = StackPanel.OrientationProperty.AddOwner( typeof( TimelinePanel ), new FrameworkPropertyMetadata( Orientation.Horizontal, FrameworkPropertyMetadataOptions.AffectsMeasure ) );
+    public Orientation Orientation
+    {
+      get
+      {
+        return ( Orientation )GetValue( OrientationProperty );
+      }
+      set
+      {
+        SetValue( OrientationProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region UnitTimeSpan Property
+
+    public static readonly DependencyProperty UnitTimeSpanProperty = DependencyProperty.Register( "UnitTimeSpan", typeof( TimeSpan ), typeof( TimelinePanel ), new FrameworkPropertyMetadata( TimeSpan.Zero, FrameworkPropertyMetadataOptions.AffectsMeasure ) );
+    public TimeSpan UnitTimeSpan
+    {
+      get
+      {
+        return ( TimeSpan )GetValue( UnitTimeSpanProperty );
+      }
+      set
+      {
+        SetValue( UnitTimeSpanProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region UnitSize Property
+
+    public static readonly DependencyProperty UnitSizeProperty = DependencyProperty.Register( "UnitSize", typeof( double ), typeof( TimelinePanel ), new FrameworkPropertyMetadata( 0d, FrameworkPropertyMetadataOptions.AffectsMeasure ) );
+    public double UnitSize
+    {
+      get
+      {
+        return ( double )GetValue( UnitSizeProperty );
+      }
+      set
+      {
+        SetValue( UnitSizeProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region Date Attached Property
+
+    public static readonly DependencyProperty DateProperty = DependencyProperty.RegisterAttached( "Date", typeof( DateTime ), typeof( TimelinePanel ), new FrameworkPropertyMetadata( DateTime.MinValue, FrameworkPropertyMetadataOptions.AffectsParentMeasure ) );
+
+    public static DateTime GetDate( DependencyObject obj )
+    {
+      return ( DateTime )obj.GetValue( DateProperty );
+    }
+
+    public static void SetDate( DependencyObject obj, DateTime value )
+    {
+      obj.SetValue( DateProperty, value );
+    }
+
+    #endregion
+
+    #region DateEnd Attached Property
+
+    public static readonly DependencyProperty DateEndProperty = DependencyProperty.RegisterAttached( "DateEnd", typeof( DateTime ), typeof( TimelinePanel ), new FrameworkPropertyMetadata( DateTime.MinValue, FrameworkPropertyMetadataOptions.AffectsParentMeasure ) );
+
+    public static DateTime GetDateEnd( DependencyObject obj )
+    {
+      return ( DateTime )obj.GetValue( DateEndProperty );
+    }
+
+    public static void SetDateEnd( DependencyObject obj, DateTime value )
+    {
+      obj.SetValue( DateEndProperty, value );
+    }
+
+    #endregion
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static TimelinePanel()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( TimelinePanel ), new FrameworkPropertyMetadata( typeof( TimelinePanel ) ) );
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    protected override Size MeasureOverride( Size availableSize )
+    {
+      DateTime calcBeginDate = DateTime.MaxValue;
+      DateTime calcEndDate = DateTime.MinValue;
+
+      foreach( UIElement child in InternalChildren )
+      {
+        DateTime date = GetDate( child );
+        DateTime dateEnd = GetDateEnd( child );
+
+        if( date < calcBeginDate )
+        {
+          calcBeginDate = date;
+        }
+
+        if( date > calcEndDate )
+        {
+          calcEndDate = date;
+        }
+
+        if( dateEnd > calcEndDate )
+        {
+          calcEndDate = dateEnd;
+        }
+      }
+
+      if( BeginDate == DateTime.MinValue )
+      {
+        BeginDate = calcBeginDate;
+      }
+
+      if( EndDate == DateTime.MinValue )
+      {
+        EndDate = calcEndDate;
+      }
+
+      foreach( UIElement child in InternalChildren )
+      {
+        DateTime date = GetDate( child );
+        DateTime dateEnd = GetDateEnd( child );
+
+        Size childSize = availableSize;
+
+        if( dateEnd > DateTime.MinValue && dateEnd > date )
+        {
+          if( Orientation == Orientation.Horizontal )
+          {
+            if( UnitTimeSpan != TimeSpan.Zero && UnitSize > 0 )
+            {
+              double size = ( double )( dateEnd.Ticks - date.Ticks ) / ( double )UnitTimeSpan.Ticks;
+
+              childSize.Width = size * UnitSize;
+            }
+            else if( !double.IsPositiveInfinity( availableSize.Width ) )
+            {
+              // width is DateEnd - Date
+              childSize.Width = CalculateTimelineOffset( dateEnd, availableSize.Width ) - CalculateTimelineOffset( date, availableSize.Width );
+            }
+          }
+          else
+          {
+            if( UnitTimeSpan != TimeSpan.Zero && UnitSize > 0 )
+            {
+              double size = ( double )( dateEnd.Ticks - date.Ticks ) / ( double )UnitTimeSpan.Ticks;
+
+              childSize.Height = size * UnitSize;
+            }
+            else if( !double.IsPositiveInfinity( availableSize.Height ) )
+            {
+              // height is DateEnd - Date
+              childSize.Height = CalculateTimelineOffset( dateEnd, availableSize.Height ) - CalculateTimelineOffset( date, availableSize.Height );
+            }
+          }
+        }
+
+        child.Measure( childSize );
+      }
+
+      Size newAvailableSize = new Size( availableSize.Width, availableSize.Height );
+
+      if( UnitTimeSpan != TimeSpan.Zero && UnitSize > 0 )
+      {
+        double size = ( double )( EndDate.Ticks - BeginDate.Ticks ) / ( double )UnitTimeSpan.Ticks;
+
+        if( Orientation == Orientation.Horizontal )
+        {
+          newAvailableSize.Width = size * UnitSize;
+        }
+        else
+        {
+          newAvailableSize.Height = size * UnitSize;
+        }
+      }
+
+      Size desiredSize = new Size();
+
+      if( ( Orientation == Orientation.Vertical && double.IsPositiveInfinity( newAvailableSize.Height ) ) ||
+          ( Orientation == Orientation.Horizontal && double.IsPositiveInfinity( newAvailableSize.Width ) ) )
+      {
+        // Our panel cannot layout items when we have positive infinity in the layout direction
+        // so defer to arrange pass.
+        _visibleElements = null;
+      }
+      else
+      {
+        LayoutItems( InternalChildren, newAvailableSize );
+
+        Rect desiredRect = new Rect();
+
+        foreach( DateElement child in _visibleElements )
+        {
+          desiredRect.Union( child.PlacementRectangle );
+        }
+
+        if( Orientation == Orientation.Horizontal )
+        {
+          desiredSize.Width = newAvailableSize.Width;
+          desiredSize.Height = desiredRect.Size.Height;
+        }
+        else
+        {
+          desiredSize.Width = desiredRect.Size.Width;
+          desiredSize.Height = newAvailableSize.Height;
+        }
+      }
+
+      if( IsScrolling )
+      {
+        Size viewport = new Size( availableSize.Width, availableSize.Height );
+        Size extent = new Size( desiredSize.Width, desiredSize.Height );
+        Vector offset = new Vector( Math.Max( 0, Math.Min( _offset.X, extent.Width - viewport.Width ) ),
+                                    Math.Max( 0, Math.Min( _offset.Y, extent.Height - viewport.Height ) ) );
+
+        SetScrollingData( viewport, extent, offset );
+
+        desiredSize.Width = Math.Min( desiredSize.Width, availableSize.Width );
+        desiredSize.Height = Math.Min( desiredSize.Height, availableSize.Height );
+
+        _physicalViewport = availableSize;
+      }
+
+      return desiredSize;
+    }
+
+    protected override Size ArrangeOverride( Size finalSize )
+    {
+      Rect finalRect = new Rect();
+
+      if( _visibleElements == null )
+      {
+        LayoutItems( InternalChildren, finalSize );
+      }
+
+      foreach( DateElement child in _visibleElements )
+      {
+        if( IsScrolling )
+        {
+          Rect placement = new Rect( child.PlacementRectangle.Location, child.PlacementRectangle.Size );
+          placement.Offset( -_offset );
+
+          child.Element.Arrange( placement );
+        }
+        else
+        {
+          child.Element.Arrange( child.PlacementRectangle );
+        }
+
+        finalRect.Union( child.PlacementRectangle );
+      }
+
+      Size renderSize;
+
+      if( Orientation == Orientation.Horizontal )
+      {
+        renderSize = new Size( finalSize.Width, finalRect.Size.Height );
+      }
+      else
+      {
+        renderSize = new Size( finalRect.Size.Width, finalSize.Height );
+      }
+
+      return renderSize;
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Methods
+
+    private void ResetScrollInfo()
+    {
+      _offset = new Vector();
+      _physicalViewport = _viewport = _extent = new Size( 0, 0 );
+    }
+
+    private void SetScrollingData( Size viewport, Size extent, Vector offset )
+    {
+      _offset = offset;
+
+      if( !AreVirtuallyEqual( viewport, _viewport ) ||
+          !AreVirtuallyEqual( extent, _extent ) ||
+          !AreVirtuallyEqual( offset, _computedOffset ) )
+      {
+        _viewport = viewport;
+        _extent = extent;
+        _offset = offset;
+
+        OnScrollChange();
+      }
+    }
+
+    private double ValidateInputOffset( double offset, string parameterName )
+    {
+      if( double.IsNaN( offset ) )
+        throw new ArgumentOutOfRangeException( parameterName );
+
+      return Math.Max( 0d, offset );
+    }
+
+    private void OnScrollChange()
+    {
+      if( ScrollOwner != null )
+      {
+        ScrollOwner.InvalidateScrollInfo();
+      }
+    }
+
+    private double CalculateTimelineOffset( DateTime d, double finalWidth )
+    {
+      double offset;
+
+      long tickRange = EndDate.Ticks - BeginDate.Ticks;
+      long tickOffset = d.Ticks - BeginDate.Ticks;
+
+      if( UnitTimeSpan != TimeSpan.Zero && UnitSize > 0 )
+      {
+        offset = ( ( double )tickOffset / ( double )UnitTimeSpan.Ticks ) * UnitSize;
+      }
+      else
+      {
+        if( tickRange > 0 )
+        {
+          offset = ( ( double )tickOffset / ( double )tickRange ) * finalWidth;
+        }
+        else
+        {
+          offset = 0;
+        }
+      }
+
+      return offset;
+    }
+
+    private static int CompareElementsByLeft( DateElement a, DateElement b )
+    {
+      return a.PlacementRectangle.Left.CompareTo( b.PlacementRectangle.Left );
+    }
+
+    private static int CompareElementsByTop( DateElement a, DateElement b )
+    {
+      return a.PlacementRectangle.Top.CompareTo( b.PlacementRectangle.Top );
+    }
+
+    private void LayoutItems( UIElementCollection children, Size availableSize )
+    {
+      _visibleElements = new List<DateElement>();
+      List<DateElement> overlappingElements = new List<DateElement>();
+
+      int index = 0;
+      foreach( UIElement child in children )
+      {
+        if( child == null )
+          continue;
+
+        DateTime date = GetDate( child );
+        DateTime dateEnd = GetDateEnd( child );
+
+        if( child.Visibility != Visibility.Collapsed )
+        {
+          if( KeepOriginalOrderForOverlap )
+          {
+            _visibleElements.Add( new DateElement( child, date, dateEnd, index ) );
+          }
+          else
+          {
+            _visibleElements.Add( new DateElement( child, date, dateEnd ) );
+          }
+        }
+
+        index++;
+      }
+
+      _visibleElements.Sort();
+
+      foreach( DateElement child in _visibleElements )
+      {
+        DateTime date = GetDate( child.Element );
+        DateTime dateEnd = GetDateEnd( child.Element );
+
+        if( Orientation == Orientation.Vertical )
+        {
+
+          //---------------------------------------------------------------------
+          // 
+          // Begin Layout Algorithm (Vertical Orientation)
+          //
+          //---------------------------------------------------------------------
+
+          // calculate the values for y (top) and height
+
+          // y
+          child.PlacementRectangle.Y = CalculateTimelineOffset( date, availableSize.Height );
+
+          // height
+          if( dateEnd > DateTime.MinValue && dateEnd > date )
+          {
+            // height is DateEnd - Date
+            child.PlacementRectangle.Height = CalculateTimelineOffset( dateEnd, availableSize.Height ) - CalculateTimelineOffset( date, availableSize.Height );
+          }
+          else
+          {
+            // height is the desired size
+            child.PlacementRectangle.Height = child.Element.DesiredSize.Height;
+          }
+
+          // now calcualte the values for x (left) and width based on the OverlapBehavior
+
+          switch( OverlapBehavior )
+          {
+
+            //---------------------------------------------------------------------
+            //
+            // OverlapBehavior == None (Vertical)
+            //
+            //---------------------------------------------------------------------
+
+            case OverlapBehavior.None:
+
+              #region OverlapBehavior == None (Vertical)
+
+              child.PlacementRectangle.X = 0;
+              child.PlacementRectangle.Width = child.Element.DesiredSize.Width;
+
+              break;
+
+              #endregion
+
+            //---------------------------------------------------------------------
+            //
+            // OverlapBehavior == Hide (Vertical)
+            //
+            //---------------------------------------------------------------------
+
+            case OverlapBehavior.Hide:
+
+              #region OverlapBehavior = Hide
+
+              overlappingElements.Clear();
+
+              foreach( DateElement compare in _visibleElements )
+              {
+                if( child == compare )
+                  break;
+
+                Rect childRect = child.PlacementRectangle;
+                Rect compareRect = compare.PlacementRectangle;
+
+                if( childRect.Top >= compareRect.Top && childRect.Top < compareRect.Bottom )
+                {
+                  overlappingElements.Add( compare );
+                }
+              }
+
+              if( overlappingElements.Count > 0 )
+              {
+                child.PlacementRectangle.X = 0;
+                child.PlacementRectangle.Y = 0;
+                child.PlacementRectangle.Width = 0;
+                child.PlacementRectangle.Height = 0;
+              }
+              else
+              {
+                child.PlacementRectangle.X = 0;
+                child.PlacementRectangle.Width = child.Element.DesiredSize.Width;
+              }
+
+              break;
+
+              #endregion
+
+            //---------------------------------------------------------------------
+            //
+            // OverlapBehavior == Stretch (Vertical)
+            //
+            //---------------------------------------------------------------------
+
+            case OverlapBehavior.Stretch:
+
+              #region OverlapBehavior = Stretch
+
+              // find the first gap at the desired vertical (Y) location (note that in doing this, we 
+              // only need to look for elements that intersect at the "top" of the item that is being
+              // placed because the _VisibleElements collection has been sorted so that the first 
+              // items come first--this means there won't be anything "below" the current item that
+              // isn't also below the current item
+
+              // find all overlapping elements
+
+              overlappingElements.Clear();
+
+              foreach( DateElement compare in _visibleElements )
+              {
+                if( child == compare )
+                  break;
+
+                Rect childRect = child.PlacementRectangle;
+                Rect compareRect = compare.PlacementRectangle;
+
+                if( childRect.Top >= compareRect.Top && childRect.Top < compareRect.Bottom )
+                {
+                  overlappingElements.Add( compare );
+                }
+              }
+
+              // sort the elements according to their "left" value so that as we search through
+              // the list we are able to identiy gaps
+
+              overlappingElements.Sort( CompareElementsByLeft );
+
+              // initialize left and width such that the item will be stretch to fill the available 
+              // space and if there are no overlapping items, skip to the end
+
+              double left = 0;
+              double width = availableSize.Width;
+
+              if( overlappingElements.Count > 0 )
+              {
+
+                bool foundGap = false;
+
+                // now, look for a gap (there is a good chance that there won't be one, but if there is 
+                // then we will place the item in it)
+
+                for( int i = 0; i < overlappingElements.Count; i++ )
+                {
+                  Rect r = overlappingElements[ i ].PlacementRectangle;
+
+                  // if this is the first overlapping element, then look for a gap at the beginning
+                  if( i == 0 )
+                  {
+                    if( r.Left > 0 )
+                    {
+                      left = 0;
+                      width = r.Left;
+                      foundGap = true;
+                      break;
+                    }
+                  }
+
+                  // if this is the last overlapping element
+                  if( i == overlappingElements.Count - 1 )
+                  {
+                    //left = r.Right;
+                    break;
+                  }
+
+                  // if this is an element somewhere in the middle, then 
+                  else
+                  {
+                    Rect n = overlappingElements[ i + 1 ].PlacementRectangle;
+                    if( ( n.Left - r.Right ) > 0 )
+                    {
+                      left = r.Right;
+                      width = n.Left - r.Right;
+                      foundGap = true;
+                      break;
+                    }
+                  }
+
+                }
+
+                // if we didn't find a gap, we need to make one by scooting the overlapping elements 
+                // over and then placing the item at the end
+
+                if( !foundGap )
+                {
+                  width = Math.Min( availableSize.Width / ( overlappingElements.Count + 1 ), overlappingElements[ 0 ].PlacementRectangle.Width );
+                  left = 0;
+
+                  foreach( DateElement e in overlappingElements )
+                  {
+                    e.PlacementRectangle.Width = width;
+                    e.PlacementRectangle.X = left;
+                    left += width;
+                  }
+                }
+              }
+
+              child.PlacementRectangle.X = left;
+
+              if( double.IsPositiveInfinity( width ) )
+              {
+                child.PlacementRectangle.Width = child.Element.DesiredSize.Width;
+              }
+              else
+              {
+                child.PlacementRectangle.Width = width;
+              }
+
+              break;
+
+              #endregion
+
+            //---------------------------------------------------------------------
+            //
+            // OverlapBehavior == Stack (Vertical)
+            //
+            //---------------------------------------------------------------------
+
+            case OverlapBehavior.Stack:
+
+              #region OverlapBehavior = Stack;
+
+              overlappingElements.Clear();
+
+              foreach( DateElement compare in _visibleElements )
+              {
+                if( child == compare )
+                  break;
+
+                Rect childRect = child.PlacementRectangle;
+                Rect compareRect = compare.PlacementRectangle;
+
+                if( childRect.Top >= compareRect.Top && childRect.Top < compareRect.Bottom )
+                {
+                  overlappingElements.Add( compare );
+                }
+              }
+
+              // sort the elements according to their "left" value so that as we search through
+              // the list we are able to identiy gaps
+
+              overlappingElements.Sort( CompareElementsByLeft );
+
+              // initialize left and width values, width will always be it's desired size
+
+              left = 0;
+              child.PlacementRectangle.Width = child.Element.DesiredSize.Width;
+
+              // find the first gap that is big enough to accomodate the current item
+
+              for( int i = 0; i < overlappingElements.Count; i++ )
+              {
+                Rect r = overlappingElements[ i ].PlacementRectangle;
+
+                if( i == 0 )
+                {
+                  if( r.Left >= child.PlacementRectangle.Width )
+                  {
+                    left = 0;
+                    break;
+                  }
+                }
+
+                if( i == overlappingElements.Count - 1 )
+                {
+                  left = r.Right;
+                  break;
+                }
+                else
+                {
+                  Rect n = overlappingElements[ i + 1 ].PlacementRectangle;
+                  if( ( n.Left - r.Right ) >= child.PlacementRectangle.Width )
+                  {
+                    left = r.Right;
+                    break;
+                  }
+                }
+              }
+
+              child.PlacementRectangle.X = left;
+
+              break;
+
+              #endregion
+          }
+        }
+        else
+        {
+          //---------------------------------------------------------------------
+          // 
+          // Begin Layout Algorithm (Horizontal Orientation)
+          //
+          //---------------------------------------------------------------------
+
+          // calculate the values for x (left) and width
+
+          // x
+          child.PlacementRectangle.X = CalculateTimelineOffset( date, availableSize.Width );
+
+          // width
+          if( dateEnd > DateTime.MinValue && dateEnd > date )
+          {
+            // width is DateEnd - Date
+            child.PlacementRectangle.Width = CalculateTimelineOffset( dateEnd, availableSize.Width ) - CalculateTimelineOffset( date, availableSize.Width );
+          }
+          else
+          {
+            // width is the desired size
+            child.PlacementRectangle.Width = child.Element.DesiredSize.Width;
+          }
+
+          // now calcualte the values for y (top) and height based on the OverlapBehavior
+
+          switch( OverlapBehavior )
+          {
+
+            //---------------------------------------------------------------------
+            //
+            // OverlapBehavior == None (Horizontal)
+            //
+            //---------------------------------------------------------------------
+
+            case OverlapBehavior.None:
+
+              #region OverlapBehavior == None (Horizontal)
+
+              child.PlacementRectangle.Y = 0;
+              child.PlacementRectangle.Height = child.Element.DesiredSize.Height;
+
+              break;
+
+              #endregion
+
+            //---------------------------------------------------------------------
+            //
+            // OverlapBehavior == Hide (Horizontal)
+            //
+            //---------------------------------------------------------------------
+
+            case OverlapBehavior.Hide:
+
+              #region OverlapBehavior = Hide (Horizontal)
+
+              overlappingElements.Clear();
+
+              foreach( DateElement compare in _visibleElements )
+              {
+                if( child == compare )
+                  break;
+
+                Rect childRect = child.PlacementRectangle;
+                Rect compareRect = compare.PlacementRectangle;
+
+                if( childRect.Left >= compareRect.Left && childRect.Left < compareRect.Right )
+                {
+                  overlappingElements.Add( compare );
+                }
+              }
+
+              if( overlappingElements.Count > 0 )
+              {
+                child.PlacementRectangle.X = 0;
+                child.PlacementRectangle.Y = 0;
+                child.PlacementRectangle.Width = 0;
+                child.PlacementRectangle.Height = 0;
+              }
+              else
+              {
+                child.PlacementRectangle.Y = 0;
+                child.PlacementRectangle.Height = child.Element.DesiredSize.Height;
+              }
+
+              break;
+
+              #endregion
+
+            //---------------------------------------------------------------------
+            //
+            // OverlapBehavior == Stretch (Horizontal)
+            //
+            //---------------------------------------------------------------------
+
+            case OverlapBehavior.Stretch:
+
+              #region OverlapBehavior = Stretch
+
+              // find the first gap at the desired vertical (Y) location (note that in doing this, we 
+              // only need to look for elements that intersect at the "top" of the item that is being
+              // placed because the _VisibleElements collection has been sorted so that the first 
+              // items come first--this means there won't be anything "below" the current item that
+              // isn't also below the current item
+
+              // find all overlapping elements
+
+              overlappingElements.Clear();
+
+              foreach( DateElement compare in _visibleElements )
+              {
+                if( child == compare )
+                  break;
+
+                Rect childRect = child.PlacementRectangle;
+                Rect compareRect = compare.PlacementRectangle;
+
+                if( childRect.Left >= compareRect.Left && childRect.Left < compareRect.Right )
+                {
+                  overlappingElements.Add( compare );
+                }
+              }
+
+              // sort the elements according to their "left" value so that as we search through
+              // the list we are able to identiy gaps
+
+              overlappingElements.Sort( CompareElementsByTop );
+
+              // initialize left and width such that the item will be stretch to fill the available 
+              // space and if there are no overlapping items, skip to the end
+
+              double top = 0;
+              double height = availableSize.Height;
+
+              if( overlappingElements.Count > 0 )
+              {
+
+                bool foundGap = false;
+
+                // now, look for a gap (there is a good chance that there won't be one, but if there is 
+                // then we will place the item in it)
+
+                for( int i = 0; i < overlappingElements.Count; i++ )
+                {
+                  Rect r = overlappingElements[ i ].PlacementRectangle;
+
+                  // if this is the first overlapping element, then look for a gap at the beginning
+                  if( i == 0 )
+                  {
+                    if( r.Top > 0 )
+                    {
+                      top = 0;
+                      height = r.Top;
+                      foundGap = true;
+                      break;
+                    }
+                  }
+
+                  // if this is the last overlapping element
+                  if( i == overlappingElements.Count - 1 )
+                  {
+                    //left = r.Right;
+                    break;
+                  }
+
+                  // if this is an element somewhere in the middle, then 
+                  else
+                  {
+                    Rect n = overlappingElements[ i + 1 ].PlacementRectangle;
+                    if( ( n.Top - r.Bottom ) > 0 )
+                    {
+                      top = r.Bottom;
+                      height = n.Top - r.Bottom;
+                      foundGap = true;
+                      break;
+                    }
+                  }
+
+                }
+
+                // if we didn't find a gap, we need to make one by scooting the overlapping elements 
+                // over and then placing the item at the end
+
+                if( !foundGap )
+                {
+                  height = Math.Min( availableSize.Height / ( overlappingElements.Count + 1 ), overlappingElements[ 0 ].PlacementRectangle.Height );
+                  top = 0;
+
+                  foreach( DateElement e in overlappingElements )
+                  {
+                    e.PlacementRectangle.Height = height;
+                    e.PlacementRectangle.Y = top;
+                    top += height;
+                  }
+                }
+              }
+
+              child.PlacementRectangle.Y = top;
+
+              if( double.IsPositiveInfinity( height ) )
+              {
+                child.PlacementRectangle.Height = child.Element.DesiredSize.Height;
+              }
+              else
+              {
+                child.PlacementRectangle.Height = height;
+              }
+
+              break;
+
+              #endregion
+
+            //---------------------------------------------------------------------
+            //
+            // OverlapBehavior == Stack (Horizontal)
+            //
+            //---------------------------------------------------------------------
+
+            case OverlapBehavior.Stack:
+
+              #region OverlapBehavior = Stack;
+
+              overlappingElements.Clear();
+
+              foreach( DateElement compare in _visibleElements )
+              {
+                if( child == compare )
+                  break;
+
+                Rect childRect = child.PlacementRectangle;
+                Rect compareRect = compare.PlacementRectangle;
+
+                if( childRect.Left >= compareRect.Left && childRect.Left < compareRect.Right )
+                {
+                  overlappingElements.Add( compare );
+                }
+              }
+
+              // sort the elements according to their "left" value so that as we search through
+              // the list we are able to identiy gaps
+
+              overlappingElements.Sort( CompareElementsByTop );
+
+              // initialize left and width values, width will always be it's desired size
+
+              top = 0;
+              child.PlacementRectangle.Height = child.Element.DesiredSize.Height;
+
+              // find the first gap that is big enough to accomodate the current item
+
+              for( int i = 0; i < overlappingElements.Count; i++ )
+              {
+                Rect r = overlappingElements[ i ].PlacementRectangle;
+
+                if( i == 0 )
+                {
+                  if( r.Top >= child.PlacementRectangle.Height )
+                  {
+                    top = 0;
+                    break;
+                  }
+                }
+
+                if( i == overlappingElements.Count - 1 )
+                {
+                  top = r.Bottom;
+                  break;
+                }
+                else
+                {
+                  Rect n = overlappingElements[ i + 1 ].PlacementRectangle;
+                  if( ( n.Top - r.Bottom ) >= child.PlacementRectangle.Height )
+                  {
+                    top = r.Bottom;
+                    break;
+                  }
+                }
+              }
+
+              child.PlacementRectangle.Y = top;
+
+              break;
+
+              #endregion
+          }
+        }
+      }
+    }
+
+    private static bool AreVirtuallyEqual( double d1, double d2 )
+    {
+      if( double.IsPositiveInfinity( d1 ) )
+        return double.IsPositiveInfinity( d2 );
+
+      if( double.IsNegativeInfinity( d1 ) )
+        return double.IsNegativeInfinity( d2 );
+
+      if( double.IsNaN( d1 ) )
+        return double.IsNaN( d2 );
+
+      double n = d1 - d2;
+      double d = ( Math.Abs( d1 ) + Math.Abs( d2 ) + 10 ) * 1.0e-15;
+      return ( -d < n ) && ( d > n );
+    }
+
+    private static bool AreVirtuallyEqual( Size s1, Size s2 )
+    {
+      return AreVirtuallyEqual( s1.Width, s2.Width )
+          && AreVirtuallyEqual( s1.Height, s2.Height );
+    }
+
+    private static bool AreVirtuallyEqual( Vector v1, Vector v2 )
+    {
+      return AreVirtuallyEqual( v1.X, v2.X )
+          && AreVirtuallyEqual( v1.Y, v2.Y );
+    }
+
+    #endregion //Methods
+
+    #region Interfaces
+
+    #region IScrollInfo
+
+    public bool CanHorizontallyScroll
+    {
+      get
+      {
+        return _allowHorizontal;
+      }
+      set
+      {
+        _allowHorizontal = value;
+      }
+    }
+
+    public bool CanVerticallyScroll
+    {
+      get
+      {
+        return _allowVertical;
+      }
+      set
+      {
+        _allowVertical = value;
+      }
+    }
+
+    public double ExtentHeight
+    {
+      get
+      {
+        return _extent.Height;
+      }
+    }
+
+    public double ExtentWidth
+    {
+      get
+      {
+        return _extent.Width;
+      }
+    }
+
+    public double HorizontalOffset
+    {
+      get
+      {
+        return _offset.X;
+      }
+    }
+
+    public void LineDown()
+    {
+      SetVerticalOffset( VerticalOffset + ( ( Orientation == Orientation.Vertical ) ? 1d : 16d ) );
+    }
+
+    public void LineLeft()
+    {
+      SetHorizontalOffset( HorizontalOffset - ( ( Orientation == Orientation.Horizontal ) ? 1d : 16d ) );
+    }
+
+    public void LineRight()
+    {
+      SetHorizontalOffset( HorizontalOffset + ( ( Orientation == Orientation.Horizontal ) ? 1d : 16d ) );
+    }
+
+    public void LineUp()
+    {
+      SetVerticalOffset( VerticalOffset - ( ( Orientation == Orientation.Vertical ) ? 1d : 16d ) );
+    }
+
+    public Rect MakeVisible( Visual visual, Rect rectangle )
+    {
+      return rectangle;
+    }
+
+    public void MouseWheelDown()
+    {
+      SetVerticalOffset( VerticalOffset + ( SystemParameters.WheelScrollLines * ( ( Orientation == Orientation.Vertical ) ? 1d : 16d ) ) );
+    }
+
+    public void MouseWheelLeft()
+    {
+      SetHorizontalOffset( HorizontalOffset - ( 3d * ( ( Orientation == Orientation.Horizontal ) ? 1d : 16d ) ) );
+    }
+
+    public void MouseWheelRight()
+    {
+      SetHorizontalOffset( HorizontalOffset + ( 3d * ( ( Orientation == Orientation.Horizontal ) ? 1d : 16d ) ) );
+    }
+
+    public void MouseWheelUp()
+    {
+      SetVerticalOffset( VerticalOffset - ( SystemParameters.WheelScrollLines * ( ( Orientation == Orientation.Vertical ) ? 1d : 16d ) ) );
+    }
+
+    public void PageDown()
+    {
+      SetVerticalOffset( VerticalOffset + ViewportHeight );
+    }
+
+    public void PageLeft()
+    {
+      SetHorizontalOffset( HorizontalOffset - ViewportWidth );
+    }
+
+    public void PageRight()
+    {
+      SetHorizontalOffset( HorizontalOffset + ViewportWidth );
+    }
+
+    public void PageUp()
+    {
+      SetVerticalOffset( VerticalOffset - ViewportHeight );
+    }
+
+    public ScrollViewer ScrollOwner
+    {
+      get
+      {
+        return _scrollOwner;
+      }
+      set
+      {
+        if( _scrollOwner != value )
+        {
+          _scrollOwner = value;
+
+          ResetScrollInfo();
+        }
+      }
+    }
+
+    public void SetHorizontalOffset( double offset )
+    {
+      offset = ValidateInputOffset( offset, "HorizontalOffset" );
+
+      if( !AreVirtuallyEqual( offset, _offset.X ) )
+      {
+        _offset.X = offset;
+
+        InvalidateMeasure();
+      }
+    }
+
+    public void SetVerticalOffset( double offset )
+    {
+      offset = ValidateInputOffset( offset, "VerticalOffset" );
+
+      if( !AreVirtuallyEqual( offset, _offset.Y ) )
+      {
+        _offset.Y = offset;
+
+        InvalidateMeasure();
+      }
+    }
+
+    public double VerticalOffset
+    {
+      get
+      {
+        return _offset.Y;
+      }
+    }
+
+    public double ViewportHeight
+    {
+      get
+      {
+        return _viewport.Height;
+      }
+    }
+
+    public double ViewportWidth
+    {
+      get
+      {
+        return _viewport.Width;
+      }
+    }
+
+    private bool IsScrolling
+    {
+      get
+      {
+        return ( _scrollOwner != null );
+      }
+    }
+
+    private bool _allowHorizontal = false;
+    private bool _allowVertical = false;
+    private Vector _computedOffset = new Vector( 0d, 0d );
+    private Size _extent = new Size( 0, 0 );
+    private Vector _offset = new Vector( 0, 0 );
+    private ScrollViewer _scrollOwner = null;
+    private Size _viewport;
+    private Size _physicalViewport;
+
+    #endregion //IScrollInfo
+
+    #endregion //Interfaces
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/VisualStates.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/VisualStates.cs
new file mode 100644
index 00000000..9d85c8f2
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/VisualStates.cs
@@ -0,0 +1,26 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit
+{
+  internal static partial class VisualStates
+  {
+
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj
new file mode 100644
index 00000000..6c7d8d60
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj
@@ -0,0 +1,443 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{72E591D6-8F83-4D8C-8F67-9C325E623234}</ProjectGuid>
+    <OutputType>library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Xceed.Wpf.Toolkit</RootNamespace>
+    <AssemblyName>WPFToolkit.Extended</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="BusyIndicator\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="ButtonSpinner\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="CalculatorUpDown\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Calculator\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="CheckListBox\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="ChildWindow\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Chromes\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="CollectionEditors\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="ColorCanvas\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="ColorPicker\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="CheckComboBox\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="DateTimePicker\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="DateTimeUpDown\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="DropDownButton\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Magnifier\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="MessageBox\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="MultiLineTextEditor\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="NumericUpDown\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="PropertyGrid\Implementation\Editors\CollectionEditor.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="CollectionEditors\Implementation\CollectionEditorDialog.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="PropertyGrid\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="RichTextBoxFormatBar\RichTextBoxFormatBar.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="SplitButton\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\Aero.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\Aero\Brushes_NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\Aero\Buttons_NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\Generic.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Themes\Generic\Brushes.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Themes\Generic\Buttons.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Themes\Generic\Common.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\Generic\Glyphs.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="TimePicker\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="WatermarkTextBox\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Wizard\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Zoombox\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyVersionInfo.cs" />
+    <Compile Include="AssemblyVersionInfoCommon.cs" />
+    <Compile Include="BusyIndicator\Implementation\BusyIndicator.cs" />
+    <Compile Include="ButtonSpinner\Implementation\ButtonSpinner.cs" />
+    <Compile Include="CalculatorUpDown\Implementation\CalculatorUpDown.cs" />
+    <Compile Include="Calculator\Implementation\Calculator.cs" />
+    <Compile Include="Calculator\Implementation\CalculatorCommands.cs" />
+    <Compile Include="CheckListBox\Implementation\CheckListBox.cs" />
+    <Compile Include="ChildWindow\Implementation\ChildWindow.cs" />
+    <Compile Include="ChildWindow\Implementation\WindowStartupLocation.cs" />
+    <Compile Include="ChildWindow\Implementation\WindowState.cs" />
+    <Compile Include="ButtonSpinner\Implementation\SpinDirection.cs" />
+    <Compile Include="ButtonSpinner\Implementation\SpinEventArgs.cs" />
+    <Compile Include="ButtonSpinner\Implementation\Spinner.cs" />
+    <Compile Include="ButtonSpinner\Implementation\ValidSpinDirections.cs" />
+    <Compile Include="Chromes\Implementation\ButtonChrome.cs" />
+    <Compile Include="CollectionEditors\Implementation\CollectionEditor.cs" />
+    <Compile Include="CheckComboBox\Implementation\CheckComboBox.cs" />
+    <Compile Include="Core\Converters\ObjectTypeToNameConverter.cs" />
+    <Compile Include="ColorCanvas\Implementation\ColorCanvas.cs" />
+    <Compile Include="Core\Converters\CalculatorMemoryToVisibilityConverter.cs" />
+    <Compile Include="Core\Converters\RoundedValueConverter.cs" />
+    <Compile Include="Core\Converters\TimeFormatToDateTimeFormatConverter.cs" />
+    <Compile Include="Core\Converters\VisibilityToBoolConverter.cs" />
+    <Compile Include="Core\Converters\WizardPageButtonVisibilityConverter.cs" />
+    <Compile Include="Core\ErrorMessages.cs" />
+    <Compile Include="Core\IndexChangedEventArgs.cs" />
+    <Compile Include="Core\IndexChangedEventHandler.cs" />
+    <Compile Include="Core\Input\KeyModifier.cs" />
+    <Compile Include="Core\Input\KeyModifierCollection.cs" />
+    <Compile Include="Core\Input\KeyModifierCollectionConverter.cs" />
+    <Compile Include="Core\InvalidContentException.cs" />
+    <Compile Include="Core\InvalidTemplateException.cs" />
+    <Compile Include="Core\Primitives\HsvColor.cs" />
+    <Compile Include="ColorPicker\Implementation\ColorItem.cs" />
+    <Compile Include="ColorPicker\Implementation\ColorPicker.cs" />
+    <Compile Include="Core\Primitives\Selector.cs" />
+    <Compile Include="Core\Primitives\SelectorItem.cs" />
+    <Compile Include="Core\Primitives\ShapeBase.cs" />
+    <Compile Include="Core\PropertyChangedEventArgs.cs" />
+    <Compile Include="Core\PropertyChangedEventHandler.cs" />
+    <Compile Include="Core\Themes\StaticResourceKey.cs" />
+    <Compile Include="Core\Utilities\CalculatorUtilities.cs" />
+    <Compile Include="Core\Utilities\ColorUtilities.cs" />
+    <Compile Include="ColorCanvas\Implementation\ColorSpectrumSlider.cs" />
+    <Compile Include="Core\Converters\ColorToSolidColorBrushConverter.cs" />
+    <Compile Include="Core\Converters\InverseBoolConverter.cs" />
+    <Compile Include="Core\Converters\SolidColorBrushToColorConverter.cs" />
+    <Compile Include="Core\Utilities\ContextMenuUtilities.cs" />
+    <Compile Include="Core\Utilities\DoubleHelper.cs" />
+    <Compile Include="Core\Utilities\EllipseHelper.cs" />
+    <Compile Include="Core\Utilities\PointHelper.cs" />
+    <Compile Include="Core\Utilities\RectHelper.cs" />
+    <Compile Include="Core\Utilities\ResourceHelper.cs" />
+    <Compile Include="Core\Utilities\Segment.cs" />
+    <Compile Include="Core\Utilities\VisualTreeHelperEx.cs" />
+    <Compile Include="DateTimePicker\Implementation\DateTimePicker.cs" />
+    <Compile Include="DateTimeUpDown\Implementation\DateTimeFormat.cs" />
+    <Compile Include="DateTimeUpDown\Implementation\DateTimeInfo.cs" />
+    <Compile Include="DateTimeUpDown\Implementation\DateTimePart.cs" />
+    <Compile Include="DateTimeUpDown\Implementation\DateTimeUpDown.cs" />
+    <Compile Include="DateTimeUpDown\Implementation\DateTimeParser.cs" />
+    <Compile Include="DropDownButton\Implementation\DropDownButton.cs" />
+    <Compile Include="Magnifier\Implementation\FrameType.cs" />
+    <Compile Include="MultiLineTextEditor\Implementation\MultiLineTextEditor.cs" />
+    <Compile Include="NumericUpDown\Implementation\DecimalUpDown.cs" />
+    <Compile Include="NumericUpDown\Implementation\DoubleUpDown.cs" />
+    <Compile Include="NumericUpDown\Implementation\IntegerUpDown.cs" />
+    <Compile Include="Magnifier\Implementation\Converters\BorderThicknessToStrokeThicknessConverter.cs" />
+    <Compile Include="Magnifier\Implementation\Converters\RadiusConverter.cs" />
+    <Compile Include="Magnifier\Implementation\Magnifier.cs" />
+    <Compile Include="Magnifier\Implementation\MagnifierAdorner.cs" />
+    <Compile Include="Magnifier\Implementation\MagnifierManager.cs" />
+    <Compile Include="Core\Primitives\InputBase.cs" />
+    <Compile Include="MaskedTextBox\Implementation\MaskedTextBox.cs" />
+    <Compile Include="MessageBox\Implementation\MessageBox.cs" />
+    <Compile Include="NumericUpDown\Implementation\NumericUpDown.cs" />
+    <Compile Include="CollectionEditors\Implementation\PrimitiveTypeCollectionEditor.cs" />
+    <Compile Include="Pie\Implementation\Pie.cs" />
+    <Compile Include="Pie\Implementation\PieModeEnum.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="BusyIndicator\Implementation\VisualStates.BusyIndicator.cs" />
+    <Compile Include="PropertyGrid\Implementation\Attributes\ExpandableObjectAttribute.cs" />
+    <Compile Include="PropertyGrid\Implementation\Attributes\IItemsSource.cs" />
+    <Compile Include="PropertyGrid\Implementation\Attributes\ItemsSourceAttribute.cs" />
+    <Compile Include="PropertyGrid\Implementation\Attributes\PropertyOrderAttribute.cs" />
+    <Compile Include="PropertyGrid\Implementation\Commands\PropertyGridCommands.cs" />
+    <Compile Include="PropertyGrid\Implementation\Converters\ValueSourceToImagePathConverter.cs" />
+    <Compile Include="PropertyGrid\Implementation\Converters\ValueSourceToToolTipConverter.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\CheckBoxEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\CollectionEditor.xaml.cs">
+      <DependentUpon>CollectionEditor.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="CollectionEditors\Implementation\CollectionEditorDialog.xaml.cs">
+      <DependentUpon>CollectionEditorDialog.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="PropertyGrid\Implementation\Editors\ColorEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\ComboBoxEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\EditorDefinition.cs" />
+    <Compile Include="PropertyGrid\Implementation\EditorDefinitionCollection.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\DateTimeUpDownEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\DecimalUpDownEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\DoubleUpDownEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\EnumComboBoxEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\FontComboBoxEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\ItemsSourceAttributeEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\TimeSpanEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\IntegerUpDownEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\ITypeEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\PrimitiveTypeCollectionEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\TextBlockEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\TextBoxEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\TypeEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Converters\ExpandableObjectMarginConverter.cs" />
+    <Compile Include="PropertyGrid\Implementation\PropertyDefinition.cs" />
+    <Compile Include="PropertyGrid\Implementation\PropertyDefinitionCollection.cs" />
+    <Compile Include="PropertyGrid\Implementation\PropertyGrid.cs" />
+    <Compile Include="PropertyGrid\Implementation\PropertyItemCollection.cs" />
+    <Compile Include="PropertyGrid\Implementation\PropertyItem.cs" />
+    <Compile Include="PropertyGrid\Implementation\Commands\PropertyItemCommands.cs" />
+    <Compile Include="PropertyGrid\Implementation\PropertyGridUtilities.cs" />
+    <Compile Include="RichTextBoxFormatBar\IRichTextBoxFormatBar.cs" />
+    <Compile Include="RichTextBoxFormatBar\RichTextBoxFormatBar.xaml.cs">
+      <DependentUpon>RichTextBoxFormatBar.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="RichTextBoxFormatBar\RichTextBoxFormatBarManager.cs" />
+    <Compile Include="Core\UIElementAdorner.cs" />
+    <Compile Include="RichTextBox\Formatters\ITextFormatter.cs" />
+    <Compile Include="RichTextBox\Formatters\PlainTextFormatter.cs" />
+    <Compile Include="RichTextBox\Formatters\RtfFormatter.cs" />
+    <Compile Include="RichTextBox\Formatters\XamlFormatter.cs" />
+    <Compile Include="RichTextBox\RichTextBox.cs" />
+    <Compile Include="Core\Primitives\UpDownBase.cs" />
+    <Compile Include="SplitButton\Implementation\SplitButton.cs" />
+    <Compile Include="Core\Themes\ResourceKeys.cs" />
+    <Compile Include="TimelinePanel\Implementation\DateElement.cs" />
+    <Compile Include="TimelinePanel\Implementation\OverlapBehavior.cs" />
+    <Compile Include="TimelinePanel\Implementation\TimelinePanel.cs" />
+    <Compile Include="TimePicker\Implementation\TimeFormat.cs" />
+    <Compile Include="TimePicker\Implementation\TimeItem.cs" />
+    <Compile Include="TimePicker\Implementation\TimePicker.cs" />
+    <Compile Include="VisualStates.cs" />
+    <Compile Include="MessageBox\Implementation\VisualStates.MessageBox.cs" />
+    <Compile Include="WatermarkTextBox\Implementation\WatermarkTextBox.cs" />
+    <Compile Include="Wizard\Implementation\WizardCommands.cs" />
+    <Compile Include="Wizard\Implementation\WizardPage.cs" />
+    <Compile Include="Wizard\Implementation\Wizard.cs" />
+    <Compile Include="Wizard\Implementation\WizardPageButtonVisibility.cs" />
+    <Compile Include="Wizard\Implementation\WizardPageType.cs" />
+    <AppDesigner Include="Properties\" />
+    <Compile Include="Zoombox\Zoombox.cs" />
+    <Compile Include="Zoombox\ZoomboxCursors.cs" />
+    <Compile Include="Zoombox\ZoomboxView.cs" />
+    <Compile Include="Zoombox\ZoomboxViewChangedEventArgs.cs" />
+    <Compile Include="Zoombox\ZoomboxViewChangedEventHandler.cs" />
+    <Compile Include="Zoombox\ZoomboxViewConverter.cs" />
+    <Compile Include="Zoombox\ZoomboxViewException.cs" />
+    <Compile Include="Zoombox\ZoomboxViewFinderDisplay.cs" />
+    <Compile Include="Zoombox\ZoomboxViewKind.cs" />
+    <Compile Include="Zoombox\ZoomboxViewStack.cs" />
+    <Compile Include="Zoombox\ZoomboxViewStackMode.cs" />
+    <Compile Include="Zoombox\ZoomboxZoomOn.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="MessageBox\Icons\Error48.png" />
+    <Resource Include="MessageBox\Icons\Information48.png" />
+    <Resource Include="MessageBox\Icons\Question48.png" />
+    <Resource Include="MessageBox\Icons\Warning48.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\Bold16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\CenterAlign16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\Italic16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\JustifyAlign16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\LeftAlign16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\RightAlign16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\Underline16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\FontColorPicker16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\TextHighlightColorPicker16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\Bullets16.png" />
+    <Resource Include="RichTextBoxFormatBar\Images\Numbering16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="PropertyGrid\Images\SortAscending16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="PropertyGrid\Images\Categorize16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="PropertyGrid\Images\AdvancedProperties11.png" />
+    <Resource Include="PropertyGrid\Images\Inheritance11.png" />
+    <Resource Include="PropertyGrid\Images\Resource11.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="PropertyGrid\Images\Database11.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="PropertyGrid\Images\Local11.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="PropertyGrid\Images\Style11.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="PropertyGrid\Images\ClearFilter16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="CollectionEditors\Images\Delete16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="MultiLineTextEditor\Images\Notes16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Zoombox\Resources\Zoom.cur" />
+    <Resource Include="Zoombox\Resources\ZoomRelative.cur" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Core\ErrorMessages.resx">
+      <DependentUpon>ErrorMessages.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WatermarkTextBox/Implementation/WatermarkTextBox.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WatermarkTextBox/Implementation/WatermarkTextBox.cs
new file mode 100644
index 00000000..4514a07e
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WatermarkTextBox/Implementation/WatermarkTextBox.cs
@@ -0,0 +1,115 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class WatermarkTextBox : TextBox
+  {
+    #region Properties
+
+    #region SelectAllOnGotFocus
+
+    public static readonly DependencyProperty SelectAllOnGotFocusProperty = DependencyProperty.Register( "SelectAllOnGotFocus", typeof( bool ), typeof( WatermarkTextBox ), new PropertyMetadata( false ) );
+    public bool SelectAllOnGotFocus
+    {
+      get
+      {
+        return ( bool )GetValue( SelectAllOnGotFocusProperty );
+      }
+      set
+      {
+        SetValue( SelectAllOnGotFocusProperty, value );
+      }
+    }
+
+    #endregion //SelectAllOnGotFocus
+
+    #region Watermark
+
+    public static readonly DependencyProperty WatermarkProperty = DependencyProperty.Register( "Watermark", typeof( object ), typeof( WatermarkTextBox ), new UIPropertyMetadata( null ) );
+    public object Watermark
+    {
+      get
+      {
+        return ( object )GetValue( WatermarkProperty );
+      }
+      set
+      {
+        SetValue( WatermarkProperty, value );
+      }
+    }
+
+    #endregion //Watermark
+
+    #region WatermarkTemplate
+
+    public static readonly DependencyProperty WatermarkTemplateProperty = DependencyProperty.Register( "WatermarkTemplate", typeof( DataTemplate ), typeof( WatermarkTextBox ), new UIPropertyMetadata( null ) );
+    public DataTemplate WatermarkTemplate
+    {
+      get
+      {
+        return ( DataTemplate )GetValue( WatermarkTemplateProperty );
+      }
+      set
+      {
+        SetValue( WatermarkTemplateProperty, value );
+      }
+    }
+
+    #endregion //WatermarkTemplate
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static WatermarkTextBox()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( WatermarkTextBox ), new FrameworkPropertyMetadata( typeof( WatermarkTextBox ) ) );
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    protected override void OnGotFocus( RoutedEventArgs e )
+    {
+      base.OnGotFocus( e );
+
+       if( SelectAllOnGotFocus )
+        SelectAll();
+    }
+
+    protected override void OnPreviewMouseLeftButtonDown( MouseButtonEventArgs e )
+    {
+      if( !IsKeyboardFocused && SelectAllOnGotFocus )
+      {
+        e.Handled = true;
+        Focus();
+      }
+
+      base.OnPreviewMouseLeftButtonDown( e );
+    }
+
+    #endregion //Base Class Overrides
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WatermarkTextBox/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WatermarkTextBox/Themes/Generic.xaml
new file mode 100644
index 00000000..9e20b897
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WatermarkTextBox/Themes/Generic.xaml
@@ -0,0 +1,106 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
+
+   <LinearGradientBrush x:Key="TextBoxBorder" EndPoint="0,20" MappingMode="Absolute" StartPoint="0,0">
+      <GradientStop Color="#ABADB3" Offset="0.05" />
+      <GradientStop Color="#E2E3EA" Offset="0.07" />
+      <GradientStop Color="#E3E9EF" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="TextBox_MouseOver" EndPoint="0,1" StartPoint="0,0">
+      <GradientStop Color="#5794BF" Offset="0.05" />
+      <GradientStop Color="#B7D5EA" Offset="0.07" />
+      <GradientStop Color="#C7E2F1" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="TextBox_Focused" EndPoint="0,1" StartPoint="0,0">
+      <GradientStop Color="#3D7BAD" Offset="0.05" />
+      <GradientStop Color="#A4C9E3" Offset="0.07" />
+      <GradientStop Color="#B7D9ED" Offset="1" />
+   </LinearGradientBrush>
+
+   <SolidColorBrush x:Key="TextBox_DisabledBorder" Color="#ADB2B5" />
+   <SolidColorBrush x:Key="TextBox_DisabledBackground" Color="#F4F4F4" />
+
+   <DataTemplate x:Key="DefaultWatermarkTemplate">
+      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
+   </DataTemplate>
+
+   <Style TargetType="{x:Type local:WatermarkTextBox}">
+      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+      <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+      <Setter Property="BorderBrush" Value="{StaticResource TextBoxBorder}" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Padding" Value="3" />
+      <Setter Property="AllowDrop" Value="true" />
+      <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+      <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
+      <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+      <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:WatermarkTextBox}">
+               <Grid>
+
+                  <Border x:Name="Border" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="1" Background="{TemplateBinding Background}" />
+                  <Border x:Name="MouseOverVisual" Opacity="0" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{StaticResource TextBox_MouseOver}" CornerRadius="1" />
+                  <Border x:Name="FocusVisual" Opacity="0" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{StaticResource TextBox_Focused}" CornerRadius="1" />
+                  <ScrollViewer x:Name="PART_ContentHost" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                  <ContentPresenter x:Name="PART_WatermarkHost"
+                                    Content="{TemplateBinding Watermark}"
+                                    ContentTemplate="{TemplateBinding WatermarkTemplate}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    IsHitTestVisible="False"
+                                    Margin="{TemplateBinding Padding}"
+                                    Visibility="Collapsed" />
+
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="IsFocused" Value="False" />
+                        <Condition Property="Text" Value="" />
+                     </MultiTrigger.Conditions>
+                     <MultiTrigger.Setters>
+                        <Setter Property="Visibility" TargetName="PART_WatermarkHost" Value="Visible" />
+                     </MultiTrigger.Setters>
+                  </MultiTrigger>
+                  <Trigger Property="IsMouseOver" Value="True">
+                     <Setter TargetName="MouseOverVisual" Property="Opacity" Value="1" />
+                  </Trigger>
+                  <Trigger Property="IsFocused" Value="True">
+                     <Setter TargetName="FocusVisual" Property="Opacity" Value="1" />
+                  </Trigger>
+                  <Trigger Property="IsEnabled" Value="false">
+                     <Setter TargetName="Border"  Property="BorderBrush" Value="{StaticResource TextBox_DisabledBorder}" />
+                     <Setter TargetName="Border"  Property="Background" Value="{StaticResource TextBox_DisabledBackground}" />
+                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/Wizard.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/Wizard.cs
new file mode 100644
index 00000000..16436dea
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/Wizard.cs
@@ -0,0 +1,583 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Interop;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class Wizard : ItemsControl
+  {
+    #region Properties
+
+    public static readonly DependencyProperty BackButtonContentProperty = DependencyProperty.Register( "BackButtonContent", typeof( object ), typeof( Wizard ), new UIPropertyMetadata( "< Back" ) );
+    public object BackButtonContent
+    {
+      get
+      {
+        return ( object )GetValue( BackButtonContentProperty );
+      }
+      set
+      {
+        SetValue( BackButtonContentProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty BackButtonVisibilityProperty = DependencyProperty.Register( "BackButtonVisibility", typeof( Visibility ), typeof( Wizard ), new UIPropertyMetadata( Visibility.Visible ) );
+    public Visibility BackButtonVisibility
+    {
+      get
+      {
+        return ( Visibility )GetValue( BackButtonVisibilityProperty );
+      }
+      set
+      {
+        SetValue( BackButtonVisibilityProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CanCancelProperty = DependencyProperty.Register( "CanCancel", typeof( bool ), typeof( Wizard ), new UIPropertyMetadata( true ) );
+    public bool CanCancel
+    {
+      get
+      {
+        return ( bool )GetValue( CanCancelProperty );
+      }
+      set
+      {
+        SetValue( CanCancelProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CancelButtonClosesWindowProperty = DependencyProperty.Register( "CancelButtonClosesWindow", typeof( bool ), typeof( Wizard ), new UIPropertyMetadata( true ) );
+    public bool CancelButtonClosesWindow
+    {
+      get
+      {
+        return ( bool )GetValue( CancelButtonClosesWindowProperty );
+      }
+      set
+      {
+        SetValue( CancelButtonClosesWindowProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CancelButtonContentProperty = DependencyProperty.Register( "CancelButtonContent", typeof( object ), typeof( Wizard ), new UIPropertyMetadata( "Cancel" ) );
+    public object CancelButtonContent
+    {
+      get
+      {
+        return ( object )GetValue( CancelButtonContentProperty );
+      }
+      set
+      {
+        SetValue( CancelButtonContentProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CancelButtonVisibilityProperty = DependencyProperty.Register( "CancelButtonVisibility", typeof( Visibility ), typeof( Wizard ), new UIPropertyMetadata( Visibility.Visible ) );
+    public Visibility CancelButtonVisibility
+    {
+      get
+      {
+        return ( Visibility )GetValue( CancelButtonVisibilityProperty );
+      }
+      set
+      {
+        SetValue( CancelButtonVisibilityProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CanFinishProperty = DependencyProperty.Register( "CanFinish", typeof( bool ), typeof( Wizard ), new UIPropertyMetadata( false ) );
+    public bool CanFinish
+    {
+      get
+      {
+        return ( bool )GetValue( CanFinishProperty );
+      }
+      set
+      {
+        SetValue( CanFinishProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CanHelpProperty = DependencyProperty.Register( "CanHelp", typeof( bool ), typeof( Wizard ), new UIPropertyMetadata( true ) );
+    public bool CanHelp
+    {
+      get
+      {
+        return ( bool )GetValue( CanHelpProperty );
+      }
+      set
+      {
+        SetValue( CanHelpProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CanSelectNextPageProperty = DependencyProperty.Register( "CanSelectNextPage", typeof( bool ), typeof( Wizard ), new UIPropertyMetadata( true ) );
+    public bool CanSelectNextPage
+    {
+      get
+      {
+        return ( bool )GetValue( CanSelectNextPageProperty );
+      }
+      set
+      {
+        SetValue( CanSelectNextPageProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CanSelectPreviousPageProperty = DependencyProperty.Register( "CanSelectPreviousPage", typeof( bool ), typeof( Wizard ), new UIPropertyMetadata( true ) );
+    public bool CanSelectPreviousPage
+    {
+      get
+      {
+        return ( bool )GetValue( CanSelectPreviousPageProperty );
+      }
+      set
+      {
+        SetValue( CanSelectPreviousPageProperty, value );
+      }
+    }
+
+    #region CurrentPage
+
+    public static readonly DependencyProperty CurrentPageProperty = DependencyProperty.Register( "CurrentPage", typeof( WizardPage ), typeof( Wizard ), new UIPropertyMetadata( null, OnCurrentPageChanged ) );
+    public WizardPage CurrentPage
+    {
+      get
+      {
+        return ( WizardPage )GetValue( CurrentPageProperty );
+      }
+      set
+      {
+        SetValue( CurrentPageProperty, value );
+      }
+    }
+
+    private static void OnCurrentPageChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      Wizard wizard = o as Wizard;
+      if( wizard != null )
+        wizard.OnCurrentPageChanged( ( WizardPage )e.OldValue, ( WizardPage )e.NewValue );
+    }
+
+    protected virtual void OnCurrentPageChanged( WizardPage oldValue, WizardPage newValue )
+    {
+      RaiseRoutedEvent( Wizard.PageChangedEvent );
+    }
+
+    #endregion //CurrentPage
+
+    public static readonly DependencyProperty ExteriorPanelMinWidthProperty = DependencyProperty.Register( "ExteriorPanelMinWidth", typeof( double ), typeof( Wizard ), new UIPropertyMetadata( 165.0 ) );
+    public double ExteriorPanelMinWidth
+    {
+      get
+      {
+        return ( double )GetValue( ExteriorPanelMinWidthProperty );
+      }
+      set
+      {
+        SetValue( ExteriorPanelMinWidthProperty, value );
+      }
+    }
+
+
+    public static readonly DependencyProperty FinishButtonClosesWindowProperty = DependencyProperty.Register( "FinishButtonClosesWindow", typeof( bool ), typeof( Wizard ), new UIPropertyMetadata( true ) );
+    public bool FinishButtonClosesWindow
+    {
+      get
+      {
+        return ( bool )GetValue( FinishButtonClosesWindowProperty );
+      }
+      set
+      {
+        SetValue( FinishButtonClosesWindowProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty FinishButtonContentProperty = DependencyProperty.Register( "FinishButtonContent", typeof( object ), typeof( Wizard ), new UIPropertyMetadata( "Finish" ) );
+    public object FinishButtonContent
+    {
+      get
+      {
+        return ( object )GetValue( FinishButtonContentProperty );
+      }
+      set
+      {
+        SetValue( FinishButtonContentProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty FinishButtonVisibilityProperty = DependencyProperty.Register( "FinishButtonVisibility", typeof( Visibility ), typeof( Wizard ), new UIPropertyMetadata( Visibility.Visible ) );
+    public Visibility FinishButtonVisibility
+    {
+      get
+      {
+        return ( Visibility )GetValue( FinishButtonVisibilityProperty );
+      }
+      set
+      {
+        SetValue( FinishButtonVisibilityProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty HelpButtonContentProperty = DependencyProperty.Register( "HelpButtonContent", typeof( object ), typeof( Wizard ), new UIPropertyMetadata( "Help" ) );
+    public object HelpButtonContent
+    {
+      get
+      {
+        return ( object )GetValue( HelpButtonContentProperty );
+      }
+      set
+      {
+        SetValue( HelpButtonContentProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty HelpButtonVisibilityProperty = DependencyProperty.Register( "HelpButtonVisibility", typeof( Visibility ), typeof( Wizard ), new UIPropertyMetadata( Visibility.Visible ) );
+    public Visibility HelpButtonVisibility
+    {
+      get
+      {
+        return ( Visibility )GetValue( HelpButtonVisibilityProperty );
+      }
+      set
+      {
+        SetValue( HelpButtonVisibilityProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty NextButtonContentProperty = DependencyProperty.Register( "NextButtonContent", typeof( object ), typeof( Wizard ), new UIPropertyMetadata( "Next >" ) );
+    public object NextButtonContent
+    {
+      get
+      {
+        return ( object )GetValue( NextButtonContentProperty );
+      }
+      set
+      {
+        SetValue( NextButtonContentProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty NextButtonVisibilityProperty = DependencyProperty.Register( "NextButtonVisibility", typeof( Visibility ), typeof( Wizard ), new UIPropertyMetadata( Visibility.Visible ) );
+    public Visibility NextButtonVisibility
+    {
+      get
+      {
+        return ( Visibility )GetValue( NextButtonVisibilityProperty );
+      }
+      set
+      {
+        SetValue( NextButtonVisibilityProperty, value );
+      }
+    }
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static Wizard()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( Wizard ), new FrameworkPropertyMetadata( typeof( Wizard ) ) );
+    }
+
+    public Wizard()
+    {
+      CommandBindings.Add( new CommandBinding( WizardCommands.Cancel, ExecuteCancelWizard, CanExecuteCancelWizard ) );
+      CommandBindings.Add( new CommandBinding( WizardCommands.Finish, ExecuteFinishWizard, CanExecuteFinishWizard ) );
+      CommandBindings.Add( new CommandBinding( WizardCommands.Help, ExecuteRequestHelp, CanExecuteRequestHelp ) );
+      CommandBindings.Add( new CommandBinding( WizardCommands.NextPage, ExecuteSelectNextPage, CanExecuteSelectNextPage ) );
+      CommandBindings.Add( new CommandBinding( WizardCommands.PreviousPage, ExecuteSelectPreviousPage, CanExecuteSelectPreviousPage ) );
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    protected override DependencyObject GetContainerForItemOverride()
+    {
+      return new WizardPage();
+    }
+
+    protected override bool IsItemItsOwnContainerOverride( object item )
+    {
+      return ( item is WizardPage );
+    }
+
+    protected override void OnInitialized( EventArgs e )
+    {
+      base.OnInitialized( e );
+
+      if( Items.Count > 0 && CurrentPage == null )
+        CurrentPage = Items[ 0 ] as WizardPage;
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Commands
+
+    private void ExecuteCancelWizard( object sender, ExecutedRoutedEventArgs e )
+    {
+      RaiseRoutedEvent( Wizard.CancelEvent );
+
+      if( CancelButtonClosesWindow )
+        CloseParentWindow( false );
+    }
+
+    private void CanExecuteCancelWizard( object sender, CanExecuteRoutedEventArgs e )
+    {
+      if( CurrentPage != null )
+      {
+        if( CurrentPage.CanCancel.HasValue )
+          e.CanExecute = CurrentPage.CanCancel.Value;
+        else
+          e.CanExecute = CanCancel;
+      }
+    }
+
+    private void ExecuteFinishWizard( object sender, ExecutedRoutedEventArgs e )
+    {
+      RaiseRoutedEvent( Wizard.FinishEvent );
+
+      if( FinishButtonClosesWindow )
+        CloseParentWindow( true );
+    }
+
+    private void CanExecuteFinishWizard( object sender, CanExecuteRoutedEventArgs e )
+    {
+      if( CurrentPage != null )
+      {
+        if( CurrentPage.CanFinish.HasValue )
+          e.CanExecute = CurrentPage.CanFinish.Value;
+        else
+          e.CanExecute = CanFinish;
+      }
+    }
+
+    private void ExecuteRequestHelp( object sender, ExecutedRoutedEventArgs e )
+    {
+      RaiseRoutedEvent( Wizard.HelpEvent );
+    }
+
+    private void CanExecuteRequestHelp( object sender, CanExecuteRoutedEventArgs e )
+    {
+      if( CurrentPage != null )
+      {
+        if( CurrentPage.CanHelp.HasValue )
+          e.CanExecute = CurrentPage.CanHelp.Value;
+        else
+          e.CanExecute = CanHelp;
+      }
+    }
+
+    private void ExecuteSelectNextPage( object sender, ExecutedRoutedEventArgs e )
+    {
+      WizardPage nextPage = null;
+
+      if( CurrentPage != null )
+      {
+        //check next page
+        if( CurrentPage.NextPage != null )
+          nextPage = CurrentPage.NextPage;
+        else
+        {
+          //no next page defined use index
+          var currentIndex = Items.IndexOf( CurrentPage );
+          var nextPageIndex = currentIndex + 1;
+          if( nextPageIndex < Items.Count )
+            nextPage = Items[ nextPageIndex ] as WizardPage;
+        }
+      }
+
+      CurrentPage = nextPage;
+    }
+
+    private void CanExecuteSelectNextPage( object sender, CanExecuteRoutedEventArgs e )
+    {
+      if( CurrentPage != null )
+      {
+        if( CurrentPage.CanSelectNextPage.HasValue ) //check to see if page has overriden default behavior
+        {
+          if( CurrentPage.CanSelectNextPage.Value )
+            e.CanExecute = NextPageExists();
+        }
+        else if( CanSelectNextPage )
+          e.CanExecute = NextPageExists();
+      }
+    }
+
+    private void ExecuteSelectPreviousPage( object sender, ExecutedRoutedEventArgs e )
+    {
+      WizardPage previousPage = null;
+
+      if( CurrentPage != null )
+      {
+        //check previous page
+        if( CurrentPage.PreviousPage != null )
+          previousPage = CurrentPage.PreviousPage;
+        else
+        {
+          //no previous page defined so use index
+          var currentIndex = Items.IndexOf( CurrentPage );
+          var previousPageIndex = currentIndex - 1;
+          if( previousPageIndex >= 0 && previousPageIndex < Items.Count )
+            previousPage = Items[ previousPageIndex ] as WizardPage;
+        }
+      }
+
+      CurrentPage = previousPage;
+    }
+
+    private void CanExecuteSelectPreviousPage( object sender, CanExecuteRoutedEventArgs e )
+    {
+      if( CurrentPage != null )
+      {
+        if( CurrentPage.CanSelectPreviousPage.HasValue ) //check to see if page has overriden default behavior
+        {
+          if( CurrentPage.CanSelectPreviousPage.Value )
+            e.CanExecute = PreviousPageExists();
+        }
+        else if( CanSelectPreviousPage )
+          e.CanExecute = PreviousPageExists();
+      }
+    }
+
+    #endregion //Commands
+
+    #region Events
+
+    public static readonly RoutedEvent CancelEvent = EventManager.RegisterRoutedEvent( "Cancel", RoutingStrategy.Bubble, typeof( EventHandler ), typeof( Wizard ) );
+    public event RoutedEventHandler Cancel
+    {
+      add
+      {
+        AddHandler( CancelEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( CancelEvent, value );
+      }
+    }
+
+    public static readonly RoutedEvent PageChangedEvent = EventManager.RegisterRoutedEvent( "PageChanged", RoutingStrategy.Bubble, typeof( EventHandler ), typeof( Wizard ) );
+    public event RoutedEventHandler PageChanged
+    {
+      add
+      {
+        AddHandler( PageChangedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( PageChangedEvent, value );
+      }
+    }
+
+    public static readonly RoutedEvent FinishEvent = EventManager.RegisterRoutedEvent( "Finish", RoutingStrategy.Bubble, typeof( EventHandler ), typeof( Wizard ) );
+    public event RoutedEventHandler Finish
+    {
+      add
+      {
+        AddHandler( FinishEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( FinishEvent, value );
+      }
+    }
+
+    public static readonly RoutedEvent HelpEvent = EventManager.RegisterRoutedEvent( "Help", RoutingStrategy.Bubble, typeof( EventHandler ), typeof( Wizard ) );
+    public event RoutedEventHandler Help
+    {
+      add
+      {
+        AddHandler( HelpEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( HelpEvent, value );
+      }
+    }
+
+    #endregion //Events
+
+    #region Methods
+
+    private void CloseParentWindow( bool dialogResult )
+    {
+      Window window = Window.GetWindow( this );
+      if( window != null )
+      {
+        //we can only set the DialogResult if the window was opened as modal with the ShowDialog() method. Otherwise an exception would occur
+        if( ComponentDispatcher.IsThreadModal )
+          window.DialogResult = dialogResult;
+
+        window.Close();
+      }
+    }
+
+    private bool NextPageExists()
+    {
+      bool exists = false;
+
+      if( CurrentPage.NextPage != null ) //check to see if a next page has been specified
+        exists = true;
+      else
+      {
+        //lets use an index to find the next page
+        var currentIndex = Items.IndexOf( CurrentPage );
+        var nextPageIndex = currentIndex + 1;
+        if( nextPageIndex < Items.Count )
+          exists = true;
+      }
+
+      return exists;
+    }
+
+    private bool PreviousPageExists()
+    {
+      bool exists = false;
+
+      if( CurrentPage.PreviousPage != null ) //check to see if a previous page has been specified
+        exists = true;
+      else
+      {
+        //lets use an index to find the next page
+        var currentIndex = Items.IndexOf( CurrentPage );
+        var previousPageIndex = currentIndex - 1;
+        if( previousPageIndex >= 0 && previousPageIndex < Items.Count )
+          exists = true;
+      }
+
+      return exists;
+    }
+
+    private void RaiseRoutedEvent( RoutedEvent routedEvent )
+    {
+      RoutedEventArgs newEventArgs = new RoutedEventArgs( routedEvent, this );
+      base.RaiseEvent( newEventArgs );
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/WizardCommands.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/WizardCommands.cs
new file mode 100644
index 00000000..d2b765ac
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/WizardCommands.cs
@@ -0,0 +1,81 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows.Input;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public static class WizardCommands
+  {
+
+    private static RoutedCommand _cancelCommand = new RoutedCommand();
+    public static RoutedCommand Cancel
+    {
+      get
+      {
+        return _cancelCommand;
+      }
+    }
+
+    private static RoutedCommand _finishCommand = new RoutedCommand();
+    public static RoutedCommand Finish
+    {
+      get
+      {
+        return _finishCommand;
+      }
+    }
+
+    private static RoutedCommand _helpCommand = new RoutedCommand();
+    public static RoutedCommand Help
+    {
+      get
+      {
+        return _helpCommand;
+      }
+    }
+
+    private static RoutedCommand _nextPageCommand = new RoutedCommand();
+    public static RoutedCommand NextPage
+    {
+      get
+      {
+        return _nextPageCommand;
+      }
+    }
+
+    private static RoutedCommand _previousPageCommand = new RoutedCommand();
+    public static RoutedCommand PreviousPage
+    {
+      get
+      {
+        return _previousPageCommand;
+      }
+    }
+
+    private static RoutedCommand _selectPageCommand = new RoutedCommand();
+    public static RoutedCommand SelectPage
+    {
+      get
+      {
+        return _selectPageCommand;
+      }
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/WizardPage.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/WizardPage.cs
new file mode 100644
index 00000000..641cac87
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/WizardPage.cs
@@ -0,0 +1,288 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class WizardPage : ContentControl
+  {
+    #region Properties
+
+    public static readonly DependencyProperty BackButtonVisibilityProperty = DependencyProperty.Register( "BackButtonVisibility", typeof( WizardPageButtonVisibility ), typeof( WizardPage ), new UIPropertyMetadata( WizardPageButtonVisibility.Inherit ) );
+    public WizardPageButtonVisibility BackButtonVisibility
+    {
+      get
+      {
+        return ( WizardPageButtonVisibility )GetValue( BackButtonVisibilityProperty );
+      }
+      set
+      {
+        SetValue( BackButtonVisibilityProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CanCancelProperty = DependencyProperty.Register( "CanCancel", typeof( bool? ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
+    public bool? CanCancel
+    {
+      get
+      {
+        return ( bool? )GetValue( CanCancelProperty );
+      }
+      set
+      {
+        SetValue( CanCancelProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CancelButtonVisibilityProperty = DependencyProperty.Register( "CancelButtonVisibility", typeof( WizardPageButtonVisibility ), typeof( WizardPage ), new UIPropertyMetadata( WizardPageButtonVisibility.Inherit ) );
+    public WizardPageButtonVisibility CancelButtonVisibility
+    {
+      get
+      {
+        return ( WizardPageButtonVisibility )GetValue( CancelButtonVisibilityProperty );
+      }
+      set
+      {
+        SetValue( CancelButtonVisibilityProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CanFinishProperty = DependencyProperty.Register( "CanFinish", typeof( bool? ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
+    public bool? CanFinish
+    {
+      get
+      {
+        return ( bool? )GetValue( CanFinishProperty );
+      }
+      set
+      {
+        SetValue( CanFinishProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CanHelpProperty = DependencyProperty.Register( "CanHelp", typeof( bool? ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
+    public bool? CanHelp
+    {
+      get
+      {
+        return ( bool? )GetValue( CanHelpProperty );
+      }
+      set
+      {
+        SetValue( CanHelpProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CanSelectNextPageProperty = DependencyProperty.Register( "CanSelectNextPage", typeof( bool? ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
+    public bool? CanSelectNextPage
+    {
+      get
+      {
+        return ( bool? )GetValue( CanSelectNextPageProperty );
+      }
+      set
+      {
+        SetValue( CanSelectNextPageProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CanSelectPreviousPageProperty = DependencyProperty.Register( "CanSelectPreviousPage", typeof( bool? ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
+    public bool? CanSelectPreviousPage
+    {
+      get
+      {
+        return ( bool? )GetValue( CanSelectPreviousPageProperty );
+      }
+      set
+      {
+        SetValue( CanSelectPreviousPageProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty DescriptionProperty = DependencyProperty.Register( "Description", typeof( string ), typeof( WizardPage ) );
+    public string Description
+    {
+      get
+      {
+        return ( string )base.GetValue( DescriptionProperty );
+      }
+      set
+      {
+        base.SetValue( DescriptionProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty ExteriorPanelBackgroundProperty = DependencyProperty.Register( "ExteriorPanelBackground", typeof( Brush ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
+    public Brush ExteriorPanelBackground
+    {
+      get
+      {
+        return ( Brush )GetValue( ExteriorPanelBackgroundProperty );
+      }
+      set
+      {
+        SetValue( ExteriorPanelBackgroundProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty ExteriorPanelContentProperty = DependencyProperty.Register( "ExteriorPanelContent", typeof( object ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
+    public object ExteriorPanelContent
+    {
+      get
+      {
+        return ( object )GetValue( ExteriorPanelContentProperty );
+      }
+      set
+      {
+        SetValue( ExteriorPanelContentProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty FinishButtonVisibilityProperty = DependencyProperty.Register( "FinishButtonVisibility", typeof( WizardPageButtonVisibility ), typeof( WizardPage ), new UIPropertyMetadata( WizardPageButtonVisibility.Inherit ) );
+    public WizardPageButtonVisibility FinishButtonVisibility
+    {
+      get
+      {
+        return ( WizardPageButtonVisibility )GetValue( FinishButtonVisibilityProperty );
+      }
+      set
+      {
+        SetValue( FinishButtonVisibilityProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty HeaderBackgroundProperty = DependencyProperty.Register( "HeaderBackground", typeof( Brush ), typeof( WizardPage ), new UIPropertyMetadata( Brushes.White ) );
+    public Brush HeaderBackground
+    {
+      get
+      {
+        return ( Brush )GetValue( HeaderBackgroundProperty );
+      }
+      set
+      {
+        SetValue( HeaderBackgroundProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty HeaderImageProperty = DependencyProperty.Register( "HeaderImage", typeof( ImageSource ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
+    public ImageSource HeaderImage
+    {
+      get
+      {
+        return ( ImageSource )GetValue( HeaderImageProperty );
+      }
+      set
+      {
+        SetValue( HeaderImageProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty HelpButtonVisibilityProperty = DependencyProperty.Register( "HelpButtonVisibility", typeof( WizardPageButtonVisibility ), typeof( WizardPage ), new UIPropertyMetadata( WizardPageButtonVisibility.Inherit ) );
+    public WizardPageButtonVisibility HelpButtonVisibility
+    {
+      get
+      {
+        return ( WizardPageButtonVisibility )GetValue( HelpButtonVisibilityProperty );
+      }
+      set
+      {
+        SetValue( HelpButtonVisibilityProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty NextButtonVisibilityProperty = DependencyProperty.Register( "NextButtonVisibility", typeof( WizardPageButtonVisibility ), typeof( WizardPage ), new UIPropertyMetadata( WizardPageButtonVisibility.Inherit ) );
+    public WizardPageButtonVisibility NextButtonVisibility
+    {
+      get
+      {
+        return ( WizardPageButtonVisibility )GetValue( NextButtonVisibilityProperty );
+      }
+      set
+      {
+        SetValue( NextButtonVisibilityProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty NextPageProperty = DependencyProperty.Register( "NextPage", typeof( WizardPage ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
+    public WizardPage NextPage
+    {
+      get
+      {
+        return ( WizardPage )GetValue( NextPageProperty );
+      }
+      set
+      {
+        SetValue( NextPageProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty PageTypeProperty = DependencyProperty.Register( "PageType", typeof( WizardPageType ), typeof( WizardPage ), new UIPropertyMetadata( WizardPageType.Exterior ) );
+    public WizardPageType PageType
+    {
+      get
+      {
+        return ( WizardPageType )GetValue( PageTypeProperty );
+      }
+      set
+      {
+        SetValue( PageTypeProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty PreviousPageProperty = DependencyProperty.Register( "PreviousPage", typeof( WizardPage ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
+    public WizardPage PreviousPage
+    {
+      get
+      {
+        return ( WizardPage )GetValue( PreviousPageProperty );
+      }
+      set
+      {
+        SetValue( PreviousPageProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty TitleProperty = DependencyProperty.Register( "Title", typeof( string ), typeof( WizardPage ) );
+    public string Title
+    {
+      get
+      {
+        return ( string )base.GetValue( TitleProperty );
+      }
+      set
+      {
+        base.SetValue( TitleProperty, value );
+      }
+    }
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static WizardPage()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( WizardPage ), new FrameworkPropertyMetadata( typeof( WizardPage ) ) );
+    }
+
+    #endregion //Constructors
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/WizardPageButtonVisibility.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/WizardPageButtonVisibility.cs
new file mode 100644
index 00000000..6f7bad79
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/WizardPageButtonVisibility.cs
@@ -0,0 +1,29 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit
+{
+  public enum WizardPageButtonVisibility
+  {
+    Inherit,
+    Collapsed,
+    Hidden,
+    Visible
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/WizardPageType.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/WizardPageType.cs
new file mode 100644
index 00000000..fcf33a8f
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/WizardPageType.cs
@@ -0,0 +1,28 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit
+{
+  public enum WizardPageType
+  {
+    Blank,
+    Exterior,
+    Interior
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Themes/Generic.xaml
new file mode 100644
index 00000000..33168b23
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Themes/Generic.xaml
@@ -0,0 +1,209 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
+
+   <conv:WizardPageButtonVisibilityConverter x:Key="WizardPageButtonVisibilityConverter" />
+
+   <Style TargetType="{x:Type local:Wizard}">
+      <Setter Property="Background" Value="#F0F0F0" />
+      <Setter Property="BorderBrush" Value="#A0A0A0" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="ItemsPanel">
+         <Setter.Value>
+            <ItemsPanelTemplate>
+               <Grid />
+            </ItemsPanelTemplate>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:Wizard}">
+               <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+                  <Grid Background="{TemplateBinding Background}">
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="*" />
+                        <RowDefinition Height="Auto" />
+                     </Grid.RowDefinitions>
+
+                     <ContentPresenter Content="{Binding CurrentPage, RelativeSource={RelativeSource TemplatedParent}}" />
+
+                     <Border Grid.Row="1" Background="#F0F0F0" BorderBrush="#A0A0A0" BorderThickness="0,1,0,0" Padding="7">
+                        <StackPanel Background="{TemplateBinding Background}">
+                           <Grid Margin="{TemplateBinding Padding}">
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="Auto" />
+                                 <ColumnDefinition Width="*" />
+                              </Grid.ColumnDefinitions>
+                              <Button Name="PART_HelpButton"
+                                      Grid.Column="0"
+                                      MinWidth="75" 
+                                      Command="local:WizardCommands.Help" 
+                                      Content="{TemplateBinding HelpButtonContent}">
+                                 <Button.Visibility>
+                                    <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
+                                       <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="HelpButtonVisibility" />
+                                       <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.HelpButtonVisibility" />
+                                    </MultiBinding>
+                                 </Button.Visibility>
+                              </Button>
+                              <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
+                                 <Button Name="PART_CancelButton"
+                                         Margin="0,0,7,0"
+                                         MinWidth="75" 
+                                         Command="local:WizardCommands.Cancel" 
+                                         Content="{TemplateBinding CancelButtonContent}">
+                                    <Button.Visibility>
+                                       <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
+                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CancelButtonVisibility" />
+                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.CancelButtonVisibility" />
+                                       </MultiBinding>
+                                    </Button.Visibility>
+                                 </Button>
+                                 <Button Name="PART_BackButton"
+                                         MinWidth="75" 
+                                         Command="local:WizardCommands.PreviousPage" 
+                                         Content="{TemplateBinding BackButtonContent}">
+                                    <Button.Visibility>
+                                       <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
+                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="BackButtonVisibility" />
+                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.BackButtonVisibility" />
+                                       </MultiBinding>
+                                    </Button.Visibility>
+                                 </Button>
+                                 <Button Name="PART_NextButton"
+                                         MinWidth="75" 
+                                         Command="local:WizardCommands.NextPage"
+                                         Content="{TemplateBinding NextButtonContent}">
+                                    <Button.Visibility>
+                                       <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
+                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="NextButtonVisibility" />
+                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.NextButtonVisibility" />
+                                       </MultiBinding>
+                                    </Button.Visibility>
+                                 </Button>
+                                 <Button Name="PART_FinishButton"
+                                         Margin="7,0,0,0"
+                                         MinWidth="75" 
+                                         Command="local:WizardCommands.Finish" 
+                                         Content="{TemplateBinding FinishButtonContent}">
+                                    <Button.Visibility>
+                                       <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
+                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="FinishButtonVisibility" />
+                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.FinishButtonVisibility" />
+                                       </MultiBinding>
+                                    </Button.Visibility>
+                                 </Button>
+                              </StackPanel>
+                           </Grid>
+                        </StackPanel>
+                     </Border>
+                  </Grid>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <ControlTemplate x:Key="BlankWizardPageTemplate" TargetType="{x:Type local:WizardPage}">
+      <Border SnapsToDevicePixels="true" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+         <Grid Background="{TemplateBinding Background}">
+            <ContentPresenter Margin="14" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
+         </Grid>
+      </Border>
+   </ControlTemplate>
+
+   <ControlTemplate x:Key="ExteriorWizardPageTemplate" TargetType="{x:Type local:WizardPage}">
+      <Grid Background="{TemplateBinding Background}">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="*" />
+         </Grid.ColumnDefinitions>
+         <Border SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+            <Grid Grid.Column="0" Background="{TemplateBinding ExteriorPanelBackground}" MinWidth="{Binding ExteriorPanelMinWidth, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:Wizard}}">
+               <ContentControl Content="{TemplateBinding ExteriorPanelContent}" />
+            </Grid>
+         </Border>
+         <Grid Column="1" Margin="14">
+            <Grid.RowDefinitions>
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+            <TextBlock Grid.Row="0" TextWrapping="Wrap" Margin="0,0,0,14" FontSize="16" FontWeight="Bold" Text="{TemplateBinding Title}" />
+            <TextBlock Grid.Row="1" TextWrapping="Wrap" Margin="0,0,0,14" Text="{TemplateBinding Description}" />
+            <ContentPresenter Grid.Row="2" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
+         </Grid>
+      </Grid>
+   </ControlTemplate>
+
+   <ControlTemplate x:Key="InteriorWizardPageTemplate" TargetType="{x:Type local:WizardPage}">
+      <Grid>
+         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+         </Grid.RowDefinitions>
+
+         <Grid Background="{TemplateBinding HeaderBackground}" MinHeight="56">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="*" />
+               <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+            <StackPanel>
+               <TextBlock Margin="16,9,0,1" TextWrapping="Wrap" FontWeight="Bold" Text="{TemplateBinding Title}" />
+               <TextBlock Margin="32,0,0,3" TextWrapping="Wrap" Text="{TemplateBinding Description}" />
+            </StackPanel>
+            <Image Grid.Column="1" Margin="4" Source="{TemplateBinding HeaderImage}" Stretch="None" HorizontalAlignment="Center" VerticalAlignment="Center" />
+         </Grid>
+
+         <Border Grid.Row="1" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+            <Grid Background="{TemplateBinding Background}">
+               <ContentPresenter Margin="14" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
+            </Grid>
+         </Border>
+      </Grid>
+   </ControlTemplate>
+
+   <Style TargetType="{x:Type local:WizardPage}">
+      <Style.Triggers>
+         <Trigger Property="PageType" Value="Blank">
+            <Setter Property="Background" Value="#FFF0F0F0" />
+            <Setter Property="BorderThickness" Value="0" />
+            <Setter Property="Template" Value="{StaticResource BlankWizardPageTemplate}" />
+         </Trigger>
+         <Trigger Property="PageType" Value="Exterior">
+            <Setter Property="Background" Value="#FFFFFF" />
+            <Setter Property="BorderThickness" Value="0" />
+            <Setter Property="ExteriorPanelBackground" Value="#E3EFFF" />
+            <Setter Property="Template" Value="{StaticResource ExteriorWizardPageTemplate}" />
+         </Trigger>
+         <Trigger Property="PageType" Value="Interior">
+            <Setter Property="Background" Value="#FFF0F0F0" />
+            <Setter Property="BorderBrush" Value="{x:Static SystemColors.ActiveBorderBrush}" />
+            <Setter Property="BorderThickness" Value="0,1,0,0" />
+            <Setter Property="HeaderBackground" Value="#FFFFFF" />
+            <Setter Property="Template" Value="{StaticResource InteriorWizardPageTemplate}" />
+         </Trigger>
+      </Style.Triggers>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/Resources/Zoom.cur b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/Resources/Zoom.cur
new file mode 100644
index 00000000..f5001727
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/Resources/Zoom.cur differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/Resources/ZoomRelative.cur b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/Resources/ZoomRelative.cur
new file mode 100644
index 00000000..7df27fd6
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/Resources/ZoomRelative.cur differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/Themes/Generic.xaml
new file mode 100644
index 00000000..189b238a
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/Themes/Generic.xaml
@@ -0,0 +1,601 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
+    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.Zoombox">
+
+   <conv:RoundedValueConverter x:Key="RoundedValueConverter" Precision="2" />
+   <conv:VisibilityToBoolConverter x:Key="TrueIfVisibleConverter"
+      Inverted="False" Not="False" />
+   <conv:VisibilityToBoolConverter x:Key="TrueIfNotVisibleConverter"
+      Inverted="False" Not="True" />
+   <conv:VisibilityToBoolConverter x:Key="VisibleIfTrueConverter"
+      Inverted="True" Not="False" />
+   <conv:VisibilityToBoolConverter x:Key="VisibleIfNotTrueConverter"
+      Inverted="True" Not="True" />
+
+   <SolidColorBrush x:Key="GlyphBrush" Color="white" />
+
+   <Style x:Key="TransparentButton" TargetType="{x:Type ButtonBase}"
+      BasedOn="{x:Null}">
+      <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+      <Setter Property="Background" Value="#333333" />
+      <Setter Property="Foreground" Value="#cccccc" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ButtonBase}">
+               <Grid Background="Transparent" Cursor="Hand">
+                  <Rectangle Fill="{TemplateBinding Background}"
+                Stroke="{TemplateBinding Foreground}" RadiusX="3" RadiusY="3"
+                x:Name="BackgroundTextBoxRectangle" Opacity="0" />
+                  <ContentPresenter />
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsEnabled" Value="False">
+                     <Setter Property="Opacity" Value="0.4" />
+                  </Trigger>
+                  <Trigger Property="IsMouseOver" Value="True">
+                     <Setter TargetName="BackgroundTextBoxRectangle" Property="Opacity"
+                  Value="1" />
+                  </Trigger>
+                  <Trigger Property="IsKeyboardFocusWithin" Value="True">
+                     <Setter TargetName="BackgroundTextBoxRectangle" Property="Opacity"
+                  Value="1" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="ViewFinderToggleButtonStyle" BasedOn="{StaticResource TransparentButton}" TargetType="{x:Type ToggleButton}">
+      <Setter Property="Visibility" Value="Visible" />
+      <Style.Triggers>
+         <DataTrigger Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:Zoombox}}, Path=ViewFinderVisibility}" Value="Hidden">
+            <Setter Property="Visibility" Value="Collapsed" />
+         </DataTrigger>
+      </Style.Triggers>
+   </Style>
+
+   <DrawingImage x:Key="ShowViewFinderGlyph" >
+      <DrawingImage.Drawing>
+         <DrawingGroup>
+            <DrawingGroup>
+               <DrawingGroup.Transform>
+                  <MatrixTransform Matrix="0.707,0.707,-0.707,0.707,11.533,0.664" />
+               </DrawingGroup.Transform>
+               <GeometryDrawing Brush="#FF000000" Geometry="M8.823,9.895 
+              L12.440,13.460 10.784,15.092 15.347,15.092 15.347,15.125 
+              9.651,15.125 11.306,13.493 8.239,10.470 8.823,9.895 z 
+              M15.347,9.511 L15.347,10.595 14.842,11.093 14.292,10.551
+              15.347,9.511 z M0,9.481 L1.133,10.598 1.133,15.092 
+              5.694,15.092 5.727,15.125 0,15.125 0,9.481 z M14.842,3.963 
+              L15.347,4.461 15.347,5.611 14.258,4.538 14.842,3.963 z 
+              M2.793,3.952 L6.410,7.517 2.793,11.082 2.243,10.540 
+              5.276,7.551 2.209,4.527 2.793,3.952 z M9.653,0 L10.821,0 
+              12.429,1.585 8.812,5.150 8.262,4.608 11.296,1.618 9.653,0 z
+              M0,0 L1.133,0 1.133,4.504 0,5.621 0,0 z"/>
+            </DrawingGroup>
+            <DrawingGroup>
+               <DrawingGroup.Transform>
+                  <MatrixTransform Matrix="0.707,0.707,-0.707,0.707,12.048,1.182"/>
+               </DrawingGroup.Transform>
+               <GeometryDrawing Brush="#4B5F5F5F" Geometry="M0,0 L5.703,0 
+              4.061,1.618 7.678,5.183 11.295,1.618 9.653,0 15.347,0 15.347,5.611
+              13.704,3.996 10.091,7.561 13.708,11.126 15.347,9.511 15.347,15.125 
+              9.651,15.125 11.306,13.493 7.689,9.928 4.071,13.493 5.727,15.125 
+              0,15.125 0,9.480 1.659,11.115 5.276,7.551 1.659,3.986 0,5.621 0,0 z"/>
+            </DrawingGroup>
+            <DrawingGroup>
+               <DrawingGroup.Transform>
+                  <MatrixTransform Matrix="0.707,0.707,-0.707,0.707,12.186,1.538"/>
+               </DrawingGroup.Transform>
+               <GeometryDrawing Brush="#FFFFFFFF" Geometry="M6.867,9.820 L7.334,10.280 
+              4.072,13.494 5.727,15.126 0,15.126 0,15.016 4.906,15.016 3.250,13.384
+              6.867,9.820 z M15.347,9.512 L15.347,15.126 9.651,15.126 9.762,15.016
+              14.525,15.016 14.525,10.322 15.347,9.512 z M0,9.481 L1.193 ,10.657 
+              0.837,11.007 0,10.182 0,9.481 z M12.887,3.888 L13.353,4.347 
+              10.091,7.56 13.242,10.667 12.887,11.018 9.270,7.453 12.887,3.888 z
+              M0.837,3.878 L1.303,4.337 0,5.621 0,4.703 0.837,3.878 z M14.525,0 
+              L15.347,0 15.347,5.612 14.525,4.802 14.525,0 z M4.772,0 L5.703,0
+              4.061,1.617 7.212,4.724 6.857,5.075 3.239,1.511 4.772,0 z"/>
+            </DrawingGroup>
+         </DrawingGroup>
+      </DrawingImage.Drawing>
+   </DrawingImage>
+
+   <DrawingImage x:Key="FillToBoundsGlyph">
+      <DrawingImage.Drawing>
+         <DrawingGroup>
+            <DrawingGroup.Children>
+               <GeometryDrawing Geometry="F1 M 218.138,210.145L 255.599,210.145L
+              255.599,246.628L 218.138,246.628L 218.138,210.145 Z">
+                  <GeometryDrawing.Pen>
+                     <Pen Thickness="1.2" LineJoin="Round"
+                  Brush="{StaticResource GlyphBrush}"/>
+                  </GeometryDrawing.Pen>
+               </GeometryDrawing>
+               <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 249.378,215.741L 249.378,215.743L 249.383,215.743L 
+              249.383,219.159L 249.378,219.159L 249.378,224.598L 245.962,224.598L 
+              245.962,219.159L 240.525,219.159L 240.525,215.743L 245.962,215.743L 
+              245.962,215.741L 249.378,215.741 Z"/>
+               <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 249.383,240.726L 249.381,240.726L 249.381,240.73L 
+              245.965,240.73L 245.965,240.726L 240.526,240.726L 240.526,237.31L 
+              245.965,237.31L 245.965,231.873L 249.381,231.873L 249.381,237.31L 
+              249.383,237.31L 249.383,240.726 Z"/>
+               <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 247.539,220.321L 239.801,228.059L 247.539,235.796L 
+              244.962,238.373L 237.224,230.635L 229.487,238.373L 226.91,235.796L 
+              234.648,228.059L 226.91,220.321L 229.487,217.744L 237.224,225.482L 
+              244.962,217.744L 247.539,220.321 Z"/>
+               <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 224.879,240.73L 224.879,240.729L 224.874,240.729L 
+              224.874,237.312L 224.879,237.312L 224.879,231.873L 228.295,231.873L 
+              228.295,237.312L 233.732,237.312L 233.732,240.729L 228.295,240.729L 
+              228.295,240.73L 224.879,240.73 Z"/>
+               <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 224.874,215.746L 224.876,215.746L 224.876,215.741L 
+              228.292,215.741L 228.292,215.746L 233.731,215.746L 233.731,219.162L 
+              228.292,219.162L 228.292,224.598L 224.876,224.598L 224.876,219.162L 
+              224.874,219.162L 224.874,215.746 Z"/>
+            </DrawingGroup.Children>
+         </DrawingGroup>
+      </DrawingImage.Drawing>
+   </DrawingImage>
+
+   <DrawingImage x:Key="FitContentGlyph">
+      <DrawingImage.Drawing>
+         <DrawingGroup>
+            <DrawingGroup.Children>
+               <GeometryDrawing Geometry="F1 M 267.334,210.477L 304.795,210.477L 
+              304.795,246.96L 267.334,246.96L 267.334,210.477 Z">
+                  <GeometryDrawing.Pen>
+                     <Pen Thickness="1.2" LineJoin="Round"
+                  Brush="{StaticResource GlyphBrush}"/>
+                  </GeometryDrawing.Pen>
+               </GeometryDrawing>
+               <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 298.574,216.073L 298.574,216.075L 298.579,216.075L 
+              298.579,219.491L 298.574,219.491L 298.574,224.93L 295.158,224.93L 
+              295.158,219.491L 289.721,219.491L 289.721,216.075L 295.158,216.075L 
+              295.158,216.073L 298.574,216.073 Z"/>
+               <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 298.579,241.058L 298.577,241.058L 298.577,241.062L 
+              295.161,241.062L 295.161,241.058L 289.722,241.058L 289.722,237.642L 
+              295.161,237.642L 295.161,232.205L 298.577,232.205L 298.577,237.642L 
+              298.579,237.642L 298.579,241.058 Z"/>
+               <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 274.075,241.062L 274.075,241.061L 274.07,241.061L 
+              274.07,237.644L 274.075,237.644L 274.075,232.205L 277.491,232.205L 
+              277.491,237.644L 282.928,237.644L 282.928,241.061L 277.491,241.061L 
+              277.491,241.062L 274.075,241.062 Z"/>
+               <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 274.07,216.078L 274.072,216.078L 274.072,216.073L 
+              277.488,216.073L 277.488,216.078L 282.927,216.078L 282.927,219.494L 
+              277.488,219.494L 277.488,224.93L 274.072,224.93L 274.072,219.494L 
+              274.07,219.494L 274.07,216.078 Z"/>
+            </DrawingGroup.Children>
+         </DrawingGroup>
+      </DrawingImage.Drawing>
+   </DrawingImage>
+
+   <DrawingImage x:Key="CenterGlyph">
+      <DrawingImage.Drawing>
+         <DrawingGroup>
+            <DrawingGroup.Children>
+               <GeometryDrawing Geometry="F1 M 315.334,209.944L 352.795,209.944L 
+              352.795,246.427L 315.334,246.427L 315.334,209.944 Z">
+                  <GeometryDrawing.Pen>
+                     <Pen Thickness="1.2" LineJoin="Round"
+                  Brush="{StaticResource GlyphBrush}"/>
+                  </GeometryDrawing.Pen>
+               </GeometryDrawing>
+               <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 328.878,223.652L 338.19,223.652C 338.27,223.652 
+              338.334,223.716 338.334,223.796L 338.334,233.108C 338.334,233.188 
+              338.27,233.252 338.19,233.252L 328.878,233.252C 328.799,233.252 
+              328.734,233.188 328.734,233.108L 328.734,223.796C 328.734,223.716 
+              328.799,223.652 328.878,223.652 Z"/>
+            </DrawingGroup.Children>
+         </DrawingGroup>
+      </DrawingImage.Drawing>
+   </DrawingImage>
+
+   <DrawingImage x:Key="RefocusGlyph" >
+      <DrawingImage.Drawing>
+         <DrawingGroup>
+            <DrawingGroup>
+               <DrawingGroup.Transform>
+                  <MatrixTransform Matrix="1,0,0,1,0.667,1.667"/>
+               </DrawingGroup.Transform>
+               <GeometryDrawing Brush="#FFFFFFFF" Geometry="M6.624,0 C10.281,0 
+              13.247,2.836 13.247,6.334 13.247,7.176 13.075,7.980 12.734,8.703
+              L14.666,10.550 14.666,10.631 8.989,10.631 8.989,5.202 9.072,5.202
+              10.971,7.018 C11.095,6.810 11.116,6.573 11.116,6.331 11.116,3.959
+              9.104,2.034 6.622,2.034 4.139,2.034 2.127,3.959 2.127,6.331
+              2.127,8.575 3.925,10.417 6.224,10.552 L8.220,12.461 C7.712,12.602
+              7.176,12.667 6.624,12.667 2.966,12.667 0,9.831 0,6.334 0,2.836
+              2.966,0 6.624,0 z"/>
+            </DrawingGroup>
+            <GeometryDrawing Brush="#00FFFFFF">
+               <GeometryDrawing.Geometry>
+                  <RectangleGeometry RadiusX="0" RadiusY="0" Rect="0,0,16,16"/>
+               </GeometryDrawing.Geometry>
+            </GeometryDrawing>
+         </DrawingGroup>
+      </DrawingImage.Drawing>
+   </DrawingImage>
+
+   <DrawingImage x:Key="HomeGlyph">
+      <DrawingImage.Drawing>
+         <DrawingGroup>
+            <DrawingGroup.Children>
+               <GeometryDrawing Geometry="F1 M 414.001,209.411L 451.462,209.411L 
+              451.462,245.893L 414.001,245.893L 414.001,209.411 Z">
+                  <GeometryDrawing.Pen>
+                     <Pen Thickness="1.2" LineJoin="Round" Brush="transparent"/>
+                  </GeometryDrawing.Pen>
+               </GeometryDrawing>
+               <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 442.009,240.438C 442.009,240.534 441.886,240.612 
+              441.735,240.612L 423.992,240.612C 423.841,240.612 423.718,240.534 
+              423.718,240.438L 423.718,229.595L 418.991,229.595C 418.874,229.479 
+              418.874,229.289 418.991,229.173L 432.652,215.511C 432.769,215.395 
+              432.958,215.395 433.075,215.511L 446.736,229.173C 446.853,229.289 
+              446.853,229.479 446.736,229.595L 442.009,229.595L 442.009,240.438 Z"/>
+            </DrawingGroup.Children>
+         </DrawingGroup>
+      </DrawingImage.Drawing>
+   </DrawingImage>
+
+   <DrawingImage x:Key="PreviousGlyph">
+      <DrawingImage.Drawing>
+         <DrawingGroup>
+            <DrawingGroup.Children>
+               <GeometryDrawing Brush="#00000000" Geometry="F1 M 8.47772,268.99L 
+              75.1444,268.99L 75.1444,335.657L 8.47772,335.657L 8.47772,268.99 Z">
+                  <GeometryDrawing.Pen>
+                     <Pen Thickness="1" LineJoin="Round" Brush="Transparent"/>
+                  </GeometryDrawing.Pen>
+               </GeometryDrawing>
+               <GeometryDrawing Brush="{StaticResource GlyphBrush}" Geometry="F1 M 
+              57.2513,286.303L 57.2513,318.344L 26.3707,302.323L 57.2513,286.303 Z">
+                  <GeometryDrawing.Pen>
+                     <Pen Thickness="1" LineJoin="Round"
+                  Brush="{StaticResource GlyphBrush}"/>
+                  </GeometryDrawing.Pen>
+               </GeometryDrawing>
+            </DrawingGroup.Children>
+         </DrawingGroup>
+      </DrawingImage.Drawing>
+   </DrawingImage>
+
+   <DrawingImage x:Key="NextGlyph">
+      <DrawingImage.Drawing>
+         <DrawingGroup>
+            <DrawingGroup.Children>
+               <GeometryDrawing Brush="#00000000" Geometry="F1 M 75.1444,415.886L 
+              8.47772,415.886L 8.47772,349.219L 75.1444,349.219L 75.1444,415.886 Z">
+                  <GeometryDrawing.Pen>
+                     <Pen Thickness="1" LineJoin="Round" Brush="#00FFFFFF"/>
+                  </GeometryDrawing.Pen>
+               </GeometryDrawing>
+               <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 26.3708,398.573L 26.3708,366.532L 57.2514,382.553L 
+              26.3708,398.573 Z">
+                  <GeometryDrawing.Pen>
+                     <Pen Thickness="1" LineJoin="Round"
+                  Brush="{StaticResource GlyphBrush}"/>
+                  </GeometryDrawing.Pen>
+               </GeometryDrawing>
+            </DrawingGroup.Children>
+         </DrawingGroup>
+      </DrawingImage.Drawing>
+   </DrawingImage>
+
+   <DrawingImage x:Key="CloseXDrawingImage">
+      <DrawingImage.Drawing>
+         <DrawingGroup>
+            <DrawingGroup.Children>
+               <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 470.57,422.952C 470.414,423.109 470.161,423.109 
+              470.005,422.952L 451.714,404.662C 451.558,404.506 451.558,404.252 
+              451.714,404.096L 489.144,366.667L 451.714,329.237C 451.558,329.081 
+              451.558,328.828 451.714,328.671L 470.005,310.381C 470.161,310.225 
+              470.414,310.225 470.57,310.381L 508,347.81L 545.43,310.381C 
+              545.586,310.225 545.839,310.225 545.995,310.381L 564.286,328.671C 
+              564.442,328.828 564.442,329.081 564.286,329.237L 526.856,366.667L 
+              564.286,404.096C 564.442,404.252 564.442,404.506 564.286,404.662L 
+              545.995,422.952C 545.839,423.109 545.586,423.109 545.43,422.952L 
+              508,385.523L 470.57,422.952 Z"/>
+            </DrawingGroup.Children>
+         </DrawingGroup>
+      </DrawingImage.Drawing>
+   </DrawingImage>
+
+   <Style x:Key="{x:Type local:Zoombox}" TargetType="{x:Type local:Zoombox}">
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="Foreground" Value="White" />
+      <Setter Property="PanDistance" Value="5.0" />
+      <Setter Property="ZoomOrigin" Value="0.5,0.5" />
+      <Setter Property="ZoomPercentage" Value="5.0" />
+      <Setter Property="DragModifiers" Value="Ctrl,Exact" />
+      <Setter Property="DragOnPreview" Value="False" />
+      <Setter Property="ZoomModifiers" Value="Shift,Exact" />
+      <Setter Property="ZoomOnPreview" Value="True" />
+      <Setter Property="RelativeZoomModifiers" Value="Ctrl,Alt,Exact" />
+      <Setter Property="ZoomToSelectionModifiers" Value="Alt,Exact" />
+      <Setter Property="NavigateOnPreview" Value="False" />
+      <Setter Property="ViewFinderVisibility" Value="Collapsed" />
+      <Setter Property="MinScale" Value="0.01" />
+      <Setter Property="MaxScale" Value="100.0" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="IsTabStop" Value="False" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:Zoombox}">
+               <ControlTemplate.Resources>
+                  <SolidColorBrush x:Key="SelectionBrush" Color="Transparent" />
+                  <Pen x:Key="SelectionPen" Thickness="2.0" Brush="#7F3F3F3F" />
+                  <Pen x:Key="ViewportPen" Thickness="1.0" Brush="Red" />
+                  <InputBindingCollection x:Key="InputBindings">
+                     <KeyBinding Command="local:Zoombox.ZoomOut" Key="Left"
+                  Modifiers="Control" />
+                     <KeyBinding Command="local:Zoombox.ZoomOut" Key="Up"
+                  Modifiers="Control" />
+                     <KeyBinding Command="local:Zoombox.ZoomIn" Key="Right"
+                  Modifiers="Control" />
+                     <KeyBinding Command="local:Zoombox.ZoomIn" Key="Down"
+                  Modifiers="Control" />
+                     <KeyBinding Command="local:Zoombox.PanLeft" Key="Left"
+                  Modifiers="Shift+Control" />
+                     <KeyBinding Command="local:Zoombox.PanUp" Key="Up"
+                  Modifiers="Shift+Control" />
+                     <KeyBinding Command="local:Zoombox.PanRight" Key="Right"
+                  Modifiers="Shift+Control" />
+                     <KeyBinding Command="local:Zoombox.PanDown" Key="Down"
+                  Modifiers="Shift+Control" />
+                     <KeyBinding Command="local:Zoombox.Forward" Key="BrowserForward" />
+                     <KeyBinding Command="local:Zoombox.Back" Key="BrowserBack" />
+                     <KeyBinding Command="local:Zoombox.Back" Key="Back" />
+                  </InputBindingCollection>
+               </ControlTemplate.Resources>
+               <Grid Name="BackgroundGrid" Background="{TemplateBinding Background}">
+                  <ContentPresenter />
+                  <Border Name="ViewFinder" RenderTransformOrigin="1,1"
+                Background="#b0666666" BorderBrush="{TemplateBinding Foreground}"
+                BorderThickness="2" Opacity="0" Width="200" Height="190"
+                HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="10"
+                CornerRadius="4" >
+                     <Border.RenderTransform>
+                        <TransformGroup>
+                           <ScaleTransform x:Name="LayoutScaleTransform"
+                      ScaleX="0" ScaleY="0"/>
+                        </TransformGroup>
+                     </Border.RenderTransform>
+                     <Grid Margin="4">
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="Auto" />
+                           <RowDefinition Height="*"/>
+                           <RowDefinition Height="Auto"/>
+                        </Grid.RowDefinitions>
+                        <StackPanel Orientation="Horizontal" Margin="0,0,0,3">
+                           <Button x:Name="BackButton" Command="local:Zoombox.Back"
+                      ToolTip="Go Back" Width="20px" Height="20px"
+                      Style="{StaticResource TransparentButton}">
+                              <Image Source="{StaticResource PreviousGlyph}" />
+                           </Button>
+                           <Button x:Name="ForwardButton" Command="local:Zoombox.Forward"
+                      ToolTip="Go Forward" Width="20px" Height="20px"
+                      Style="{StaticResource TransparentButton}">
+                              <Image Source="{StaticResource NextGlyph}"  />
+                           </Button>
+                           <Button x:Name="HomeButton" Command="local:Zoombox.Home"
+                      ToolTip="Go Home" Width="20px" Height="20px"
+                      Style="{StaticResource TransparentButton}">
+                              <Image Source="{StaticResource HomeGlyph}" Margin="2"/>
+                           </Button>
+                           <Button x:Name="FitButton" Command="local:Zoombox.Fit"
+                      ToolTip="Fit Content within Bounds" Width="20px" Height="20px"
+                      Margin="2,0"  Style="{StaticResource TransparentButton}">
+                              <Image Source="{StaticResource FitContentGlyph}" Margin="2"/>
+                           </Button>
+                           <Button x:Name="FillButton" Command="local:Zoombox.Fill"
+                      ToolTip="Fill Bounds with Content" Width="20px" Height="20px"
+                      Margin="2,0"  Style="{StaticResource TransparentButton}">
+                              <Image Source="{StaticResource FillToBoundsGlyph}" Margin="2"/>
+                           </Button>
+                           <Button x:Name="CenterButton" Command="local:Zoombox.Center"
+                      ToolTip="Center Content" Width="20px" Height="20px"
+                      Margin="2,0" Style="{StaticResource TransparentButton}">
+                              <Image Source="{StaticResource CenterGlyph}" Margin="2"/>
+                           </Button>
+                           <Button x:Name="RefocusButton" Command="local:Zoombox.Refocus"
+                      Visibility="Collapsed" ToolTip="Refocus View"
+                      Width="20px" Height="20px" Margin="2,0"
+                      Style="{StaticResource TransparentButton}">
+                              <Image Source="{StaticResource RefocusGlyph}" Margin="2"/>
+                           </Button>
+                        </StackPanel>
+                        <ToggleButton x:Name="ToggleViewFinderButton"
+                    ToolTip="Hide View Finder" Height="13" Width="13"
+                    Margin="0,2,0,0" HorizontalAlignment="Right"
+                    VerticalAlignment="Top"
+                    Style="{StaticResource TransparentButton}" Foreground="White"
+                    IsChecked="{Binding ElementName=ShowViewFinder, Path=IsChecked}" >
+                           <Image Source="{StaticResource CloseXDrawingImage}" Margin="2" />
+                        </ToggleButton>
+                        <Border Grid.Row="1" BorderBrush="{StaticResource GlyphBrush}"
+                    BorderThickness="2" Background="#80FFFFFF" />
+                        <local:ZoomboxViewFinderDisplay Grid.Row="1" Name="ViewFinderDisplay"
+                    ClipToBounds="True" Background="#C0FFFFFF" Margin="2" 
+                    ShadowBrush="#80FFFFFF" ViewportBrush="Transparent"
+                    ViewportPen="{StaticResource ViewportPen}" />
+                     </Grid>
+                  </Border>
+                  <ToggleButton Name="ShowViewFinder" IsTabStop="False"
+                ToolTip="Show View Finder" HorizontalAlignment="Right"
+                VerticalAlignment="Bottom" Margin="5" Height="22" Width="22"
+                FocusVisualStyle="{x:Null}"
+                Style="{StaticResource ViewFinderToggleButtonStyle}"
+                Foreground="Transparent" Background="Transparent"
+                IsChecked="{Binding Path=ViewFinderVisibility, 
+                    Mode=TwoWay,RelativeSource={RelativeSource TemplatedParent},
+                    Converter={StaticResource TrueIfVisibleConverter}}">
+                     <Grid Name="ShowViewFinderGlyph" Opacity="0">
+                        <Image x:Name="ShowViewFinderGlyphImage" 
+                    Source="{StaticResource ShowViewFinderGlyph}" />
+                     </Grid>
+                  </ToggleButton>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="EffectiveViewStackMode" Value="Manual">
+                     <Setter TargetName="RefocusButton" Property="Visibility" Value="Visible" />
+                  </Trigger>
+                  <Trigger Property="IsMouseOver" Value="True">
+                     <Trigger.EnterActions>
+                        <BeginStoryboard>
+                           <Storyboard>
+                              <DoubleAnimation Storyboard.TargetName="ShowViewFinderGlyph"
+                        Storyboard.TargetProperty="Opacity"
+                        DecelerationRatio="1"  Duration="0:0:0.3" From="0" To="1"
+                        FillBehavior="HoldEnd" />
+                           </Storyboard>
+                        </BeginStoryboard>
+                     </Trigger.EnterActions>
+                     <Trigger.ExitActions>
+                        <BeginStoryboard>
+                           <Storyboard>
+                              <DoubleAnimation Storyboard.TargetName="ShowViewFinderGlyph"
+                        Storyboard.TargetProperty="Opacity"
+                        DecelerationRatio="1"  Duration="0:0:0.3" From="1" To="0"
+                        FillBehavior="HoldEnd" />
+                           </Storyboard>
+                        </BeginStoryboard>
+                     </Trigger.ExitActions>
+                  </Trigger>
+                  <Trigger Property="IsChecked" Value="False" SourceName="ShowViewFinder">
+                     <Setter Property="Focusable" Value="False" TargetName="BackButton" />
+                     <Setter Property="Focusable" Value="False"
+                  TargetName="ForwardButton" />
+                     <Setter Property="Focusable" Value="False" TargetName="HomeButton" />
+                     <Setter Property="Focusable" Value="False" TargetName="FitButton" />
+                     <Setter Property="Focusable" Value="False" TargetName="FillButton" />
+                     <Setter Property="Focusable" Value="False" TargetName="CenterButton" />
+                     <Setter Property="Focusable" Value="False"
+                  TargetName="ToggleViewFinderButton" />
+                  </Trigger>
+                  <EventTrigger RoutedEvent="ToggleButton.Checked"
+                SourceName="ShowViewFinder">
+                     <BeginStoryboard>
+                        <Storyboard>
+                           <DoubleAnimation Storyboard.TargetName="ViewFinder"
+                      Storyboard.TargetProperty="Opacity"
+                      DecelerationRatio="1"  Duration="0:0:0.3" From="0" To="1"
+                      FillBehavior="HoldEnd" />
+                           <DoubleAnimation Storyboard.TargetName="ShowViewFinder"
+                      Storyboard.TargetProperty="Opacity"
+                      DecelerationRatio="1"  Duration="0:0:0.3" From="1" To="0"
+                      FillBehavior="HoldEnd" />
+                           <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
+                      Storyboard.TargetProperty="(ScaleTransform.ScaleY)"
+                      Storyboard.TargetName="LayoutScaleTransform"
+                      AccelerationRatio="1">
+                              <SplineDoubleKeyFrame KeySpline="0.5,0.5,0.5,0.5" Value="1"
+                      KeyTime="00:00:00.3"/>
+                           </DoubleAnimationUsingKeyFrames>
+                           <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
+                      Storyboard.TargetProperty="(ScaleTransform.ScaleX)"
+                      Storyboard.TargetName="LayoutScaleTransform"
+                      AccelerationRatio="1">
+                              <SplineDoubleKeyFrame  KeySpline="0.5,0.5,0.5,0.5" Value="1"
+                      KeyTime="00:00:00.3"/>
+                           </DoubleAnimationUsingKeyFrames>
+                        </Storyboard>
+                     </BeginStoryboard>
+                  </EventTrigger>
+                  <EventTrigger RoutedEvent="ToggleButton.Unchecked"
+                SourceName="ShowViewFinder">
+                     <BeginStoryboard>
+                        <Storyboard>
+                           <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
+                      Storyboard.TargetProperty="(ScaleTransform.ScaleY)"
+                      Storyboard.TargetName="LayoutScaleTransform"
+                      AccelerationRatio="1">
+                              <SplineDoubleKeyFrame KeySpline="0.5,0.5,0.5,0.5" Value="0"
+                        KeyTime="00:00:00.3"/>
+                           </DoubleAnimationUsingKeyFrames>
+                           <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
+                      Storyboard.TargetProperty="(ScaleTransform.ScaleX)"
+                      Storyboard.TargetName="LayoutScaleTransform"
+                      AccelerationRatio="1">
+                              <SplineDoubleKeyFrame  KeySpline="0.5,0.5,0.5,0.5" Value="0"
+                        KeyTime="00:00:00.3"/>
+                           </DoubleAnimationUsingKeyFrames>
+                           <DoubleAnimation Storyboard.TargetName="ViewFinder"
+                      Storyboard.TargetProperty="Opacity"
+                      DecelerationRatio="1"  Duration="0:0:0.3" From="1" To="0"
+                      FillBehavior="HoldEnd" />
+                           <DoubleAnimation Storyboard.TargetName="ShowViewFinder"
+                      Storyboard.TargetProperty="Opacity"
+                      DecelerationRatio="1"  Duration="0:0:0.3" From="0" To="1"
+                      FillBehavior="HoldEnd" />
+                        </Storyboard>
+                     </BeginStoryboard>
+                  </EventTrigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+      <Style.Triggers>
+         <!-- NOTE:  Order matters!
+          These triggers should be ordered according to the KeyModifiers assigned to 
+          each operation. If one operation requires Ctrl and another requires 
+          Ctrl+Shift, the trigger for the operation requiring both modifier keys 
+          should appear *after* the trigger for the operation requiring only one. -->
+         <Trigger Property="AreDragModifiersActive" Value="True">
+            <Setter Property="Cursor" Value="SizeAll" />
+         </Trigger>
+         <Trigger Property="AreZoomToSelectionModifiersActive" Value="True">
+            <Setter Property="Cursor" Value="Cross" />
+         </Trigger>
+         <Trigger Property="AreZoomModifiersActive" Value="True">
+            <Setter Property="Cursor" Value="{x:Static local:ZoomboxCursors.Zoom}" />
+         </Trigger>
+         <Trigger Property="AreRelativeZoomModifiersActive" Value="True">
+            <Setter Property="Cursor" Value="{x:Static local:ZoomboxCursors.ZoomRelative}" />
+         </Trigger>
+         <!-- The IsDraggingContent and IsSelectingRegion triggers should 
+           always be last. -->
+         <Trigger Property="IsDraggingContent" Value="True">
+            <Setter Property="Cursor" Value="SizeAll" />
+         </Trigger>
+         <Trigger Property="IsSelectingRegion" Value="True">
+            <Setter Property="Cursor" Value="Cross" />
+         </Trigger>
+      </Style.Triggers>
+   </Style>
+
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/Zoombox.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/Zoombox.cs
new file mode 100644
index 00000000..93798650
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/Zoombox.cs
@@ -0,0 +1,3781 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Globalization;
+using System.Security;
+using System.Security.Permissions;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using Xceed.Wpf.Toolkit.Core.Input;
+using Xceed.Wpf.Toolkit.Core;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+
+namespace Xceed.Wpf.Toolkit.Zoombox
+{
+  public sealed class Zoombox : ContentControl
+  {
+
+    #region Constructors
+
+    static Zoombox()
+    {
+      Zoombox.DefaultStyleKeyProperty.OverrideMetadata( typeof( Zoombox ), new FrameworkPropertyMetadata( typeof( Zoombox ) ) );
+      Zoombox.ClipToBoundsProperty.OverrideMetadata( typeof( Zoombox ), new FrameworkPropertyMetadata( true ) );
+      Zoombox.FocusableProperty.OverrideMetadata( typeof( Zoombox ), new FrameworkPropertyMetadata( true ) );
+      Zoombox.HorizontalContentAlignmentProperty.OverrideMetadata( typeof( Zoombox ), new FrameworkPropertyMetadata( HorizontalAlignment.Center, new PropertyChangedCallback( Zoombox.RefocusView ) ) );
+      Zoombox.VerticalContentAlignmentProperty.OverrideMetadata( typeof( Zoombox ), new FrameworkPropertyMetadata( VerticalAlignment.Center, new PropertyChangedCallback( Zoombox.RefocusView ) ) );
+      Zoombox.ContentProperty.OverrideMetadata( typeof( Zoombox ), new FrameworkPropertyMetadata( ( PropertyChangedCallback )null, new CoerceValueCallback( Zoombox.CoerceContentValue ) ) );
+    }
+
+    public Zoombox()
+      : base()
+    {
+      try
+      {
+        new UIPermission( PermissionState.Unrestricted ).Demand();
+        _cacheBits[ ( int )CacheBits.HasUIPermission ] = true;
+      }
+      catch( SecurityException )
+      {
+      }
+
+      this.InitCommands();
+
+      // use the LayoutUpdated event to keep the Viewport in sync
+      this.LayoutUpdated += new EventHandler( this.OnLayoutUpdated );
+      this.AddHandler( FrameworkElement.SizeChangedEvent, new SizeChangedEventHandler( this.OnSizeChanged ), true );
+
+      this.CoerceValue( Zoombox.ViewStackModeProperty );
+    }
+
+    #endregion
+
+    #region AnimationAccelerationRatio Property
+
+    public static readonly DependencyProperty AnimationAccelerationRatioProperty =
+      DependencyProperty.Register( "AnimationAccelerationRatio", typeof( double ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( 0d ), 
+          new ValidateValueCallback( Zoombox.ValidateAccelerationRatio ) );
+
+    public double AnimationAccelerationRatio
+    {
+      get
+      {
+        return ( double )this.GetValue( Zoombox.AnimationAccelerationRatioProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.AnimationAccelerationRatioProperty, value );
+      }
+    }
+
+    private static bool ValidateAccelerationRatio( object value )
+    {
+      double newValue = ( double )value;
+      if( newValue < 0 || newValue > 1 || DoubleHelper.IsNaN( newValue ) )
+        throw new ArgumentException( ErrorMessages.GetMessage( "AnimationAccelerationRatioOOR" ) );
+
+      return true;
+    }
+
+    #endregion
+
+    #region AnimationDecelerationRatio Property
+
+    public static readonly DependencyProperty AnimationDecelerationRatioProperty =
+      DependencyProperty.Register( "AnimationDecelerationRatio", typeof( double ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( 0d ), 
+          new ValidateValueCallback( Zoombox.ValidateDecelerationRatio ) );
+
+    public double AnimationDecelerationRatio
+    {
+      get
+      {
+        return ( double )this.GetValue( Zoombox.AnimationDecelerationRatioProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.AnimationDecelerationRatioProperty, value );
+      }
+    }
+
+    private static bool ValidateDecelerationRatio( object value )
+    {
+      double newValue = ( double )value;
+      if( newValue < 0 || newValue > 1 || DoubleHelper.IsNaN( newValue ) )
+        throw new ArgumentException( ErrorMessages.GetMessage( "AnimationDecelerationRatioOOR" ) );
+
+      return true;
+    }
+
+    #endregion
+
+    #region AnimationDuration Property
+
+    public static readonly DependencyProperty AnimationDurationProperty =
+      DependencyProperty.Register( "AnimationDuration", typeof( Duration ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( new Duration( TimeSpan.FromMilliseconds( 300 ) ) ) );
+
+    public Duration AnimationDuration
+    {
+      get
+      {
+        return ( Duration )this.GetValue( Zoombox.AnimationDurationProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.AnimationDurationProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region AreDragModifiersActive Property
+
+    private static readonly DependencyPropertyKey AreDragModifiersActivePropertyKey =
+      DependencyProperty.RegisterReadOnly( "AreDragModifiersActive", typeof( bool ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( false ) );
+
+    public static readonly DependencyProperty AreDragModifiersActiveProperty = Zoombox.AreDragModifiersActivePropertyKey.DependencyProperty;
+
+    public bool AreDragModifiersActive
+    {
+      get
+      {
+        return ( bool )this.GetValue( Zoombox.AreDragModifiersActiveProperty );
+      }
+    }
+
+    private void SetAreDragModifiersActive( bool value )
+    {
+      this.SetValue( Zoombox.AreDragModifiersActivePropertyKey, value );
+    }
+
+    #endregion
+
+    #region AreRelativeZoomModifiersActive Property
+
+    private static readonly DependencyPropertyKey AreRelativeZoomModifiersActivePropertyKey =
+      DependencyProperty.RegisterReadOnly( "AreRelativeZoomModifiersActive", typeof( bool ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( false ) );
+
+    public static readonly DependencyProperty AreRelativeZoomModifiersActiveProperty = Zoombox.AreRelativeZoomModifiersActivePropertyKey.DependencyProperty;
+
+    public bool AreRelativeZoomModifiersActive
+    {
+      get
+      {
+        return ( bool )this.GetValue( Zoombox.AreRelativeZoomModifiersActiveProperty );
+      }
+    }
+
+    private void SetAreRelativeZoomModifiersActive( bool value )
+    {
+      this.SetValue( Zoombox.AreRelativeZoomModifiersActivePropertyKey, value );
+    }
+
+    #endregion
+
+    #region AreZoomModifiersActive Property
+
+    private static readonly DependencyPropertyKey AreZoomModifiersActivePropertyKey =
+      DependencyProperty.RegisterReadOnly( "AreZoomModifiersActive", typeof( bool ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( false ) );
+
+    public static readonly DependencyProperty AreZoomModifiersActiveProperty = Zoombox.AreZoomModifiersActivePropertyKey.DependencyProperty;
+
+    public bool AreZoomModifiersActive
+    {
+      get
+      {
+        return ( bool )this.GetValue( Zoombox.AreZoomModifiersActiveProperty );
+      }
+    }
+
+    private void SetAreZoomModifiersActive( bool value )
+    {
+      this.SetValue( Zoombox.AreZoomModifiersActivePropertyKey, value );
+    }
+
+    #endregion
+
+    #region AreZoomToSelectionModifiersActive Property
+
+    private static readonly DependencyPropertyKey AreZoomToSelectionModifiersActivePropertyKey =
+      DependencyProperty.RegisterReadOnly( "AreZoomToSelectionModifiersActive", typeof( bool ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( false ) );
+
+    public static readonly DependencyProperty AreZoomToSelectionModifiersActiveProperty = Zoombox.AreZoomToSelectionModifiersActivePropertyKey.DependencyProperty;
+
+    public bool AreZoomToSelectionModifiersActive
+    {
+      get
+      {
+        return ( bool )this.GetValue( Zoombox.AreZoomToSelectionModifiersActiveProperty );
+      }
+    }
+
+    private void SetAreZoomToSelectionModifiersActive( bool value )
+    {
+      this.SetValue( Zoombox.AreZoomToSelectionModifiersActivePropertyKey, value );
+    }
+
+    #endregion
+
+    #region AutoWrapContentWithViewbox Property
+
+    public static readonly DependencyProperty AutoWrapContentWithViewboxProperty =
+      DependencyProperty.Register( "AutoWrapContentWithViewbox", typeof( bool ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( true, 
+          new PropertyChangedCallback( Zoombox.OnAutoWrapContentWithViewboxChanged ) ) );
+
+    public bool AutoWrapContentWithViewbox
+    {
+      get
+      {
+        return ( bool )this.GetValue( Zoombox.AutoWrapContentWithViewboxProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.AutoWrapContentWithViewboxProperty, value );
+      }
+    }
+
+    private static void OnAutoWrapContentWithViewboxChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      o.CoerceValue( Zoombox.ContentProperty );
+    }
+
+    private static object CoerceContentValue( DependencyObject d, object value )
+    {
+      return ( ( Zoombox )d ).CoerceContentValue( value );
+    }
+
+    private object CoerceContentValue( object value )
+    {
+      if( value != null && !( value is UIElement ) && !( ( bool )this.GetValue( DesignerProperties.IsInDesignModeProperty ) ) )
+        throw new InvalidContentException( ErrorMessages.GetMessage( "ZoomboxContentMustBeUIElement" ) );
+
+      object oldContent = _content;
+      if( value != _trueContent || ( this.IsContentWrapped != this.AutoWrapContentWithViewbox ) )
+      {
+        // check whether the content is currently wrapped and needs to be unwrapped
+        if( this.IsContentWrapped && _content is Viewbox && _content != _trueContent )
+        {
+          Viewbox viewbox = ( Viewbox )_content;
+
+          BindingOperations.ClearAllBindings( viewbox );
+          ( viewbox as Viewbox ).Child = null;
+
+          this.RemoveLogicalChild( viewbox );
+        }
+
+        // make sure the view finder's visual brush is null
+        if( _viewFinderDisplay != null && _viewFinderDisplay.VisualBrush != null )
+        {
+          _viewFinderDisplay.VisualBrush.Visual = null;
+          _viewFinderDisplay.VisualBrush = null;
+        }
+
+        // update the cached content and true content values
+        _content = value as UIElement;
+        _trueContent = value as UIElement;
+
+        // if necessary, unparent the existing content
+        if( _contentPresenter != null && _contentPresenter.Content != null )
+        {
+          _contentPresenter.Content = null;
+        }
+
+        // if necessary, wrap the content
+        this.IsContentWrapped = false;
+        if( this.AutoWrapContentWithViewbox )
+        {
+          // create a viewbox and make it the logical child of the Zoombox
+          Viewbox viewbox = new Viewbox();
+          this.AddLogicalChild( viewbox );
+
+          // now set the new parent to be the viewbox
+          viewbox.Child = value as UIElement;
+          _content = viewbox;
+          viewbox.HorizontalAlignment = HorizontalAlignment.Left;
+          viewbox.VerticalAlignment = VerticalAlignment.Top;
+          this.IsContentWrapped = true;
+        }
+
+        if( _contentPresenter != null )
+        {
+          _contentPresenter.Content = _content;
+        }
+
+        if( _viewFinderDisplay != null )
+        {
+          this.CreateVisualBrushForViewFinder( _content );
+        }
+        this.UpdateViewFinderDisplayContentBounds();
+      }
+
+      // if the content changes, we need to reset the flags used to first render and arrange the content
+      if( oldContent != _content
+          && this.HasArrangedContentPresenter
+          && this.HasRenderedFirstView )
+      {
+        this.HasArrangedContentPresenter = false;
+        this.HasRenderedFirstView = false;
+        this.RefocusViewOnFirstRender = true;
+        _contentPresenter.LayoutUpdated += new EventHandler( this.ContentPresenterFirstArranged );
+      }
+      return _content;
+    }
+
+    private UIElement _trueContent; //null
+
+    #endregion
+
+    #region CurrentView Property
+
+    private static readonly DependencyPropertyKey CurrentViewPropertyKey =
+      DependencyProperty.RegisterReadOnly( "CurrentView", typeof( ZoomboxView ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( ZoomboxView.Empty, 
+          new PropertyChangedCallback( Zoombox.OnCurrentViewChanged ) ) );
+
+    public static readonly DependencyProperty CurrentViewProperty = Zoombox.CurrentViewPropertyKey.DependencyProperty;
+
+    public ZoomboxView CurrentView
+    {
+      get
+      {
+        return ( ZoomboxView )this.GetValue( Zoombox.CurrentViewProperty );
+      }
+    }
+
+    private void SetCurrentView( ZoomboxView value )
+    {
+      this.SetValue( Zoombox.CurrentViewPropertyKey, value );
+    }
+
+    private static void OnCurrentViewChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      Zoombox zoombox = ( Zoombox )o;
+      if( !zoombox.IsUpdatingView )
+      {
+        zoombox.ZoomTo( zoombox.CurrentView );
+      }
+      zoombox.RaiseEvent( new ZoomboxViewChangedEventArgs( e.OldValue as ZoomboxView, e.NewValue as ZoomboxView, zoombox._lastViewIndex, zoombox.CurrentViewIndex ) );
+    }
+
+    #endregion
+
+    #region CurrentViewIndex Property
+
+    private static readonly DependencyPropertyKey CurrentViewIndexPropertyKey =
+      DependencyProperty.RegisterReadOnly( "CurrentViewIndex", typeof( int ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( -1 ) );
+
+    public static readonly DependencyProperty CurrentViewIndexProperty = Zoombox.CurrentViewIndexPropertyKey.DependencyProperty;
+
+    public int CurrentViewIndex
+    {
+      get
+      {
+        return ( int )this.GetValue( Zoombox.CurrentViewIndexProperty );
+      }
+    }
+
+    internal void SetCurrentViewIndex( int value )
+    {
+      this.SetValue( Zoombox.CurrentViewIndexPropertyKey, value );
+    }
+
+    #endregion
+
+    #region DragModifiers Property
+
+    public static readonly DependencyProperty DragModifiersProperty =
+      DependencyProperty.Register( "DragModifiers", typeof( KeyModifierCollection ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( Zoombox.GetDefaultDragModifiers() ) );
+
+    [TypeConverter( typeof( KeyModifierCollectionConverter ) )]
+    public KeyModifierCollection DragModifiers
+    {
+      get
+      {
+        return ( KeyModifierCollection )this.GetValue( Zoombox.DragModifiersProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.DragModifiersProperty, value );
+      }
+    }
+
+    private static KeyModifierCollection GetDefaultDragModifiers()
+    {
+      KeyModifierCollection result = new KeyModifierCollection();
+      result.Add( KeyModifier.Ctrl );
+      result.Add( KeyModifier.Exact );
+      return result;
+    }
+
+    #endregion
+
+    #region DragOnPreview Property
+
+    public static readonly DependencyProperty DragOnPreviewProperty =
+      DependencyProperty.Register( "DragOnPreview", typeof( bool ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( false ) );
+
+    public bool DragOnPreview
+    {
+      get
+      {
+        return ( bool )this.GetValue( Zoombox.DragOnPreviewProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.DragOnPreviewProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region EffectiveViewStackMode Property
+
+    private static readonly DependencyPropertyKey EffectiveViewStackModePropertyKey =
+      DependencyProperty.RegisterReadOnly( "EffectiveViewStackMode", typeof( ZoomboxViewStackMode ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( ZoomboxViewStackMode.Auto ) );
+
+    public static readonly DependencyProperty EffectiveViewStackModeProperty = Zoombox.EffectiveViewStackModePropertyKey.DependencyProperty;
+
+    public ZoomboxViewStackMode EffectiveViewStackMode
+    {
+      get
+      {
+        return ( ZoomboxViewStackMode )this.GetValue( Zoombox.EffectiveViewStackModeProperty );
+      }
+    }
+
+    private void SetEffectiveViewStackMode( ZoomboxViewStackMode value )
+    {
+      this.SetValue( Zoombox.EffectiveViewStackModePropertyKey, value );
+    }
+
+    #endregion
+
+    #region HasBackStack Property
+
+    private static readonly DependencyPropertyKey HasBackStackPropertyKey =
+      DependencyProperty.RegisterReadOnly( "HasBackStack", typeof( bool ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( false ) );
+
+    public static readonly DependencyProperty HasBackStackProperty = Zoombox.HasBackStackPropertyKey.DependencyProperty;
+
+    public bool HasBackStack
+    {
+      get
+      {
+        return ( bool )this.GetValue( Zoombox.HasBackStackProperty );
+      }
+    }
+
+    #endregion
+
+    #region HasForwardStack Property
+
+    private static readonly DependencyPropertyKey HasForwardStackPropertyKey =
+      DependencyProperty.RegisterReadOnly( "HasForwardStack", typeof( bool ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( false ) );
+
+    public static readonly DependencyProperty HasForwardStackProperty = Zoombox.HasForwardStackPropertyKey.DependencyProperty;
+
+    public bool HasForwardStack
+    {
+      get
+      {
+        return ( bool )this.GetValue( Zoombox.HasForwardStackProperty );
+      }
+    }
+
+    #endregion
+
+    #region IsAnimated Property
+
+    public static readonly DependencyProperty IsAnimatedProperty =
+      DependencyProperty.Register( "IsAnimated", typeof( bool ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( true, 
+          ( PropertyChangedCallback )null, new CoerceValueCallback( Zoombox.CoerceIsAnimatedValue ) ) );
+
+    public bool IsAnimated
+    {
+      get
+      {
+        return ( bool )this.GetValue( Zoombox.IsAnimatedProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.IsAnimatedProperty, value );
+      }
+    }
+
+    private static object CoerceIsAnimatedValue( DependencyObject d, object value )
+    {
+      Zoombox zoombox = ( Zoombox )d;
+      bool result = ( bool )value;
+      if( !zoombox.IsInitialized )
+      {
+        result = false;
+      }
+      return result;
+    }
+
+    #endregion
+
+    #region IsDraggingContent Property
+
+    private static readonly DependencyPropertyKey IsDraggingContentPropertyKey =
+      DependencyProperty.RegisterReadOnly( "IsDraggingContent", typeof( bool ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( false ) );
+
+    public static readonly DependencyProperty IsDraggingContentProperty = Zoombox.IsDraggingContentPropertyKey.DependencyProperty;
+
+    public bool IsDraggingContent
+    {
+      get
+      {
+        return ( bool )this.GetValue( Zoombox.IsDraggingContentProperty );
+      }
+    }
+
+    private void SetIsDraggingContent( bool value )
+    {
+      this.SetValue( Zoombox.IsDraggingContentPropertyKey, value );
+    }
+
+    #endregion
+
+    #region IsSelectingRegion Property
+
+    private static readonly DependencyPropertyKey IsSelectingRegionPropertyKey =
+      DependencyProperty.RegisterReadOnly( "IsSelectingRegion", typeof( bool ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( false ) );
+
+    public static readonly DependencyProperty IsSelectingRegionProperty = Zoombox.IsSelectingRegionPropertyKey.DependencyProperty;
+
+    public bool IsSelectingRegion
+    {
+      get
+      {
+        return ( bool )this.GetValue( Zoombox.IsSelectingRegionProperty );
+      }
+    }
+
+    private void SetIsSelectingRegion( bool value )
+    {
+      this.SetValue( Zoombox.IsSelectingRegionPropertyKey, value );
+    }
+
+    #endregion
+
+    #region MaxScale Property
+
+    public static readonly DependencyProperty MaxScaleProperty =
+      DependencyProperty.Register( "MaxScale", typeof( double ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( 100d, FrameworkPropertyMetadataOptions.AffectsMeasure,
+          new PropertyChangedCallback( Zoombox.OnMaxScaleChanged ), new CoerceValueCallback( Zoombox.CoerceMaxScaleValue ) ) );
+
+    public double MaxScale
+    {
+      get
+      {
+        return ( double )this.GetValue( Zoombox.MaxScaleProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.MaxScaleProperty, value );
+      }
+    }
+
+    private static void OnMaxScaleChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      Zoombox zoombox = ( Zoombox )o;
+      zoombox.CoerceValue( Zoombox.MinScaleProperty );
+      zoombox.CoerceValue( Zoombox.ScaleProperty );
+    }
+
+    private static object CoerceMaxScaleValue( DependencyObject d, object value )
+    {
+      Zoombox zoombox = ( Zoombox )d;
+      double result = ( double )value;
+      if( result < zoombox.MinScale )
+      {
+        result = zoombox.MinScale;
+      }
+      return result;
+    }
+
+    #endregion
+
+    #region MinScale Property
+
+    public static readonly DependencyProperty MinScaleProperty =
+      DependencyProperty.Register( "MinScale", typeof( double ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( 0.01d, FrameworkPropertyMetadataOptions.AffectsMeasure,
+          new PropertyChangedCallback( Zoombox.OnMinScaleChanged ), new CoerceValueCallback( Zoombox.CoerceMinScaleValue ) ) );
+
+    public double MinScale
+    {
+      get
+      {
+        return ( double )this.GetValue( Zoombox.MinScaleProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.MinScaleProperty, value );
+      }
+    }
+
+    private static void OnMinScaleChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      Zoombox zoombox = ( Zoombox )o;
+      zoombox.CoerceValue( Zoombox.MinScaleProperty );
+      zoombox.CoerceValue( Zoombox.ScaleProperty );
+    }
+
+    private static object CoerceMinScaleValue( DependencyObject d, object value )
+    {
+      Zoombox zoombox = ( Zoombox )d;
+      double result = ( double )value;
+      if( result > zoombox.MaxScale )
+      {
+        result = zoombox.MaxScale;
+      }
+      return result;
+    }
+
+    #endregion
+
+    #region NavigateOnPreview Property
+
+    public static readonly DependencyProperty NavigateOnPreviewProperty =
+      DependencyProperty.Register( "NavigateOnPreview", typeof( bool ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( false ) );
+
+    public bool NavigateOnPreview
+    {
+      get
+      {
+        return ( bool )this.GetValue( Zoombox.NavigateOnPreviewProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.NavigateOnPreviewProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region PanDistance Property
+
+    public static readonly DependencyProperty PanDistanceProperty =
+      DependencyProperty.Register( "PanDistance", typeof( double ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( 5d ) );
+
+    public double PanDistance
+    {
+      get
+      {
+        return ( double )this.GetValue( Zoombox.PanDistanceProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.PanDistanceProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region Position Property
+
+    public static readonly DependencyProperty PositionProperty =
+      DependencyProperty.Register( "Position", typeof( Point ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( PointHelper.Empty, new PropertyChangedCallback( Zoombox.OnPositionChanged ) ) );
+
+    public Point Position
+    {
+      get
+      {
+        return ( Point )this.GetValue( Zoombox.PositionProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.PositionProperty, value );
+      }
+    }
+
+    private static void OnPositionChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      Zoombox zoombox = ( Zoombox )o;
+      if( !zoombox.IsUpdatingViewport )
+      {
+        Point newPosition = ( Point )e.NewValue;
+        double scale = zoombox.Scale;
+        if( scale > 0 )
+        {
+          zoombox.ZoomTo( new Point( -newPosition.X, -newPosition.Y ) );
+        }
+      }
+    }
+
+    #endregion
+
+    #region RelativeZoomModifiers Property
+
+    public static readonly DependencyProperty RelativeZoomModifiersProperty =
+      DependencyProperty.Register( "RelativeZoomModifiers", typeof( KeyModifierCollection ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( Zoombox.GetDefaultRelativeZoomModifiers() ) );
+
+    [TypeConverter( typeof( KeyModifierCollectionConverter ) )]
+    public KeyModifierCollection RelativeZoomModifiers
+    {
+      get
+      {
+        return ( KeyModifierCollection )this.GetValue( Zoombox.RelativeZoomModifiersProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.RelativeZoomModifiersProperty, value );
+      }
+    }
+
+    private static KeyModifierCollection GetDefaultRelativeZoomModifiers()
+    {
+      KeyModifierCollection result = new KeyModifierCollection();
+      result.Add( KeyModifier.Ctrl );
+      result.Add( KeyModifier.Alt );
+      result.Add( KeyModifier.Exact );
+      return result;
+    }
+
+    #endregion
+
+    #region Scale Property
+
+    public static readonly DependencyProperty ScaleProperty =
+      DependencyProperty.Register( "Scale", typeof( double ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( double.NaN, 
+          new PropertyChangedCallback( Zoombox.OnScaleChanged ), new CoerceValueCallback( Zoombox.CoerceScaleValue ) ) );
+
+    public double Scale
+    {
+      get
+      {
+        return ( double )this.GetValue( Zoombox.ScaleProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.ScaleProperty, value );
+      }
+    }
+
+    private static void OnScaleChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      Zoombox zoombox = ( Zoombox )o;
+      if( !zoombox.IsUpdatingView )
+      {
+        double newScale = ( double )e.NewValue;
+        zoombox.ZoomTo( newScale );
+      }
+    }
+
+    private static object CoerceScaleValue( DependencyObject d, object value )
+    {
+      Zoombox zoombox = ( Zoombox )d;
+      double result = ( double )value;
+
+      if( result < zoombox.MinScale )
+      {
+        result = zoombox.MinScale;
+      }
+
+      if( result > zoombox.MaxScale )
+      {
+        result = zoombox.MaxScale;
+      }
+
+      return result;
+    }
+
+    #endregion
+
+    #region ViewFinder Property
+
+    private static readonly DependencyPropertyKey ViewFinderPropertyKey =
+      DependencyProperty.RegisterReadOnly( "ViewFinder", typeof( FrameworkElement ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( null ) );
+
+    public static readonly DependencyProperty ViewFinderProperty = Zoombox.ViewFinderPropertyKey.DependencyProperty;
+
+    public FrameworkElement ViewFinder
+    {
+      get
+      {
+        return ( FrameworkElement )this.GetValue( Zoombox.ViewFinderProperty );
+      }
+    }
+
+    #endregion
+
+    #region ViewFinderVisibility Attached Property
+
+    public static readonly DependencyProperty ViewFinderVisibilityProperty =
+      DependencyProperty.RegisterAttached( "ViewFinderVisibility", typeof( Visibility ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( Visibility.Visible ) );
+
+    public static Visibility GetViewFinderVisibility( DependencyObject d )
+    {
+      return ( Visibility )( d.GetValue( Zoombox.ViewFinderVisibilityProperty ) );
+    }
+
+    public static void SetViewFinderVisibility( DependencyObject d, Visibility value )
+    {
+      d.SetValue( Zoombox.ViewFinderVisibilityProperty, value );
+    }
+
+    #endregion
+
+    #region Viewport Property
+
+    private static readonly DependencyPropertyKey ViewportPropertyKey =
+      DependencyProperty.RegisterReadOnly( "Viewport", typeof( Rect ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( Rect.Empty, 
+          new PropertyChangedCallback( Zoombox.OnViewportChanged ) ) );
+
+    public static readonly DependencyProperty ViewportProperty = Zoombox.ViewportPropertyKey.DependencyProperty;
+
+    public Rect Viewport
+    {
+      get
+      {
+        return ( Rect )this.GetValue( Zoombox.ViewportProperty );
+      }
+    }
+
+    private static void OnViewportChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      // keep the Position property in sync with the Viewport
+      Zoombox zoombox = ( Zoombox )o;
+      zoombox.Position = new Point( -zoombox.Viewport.Left * zoombox.Scale / zoombox._viewboxFactor, -zoombox.Viewport.Top * zoombox.Scale / zoombox._viewboxFactor );
+    }
+
+    #endregion
+
+    #region ViewStackCount Property
+
+    private static readonly DependencyPropertyKey ViewStackCountPropertyKey =
+      DependencyProperty.RegisterReadOnly( "ViewStackCount", typeof( int ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( -1,
+          new PropertyChangedCallback( Zoombox.OnViewStackCountChanged ) ) );
+
+    public static readonly DependencyProperty ViewStackCountProperty = Zoombox.ViewStackCountPropertyKey.DependencyProperty;
+
+    public int ViewStackCount
+    {
+      get
+      {
+        return ( int )this.GetValue( Zoombox.ViewStackCountProperty );
+      }
+    }
+
+    internal void SetViewStackCount( int value )
+    {
+      this.SetValue( Zoombox.ViewStackCountPropertyKey, value );
+    }
+
+    private static void OnViewStackCountChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( Zoombox )d ).OnViewStackCountChanged( e );
+    }
+
+    private void OnViewStackCountChanged( DependencyPropertyChangedEventArgs e )
+    {
+      if( this.EffectiveViewStackMode == ZoomboxViewStackMode.Disabled )
+        return;
+
+      this.UpdateStackProperties();
+    }
+
+    #endregion
+
+    #region ViewStackIndex Property
+
+    public static readonly DependencyProperty ViewStackIndexProperty =
+      DependencyProperty.Register( "ViewStackIndex", typeof( int ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( -1,
+          new PropertyChangedCallback( Zoombox.OnViewStackIndexChanged ), new CoerceValueCallback( Zoombox.CoerceViewStackIndexValue ) ) );
+
+    public int ViewStackIndex
+    {
+      get
+      {
+        return ( int )this.GetValue( Zoombox.ViewStackIndexProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.ViewStackIndexProperty, value );
+      }
+    }
+
+    private static void OnViewStackIndexChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( Zoombox )d ).OnViewStackIndexChanged( e );
+    }
+
+    private void OnViewStackIndexChanged( DependencyPropertyChangedEventArgs e )
+    {
+      if( this.EffectiveViewStackMode == ZoomboxViewStackMode.Disabled )
+        return;
+
+      if( !this.IsUpdatingView )
+      {
+        int viewIndex = this.ViewStackIndex;
+        if( viewIndex >= 0 && viewIndex < ViewStack.Count )
+        {
+          // update the current view, but don't allow the new view 
+          // to be added to the view stack
+          this.UpdateView( this.ViewStack[ viewIndex ], true, false, viewIndex );
+        }
+      }
+
+      this.UpdateStackProperties();
+      this.RaiseEvent( new IndexChangedEventArgs( Zoombox.ViewStackIndexChangedEvent, ( int )e.OldValue, ( int )e.NewValue ) );
+    }
+
+    private static object CoerceViewStackIndexValue( DependencyObject d, object value )
+    {
+      Zoombox zoombox = d as Zoombox;
+      return ( zoombox.EffectiveViewStackMode == ZoomboxViewStackMode.Disabled ) ? -1 : value;
+    }
+
+    #endregion
+
+    #region ViewStackMode Property
+
+    public static readonly DependencyProperty ViewStackModeProperty = 
+      DependencyProperty.Register( "ViewStackMode", typeof( ZoomboxViewStackMode ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( ZoomboxViewStackMode.Default,
+          new PropertyChangedCallback( Zoombox.OnViewStackModeChanged ), new CoerceValueCallback( Zoombox.CoerceViewStackModeValue ) ) );
+
+    public ZoomboxViewStackMode ViewStackMode
+    {
+      get
+      {
+        return ( ZoomboxViewStackMode )this.GetValue( Zoombox.ViewStackModeProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.ViewStackModeProperty, value );
+      }
+    }
+
+    private static void OnViewStackModeChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( Zoombox )d ).OnViewStackModeChanged( e );
+    }
+
+    private void OnViewStackModeChanged( DependencyPropertyChangedEventArgs e )
+    {
+      if( ( ZoomboxViewStackMode )e.NewValue == ZoomboxViewStackMode.Disabled && _viewStack != null )
+      {
+        _viewStack.ClearViewStackSource();
+        _viewStack = null;
+      }
+    }
+
+    private static object CoerceViewStackModeValue( DependencyObject d, object value )
+    {
+      Zoombox zoombox = d as Zoombox;
+      ZoomboxViewStackMode effectiveMode = ( ZoomboxViewStackMode )value;
+
+      // if the effective mode is currently disabled, it must be updated first
+      if( zoombox.EffectiveViewStackMode == ZoomboxViewStackMode.Disabled )
+      {
+        zoombox.SetEffectiveViewStackMode( effectiveMode );
+      }
+
+      // now determine the correct effective mode
+      if( effectiveMode != ZoomboxViewStackMode.Disabled )
+      {
+        if( effectiveMode == ZoomboxViewStackMode.Default )
+        {
+          effectiveMode = ( zoombox.ViewStack.AreViewsFromSource ? ZoomboxViewStackMode.Manual : ZoomboxViewStackMode.Auto );
+        }
+        if( zoombox.ViewStack.AreViewsFromSource && ( ZoomboxViewStackMode )effectiveMode != ZoomboxViewStackMode.Manual )
+        {
+          throw new InvalidOperationException( ErrorMessages.GetMessage( "ViewModeInvalidForSource" ) );
+        }
+      }
+
+      // update the effective mode
+      zoombox.SetEffectiveViewStackMode( effectiveMode );
+      return value;
+    }
+
+    #endregion
+
+    #region ViewStackSource Property
+
+    public static readonly DependencyProperty ViewStackSourceProperty =
+      DependencyProperty.Register( "ViewStackSource", typeof( IEnumerable ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( ( IEnumerable )null,
+          new PropertyChangedCallback( Zoombox.OnViewStackSourceChanged ) ) );
+
+    [Bindable( true )]
+    public IEnumerable ViewStackSource
+    {
+      get
+      {
+        return ( _viewStack == null ) ? null : ViewStack.Source;
+      }
+      set
+      {
+        if( value == null )
+        {
+          this.ClearValue( Zoombox.ViewStackSourceProperty );
+        }
+        else
+        {
+          this.SetValue( Zoombox.ViewStackSourceProperty, value );
+        }
+      }
+    }
+
+    private static void OnViewStackSourceChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      Zoombox zoombox = ( Zoombox )d;
+      IEnumerable oldValue = ( IEnumerable )e.OldValue;
+      IEnumerable newValue = ( IEnumerable )e.NewValue;
+
+      // We need to know whether the new value represents an explicit null value 
+      // or whether it came from a binding. The latter indicates that we stay in ViewStackSource mode,
+      // but with a null collection.
+      if( e.NewValue == null && !BindingOperations.IsDataBound( d, Zoombox.ViewStackSourceProperty ) )
+      {
+        if( zoombox.ViewStack != null )
+        {
+          zoombox.ViewStack.ClearViewStackSource();
+        }
+      }
+      else
+      {
+        zoombox.ViewStack.SetViewStackSource( newValue );
+      }
+
+      zoombox.CoerceValue( Zoombox.ViewStackModeProperty );
+    }
+
+    #endregion
+
+    #region ZoomModifiers Property
+
+    public static readonly DependencyProperty ZoomModifiersProperty =
+      DependencyProperty.Register( "ZoomModifiers", typeof( KeyModifierCollection ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( Zoombox.GetDefaultZoomModifiers() ) );
+
+    [TypeConverter( typeof( KeyModifierCollectionConverter ) )]
+    public KeyModifierCollection ZoomModifiers
+    {
+      get
+      {
+        return ( KeyModifierCollection )this.GetValue( Zoombox.ZoomModifiersProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.ZoomModifiersProperty, value );
+      }
+    }
+
+    private static KeyModifierCollection GetDefaultZoomModifiers()
+    {
+      KeyModifierCollection result = new KeyModifierCollection();
+      result.Add( KeyModifier.Shift );
+      result.Add( KeyModifier.Exact );
+      return result;
+    }
+
+    #endregion
+
+    #region ZoomOnPreview Property
+
+    public static readonly DependencyProperty ZoomOnPreviewProperty =
+      DependencyProperty.Register( "ZoomOnPreview", typeof( bool ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( true ) );
+
+    public bool ZoomOnPreview
+    {
+      get
+      {
+        return ( bool )this.GetValue( Zoombox.ZoomOnPreviewProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.ZoomOnPreviewProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region ZoomOrigin Property
+
+    public static readonly DependencyProperty ZoomOriginProperty =
+      DependencyProperty.Register( "ZoomOrigin", typeof( Point ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( new Point( 0.5d, 0.5d ) ) );
+
+    public Point ZoomOrigin
+    {
+      get
+      {
+        return ( Point )this.GetValue( Zoombox.ZoomOriginProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.ZoomOriginProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region ZoomPercentage Property
+
+    public static readonly DependencyProperty ZoomPercentageProperty =
+      DependencyProperty.Register( "ZoomPercentage", typeof( double ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( 5d ) );
+
+    public double ZoomPercentage
+    {
+      get
+      {
+        return ( double )this.GetValue( Zoombox.ZoomPercentageProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.ZoomPercentageProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region ZoomOn Property
+
+    public static readonly DependencyProperty ZoomOnProperty =
+      DependencyProperty.Register( "ZoomOn", typeof( ZoomboxZoomOn ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( ZoomboxZoomOn.Content ) );
+
+    public ZoomboxZoomOn ZoomOn
+    {
+      get
+      {
+        return ( ZoomboxZoomOn )this.GetValue( Zoombox.ZoomOnProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.ZoomOnProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region ZoomToSelectionModifiers Property
+
+    public static readonly DependencyProperty ZoomToSelectionModifiersProperty =
+      DependencyProperty.Register( "ZoomToSelectionModifiers", typeof( KeyModifierCollection ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( Zoombox.GetDefaultZoomToSelectionModifiers() ) );
+
+    [TypeConverter( typeof( KeyModifierCollectionConverter ) )]
+    public KeyModifierCollection ZoomToSelectionModifiers
+    {
+      get
+      {
+        return ( KeyModifierCollection )this.GetValue( Zoombox.ZoomToSelectionModifiersProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.ZoomToSelectionModifiersProperty, value );
+      }
+    }
+
+    private static KeyModifierCollection GetDefaultZoomToSelectionModifiers()
+    {
+      KeyModifierCollection result = new KeyModifierCollection();
+      result.Add( KeyModifier.Alt );
+      result.Add( KeyModifier.Exact );
+      return result;
+    }
+
+    #endregion
+
+    #region KeepContentInBounds Property
+
+    public static readonly DependencyProperty KeepContentInBoundsProperty =
+      DependencyProperty.Register( "KeepContentInBounds", typeof( bool ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( false, 
+          new PropertyChangedCallback( Zoombox.OnKeepContentInBoundsChanged ) ) );
+
+    public bool KeepContentInBounds
+    {
+      get
+      {
+        return ( bool )this.GetValue( Zoombox.KeepContentInBoundsProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.KeepContentInBoundsProperty, value );
+      }
+    }
+
+    private static void OnKeepContentInBoundsChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( Zoombox )d ).OnKeepContentInBoundsChanged( e );
+    }
+
+    private void OnKeepContentInBoundsChanged( DependencyPropertyChangedEventArgs e )
+    {
+      //
+      // Update view and see if we need to reposition the content
+      //
+      bool oldIsAnimated = this.IsAnimated;
+      this.IsAnimated = false;
+      try
+      {
+        this.UpdateView( this.CurrentView, false, false, this.ViewStackIndex );
+      }
+      finally
+      {
+        this.IsAnimated = oldIsAnimated;
+      }
+    }
+
+    #endregion
+
+    #region ViewStack Property
+
+    public ZoomboxViewStack ViewStack
+    {
+      get
+      {
+        if( _viewStack == null && this.EffectiveViewStackMode != ZoomboxViewStackMode.Disabled )
+        {
+          _viewStack = new ZoomboxViewStack( this );
+        }
+        return _viewStack;
+      }
+    }
+
+    #endregion
+
+    #region HasArrangedContentPresenter Internal Property
+
+    internal bool HasArrangedContentPresenter
+    {
+      get
+      {
+        return _cacheBits[ ( int )CacheBits.HasArrangedContentPresenter ];
+      }
+      set
+      {
+        _cacheBits[ ( int )CacheBits.HasArrangedContentPresenter ] = value;
+      }
+    }
+
+    #endregion
+
+    #region IsUpdatingView Internal Property
+
+    internal bool IsUpdatingView
+    {
+      get
+      {
+        return _cacheBits[ ( int )CacheBits.IsUpdatingView ];
+      }
+      set
+      {
+        _cacheBits[ ( int )CacheBits.IsUpdatingView ] = value;
+      }
+    }
+
+    #endregion
+
+    #region ContentOffset Private Property
+
+    private Vector ContentOffset
+    {
+      get
+      {
+        // auto-wrapped content is always left and top aligned
+        if( this.IsContentWrapped || _content == null || !( _content is FrameworkElement ) )
+          return new Vector( 0, 0 );
+
+        double x = 0;
+        double y = 0;
+        Size contentSize = this.ContentRect.Size;
+
+        switch( ( _content as FrameworkElement ).HorizontalAlignment )
+        {
+          case HorizontalAlignment.Center:
+          case HorizontalAlignment.Stretch:
+            x = ( this.RenderSize.Width - contentSize.Width ) / 2;
+            break;
+
+          case HorizontalAlignment.Right:
+            x = this.RenderSize.Width - contentSize.Width;
+            break;
+        }
+
+        switch( ( _content as FrameworkElement ).VerticalAlignment )
+        {
+          case VerticalAlignment.Center:
+          case VerticalAlignment.Stretch:
+            y = ( this.RenderSize.Height - contentSize.Height ) / 2;
+            break;
+
+          case VerticalAlignment.Bottom:
+            y = this.RenderSize.Height - contentSize.Height;
+            break;
+        }
+
+        return new Vector( x, y );
+      }
+    }
+
+    #endregion
+
+    #region ContentRect Private Property
+
+    private Rect ContentRect
+    {
+      get
+      {
+        return ( _content == null ) ? Rect.Empty
+            : new Rect( new Size( _content.RenderSize.Width / _viewboxFactor, _content.RenderSize.Height / _viewboxFactor ) );
+      }
+    }
+
+    #endregion
+
+    #region HasRenderedFirstView Private Property
+
+    private bool HasRenderedFirstView
+    {
+      get
+      {
+        return _cacheBits[ ( int )CacheBits.HasRenderedFirstView ];
+      }
+      set
+      {
+        _cacheBits[ ( int )CacheBits.HasRenderedFirstView ] = value;
+      }
+    }
+
+    #endregion
+
+    #region HasUIPermission Private Property
+
+    private bool HasUIPermission
+    {
+      get
+      {
+        return _cacheBits[ ( int )CacheBits.HasUIPermission ];
+      }
+    }
+
+    #endregion
+
+    #region IsContentWrapped Private Property
+
+    private bool IsContentWrapped
+    {
+      get
+      {
+        return _cacheBits[ ( int )CacheBits.IsContentWrapped ];
+      }
+      set
+      {
+        _cacheBits[ ( int )CacheBits.IsContentWrapped ] = value;
+      }
+    }
+
+    #endregion
+
+    #region IsDraggingViewport Private Property
+
+    private bool IsDraggingViewport
+    {
+      get
+      {
+        return _cacheBits[ ( int )CacheBits.IsDraggingViewport ];
+      }
+      set
+      {
+        _cacheBits[ ( int )CacheBits.IsDraggingViewport ] = value;
+      }
+    }
+
+    #endregion
+
+    #region IsMonitoringInput Private Property
+
+    private bool IsMonitoringInput
+    {
+      get
+      {
+        return _cacheBits[ ( int )CacheBits.IsMonitoringInput ];
+      }
+      set
+      {
+        _cacheBits[ ( int )CacheBits.IsMonitoringInput ] = value;
+      }
+    }
+
+    #endregion
+
+    #region IsResizingViewport Private Property
+
+    private bool IsResizingViewport
+    {
+      get
+      {
+        return _cacheBits[ ( int )CacheBits.IsResizingViewport ];
+      }
+      set
+      {
+        _cacheBits[ ( int )CacheBits.IsResizingViewport ] = value;
+      }
+    }
+
+    #endregion
+
+    #region IsUpdatingViewport Private Property
+
+    private bool IsUpdatingViewport
+    {
+      get
+      {
+        return _cacheBits[ ( int )CacheBits.IsUpdatingViewport ];
+      }
+      set
+      {
+        _cacheBits[ ( int )CacheBits.IsUpdatingViewport ] = value;
+      }
+    }
+
+    #endregion
+
+    #region RefocusViewOnFirstRender Private Property
+
+    private bool RefocusViewOnFirstRender
+    {
+      get
+      {
+        return _cacheBits[ ( int )CacheBits.RefocusViewOnFirstRender ];
+      }
+      set
+      {
+        _cacheBits[ ( int )CacheBits.RefocusViewOnFirstRender ] = value;
+      }
+    }
+
+    #endregion
+
+    #region ViewFinderDisplayRect Private Property
+
+    private Rect ViewFinderDisplayRect
+    {
+      get
+      {
+        return ( _viewFinderDisplay == null ) ? Rect.Empty
+            : new Rect( new Point( 0, 0 ), new Point( _viewFinderDisplay.RenderSize.Width, _viewFinderDisplay.RenderSize.Height ) );
+      }
+    }
+
+    #endregion
+
+    #region AnimationBeginning Event
+
+    public static readonly RoutedEvent AnimationBeginningEvent = EventManager.RegisterRoutedEvent( "AnimationBeginning", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( Zoombox ) );
+
+    public event RoutedEventHandler AnimationBeginning
+    {
+      add
+      {
+        this.AddHandler( Zoombox.AnimationBeginningEvent, value );
+      }
+      remove
+      {
+        this.RemoveHandler( Zoombox.AnimationBeginningEvent, value );
+      }
+    }
+
+    #endregion
+
+    #region AnimationCompleted Event
+
+    public static readonly RoutedEvent AnimationCompletedEvent = EventManager.RegisterRoutedEvent( "AnimationCompleted", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( Zoombox ) );
+
+    public event RoutedEventHandler AnimationCompleted
+    {
+      add
+      {
+        this.AddHandler( Zoombox.AnimationCompletedEvent, value );
+      }
+      remove
+      {
+        this.RemoveHandler( Zoombox.AnimationCompletedEvent, value );
+      }
+    }
+
+    #endregion
+
+    #region CurrentViewChanged Event
+
+    public static readonly RoutedEvent CurrentViewChangedEvent = EventManager.RegisterRoutedEvent( "CurrentViewChanged", RoutingStrategy.Bubble, typeof( ZoomboxViewChangedEventHandler ), typeof( Zoombox ) );
+
+    public event ZoomboxViewChangedEventHandler CurrentViewChanged
+    {
+      add
+      {
+        this.AddHandler( Zoombox.CurrentViewChangedEvent, value );
+      }
+      remove
+      {
+        this.RemoveHandler( Zoombox.CurrentViewChangedEvent, value );
+      }
+    }
+
+    #endregion
+
+    #region ViewStackIndexChanged Event
+
+    public static readonly RoutedEvent ViewStackIndexChangedEvent = EventManager.RegisterRoutedEvent( "ViewStackIndexChanged", RoutingStrategy.Bubble, typeof( IndexChangedEventHandler ), typeof( Zoombox ) );
+
+    public event IndexChangedEventHandler ViewStackIndexChanged
+    {
+      add
+      {
+        this.AddHandler( Zoombox.ViewStackIndexChangedEvent, value );
+      }
+      remove
+      {
+        this.RemoveHandler( Zoombox.ViewStackIndexChangedEvent, value );
+      }
+    }
+
+    #endregion
+
+    #region Back Command
+
+    public static RoutedUICommand Back = new RoutedUICommand( "Go Back", "GoBack", typeof( Zoombox ) );
+
+    private void CanGoBack( object sender, CanExecuteRoutedEventArgs e )
+    {
+      e.CanExecute = ( this.EffectiveViewStackMode != ZoomboxViewStackMode.Disabled )
+                  && ( this.ViewStackIndex > 0 );
+    }
+
+    private void GoBack( object sender, ExecutedRoutedEventArgs e )
+    {
+      this.GoBack();
+    }
+
+    #endregion
+
+    #region Center Command
+
+    public static RoutedUICommand Center = new RoutedUICommand( "Center Content", "Center", typeof( Zoombox ) );
+
+    private void CenterContent( object sender, ExecutedRoutedEventArgs e )
+    {
+      this.CenterContent();
+    }
+
+    #endregion
+
+    #region Fill Command
+
+    public static RoutedUICommand Fill = new RoutedUICommand( "Fill Bounds with Content", "FillToBounds", typeof( Zoombox ) );
+
+    private void FillToBounds( object sender, ExecutedRoutedEventArgs e )
+    {
+      this.FillToBounds();
+    }
+
+    #endregion
+
+    #region Fit Command
+
+    public static RoutedUICommand Fit = new RoutedUICommand( "Fit Content within Bounds", "FitToBounds", typeof( Zoombox ) );
+
+    private void FitToBounds( object sender, ExecutedRoutedEventArgs e )
+    {
+      this.FitToBounds();
+    }
+
+    #endregion
+
+    #region Forward Command
+
+    public static RoutedUICommand Forward = new RoutedUICommand( "Go Forward", "GoForward", typeof( Zoombox ) );
+
+    private void CanGoForward( object sender, CanExecuteRoutedEventArgs e )
+    {
+      e.CanExecute = ( this.EffectiveViewStackMode != ZoomboxViewStackMode.Disabled )
+                  && ( this.ViewStackIndex < this.ViewStack.Count - 1 );
+    }
+
+    private void GoForward( object sender, ExecutedRoutedEventArgs e )
+    {
+      this.GoForward();
+    }
+
+    #endregion
+
+    #region Home Command
+
+    public static RoutedUICommand Home = new RoutedUICommand( "Go Home", "GoHome", typeof( Zoombox ) );
+
+    private void CanGoHome( object sender, CanExecuteRoutedEventArgs e )
+    {
+      e.CanExecute = ( this.EffectiveViewStackMode != ZoomboxViewStackMode.Disabled )
+                  && ( this.ViewStack.Count > 0 )
+                  && ( this.ViewStackIndex != 0 );
+    }
+
+    private void GoHome( object sender, ExecutedRoutedEventArgs e )
+    {
+      this.GoHome();
+    }
+
+    #endregion
+
+    #region PanDown Command
+
+    public static RoutedUICommand PanDown = new RoutedUICommand( "Pan Down", "PanDown", typeof( Zoombox ) );
+
+    private void PanDownExecuted( object sender, ExecutedRoutedEventArgs e )
+    {
+      this.Position = new Point( _basePosition.X, _basePosition.Y + PanDistance );
+    }
+
+    #endregion
+
+    #region PanLeft Command
+
+    public static RoutedUICommand PanLeft = new RoutedUICommand( "Pan Left", "PanLeft", typeof( Zoombox ) );
+
+    private void PanLeftExecuted( object sender, ExecutedRoutedEventArgs e )
+    {
+      this.Position = new Point( _basePosition.X - this.PanDistance, _basePosition.Y );
+    }
+
+    #endregion
+
+    #region PanRight Command
+
+    public static RoutedUICommand PanRight = new RoutedUICommand( "Pan Right", "PanRight", typeof( Zoombox ) );
+
+    private void PanRightExecuted( object sender, ExecutedRoutedEventArgs e )
+    {
+      this.Position = new Point( _basePosition.X + this.PanDistance, _basePosition.Y );
+    }
+
+    #endregion
+
+    #region PanUp Command
+
+    public static RoutedUICommand PanUp = new RoutedUICommand( "Pan Up", "PanUp", typeof( Zoombox ) );
+
+    private void PanUpExecuted( object sender, ExecutedRoutedEventArgs e )
+    {
+      this.Position = new Point( _basePosition.X, _basePosition.Y - this.PanDistance );
+    }
+
+    #endregion
+
+    #region Refocus Command
+
+    public static RoutedUICommand Refocus = new RoutedUICommand( "Refocus View", "Refocus", typeof( Zoombox ) );
+
+    private void CanRefocusView( object sender, CanExecuteRoutedEventArgs e )
+    {
+      e.CanExecute = ( this.EffectiveViewStackMode == ZoomboxViewStackMode.Manual )
+                  && ( this.ViewStackIndex >= 0 && this.ViewStackIndex < this.ViewStack.Count )
+                  && ( this.CurrentView != this.ViewStack[ this.ViewStackIndex ] );
+    }
+
+    private void RefocusView( object sender, ExecutedRoutedEventArgs e )
+    {
+      this.RefocusView();
+    }
+
+    #endregion
+
+    #region ZoomIn Command
+
+    public static RoutedUICommand ZoomIn = new RoutedUICommand( "Zoom In", "ZoomIn", typeof( Zoombox ) );
+
+    private void ZoomInExecuted( object sender, ExecutedRoutedEventArgs e )
+    {
+      this.Zoom( this.ZoomPercentage / 100 );
+    }
+
+    #endregion
+
+    #region ZoomOut Command
+
+    public static RoutedUICommand ZoomOut = new RoutedUICommand( "Zoom Out", "ZoomOut", typeof( Zoombox ) );
+
+    private void ZoomOutExecuted( object sender, ExecutedRoutedEventArgs e )
+    {
+      this.Zoom( -this.ZoomPercentage / 100 );
+    }
+
+    #endregion
+
+    public void CenterContent()
+    {
+      if( _content != null )
+      {
+        this.ZoomTo( ZoomboxView.Center );
+      }
+    }
+
+    public void FillToBounds()
+    {
+      if( _content != null )
+      {
+        this.ZoomTo( ZoomboxView.Fill );
+      }
+    }
+
+    public void FitToBounds()
+    {
+      if( _content != null )
+      {
+        this.ZoomTo( ZoomboxView.Fit );
+      }
+    }
+
+    public void GoBack()
+    {
+      if( this.EffectiveViewStackMode == ZoomboxViewStackMode.Disabled )
+        return;
+
+      if( this.ViewStackIndex > 0 )
+      {
+        this.ViewStackIndex--;
+      }
+    }
+
+    public void GoForward()
+    {
+      if( this.EffectiveViewStackMode == ZoomboxViewStackMode.Disabled )
+        return;
+
+      if( this.ViewStackIndex < this.ViewStack.Count - 1 )
+      {
+        this.ViewStackIndex++;
+      }
+    }
+
+    public void GoHome()
+    {
+      if( this.EffectiveViewStackMode == ZoomboxViewStackMode.Disabled )
+        return;
+
+      if( this.ViewStackIndex > 0 )
+      {
+        this.ViewStackIndex = 0;
+      }
+    }
+
+    public override void OnApplyTemplate()
+    {
+      this.AttachToVisualTree();
+      base.OnApplyTemplate();
+    }
+
+    public void RefocusView()
+    {
+      if( this.EffectiveViewStackMode == ZoomboxViewStackMode.Disabled )
+        return;
+
+      if( this.ViewStackIndex >= 0 && this.ViewStackIndex < this.ViewStack.Count
+          && this.CurrentView != this.ViewStack[ this.ViewStackIndex ] )
+      {
+        this.UpdateView( this.ViewStack[ this.ViewStackIndex ], true, false, this.ViewStackIndex );
+      }
+    }
+
+    public void Zoom( double percentage )
+    {
+      // if there is nothing to scale, just return
+      if( _content == null )
+        return;
+
+      this.Zoom( percentage, this.GetZoomRelativePoint() );
+    }
+
+    public void Zoom( double percentage, Point relativeTo )
+    {
+      // if there is nothing to scale, just return
+      if( _content == null )
+        return;
+
+      // adjust the current scale relative to the given point
+      double scale = this.Scale * ( 1 + percentage );
+      this.ZoomTo( scale, relativeTo );
+    }
+
+    public void ZoomTo( Point position )
+    {
+      // if there is nothing to pan, just return
+      if( _content == null )
+        return;
+
+      // zoom to the new region
+      this.ZoomTo( new ZoomboxView( new Point( -position.X, -position.Y ) ) );
+    }
+
+    public void ZoomTo( Rect region )
+    {
+      if( _content == null )
+        return;
+
+      // adjust the current scale and position
+      this.UpdateView( new ZoomboxView( region ), true, true );
+    }
+
+    public void ZoomTo( double scale )
+    {
+      // if there is nothing to scale, just return
+      if( _content == null )
+        return;
+
+      // adjust the current scale relative to the center of the content within the control
+      this.ZoomTo( scale, true );
+    }
+
+    public void ZoomTo( double scale, Point relativeTo )
+    {
+      this.ZoomTo( scale, relativeTo, true, true );
+    }
+
+    public void ZoomTo( ZoomboxView view )
+    {
+      this.UpdateView( view, true, true );
+    }
+
+    internal void UpdateStackProperties()
+    {
+      this.SetValue( Zoombox.HasBackStackPropertyKey, this.ViewStackIndex > 0 );
+      this.SetValue( Zoombox.HasForwardStackPropertyKey, this.ViewStack.Count > this.ViewStackIndex + 1 );
+      CommandManager.InvalidateRequerySuggested();
+    }
+
+    protected override Size MeasureOverride( Size constraint )
+    {
+      if( _content != null )
+      {
+        // measure visuals according to supplied constraint
+        base.MeasureOverride( constraint );
+
+        // now re-measure content to let the child be whatever size it desires
+        _content.Measure( new Size( double.PositiveInfinity, double.PositiveInfinity ) );
+      }
+
+      // avoid returning infinity
+      if( double.IsInfinity( constraint.Height ) )
+      {
+        constraint.Height = 0;
+      }
+
+      if( double.IsInfinity( constraint.Width ) )
+      {
+        constraint.Width = 0;
+      }
+      return constraint;
+    }
+
+    protected override void OnContentChanged( object oldContent, object newContent )
+    {
+      // disconnect SizeChanged handler from old content
+      if( oldContent is FrameworkElement )
+      {
+        ( oldContent as FrameworkElement ).RemoveHandler( FrameworkElement.SizeChangedEvent, new SizeChangedEventHandler( this.OnContentSizeChanged ) );
+      }
+      else
+      {
+        this.RemoveHandler( FrameworkElement.SizeChangedEvent, new SizeChangedEventHandler( this.OnContentSizeChanged ) );
+      }
+
+      // connect SizeChanged handler to new content
+      if( _content is FrameworkElement )
+      {
+        ( _content as FrameworkElement ).AddHandler( FrameworkElement.SizeChangedEvent, new SizeChangedEventHandler( this.OnContentSizeChanged ), true );
+      }
+      else
+      {
+        this.AddHandler( FrameworkElement.SizeChangedEvent, new SizeChangedEventHandler( this.OnContentSizeChanged ), true );
+      }
+
+      // update the Visual property of the view finder display panel's VisualBrush
+      if( _viewFinderDisplay != null && _viewFinderDisplay.VisualBrush != null )
+      {
+        _viewFinderDisplay.VisualBrush.Visual = _content;
+      }
+    }
+
+    protected override void OnGotKeyboardFocus( KeyboardFocusChangedEventArgs e )
+    {
+      this.MonitorInput();
+      base.OnGotKeyboardFocus( e );
+    }
+
+    protected override void OnLostKeyboardFocus( KeyboardFocusChangedEventArgs e )
+    {
+      this.MonitorInput();
+      base.OnLostKeyboardFocus( e );
+    }
+
+    protected override void OnInitialized( EventArgs e )
+    {
+      base.OnInitialized( e );
+      this.CoerceValue( Zoombox.IsAnimatedProperty );
+    }
+
+    protected override void OnRender( DrawingContext drawingContext )
+    {
+      if( this.HasArrangedContentPresenter && !this.HasRenderedFirstView )
+      {
+        this.HasRenderedFirstView = true;
+        if( this.RefocusViewOnFirstRender )
+        {
+          this.RefocusViewOnFirstRender = false;
+          bool oldAnimated = this.IsAnimated;
+          this.IsAnimated = false;
+          try
+          {
+            this.RefocusView();
+          }
+          finally
+          {
+            this.IsAnimated = oldAnimated;
+          }
+        }
+      }
+
+      base.OnRender( drawingContext );
+    }
+
+    private static void RefocusView( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      Zoombox zoombox = o as Zoombox;
+      zoombox.UpdateView( zoombox.CurrentView, true, false, zoombox.ViewStackIndex );
+    }
+
+    private void AttachToVisualTree()
+    {
+      // detach from the old tree
+      this.DetachFromVisualTree();
+
+      // create the drag adorner for selection operations
+      _dragAdorner = new DragAdorner( this );
+
+      // check the template for a SelectionBrush resource
+      if( this.Template.Resources.Contains( "SelectionBrush" ) )
+        _dragAdorner.Brush = this.Template.Resources[ "SelectionBrush" ] as Brush;
+
+      // check the template for a SelectionPen resource
+      if( this.Template.Resources.Contains( "SelectionPen" ) )
+        _dragAdorner.Pen = this.Template.Resources[ "SelectionPen" ] as Pen;
+
+      // check the template for key bindings
+      if( this.Template.Resources.Contains( "InputBindings" ) )
+      {
+        InputBindingCollection inputBindings = this.Template.Resources[ "InputBindings" ] as InputBindingCollection;
+        if( inputBindings != null )
+        {
+          this.InputBindings.AddRange( inputBindings );
+        }
+      }
+
+      // locate the content presenter
+      _contentPresenter = VisualTreeHelperEx.FindDescendantByType( this, typeof( ContentPresenter ) ) as ContentPresenter;
+      if( _contentPresenter == null )
+        throw new InvalidTemplateException( ErrorMessages.GetMessage( "ZoomboxTemplateNeedsContent" ) );
+
+      // check the template for an AdornerDecorator
+      AdornerLayer al = null;
+      AdornerDecorator ad = VisualTreeHelperEx.FindDescendantByType( this, typeof( AdornerDecorator ) ) as AdornerDecorator;
+      if( ad != null )
+      {
+        al = ad.AdornerLayer;
+      }
+      else
+      {
+        // look for an inherited adorner layer
+        try
+        {
+          al = AdornerLayer.GetAdornerLayer( this );
+        }
+        catch( Exception )
+        {
+        }
+      }
+
+      // add the drag adorner to the adorner layer
+      if( al != null )
+      {
+        al.Add( _dragAdorner );
+      }
+
+      // TODO: Why is it necessary to walk the visual tree the first time through?
+      // If we don't do the following, the content is not laid out correctly (centered) initially.
+      VisualTreeHelperEx.FindDescendantWithPropertyValue( this, Button.IsPressedProperty, true );
+
+      // set a reference to the ViewFinder element, if present
+      this.SetValue( Zoombox.ViewFinderPropertyKey, this.Template.FindName( "ViewFinder", this ) as FrameworkElement );
+
+      // locate the view finder display panel
+      _viewFinderDisplay = VisualTreeHelperEx.FindDescendantByType( this, typeof( ZoomboxViewFinderDisplay ) ) as ZoomboxViewFinderDisplay;
+
+      // if a ViewFinder was specified but no display panel is present, throw an exception
+      if( this.ViewFinder != null && _viewFinderDisplay == null )
+        throw new InvalidTemplateException( ErrorMessages.GetMessage( "ZoomboxHasViewFinderButNotDisplay" ) );
+
+      // set up the VisualBrush and adorner for the display panel
+      if( _viewFinderDisplay != null )
+      {
+        // create VisualBrush for the view finder display panel
+        this.CreateVisualBrushForViewFinder( _content );
+
+        // hook up event handlers for dragging and resizing the viewport
+        _viewFinderDisplay.MouseMove += new MouseEventHandler( this.ViewFinderDisplayMouseMove );
+        _viewFinderDisplay.MouseLeftButtonDown += new MouseButtonEventHandler( this.ViewFinderDisplayBeginCapture );
+        _viewFinderDisplay.MouseLeftButtonUp += new MouseButtonEventHandler( this.ViewFinderDisplayEndCapture );
+
+        // bind the ViewportRect property of the display to the Viewport of the Zoombox
+        Binding binding = new Binding( "Viewport" );
+        binding.Mode = BindingMode.OneWay;
+        binding.Converter = new ViewFinderSelectionConverter( this );
+        binding.Source = this;
+        _viewFinderDisplay.SetBinding( ZoomboxViewFinderDisplay.ViewportRectProperty, binding );
+      }
+
+      // set up event handler to run once the content presenter has been arranged
+      _contentPresenter.LayoutUpdated += new EventHandler( this.ContentPresenterFirstArranged );
+    }
+
+    private void CreateVisualBrushForViewFinder( Visual visual )
+    {
+      _viewFinderDisplay.VisualBrush = new VisualBrush( visual );
+      _viewFinderDisplay.VisualBrush.Stretch = Stretch.Uniform;
+      _viewFinderDisplay.VisualBrush.AlignmentX = AlignmentX.Left;
+      _viewFinderDisplay.VisualBrush.AlignmentY = AlignmentY.Top;
+    }
+
+    private void ContentPresenterFirstArranged( object sender, EventArgs e )
+    {
+      // remove the handler
+      _contentPresenter.LayoutUpdated -= new EventHandler( this.ContentPresenterFirstArranged );
+
+      // it's now safe to update the view
+      this.HasArrangedContentPresenter = true;
+      this.InvalidateVisual();
+
+      // temporarily disable animations
+      bool oldAnimated = IsAnimated;
+      this.IsAnimated = false;
+      try
+      {
+        // set the initial view
+        double scale = this.Scale;
+        Point position = this.Position;
+
+        // if there are items in the ViewStack and a ViewStackIndex is set, use it
+        if( this.EffectiveViewStackMode != ZoomboxViewStackMode.Disabled )
+        {
+          bool isInitialViewSet = false;
+          if( this.ViewStack.Count > 0 )
+          {
+            if( this.ViewStackIndex >= 0 )
+            {
+              if( this.ViewStackIndex > this.ViewStack.Count - 1 )
+              {
+                this.ViewStackIndex = this.ViewStack.Count - 1;
+              }
+              else
+              {
+                this.UpdateView( this.ViewStack[ this.ViewStackIndex ], false, false, this.ViewStackIndex );
+              }
+            }
+            else if( this.EffectiveViewStackMode != ZoomboxViewStackMode.Auto )
+            {
+              // if this is not an auto-stack, then ensure the index is set to a valid value
+              if( this.ViewStackIndex < 0 )
+              {
+                this.ViewStackIndex = 0;
+              }
+            }
+
+            // if a ViewStackIndex has been set, apply the scale and position values, iff different than the default values
+            if( this.ViewStackIndex >= 0 )
+            {
+              isInitialViewSet = true;
+              if( !DoubleHelper.IsNaN( scale ) || !PointHelper.IsEmpty( position ) )
+              {
+                this.UpdateView( new ZoomboxView( scale, position ), false, false );
+              }
+            }
+          }
+
+          if( !isInitialViewSet )
+          {
+            // set initial view according to the scale and position values and push it on the stack, as necessary
+            ZoomboxView initialView = new ZoomboxView( DoubleHelper.IsNaN( Scale ) ? 1.0 : Scale,
+              PointHelper.IsEmpty( position ) ? new Point() : position );
+
+            if( this.EffectiveViewStackMode == ZoomboxViewStackMode.Auto )
+            {
+              this.ViewStack.PushView( initialView );
+              this.ViewStackIndex = 0;
+            }
+            else
+            {
+              this.UpdateView( initialView, false, false );
+            }
+          }
+        }
+        else
+        {
+          // just set initial view according to the scale and position values
+          ZoomboxView initialView = new ZoomboxView( DoubleHelper.IsNaN( Scale ) ? 1.0 : this.Scale, position );
+          this.UpdateView( initialView, false, false );
+        }
+      }
+      finally
+      {
+        IsAnimated = oldAnimated;
+      }
+    }
+
+    private void DetachFromVisualTree()
+    {
+      // remove the drag adorner
+      if( _dragAdorner != null )
+        AdornerLayer.GetAdornerLayer( this ).Remove( _dragAdorner );
+
+      // remove the layout updated handler, if present
+      if( _contentPresenter != null )
+      {
+        _contentPresenter.LayoutUpdated -= new EventHandler( this.ContentPresenterFirstArranged );
+      }
+
+      // remove the view finder display panel's visual brush and adorner
+      if( _viewFinderDisplay != null )
+      {
+        _viewFinderDisplay = null;
+      }
+
+      // set object references to null
+      _contentPresenter = null;
+    }
+
+    private void DragDisplayViewport( DragDeltaEventArgs e, bool end )
+    {
+      // get the scale of the view finder display panel, the selection rect, and the VisualBrush rect
+      double scale = _viewFinderDisplay.Scale;
+      Rect viewportRect = _viewFinderDisplay.ViewportRect;
+      Rect vbRect = _viewFinderDisplay.ContentBounds;
+
+      // if the entire content is visible, do nothing
+      if( viewportRect.Contains( vbRect ) )
+        return;
+
+      // ensure that we stay within the bounds of the VisualBrush
+      double dx = e.HorizontalChange;
+      double dy = e.VerticalChange;
+
+      // check left boundary
+      if( viewportRect.Left < vbRect.Left )
+      {
+        dx = Math.Max( 0, dx );
+      }
+      else if( viewportRect.Left + dx < vbRect.Left )
+      {
+        dx = vbRect.Left - viewportRect.Left;
+      }
+
+      // check right boundary
+      if( viewportRect.Right > vbRect.Right )
+      {
+        dx = Math.Min( 0, dx );
+      }
+      else if( viewportRect.Right + dx > vbRect.Left + vbRect.Width )
+      {
+        dx = vbRect.Left + vbRect.Width - viewportRect.Right;
+      }
+
+      // check top boundary
+      if( viewportRect.Top < vbRect.Top )
+      {
+        dy = Math.Max( 0, dy );
+      }
+      else if( viewportRect.Top + dy < vbRect.Top )
+      {
+        dy = vbRect.Top - viewportRect.Top;
+      }
+
+      // check bottom boundary
+      if( viewportRect.Bottom > vbRect.Bottom )
+      {
+        dy = Math.Min( 0, dy );
+      }
+      else if( viewportRect.Bottom + dy > vbRect.Top + vbRect.Height )
+      {
+        dy = vbRect.Top + vbRect.Height - viewportRect.Bottom;
+      }
+
+      // call the main OnDrag handler that is used when dragging the content directly
+      this.OnDrag( new DragDeltaEventArgs( -dx / scale / _viewboxFactor, -dy / scale / _viewboxFactor ), end );
+
+      // for a drag operation, update the origin with each delta
+      _originPoint = _originPoint + new Vector( dx, dy );
+    }
+
+    private void InitCommands()
+    {
+      CommandBinding binding = new CommandBinding( Zoombox.Back, this.GoBack, this.CanGoBack );
+      this.CommandBindings.Add( binding );
+
+      binding = new CommandBinding( Zoombox.Center, this.CenterContent );
+      this.CommandBindings.Add( binding );
+
+      binding = new CommandBinding( Zoombox.Fill, this.FillToBounds );
+      this.CommandBindings.Add( binding );
+
+      binding = new CommandBinding( Zoombox.Fit, this.FitToBounds );
+      this.CommandBindings.Add( binding );
+
+      binding = new CommandBinding( Zoombox.Forward, this.GoForward, this.CanGoForward );
+      this.CommandBindings.Add( binding );
+
+      binding = new CommandBinding( Zoombox.Home, this.GoHome, this.CanGoHome );
+      this.CommandBindings.Add( binding );
+
+      binding = new CommandBinding( Zoombox.PanDown, this.PanDownExecuted );
+      this.CommandBindings.Add( binding );
+
+      binding = new CommandBinding( Zoombox.PanLeft, this.PanLeftExecuted );
+      this.CommandBindings.Add( binding );
+
+      binding = new CommandBinding( Zoombox.PanRight, this.PanRightExecuted );
+      this.CommandBindings.Add( binding );
+
+      binding = new CommandBinding( Zoombox.PanUp, this.PanUpExecuted );
+      this.CommandBindings.Add( binding );
+
+      binding = new CommandBinding( Zoombox.Refocus, this.RefocusView, this.CanRefocusView );
+      this.CommandBindings.Add( binding );
+
+      binding = new CommandBinding( Zoombox.ZoomIn, this.ZoomInExecuted );
+      this.CommandBindings.Add( binding );
+
+      binding = new CommandBinding( Zoombox.ZoomOut, this.ZoomOutExecuted );
+      this.CommandBindings.Add( binding );
+    }
+
+    private void MonitorInput()
+    {
+      // cannot pre-process input in partial trust
+      if( this.HasUIPermission )
+      {
+        this.PreProcessInput();
+      }
+    }
+
+    private void OnContentSizeChanged( object sender, SizeChangedEventArgs e )
+    {
+      this.UpdateViewFinderDisplayContentBounds();
+
+      if( this.HasArrangedContentPresenter )
+      {
+        if( this.HasRenderedFirstView )
+        {
+          this.UpdateView( this.CurrentView, true, false, this.CurrentViewIndex );
+        }
+        else
+        {
+          // if the content size changes after the content presenter has been arranged,
+          // but before the first view is rendered, invalidate the render so we can refocus 
+          // the view on the first render
+          this.RefocusViewOnFirstRender = true;
+          this.InvalidateVisual();
+        }
+      }
+    }
+
+    private void OnDrag( DragDeltaEventArgs e, bool end )
+    {
+      Point relativePosition = _relativePosition;
+      double scale = this.Scale;
+      Point newPosition = relativePosition + ( this.ContentOffset * scale ) + new Vector( e.HorizontalChange * scale, e.VerticalChange * scale );
+
+      // update the transform
+      this.UpdateView( new ZoomboxView( scale, newPosition ), false, end );
+    }
+
+    private void OnLayoutUpdated( object sender, EventArgs e )
+    {
+      this.UpdateViewport();
+    }
+
+    private void OnSelectRegion( DragDeltaEventArgs e, bool end )
+    {
+      // draw adorner rect
+      if( end )
+      {
+        _dragAdorner.Rect = Rect.Empty;
+
+        if( _trueContent != null )
+        {
+          // get the selected region (in the content's coordinate space) based on the adorner's last position and size
+          Rect selection =
+            new Rect(
+              this.TranslatePoint( _dragAdorner.LastPosition, _trueContent ),
+              this.TranslatePoint( _dragAdorner.LastPosition + new Vector( _dragAdorner.LastSize.Width, _dragAdorner.LastSize.Height ), _trueContent ) );
+
+          // zoom to the selection
+          this.ZoomTo( selection );
+        }
+      }
+      else
+      {
+        _dragAdorner.Rect =
+          Rect.Intersect(
+            new Rect(
+              _originPoint,
+              new Vector( e.HorizontalChange, e.VerticalChange ) ),
+            new Rect(
+              new Point( 0, 0 ),
+              new Point( this.RenderSize.Width, this.RenderSize.Height ) ) );
+      }
+    }
+
+    private void OnSizeChanged( object sender, SizeChangedEventArgs e )
+    {
+      if( !this.HasArrangedContentPresenter )
+        return;
+
+      // when the size is changing, the viewbox factor must be updated before updating the view
+      this.UpdateViewboxFactor();
+
+      bool oldIsAnimated = this.IsAnimated;
+      this.IsAnimated = false;
+      try
+      {
+        this.UpdateView( this.CurrentView, false, false, this.ViewStackIndex );
+      }
+      finally
+      {
+        this.IsAnimated = oldIsAnimated;
+      }
+    }
+
+    private void PreProcessInput()
+    {
+      // if mouse is over the Zoombox element or if it has keyboard focus, pre-process input 
+      // to update the KeyModifier trigger properties (e.g., DragModifiersAreActive)
+      if( this.IsMouseOver || this.IsKeyboardFocusWithin )
+      {
+        if( !this.IsMonitoringInput )
+        {
+          this.IsMonitoringInput = true;
+          InputManager.Current.PreNotifyInput += new NotifyInputEventHandler( this.PreProcessInput );
+          this.UpdateKeyModifierTriggerProperties();
+        }
+      }
+      else
+      {
+        if( this.IsMonitoringInput )
+        {
+          this.IsMonitoringInput = false;
+          InputManager.Current.PreNotifyInput -= new NotifyInputEventHandler( this.PreProcessInput );
+
+          this.SetAreDragModifiersActive( false );
+          this.SetAreRelativeZoomModifiersActive( false );
+          this.SetAreZoomModifiersActive( false );
+          this.SetAreZoomToSelectionModifiersActive( false );
+        }
+      }
+    }
+
+    private void PreProcessInput( object sender, NotifyInputEventArgs e )
+    {
+      if( e.StagingItem.Input is KeyEventArgs )
+      {
+        this.UpdateKeyModifierTriggerProperties();
+      }
+    }
+
+    private void ProcessMouseLeftButtonDown( MouseButtonEventArgs e )
+    {
+      if( this.ZoomToSelectionModifiers.AreActive )
+      {
+        this.SetIsDraggingContent( false );
+        this.SetIsSelectingRegion( true );
+      }
+      else if( this.DragModifiers.AreActive )
+      {
+        this.SetIsSelectingRegion( false );
+        this.SetIsDraggingContent( true );
+      }
+      else
+      {
+        this.SetIsSelectingRegion( false );
+        this.SetIsDraggingContent( false );
+      }
+
+      // if nothing to do, just return
+      if( !this.IsSelectingRegion && !this.IsDraggingContent )
+        return;
+
+      // set the origin point and capture the mouse
+      _originPoint = e.GetPosition( this );
+      _contentPresenter.CaptureMouse();
+      e.Handled = true;
+      if( this.IsDraggingContent )
+      {
+        // execute the Drag operation
+        this.OnDrag( new DragDeltaEventArgs( 0, 0 ), false );
+      }
+      else if( this.IsSelectingRegion )
+      {
+        this.OnSelectRegion( new DragDeltaEventArgs( 0, 0 ), false );
+      }
+    }
+
+    private void ProcessMouseLeftButtonUp( MouseButtonEventArgs e )
+    {
+      if( !this.IsDraggingContent && !this.IsSelectingRegion )
+        return;
+
+      bool endDrag = this.IsDraggingContent;
+
+      this.SetIsDraggingContent( false );
+      this.SetIsSelectingRegion( false );
+
+      _originPoint = new Point();
+      _contentPresenter.ReleaseMouseCapture();
+      e.Handled = true;
+
+      if( endDrag )
+      {
+        this.OnDrag( new DragDeltaEventArgs( 0, 0 ), true );
+      }
+      else
+      {
+        this.OnSelectRegion( new DragDeltaEventArgs( 0, 0 ), true );
+      }
+    }
+
+    private void ProcessMouseMove( MouseEventArgs e )
+    {
+      if( e.MouseDevice.LeftButton != MouseButtonState.Pressed )
+        return;
+
+      if( !this.IsDraggingContent && !this.IsSelectingRegion )
+        return;
+
+      Point pos = e.GetPosition( this );
+      e.Handled = true;
+
+      if( this.IsDraggingContent )
+      {
+        Vector delta = ( pos - _originPoint ) / this.Scale;
+        this.OnDrag( new DragDeltaEventArgs( delta.X, delta.Y ), false );
+        _originPoint = pos;
+      }
+      else if( this.IsSelectingRegion )
+      {
+        Vector delta = pos - _originPoint;
+        this.OnSelectRegion( new DragDeltaEventArgs( delta.X, delta.Y ), false );
+      }
+    }
+
+    private void ProcessMouseWheelZoom( MouseWheelEventArgs e )
+    {
+      if( _content == null )
+        return;
+
+      // check modifiers to see if there's work to do
+      bool doZoom = this.ZoomModifiers.AreActive;
+      bool doRelativeZoom = this.RelativeZoomModifiers.AreActive;
+
+      // can't do both, so assume relative zoom
+      if( doZoom && doRelativeZoom )
+      {
+        doZoom = false;
+      }
+
+      if( !( doZoom || doRelativeZoom ) )
+        return;
+
+      e.Handled = true;
+      double percentage = ( ( e.Delta / Zoombox.MOUSE_WHEEL_DELTA ) * this.ZoomPercentage ) / 100;
+
+      // Are we doing a zoom relative to the current mouse position?
+      if( doRelativeZoom )
+      {
+        this.Zoom( percentage, Mouse.GetPosition( _content ) );
+      }
+      else
+      {
+        this.Zoom( percentage );
+      }
+    }
+
+    private void ProcessNavigationButton( RoutedEventArgs e )
+    {
+      if( e is MouseButtonEventArgs )
+      {
+        MouseButtonEventArgs mbea = e as MouseButtonEventArgs;
+        if( mbea.ChangedButton == MouseButton.XButton1
+            || mbea.ChangedButton == MouseButton.XButton2 )
+        {
+          if( mbea.ChangedButton == MouseButton.XButton2 )
+          {
+            this.GoForward();
+          }
+          else
+          {
+            this.GoBack();
+          }
+          mbea.Handled = true;
+        }
+      }
+      else if( e is KeyEventArgs )
+      {
+        KeyEventArgs kea = e as KeyEventArgs;
+        if( kea.Key == Key.Back || kea.Key == Key.BrowserBack || kea.Key == Key.BrowserForward )
+        {
+          if( kea.Key == Key.BrowserForward )
+          {
+            this.GoForward();
+          }
+          else
+          {
+            this.GoBack();
+          }
+          kea.Handled = true;
+        }
+      }
+    }
+
+    private void ResizeDisplayViewport( DragDeltaEventArgs e, ResizeEdge relativeTo )
+    {
+      // get the existing viewport rect and scale
+      Rect viewportRect = _viewFinderDisplay.ViewportRect;
+      double scale = _viewFinderDisplay.Scale;
+
+      // ensure that we stay within the bounds of the VisualBrush
+      double x = Math.Max( _resizeViewportBounds.Left, Math.Min( _resizeDraggingPoint.X + e.HorizontalChange, _resizeViewportBounds.Right ) );
+      double y = Math.Max( _resizeViewportBounds.Top, Math.Min( _resizeDraggingPoint.Y + e.VerticalChange, _resizeViewportBounds.Bottom ) );
+
+      // get the selected region in the coordinate space of the content
+      Point anchorPoint = new Point( _resizeAnchorPoint.X / scale, _resizeAnchorPoint.Y / scale );
+      Vector newRegionVector = new Vector( ( x - _resizeAnchorPoint.X ) / scale / _viewboxFactor, ( y - _resizeAnchorPoint.Y ) / scale / _viewboxFactor );
+      Rect region = new Rect( anchorPoint, newRegionVector );
+
+      // now translate the region from the coordinate space of the content 
+      // to the coordinate space of the content presenter
+      region =
+        new Rect(
+          _content.TranslatePoint( region.TopLeft, _contentPresenter ),
+          _content.TranslatePoint( region.BottomRight, _contentPresenter ) );
+
+      // calculate actual scale value
+      double aspectX = this.RenderSize.Width / region.Width;
+      double aspectY = this.RenderSize.Height / region.Height;
+      scale = aspectX < aspectY ? aspectX : aspectY;
+
+      // scale relative to the anchor point
+      this.ZoomTo( scale, anchorPoint, false, false );
+    }
+
+    private void UpdateKeyModifierTriggerProperties()
+    {
+      this.SetAreDragModifiersActive( this.DragModifiers.AreActive );
+      this.SetAreRelativeZoomModifiersActive( this.RelativeZoomModifiers.AreActive );
+      this.SetAreZoomModifiersActive( this.ZoomModifiers.AreActive );
+      this.SetAreZoomToSelectionModifiersActive( this.ZoomToSelectionModifiers.AreActive );
+    }
+
+    private void UpdateView( ZoomboxView view, bool allowAnimation, bool allowStackAddition )
+    {
+      this.UpdateView( view, allowAnimation, allowStackAddition, -1 );
+    }
+
+    private void UpdateView( ZoomboxView view, bool allowAnimation, bool allowStackAddition, int stackIndex )
+    {
+      if( _contentPresenter == null || _content == null || !this.HasArrangedContentPresenter )
+        return;
+
+      // if an absolute view is being used and only a Scale value has been specified,
+      // use the ZoomTo() function to perform a relative zoom
+      if( view.ViewKind == ZoomboxViewKind.Absolute && PointHelper.IsEmpty( view.Position ) )
+      {
+        this.ZoomTo( view.Scale, allowStackAddition );
+        return;
+      }
+
+      // disallow reentrancy
+      if( !this.IsUpdatingView )
+      {
+        this.IsUpdatingView = true;
+        try
+        {
+          // determine the new scale and position
+          double newRelativeScale = _viewboxFactor;
+          Point newRelativePosition = new Point();
+          Rect region = Rect.Empty;
+          switch( view.ViewKind )
+          {
+            case ZoomboxViewKind.Empty:
+              break;
+
+            case ZoomboxViewKind.Absolute:
+              newRelativeScale = DoubleHelper.IsNaN( view.Scale ) ? _relativeScale : view.Scale;
+              newRelativePosition = PointHelper.IsEmpty( view.Position ) ? _relativePosition
+                  : new Point( view.Position.X, view.Position.Y ) - this.ContentOffset * newRelativeScale;
+              break;
+
+            case ZoomboxViewKind.Region:
+              region = view.Region;
+              break;
+
+            case ZoomboxViewKind.Center:
+              {
+                // get the current ContentRect in the coordinate space of the Zoombox control
+                Rect currentContentRect =
+                  new Rect(
+                    _content.TranslatePoint( this.ContentRect.TopLeft, this ),
+                    _content.TranslatePoint( this.ContentRect.BottomRight, this ) );
+
+                // inflate (or deflate) the rect by the appropriate amounts in the x & y directions
+                region = Rect.Inflate( currentContentRect,
+                    ( this.RenderSize.Width / _viewboxFactor - currentContentRect.Width ) / 2,
+                    ( this.RenderSize.Height / _viewboxFactor - currentContentRect.Height ) / 2 );
+
+                // now translate the centered rect back to the coordinate space of the content
+                region = new Rect( this.TranslatePoint( region.TopLeft, _content ), this.TranslatePoint( region.BottomRight, _content ) );
+              }
+              break;
+
+            case ZoomboxViewKind.Fit:
+              region = this.ContentRect;
+              break;
+
+            case ZoomboxViewKind.Fill:
+              region = this.CalculateFillRect();
+              break;
+          }
+
+          if( view.ViewKind != ZoomboxViewKind.Empty )
+          {
+            if( !region.IsEmpty )
+            {   // ZOOMING TO A REGION
+              this.CalculatePositionAndScale( region, ref newRelativePosition, ref newRelativeScale );
+            }
+            else if( view != ZoomboxView.Empty )
+            {   // USING ABSOLUTE POSITION AND SCALE VALUES
+
+              // ensure that the scale value falls within the valid range
+              if( newRelativeScale > MaxScale )
+              {
+                newRelativeScale = MaxScale;
+              }
+              else if( newRelativeScale < MinScale )
+              {
+                newRelativeScale = MinScale;
+              }
+            }
+
+            double currentScale = _relativeScale;
+            double currentX = _relativePosition.X;
+            double currentY = _relativePosition.Y;
+
+            ScaleTransform st = null;
+            TranslateTransform tt = null;
+            TransformGroup tg = null;
+
+            if( _contentPresenter.RenderTransform != Transform.Identity )
+            {
+              tg = _contentPresenter.RenderTransform as TransformGroup;
+              st = tg.Children[ 0 ] as ScaleTransform;
+              tt = tg.Children[ 1 ] as TranslateTransform;
+              currentScale = st.ScaleX;
+              currentX = tt.X;
+              currentY = tt.Y;
+            }
+
+            if( KeepContentInBounds == true )
+            {
+              Rect boundsRect = new Rect( new Size( this.ContentRect.Width * newRelativeScale, this.ContentRect.Height * newRelativeScale ) );
+
+              // Calc viewport rect (should be inside bounds content rect)
+              Point viewportPosition = new Point( -newRelativePosition.X, -newRelativePosition.Y );
+              Rect viewportRect = new Rect( viewportPosition, _contentPresenter.RenderSize );
+
+              if( DoubleHelper.AreVirtuallyEqual( _relativeScale, newRelativeScale ) ) // we are positioning the content, not scaling
+              {
+                // Handle the width and height seperately since the content extent 
+                // could be contained only partially in the viewport.  Also if the viewport is only 
+                // partially contained within the content extent.
+
+                //
+                // Content extent width is greater than the viewport's width (Zoomed in).  Make sure we restrict
+                // the viewport X inside the content.
+                //
+                if( this.IsGreaterThanOrClose( boundsRect.Width, viewportRect.Width ) )
+                {
+                  if( boundsRect.Right < viewportRect.Right )
+                  {
+                    newRelativePosition.X = -( boundsRect.Width - viewportRect.Width );
+                  }
+
+                  if( boundsRect.Left > viewportRect.Left )
+                  {
+                    newRelativePosition.X = 0;
+                  }
+                }
+                //
+                // Viewport width is greater than the content extent's width (Zoomed out).  Make sure we restrict
+                // the content X inside the viewport.
+                //
+                else if( this.IsGreaterThanOrClose( viewportRect.Width, boundsRect.Width ) )
+                {
+                  if( viewportRect.Right < boundsRect.Right )
+                  {
+                    newRelativePosition.X = viewportRect.Width - boundsRect.Width;
+                  }
+
+                  if( viewportRect.Left > boundsRect.Left )
+                  {
+                    newRelativePosition.X = 0;
+                  }
+                }
+
+                //
+                // Content extent height is greater than the viewport's height (Zoomed in).  Make sure we restrict
+                // the viewport Y inside the content.
+                //
+                if( this.IsGreaterThanOrClose( boundsRect.Height, viewportRect.Height ) )
+                {
+                  if( boundsRect.Bottom < viewportRect.Bottom )
+                  {
+                    newRelativePosition.Y = -( boundsRect.Height - viewportRect.Height );
+                  }
+
+                  if( boundsRect.Top > viewportRect.Top )
+                  {
+                    newRelativePosition.Y = 0;
+                  }
+                }
+                //
+                // Viewport height is greater than the content extent's height (Zoomed out).  Make sure we restrict
+                // the content Y inside the viewport.
+                //
+                else if( this.IsGreaterThanOrClose( viewportRect.Height, boundsRect.Height ) )
+                {
+                  if( viewportRect.Bottom < boundsRect.Bottom )
+                  {
+                    newRelativePosition.Y = viewportRect.Height - boundsRect.Height;
+                  }
+
+                  if( viewportRect.Top > boundsRect.Top )
+                  {
+                    newRelativePosition.Y = 0;
+                  }
+                }
+              }
+            }
+
+            st = new ScaleTransform( newRelativeScale / _viewboxFactor, newRelativeScale / _viewboxFactor );
+            tt = new TranslateTransform( newRelativePosition.X, newRelativePosition.Y );
+            tg = new TransformGroup();
+            tg.Children.Add( st );
+            tg.Children.Add( tt );
+
+            _contentPresenter.RenderTransform = tg;
+
+            if( allowAnimation && IsAnimated )
+            {
+              DoubleAnimation daScale = new DoubleAnimation( currentScale, newRelativeScale / _viewboxFactor, AnimationDuration );
+              daScale.AccelerationRatio = this.AnimationAccelerationRatio;
+              daScale.DecelerationRatio = this.AnimationDecelerationRatio;
+
+              DoubleAnimation daTranslateX = new DoubleAnimation( currentX, newRelativePosition.X, AnimationDuration );
+              daTranslateX.AccelerationRatio = this.AnimationAccelerationRatio;
+              daTranslateX.DecelerationRatio = this.AnimationDecelerationRatio;
+
+              DoubleAnimation daTranslateY = new DoubleAnimation( currentY, newRelativePosition.Y, AnimationDuration );
+              daTranslateY.AccelerationRatio = this.AnimationAccelerationRatio;
+              daTranslateY.DecelerationRatio = this.AnimationDecelerationRatio;
+              daTranslateY.CurrentTimeInvalidated += new EventHandler( this.UpdateViewport );
+              daTranslateY.CurrentStateInvalidated += new EventHandler( this.ZoomAnimationCompleted );
+
+              // raise animation beginning event before beginning the animations
+              RaiseEvent( new RoutedEventArgs( AnimationBeginningEvent, this ) );
+
+              st.BeginAnimation( ScaleTransform.ScaleXProperty, daScale );
+              st.BeginAnimation( ScaleTransform.ScaleYProperty, daScale );
+              tt.BeginAnimation( TranslateTransform.XProperty, daTranslateX );
+              tt.BeginAnimation( TranslateTransform.YProperty, daTranslateY );
+            }
+
+            // maintain the relative scale and position for dragging and animating purposes
+            _relativePosition = newRelativePosition;
+            _relativeScale = newRelativeScale;
+
+            // update the Scale and Position properties to keep them in sync with the current view
+            this.Scale = newRelativeScale;
+            _basePosition = newRelativePosition + this.ContentOffset * newRelativeScale;
+            this.UpdateViewport();
+          }
+
+          // add the current view to the view stack
+          if( this.EffectiveViewStackMode == ZoomboxViewStackMode.Auto && allowStackAddition )
+          {
+            // if the last view was pushed on the stack within the last 300 milliseconds, discard it
+            // since proximally close views are probably the result of a mouse wheel scroll
+            if( this.ViewStack.Count > 1
+              && Math.Abs( DateTime.Now.Ticks - _lastStackAddition.Ticks ) < TimeSpan.FromMilliseconds( 300 ).Ticks )
+            {
+              this.ViewStack.RemoveAt( this.ViewStack.Count - 1 );
+              _lastStackAddition = DateTime.Now - TimeSpan.FromMilliseconds( 300 );
+            }
+
+            // if the current view is the same as the last view, do nothing
+            if( this.ViewStack.Count > 0 && view == this.ViewStack.SelectedView )
+            {
+              // do nothing
+            }
+            else
+            {
+              // otherwise, push the current view on stack
+              this.ViewStack.PushView( view );
+              this.ViewStackIndex++;
+              stackIndex = this.ViewStackIndex;
+
+              // update the timestamp for the last stack addition
+              _lastStackAddition = DateTime.Now;
+            }
+          }
+
+          // update the stack indices used by CurrentViewChanged event
+          _lastViewIndex = this.CurrentViewIndex;
+          this.SetCurrentViewIndex( stackIndex );
+
+          // set the new view parameters
+          // NOTE: this is the only place where the CurrentView member should be set
+          this.SetCurrentView( view );
+        }
+        finally
+        {
+          this.IsUpdatingView = false;
+        }
+      }
+    }
+
+    private bool IsGreaterThanOrClose( double value1, double value2 )
+    {
+      return value1 <= value2 ? DoubleHelper.AreVirtuallyEqual( value1, value2 ) : true;
+    }
+
+    private Rect CalculateFillRect()
+    {
+      // determine the x-y ratio of the current Viewport
+      double xyRatio = this.RenderSize.Width / this.RenderSize.Height;
+
+      // now find the maximal rect within the ContentRect that has the same ratio
+      double x = 0;
+      double y = 0;
+      double width = this.ContentRect.Width;
+      double height = this.ContentRect.Height;
+      if( xyRatio > width / height )
+      {
+        height = width / xyRatio;
+        y = ( this.ContentRect.Height - height ) / 2;
+      }
+      else
+      {
+        width = height * xyRatio;
+        x = ( this.ContentRect.Width - width ) / 2;
+      }
+
+      return new Rect( x, y, width, height );
+    }
+
+    private void CalculatePositionAndScale( Rect region, ref Point newRelativePosition, ref double newRelativeScale )
+    {
+      // if there is nothing to scale, just return
+      // if the region has no area, just return
+      if( region.Width == 0 || region.Height == 0 )
+        return;
+
+      // verify that the selected region intersects with the content, which prevents 
+      // the scale operation from zooming the content out of the current view
+      if( !this.ContentRect.IntersectsWith( region ) )
+        return;
+
+      // translate the region from the coordinate space of the content 
+      // to the coordinate space of the content presenter
+      region =
+        new Rect(
+          _content.TranslatePoint( region.TopLeft, _contentPresenter ),
+          _content.TranslatePoint( region.BottomRight, _contentPresenter ) );
+
+      // calculate actual zoom, which must fit the entire selection 
+      // while maintaining a 1:1 ratio
+      double aspectX = this.RenderSize.Width / region.Width;
+      double aspectY = this.RenderSize.Height / region.Height;
+      newRelativeScale = aspectX < aspectY ? aspectX : aspectY;
+
+      // ensure that the scale value falls within the valid range
+      if( newRelativeScale > this.MaxScale )
+      {
+        newRelativeScale = this.MaxScale;
+      }
+      else if( newRelativeScale < this.MinScale )
+      {
+        newRelativeScale = this.MinScale;
+      }
+
+      // determine the new content position for this zoom operation based 
+      // on HorizontalContentAlignment and VerticalContentAlignment
+      double horizontalOffset = 0;
+      double verticalOffset = 0;
+      switch( this.HorizontalContentAlignment )
+      {
+        case HorizontalAlignment.Center:
+        case HorizontalAlignment.Stretch:
+          horizontalOffset = ( this.RenderSize.Width - region.Width * newRelativeScale ) / 2;
+          break;
+
+        case HorizontalAlignment.Right:
+          horizontalOffset = ( this.RenderSize.Width - region.Width * newRelativeScale );
+          break;
+      }
+      switch( VerticalContentAlignment )
+      {
+        case VerticalAlignment.Center:
+        case VerticalAlignment.Stretch:
+          verticalOffset = ( this.RenderSize.Height - region.Height * newRelativeScale ) / 2;
+          break;
+
+        case VerticalAlignment.Bottom:
+          verticalOffset = ( this.RenderSize.Height - region.Height * newRelativeScale );
+          break;
+      }
+      newRelativePosition =
+        new Point( -region.TopLeft.X * newRelativeScale, -region.TopLeft.Y * newRelativeScale )
+          + new Vector( horizontalOffset, verticalOffset );
+    }
+
+    private void UpdateViewFinderDisplayContentBounds()
+    {
+      if( _content == null || _trueContent == null || _viewFinderDisplay == null )
+        return;
+
+      this.UpdateViewboxFactor();
+
+      // ensure the display panel has a size
+      Size contentSize = _content.RenderSize;
+      Size viewFinderSize = _viewFinderDisplay.AvailableSize;
+      if( viewFinderSize.Width > 0d && DoubleHelper.AreVirtuallyEqual( viewFinderSize.Height, 0d ) )
+      {
+        // update height to accomodate width, while keeping a ratio equal to the actual content
+        viewFinderSize = new Size( viewFinderSize.Width, contentSize.Height * viewFinderSize.Width / contentSize.Width );
+      }
+      else if( viewFinderSize.Height > 0d && DoubleHelper.AreVirtuallyEqual( viewFinderSize.Width, 0d ) )
+      {
+        // update width to accomodate height, while keeping a ratio equal to the actual content
+        viewFinderSize = new Size( contentSize.Width * viewFinderSize.Height / contentSize.Height, viewFinderSize.Width );
+      }
+
+      // determine the scale of the view finder display panel
+      double aspectX = viewFinderSize.Width / contentSize.Width;
+      double aspectY = viewFinderSize.Height / contentSize.Height;
+      double scale = aspectX < aspectY ? aspectX : aspectY;
+
+      // determine the rect of the VisualBrush
+      double vbWidth = contentSize.Width * scale;
+      double vbHeight = contentSize.Height * scale;
+
+      // set the ContentBounds and Scale properties on the view finder display panel
+      _viewFinderDisplay.Scale = scale;
+      _viewFinderDisplay.ContentBounds = new Rect( new Size( vbWidth, vbHeight ) );
+    }
+
+    private void UpdateViewboxFactor()
+    {
+      if( _content == null || _trueContent == null )
+        return;
+
+      double contentWidth = _content.RenderSize.Width;
+      double trueContentWidth = _trueContent.RenderSize.Width;
+
+      if( DoubleHelper.AreVirtuallyEqual( contentWidth, 0d ) || DoubleHelper.AreVirtuallyEqual( trueContentWidth, 0d ) )
+      {
+        _viewboxFactor = 1d;
+      }
+      else
+      {
+        _viewboxFactor = contentWidth / trueContentWidth;
+      }
+    }
+
+    private void UpdateViewport()
+    {
+      // if we haven't attached to the visual tree yet or we don't have content, just return
+      if( _contentPresenter == null || _trueContent == null )
+        return;
+
+      this.IsUpdatingViewport = true;
+      try
+      {
+        // calculate the current viewport
+        Rect viewport =
+          new Rect(
+            this.TranslatePoint( new Point( 0d, 0d ), _trueContent ),
+            this.TranslatePoint( new Point( RenderSize.Width, RenderSize.Height ), _trueContent ) );
+
+        // if the viewport has changed, set the Viewport dependency property
+        if( !DoubleHelper.AreVirtuallyEqual( viewport, this.Viewport ) )
+        {
+          this.SetValue( Zoombox.ViewportPropertyKey, viewport );
+        }
+      }
+      finally
+      {
+        this.IsUpdatingViewport = false;
+      }
+    }
+
+    private void UpdateViewport( object sender, EventArgs e )
+    {
+      this.UpdateViewport();
+    }
+
+    private void ViewFinderDisplayBeginCapture( object sender, MouseButtonEventArgs e )
+    {
+      const double ARBITRARY_LARGE_VALUE = 10000000000;
+
+      // if we need to acquire capture, the Tag property of the view finder display panel
+      // will be a ResizeEdge value.
+      if( _viewFinderDisplay.Tag is ResizeEdge )
+      {
+        // if the Tag is ResizeEdge.None, then its a drag operation; otherwise, its a resize
+        if( ( ResizeEdge )_viewFinderDisplay.Tag == ResizeEdge.None )
+        {
+          this.IsDraggingViewport = true;
+        }
+        else
+        {
+          this.IsResizingViewport = true;
+          Vector direction = new Vector();
+          switch( ( ResizeEdge )_viewFinderDisplay.Tag )
+          {
+            case ResizeEdge.TopLeft:
+              _resizeDraggingPoint = _viewFinderDisplay.ViewportRect.TopLeft;
+              _resizeAnchorPoint = _viewFinderDisplay.ViewportRect.BottomRight;
+              direction = new Vector( -1, -1 );
+              break;
+
+            case ResizeEdge.TopRight:
+              _resizeDraggingPoint = _viewFinderDisplay.ViewportRect.TopRight;
+              _resizeAnchorPoint = _viewFinderDisplay.ViewportRect.BottomLeft;
+              direction = new Vector( 1, -1 );
+              break;
+
+            case ResizeEdge.BottomLeft:
+              _resizeDraggingPoint = _viewFinderDisplay.ViewportRect.BottomLeft;
+              _resizeAnchorPoint = _viewFinderDisplay.ViewportRect.TopRight;
+              direction = new Vector( -1, 1 );
+              break;
+
+            case ResizeEdge.BottomRight:
+              _resizeDraggingPoint = _viewFinderDisplay.ViewportRect.BottomRight;
+              _resizeAnchorPoint = _viewFinderDisplay.ViewportRect.TopLeft;
+              direction = new Vector( 1, 1 );
+              break;
+            case ResizeEdge.Left:
+              _resizeDraggingPoint = new Point( _viewFinderDisplay.ViewportRect.Left,
+                  _viewFinderDisplay.ViewportRect.Top + ( _viewFinderDisplay.ViewportRect.Height / 2 ) );
+              _resizeAnchorPoint = new Point( _viewFinderDisplay.ViewportRect.Right,
+                  _viewFinderDisplay.ViewportRect.Top + ( _viewFinderDisplay.ViewportRect.Height / 2 ) );
+              direction = new Vector( -1, 0 );
+              break;
+            case ResizeEdge.Top:
+              _resizeDraggingPoint = new Point( _viewFinderDisplay.ViewportRect.Left + ( _viewFinderDisplay.ViewportRect.Width / 2 ),
+                  _viewFinderDisplay.ViewportRect.Top );
+              _resizeAnchorPoint = new Point( _viewFinderDisplay.ViewportRect.Left + ( _viewFinderDisplay.ViewportRect.Width / 2 ),
+                  _viewFinderDisplay.ViewportRect.Bottom );
+              direction = new Vector( 0, -1 );
+              break;
+            case ResizeEdge.Right:
+              _resizeDraggingPoint = new Point( _viewFinderDisplay.ViewportRect.Right,
+                  _viewFinderDisplay.ViewportRect.Top + ( _viewFinderDisplay.ViewportRect.Height / 2 ) );
+              _resizeAnchorPoint = new Point( _viewFinderDisplay.ViewportRect.Left,
+                  _viewFinderDisplay.ViewportRect.Top + ( _viewFinderDisplay.ViewportRect.Height / 2 ) );
+              direction = new Vector( 1, 0 );
+              break;
+            case ResizeEdge.Bottom:
+              _resizeDraggingPoint = new Point( _viewFinderDisplay.ViewportRect.Left + ( _viewFinderDisplay.ViewportRect.Width / 2 ),
+                  _viewFinderDisplay.ViewportRect.Bottom );
+              _resizeAnchorPoint = new Point( _viewFinderDisplay.ViewportRect.Left + ( _viewFinderDisplay.ViewportRect.Width / 2 ),
+                  _viewFinderDisplay.ViewportRect.Top );
+              direction = new Vector( 0, 1 );
+              break;
+          }
+          double scale = _viewFinderDisplay.Scale;
+          Rect contentRect = _viewFinderDisplay.ContentBounds;
+          Vector minVector = new Vector( direction.X * ARBITRARY_LARGE_VALUE, direction.Y * ARBITRARY_LARGE_VALUE );
+          Vector maxVector = new Vector( direction.X * contentRect.Width / MaxScale, direction.Y * contentRect.Height / MaxScale );
+          _resizeViewportBounds = new Rect( _resizeAnchorPoint + minVector, _resizeAnchorPoint + maxVector );
+        }
+
+        // store the origin of the operation and acquire capture
+        _originPoint = e.GetPosition( _viewFinderDisplay );
+        _viewFinderDisplay.CaptureMouse();
+        e.Handled = true;
+      }
+    }
+
+    private void ViewFinderDisplayEndCapture( object sender, MouseButtonEventArgs e )
+    {
+      // if a drag or resize is in progress, end it and release capture
+      if( this.IsDraggingViewport || this.IsResizingViewport )
+      {
+        // call the DragDisplayViewport method to end the operation
+        // and store the current position on the stack
+        this.DragDisplayViewport( new DragDeltaEventArgs( 0, 0 ), true );
+
+        // reset the dragging state variables and release capture
+        this.IsDraggingViewport = false;
+        this.IsResizingViewport = false;
+        _originPoint = new Point();
+        _viewFinderDisplay.ReleaseMouseCapture();
+        e.Handled = true;
+      }
+    }
+
+    private void ViewFinderDisplayMouseMove( object sender, MouseEventArgs e )
+    {
+      // if a drag operation is in progress, update the operation
+      if( e.MouseDevice.LeftButton == MouseButtonState.Pressed
+          && ( this.IsDraggingViewport || this.IsResizingViewport ) )
+      {
+        Point pos = e.GetPosition( _viewFinderDisplay );
+        Vector delta = pos - _originPoint;
+        if( this.IsDraggingViewport )
+        {
+          this.DragDisplayViewport( new DragDeltaEventArgs( delta.X, delta.Y ), false );
+        }
+        else
+        {
+          this.ResizeDisplayViewport( new DragDeltaEventArgs( delta.X, delta.Y ), ( ResizeEdge )_viewFinderDisplay.Tag );
+        }
+        e.Handled = true;
+      }
+      else
+      {
+        // update the cursor based on the nearest corner
+        Point mousePos = e.GetPosition( _viewFinderDisplay );
+        Rect viewportRect = _viewFinderDisplay.ViewportRect;
+        double cornerDelta = viewportRect.Width * viewportRect.Height > 100 ? 5.0
+            : Math.Sqrt( viewportRect.Width * viewportRect.Height ) / 2;
+
+        // if the mouse is within the Rect and the Rect does not encompass the entire content, set the appropriate cursor
+        if( viewportRect.Contains( mousePos )
+            && !DoubleHelper.AreVirtuallyEqual( Rect.Intersect( viewportRect, _viewFinderDisplay.ContentBounds ), _viewFinderDisplay.ContentBounds ) )
+        {
+          if( PointHelper.DistanceBetween( mousePos, viewportRect.TopLeft ) < cornerDelta )
+          {
+            _viewFinderDisplay.Tag = ResizeEdge.TopLeft;
+            _viewFinderDisplay.Cursor = Cursors.SizeNWSE;
+          }
+          else if( PointHelper.DistanceBetween( mousePos, viewportRect.BottomRight ) < cornerDelta )
+          {
+            _viewFinderDisplay.Tag = ResizeEdge.BottomRight;
+            _viewFinderDisplay.Cursor = Cursors.SizeNWSE;
+          }
+          else if( PointHelper.DistanceBetween( mousePos, viewportRect.TopRight ) < cornerDelta )
+          {
+            _viewFinderDisplay.Tag = ResizeEdge.TopRight;
+            _viewFinderDisplay.Cursor = Cursors.SizeNESW;
+          }
+          else if( PointHelper.DistanceBetween( mousePos, viewportRect.BottomLeft ) < cornerDelta )
+          {
+            _viewFinderDisplay.Tag = ResizeEdge.BottomLeft;
+            _viewFinderDisplay.Cursor = Cursors.SizeNESW;
+          }
+          else if( mousePos.X <= viewportRect.Left + cornerDelta )
+          {
+            _viewFinderDisplay.Tag = ResizeEdge.Left;
+            _viewFinderDisplay.Cursor = Cursors.SizeWE;
+          }
+          else if( mousePos.Y <= viewportRect.Top + cornerDelta )
+          {
+            _viewFinderDisplay.Tag = ResizeEdge.Top;
+            _viewFinderDisplay.Cursor = Cursors.SizeNS;
+          }
+          else if( mousePos.X >= viewportRect.Right - cornerDelta )
+          {
+            _viewFinderDisplay.Tag = ResizeEdge.Right;
+            _viewFinderDisplay.Cursor = Cursors.SizeWE;
+          }
+          else if( mousePos.Y >= viewportRect.Bottom - cornerDelta )
+          {
+            _viewFinderDisplay.Tag = ResizeEdge.Bottom;
+            _viewFinderDisplay.Cursor = Cursors.SizeNS;
+          }
+          else
+          {
+            _viewFinderDisplay.Tag = ResizeEdge.None;
+            _viewFinderDisplay.Cursor = Cursors.SizeAll;
+          }
+        }
+        else
+        {
+          _viewFinderDisplay.Tag = null;
+          _viewFinderDisplay.Cursor = Cursors.Arrow;
+        }
+      }
+    }
+
+    private void ZoomAnimationCompleted( object sender, EventArgs e )
+    {
+      if( ( sender as AnimationClock ).CurrentState != ClockState.Active )
+      {
+        // remove the event handlers
+        ( sender as AnimationClock ).CurrentStateInvalidated -= new EventHandler( this.ZoomAnimationCompleted );
+        ( sender as AnimationClock ).CurrentTimeInvalidated -= new EventHandler( this.UpdateViewport );
+
+        // raise animation completed event
+        this.RaiseEvent( new RoutedEventArgs( Zoombox.AnimationCompletedEvent, this ) );
+      }
+    }
+
+    private void ZoomTo( double scale, bool allowStackAddition )
+    {
+      // if there is nothing to scale, just return
+      if( _content == null )
+        return;
+
+      // adjust the current scale relative to the zoom origin
+      this.ZoomTo( scale, this.GetZoomRelativePoint(), true, allowStackAddition );
+    }
+
+    private void ZoomTo( double scale, Point relativeTo, bool restrictRelativePointToContent, bool allowStackAddition )
+    {
+      // if there is nothing to scale, just return
+      if( _content == null )
+        return;
+
+      // if necessary, verify that the relativeTo point falls within the content
+      if( restrictRelativePointToContent && !( new Rect( _content.RenderSize ) ).Contains( relativeTo ) )
+        return;
+
+      // ensure that the scale value falls within the valid range
+      if( scale > this.MaxScale )
+      {
+        scale = this.MaxScale;
+      }
+      else if( scale < this.MinScale )
+      {
+        scale = this.MinScale;
+      }
+
+      // internally, updates are always relative to the Zoombox control
+      Point translateFrom = relativeTo;
+      if( this.HasRenderedFirstView )
+      {
+        // Note that this TranslatePoint approach will not work until the first render occurs
+        relativeTo = _content.TranslatePoint( relativeTo, this );
+
+        // adjust translateFrom based on relativeTo
+        translateFrom = this.TranslatePoint( relativeTo, _contentPresenter );
+      }
+      else
+      {
+        // prior to the first render, just use the ContentPresenter's transform and do not adjust translateFrom
+        if( _contentPresenter.RenderTransform == Transform.Identity )
+        {
+          // in order for this approach to work, we must at least make one pass to update a generic view
+          // with Scale = 1.0 and Position = 0,0
+          this.UpdateView( new ZoomboxView( 1, new Point( 0, 0 ) ), false, false );
+        }
+
+        // now there should be a valid RenderTransform
+        relativeTo = ( _contentPresenter.RenderTransform as Transform ).Transform( relativeTo );
+      }
+
+      // determine the new content position for this zoom operation
+      Point translateTo = new Point( relativeTo.X - ( translateFrom.X * scale / _viewboxFactor ),
+          relativeTo.Y - ( translateFrom.Y * scale / _viewboxFactor ) )
+          + this.ContentOffset * scale / _viewboxFactor;
+      this.UpdateView( new ZoomboxView( scale, translateTo ), !this.IsResizingViewport, allowStackAddition );
+    }
+
+    private Point GetZoomRelativePoint()
+    {
+      Point zoomPoint;
+
+      if( ZoomOn == ZoomboxZoomOn.View )
+      {
+        // Transform the viewport point to the content
+        Point viewportZoomOrigin = new Point();
+
+        viewportZoomOrigin.X = this.Viewport.X + ( this.Viewport.Width * this.ZoomOrigin.X );
+        viewportZoomOrigin.Y = this.Viewport.Y + ( this.Viewport.Height * this.ZoomOrigin.Y );
+
+        Point contentZoomOrigin = _trueContent.TranslatePoint( viewportZoomOrigin, _content );
+
+        if( contentZoomOrigin.X < 0 )
+        {
+          contentZoomOrigin.X = 0;
+        }
+        else if( contentZoomOrigin.X > _content.RenderSize.Width )
+        {
+          contentZoomOrigin.X = _content.RenderSize.Width;
+        }
+
+        if( contentZoomOrigin.Y < 0 )
+        {
+          contentZoomOrigin.Y = 0;
+        }
+        else if( contentZoomOrigin.Y > _content.RenderSize.Height )
+        {
+          contentZoomOrigin.Y = _content.RenderSize.Height;
+        }
+
+        zoomPoint = contentZoomOrigin;
+      }
+      else
+      {
+        zoomPoint = new Point( _content.RenderSize.Width * ZoomOrigin.X, _content.RenderSize.Height * ZoomOrigin.Y );
+      }
+
+      return zoomPoint;
+    }
+
+    #region OnKeyDown Methods
+
+    protected override void OnPreviewKeyDown( KeyEventArgs e )
+    {
+      if( this.NavigateOnPreview && !e.Handled )
+      {
+        this.ProcessNavigationButton( e );
+      }
+
+      base.OnPreviewKeyDown( e );
+    }
+
+    protected override void OnKeyDown( KeyEventArgs e )
+    {
+      if( !this.NavigateOnPreview && !e.Handled )
+      {
+        this.ProcessNavigationButton( e );
+      }
+
+      base.OnKeyDown( e );
+    }
+
+    #endregion
+
+    #region OnMouseDown Methods
+
+    protected override void OnPreviewMouseDown( MouseButtonEventArgs e )
+    {
+      if( this.NavigateOnPreview && !e.Handled )
+      {
+        this.ProcessNavigationButton( e );
+      }
+
+      base.OnPreviewMouseDown( e );
+    }
+
+    protected override void OnMouseDown( MouseButtonEventArgs e )
+    {
+      if( !this.NavigateOnPreview && !e.Handled )
+      {
+        this.ProcessNavigationButton( e );
+      }
+
+      base.OnMouseDown( e );
+    }
+
+    #endregion
+
+    #region OnMouseEnter Methods
+
+    protected override void OnMouseEnter( MouseEventArgs e )
+    {
+      this.MonitorInput();
+
+      base.OnMouseEnter( e );
+    }
+
+    #endregion
+
+    #region OnMouseLeave Methods
+
+    protected override void OnMouseLeave( MouseEventArgs e )
+    {
+      this.MonitorInput();
+
+      base.OnMouseLeave( e );
+    }
+
+    #endregion
+
+    #region OnMouseLeftButton Methods
+
+    protected override void OnPreviewMouseLeftButtonDown( MouseButtonEventArgs e )
+    {
+      if( this.DragOnPreview && !e.Handled && _contentPresenter != null )
+      {
+        this.ProcessMouseLeftButtonDown( e );
+      }
+
+      base.OnPreviewMouseLeftButtonDown( e );
+    }
+
+    protected override void OnMouseLeftButtonDown( MouseButtonEventArgs e )
+    {
+      if( !this.DragOnPreview && !e.Handled && _contentPresenter != null )
+      {
+        this.ProcessMouseLeftButtonDown( e );
+      }
+
+      base.OnMouseLeftButtonDown( e );
+    }
+
+    protected override void OnPreviewMouseLeftButtonUp( MouseButtonEventArgs e )
+    {
+      if( this.DragOnPreview && !e.Handled && _contentPresenter != null )
+      {
+        this.ProcessMouseLeftButtonUp( e );
+      }
+
+      base.OnPreviewMouseLeftButtonUp( e );
+    }
+
+    protected override void OnMouseLeftButtonUp( MouseButtonEventArgs e )
+    {
+      if( !this.DragOnPreview && !e.Handled && _contentPresenter != null )
+      {
+        this.ProcessMouseLeftButtonUp( e );
+      }
+
+      base.OnMouseLeftButtonUp( e );
+    }
+
+    #endregion
+
+    #region OnMouseMove Methods
+
+    protected override void OnPreviewMouseMove( MouseEventArgs e )
+    {
+      if( this.DragOnPreview && !e.Handled && _contentPresenter != null )
+      {
+        this.ProcessMouseMove( e );
+      }
+
+      base.OnPreviewMouseMove( e );
+    }
+
+    protected override void OnMouseMove( MouseEventArgs e )
+    {
+      if( !this.DragOnPreview && !e.Handled && _contentPresenter != null )
+      {
+        this.ProcessMouseMove( e );
+      }
+
+      base.OnMouseMove( e );
+    }
+
+    #endregion
+
+    #region OnMouseWheel Methods
+
+    protected override void OnPreviewMouseWheel( MouseWheelEventArgs e )
+    {
+      if( this.ZoomOnPreview && !e.Handled && _contentPresenter != null )
+      {
+        this.ProcessMouseWheelZoom( e );
+      }
+
+      base.OnPreviewMouseWheel( e );
+    }
+
+    protected override void OnMouseWheel( MouseWheelEventArgs e )
+    {
+      if( !this.ZoomOnPreview && !e.Handled && _contentPresenter != null )
+      {
+        this.ProcessMouseWheelZoom( e );
+      }
+
+      base.OnMouseWheel( e );
+    }
+
+    #endregion
+
+    #region Private Fields
+
+    // the default value for a single mouse wheel delta appears to be 28
+    private static int MOUSE_WHEEL_DELTA = 28;
+
+    // the content control's one and only content presenter
+    private ContentPresenter _contentPresenter = null;
+
+    // the content of the Zoombox (cast as a UIElement)
+    private UIElement _content = null;
+
+    // the drag adorner used for selecting a region in a zoom-to-selection operation
+    private DragAdorner _dragAdorner = null;
+
+    // the view stack
+    private ZoomboxViewStack _viewStack = null;
+
+    // the view finder display panel
+    // this is used to show the current viewport
+    private ZoomboxViewFinderDisplay _viewFinderDisplay = null;
+
+    // state variables used during drag and select operations
+    private Rect _resizeViewportBounds = Rect.Empty;
+    private Point _resizeAnchorPoint = new Point( 0, 0 );
+    private Point _resizeDraggingPoint = new Point( 0, 0 );
+    private Point _originPoint = new Point( 0, 0 );
+
+    private double _viewboxFactor = 1.0;
+    private double _relativeScale = 1.0;
+    private Point _relativePosition = new Point();
+    private Point _basePosition = new Point();
+
+    // used to track the time delta between stack operations
+    private DateTime _lastStackAddition;
+
+    // used to provide stack index when view changes
+    private int _lastViewIndex = -1;
+
+    private BitVector32 _cacheBits = new BitVector32( 0 );
+
+    #endregion
+
+    #region ViewFinderSelectionConverter Nested Type
+
+    private sealed class ViewFinderSelectionConverter : IValueConverter
+    {
+      public ViewFinderSelectionConverter( Zoombox zoombox )
+      {
+        _zoombox = zoombox;
+      }
+
+      public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
+      {
+        Rect viewport = ( Rect )value;
+        if( viewport.IsEmpty )
+          return viewport;
+
+        // adjust the viewport from the coordinate space of the Content element
+        // to the coordinate space of the view finder display panel
+        double scale = _zoombox._viewFinderDisplay.Scale * _zoombox._viewboxFactor;
+        Rect result = new Rect( viewport.Left * scale, viewport.Top * scale,
+            viewport.Width * scale, viewport.Height * scale );
+        result.Offset( _zoombox._viewFinderDisplay.ContentBounds.Left,
+            _zoombox._viewFinderDisplay.ContentBounds.Top );
+        return result;
+      }
+
+      public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
+      {
+        return null;
+      }
+
+      private readonly Zoombox _zoombox;
+    }
+
+    #endregion
+
+    #region DragAdorner Nested Type
+
+    internal sealed class DragAdorner : Adorner
+    {
+      public DragAdorner( UIElement adornedElement )
+        : base( adornedElement )
+      {
+        this.ClipToBounds = true;
+      }
+
+      public static readonly DependencyProperty BrushProperty =
+        DependencyProperty.Register( "Brush", typeof( Brush ), typeof( DragAdorner ),
+          new FrameworkPropertyMetadata( Brushes.Transparent, FrameworkPropertyMetadataOptions.AffectsRender ) );
+
+      public Brush Brush
+      {
+        get
+        {
+          return ( Brush )this.GetValue( DragAdorner.BrushProperty );
+        }
+        set
+        {
+          this.SetValue( DragAdorner.BrushProperty, value );
+        }
+      }
+
+      public static readonly DependencyProperty PenProperty =
+        DependencyProperty.Register( "Pen", typeof( Pen ), typeof( DragAdorner ),
+          new FrameworkPropertyMetadata( new Pen( new SolidColorBrush( Color.FromArgb( 0x7F, 0x3F, 0x3F, 0x3F ) ), 2d ), FrameworkPropertyMetadataOptions.AffectsRender ) );
+
+      public Pen Pen
+      {
+        get
+        {
+          return ( Pen )this.GetValue( DragAdorner.PenProperty );
+        }
+        set
+        {
+          this.SetValue( DragAdorner.PenProperty, value );
+        }
+      }
+
+      public static readonly DependencyProperty RectProperty =
+        DependencyProperty.Register( "Rect", typeof( Rect ), typeof( DragAdorner ),
+          new FrameworkPropertyMetadata( Rect.Empty, FrameworkPropertyMetadataOptions.AffectsRender,
+            new PropertyChangedCallback( DragAdorner.OnRectChanged ) ) );
+
+      public Rect Rect
+      {
+        get
+        {
+          return ( Rect )this.GetValue( DragAdorner.RectProperty );
+        }
+        set
+        {
+          this.SetValue( DragAdorner.RectProperty, value );
+        }
+      }
+
+      private static void OnRectChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+      {
+        DragAdorner dragAdorner = ( DragAdorner )d;
+        Rect rect = ( Rect )e.NewValue;
+
+        // ignore empty values
+        if( rect.IsEmpty )
+          return;
+
+        // if the value is not empty, cache the position and size
+        dragAdorner._cachedPosition = ( ( Rect )e.NewValue ).TopLeft;
+        dragAdorner._cachedSize = ( ( Rect )e.NewValue ).Size;
+      }
+
+      public Point LastPosition
+      {
+        get
+        {
+          return _cachedPosition;
+        }
+      }
+
+      public Size LastSize
+      {
+        get
+        {
+          return _cachedSize;
+        }
+      }
+
+      protected override void OnRender( DrawingContext drawingContext )
+      {
+        drawingContext.DrawRectangle( Brush, Pen, Rect );
+      }
+
+      private Point _cachedPosition;
+      private Size _cachedSize;
+    }
+
+    #endregion
+
+    #region CacheBits Nested Type
+
+    private enum CacheBits
+    {
+      IsUpdatingView = 0x00000001,
+      IsUpdatingViewport = 0x00000002,
+      IsDraggingViewport = 0x00000004,
+      IsResizingViewport = 0x00000008,
+      IsMonitoringInput = 0x00000010,
+      IsContentWrapped = 0x00000020,
+      HasArrangedContentPresenter = 0x00000040,
+      HasRenderedFirstView = 0x00000080,
+      RefocusViewOnFirstRender = 0x00000100,
+      HasUIPermission = 0x00000200,
+    }
+
+    #endregion
+
+    #region ResizeEdge Nested Type
+
+    private enum ResizeEdge
+    {
+      None,
+      TopLeft,
+      TopRight,
+      BottomLeft,
+      BottomRight,
+      Left,
+      Top,
+      Right,
+      Bottom,
+    }
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxCursors.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxCursors.cs
new file mode 100644
index 00000000..960504dc
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxCursors.cs
@@ -0,0 +1,76 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Reflection;
+using System.Security;
+using System.Security.Permissions;
+using System.Windows.Input;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+
+namespace Xceed.Wpf.Toolkit.Zoombox
+{
+  public class ZoomboxCursors
+  {
+    #region Constructors
+
+    static ZoomboxCursors()
+    {
+      try
+      {
+        new EnvironmentPermission( PermissionState.Unrestricted ).Demand();
+        _zoom = new Cursor( ResourceHelper.LoadResourceStream( Assembly.GetExecutingAssembly(), "Zoombox/Resources/Zoom.cur" ) );
+        _zoomRelative = new Cursor( ResourceHelper.LoadResourceStream( Assembly.GetExecutingAssembly(), "Zoombox/Resources/ZoomRelative.cur" ) );
+      }
+      catch( SecurityException )
+      {
+        // partial trust, so just use default cursors
+      }
+    }
+
+    #endregion
+
+    #region Zoom Static Property
+
+    public static Cursor Zoom
+    {
+      get
+      {
+        return _zoom;
+      }
+    }
+
+    private static readonly Cursor _zoom = Cursors.Arrow;
+
+    #endregion
+
+    #region ZoomRelative Static Property
+
+    public static Cursor ZoomRelative
+    {
+      get
+      {
+        return _zoomRelative;
+      }
+    }
+
+    private static readonly Cursor _zoomRelative = Cursors.Arrow;
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxView.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxView.cs
new file mode 100644
index 00000000..f1776222
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxView.cs
@@ -0,0 +1,317 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.ComponentModel;
+using System.Windows;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+using Xceed.Wpf.Toolkit.Core;
+
+namespace Xceed.Wpf.Toolkit.Zoombox
+{
+  [TypeConverter( typeof( ZoomboxViewConverter ) )]
+  public class ZoomboxView
+  {
+    #region Constructors
+
+    public ZoomboxView()
+    {
+    }
+
+    public ZoomboxView( double scale )
+    {
+      this.Scale = scale;
+    }
+
+    public ZoomboxView( Point position )
+    {
+      this.Position = position;
+    }
+
+    public ZoomboxView( double scale, Point position )
+    {
+      this.Position = position;
+      this.Scale = scale;
+    }
+
+    public ZoomboxView( Rect region )
+    {
+      this.Region = region;
+    }
+
+    public ZoomboxView( double x, double y )
+      : this( new Point( x, y ) )
+    {
+    }
+
+    public ZoomboxView( double scale, double x, double y )
+      : this( scale, new Point( x, y ) )
+    {
+    }
+
+    public ZoomboxView( double x, double y, double width, double height )
+      : this( new Rect( x, y, width, height ) )
+    {
+    }
+
+    #endregion
+
+    #region Empty Static Property
+
+    public static ZoomboxView Empty
+    {
+      get
+      {
+        return _empty;
+      }
+    }
+
+    private static readonly ZoomboxView _empty = new ZoomboxView( ZoomboxViewKind.Empty );
+
+    #endregion
+
+    #region Fill Static Property
+
+    public static ZoomboxView Fill
+    {
+      get
+      {
+        return _fill;
+      }
+    }
+
+    private static readonly ZoomboxView _fill = new ZoomboxView( ZoomboxViewKind.Fill );
+
+    #endregion
+
+    #region Fit Static Property
+
+    public static ZoomboxView Fit
+    {
+      get
+      {
+        return _fit;
+      }
+    }
+
+    private static readonly ZoomboxView _fit = new ZoomboxView( ZoomboxViewKind.Fit );
+
+    #endregion
+
+    #region Center Static Property
+
+    public static ZoomboxView Center
+    {
+      get
+      {
+        return _center;
+      }
+    }
+
+    private static readonly ZoomboxView _center = new ZoomboxView( ZoomboxViewKind.Center );
+
+    #endregion
+
+    #region ViewKind Property
+
+    public ZoomboxViewKind ViewKind
+    {
+      get
+      {
+        if( _kindHeight > 0 )
+        {
+          return ZoomboxViewKind.Region;
+        }
+        else
+        {
+          return ( ZoomboxViewKind )( int )_kindHeight;
+        }
+      }
+    }
+
+    private double _kindHeight = ( int )ZoomboxViewKind.Empty;
+
+    #endregion
+
+    #region Position Property
+
+    public Point Position
+    {
+      get
+      {
+        if( this.ViewKind != ZoomboxViewKind.Absolute )
+          throw new InvalidOperationException( ErrorMessages.GetMessage( "PositionOnlyAccessibleOnAbsolute" ) );
+
+        return new Point( _x, _y );
+      }
+      set
+      {
+        if( this.ViewKind != ZoomboxViewKind.Absolute && this.ViewKind != ZoomboxViewKind.Empty )
+          throw new InvalidOperationException( String.Format( ErrorMessages.GetMessage( "ZoomboxViewAlreadyInitialized" ), this.ViewKind.ToString() ) );
+
+        _x = value.X;
+        _y = value.Y;
+        _kindHeight = ( int )ZoomboxViewKind.Absolute;
+      }
+    }
+
+    private double _x = double.NaN;
+    private double _y = double.NaN;
+
+    #endregion
+
+    #region Scale Property
+
+    public double Scale
+    {
+      get
+      {
+        if( this.ViewKind != ZoomboxViewKind.Absolute )
+          throw new InvalidOperationException( ErrorMessages.GetMessage( "ScaleOnlyAccessibleOnAbsolute" ) );
+
+        return _scaleWidth;
+      }
+      set
+      {
+        if( this.ViewKind != ZoomboxViewKind.Absolute && this.ViewKind != ZoomboxViewKind.Empty )
+          throw new InvalidOperationException( String.Format( ErrorMessages.GetMessage( "ZoomboxViewAlreadyInitialized" ), this.ViewKind.ToString() ) );
+
+        _scaleWidth = value;
+        _kindHeight = ( int )ZoomboxViewKind.Absolute;
+      }
+    }
+
+    private double _scaleWidth = double.NaN;
+
+    #endregion
+
+    #region Region Property
+
+    public Rect Region
+    {
+      get
+      {
+        // a region view has a positive _typeHeight value
+        if( _kindHeight < 0 )
+          throw new InvalidOperationException( ErrorMessages.GetMessage( "RegionOnlyAccessibleOnRegionalView" ) );
+
+        return new Rect( _x, _y, _scaleWidth, _kindHeight );
+      }
+      set
+      {
+        if( this.ViewKind != ZoomboxViewKind.Region && this.ViewKind != ZoomboxViewKind.Empty )
+          throw new InvalidOperationException( String.Format( ErrorMessages.GetMessage( "ZoomboxViewAlreadyInitialized" ), this.ViewKind.ToString() ) );
+
+        if( !value.IsEmpty )
+        {
+          _x = value.X;
+          _y = value.Y;
+          _scaleWidth = value.Width;
+          _kindHeight = value.Height;
+        }
+      }
+    }
+
+    #endregion
+
+    public override int GetHashCode()
+    {
+      return _x.GetHashCode() ^ _y.GetHashCode() ^ _scaleWidth.GetHashCode() ^ _kindHeight.GetHashCode();
+    }
+
+    public override bool Equals( object o )
+    {
+      bool result = false;
+      if( o is ZoomboxView )
+      {
+        ZoomboxView other = ( ZoomboxView )o;
+        if( this.ViewKind == other.ViewKind )
+        {
+          switch( this.ViewKind )
+          {
+            case ZoomboxViewKind.Absolute:
+              result = ( DoubleHelper.AreVirtuallyEqual( _scaleWidth, other._scaleWidth ) )
+                    && ( DoubleHelper.AreVirtuallyEqual( Position, other.Position ) );
+              break;
+
+            case ZoomboxViewKind.Region:
+              result = DoubleHelper.AreVirtuallyEqual( Region, other.Region );
+              break;
+
+            default:
+              result = true;
+              break;
+          }
+        }
+      }
+      return result;
+    }
+
+    public override string ToString()
+    {
+      switch( ViewKind )
+      {
+        case ZoomboxViewKind.Empty:
+          return "ZoomboxView: Empty";
+
+        case ZoomboxViewKind.Center:
+          return "ZoomboxView: Center";
+
+        case ZoomboxViewKind.Fill:
+          return "ZoomboxView: Fill";
+
+        case ZoomboxViewKind.Fit:
+          return "ZoomboxView: Fit";
+
+        case ZoomboxViewKind.Absolute:
+          return string.Format( "ZoomboxView: Scale = {0}; Position = ({1}, {2})", _scaleWidth.ToString( "f" ), _x.ToString( "f" ), _y.ToString( "f" ) );
+
+        case ZoomboxViewKind.Region:
+          return string.Format( "ZoomboxView: Region = ({0}, {1}, {2}, {3})", _x.ToString( "f" ), _y.ToString( "f" ), _scaleWidth.ToString( "f" ), _kindHeight.ToString( "f" ) );
+      }
+
+      return base.ToString();
+    }
+
+    private ZoomboxView( ZoomboxViewKind viewType )
+    {
+      _kindHeight = ( int )viewType;
+    }
+
+    #region Operators Methods
+
+    public static bool operator ==( ZoomboxView v1, ZoomboxView v2 )
+    {
+      if( ( object )v1 == null )
+        return ( object )v2 == null;
+
+      if( ( object )v2 == null )
+        return ( object )v1 == null;
+
+      return v1.Equals( v2 );
+    }
+
+    public static bool operator !=( ZoomboxView v1, ZoomboxView v2 )
+    {
+      return !( v1 == v2 );
+    }
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewChangedEventArgs.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewChangedEventArgs.cs
new file mode 100644
index 00000000..bc7b6d2c
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewChangedEventArgs.cs
@@ -0,0 +1,99 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using Xceed.Wpf.Toolkit.Core;
+
+namespace Xceed.Wpf.Toolkit.Zoombox
+{
+  public class ZoomboxViewChangedEventArgs : PropertyChangedEventArgs<ZoomboxView>
+  {
+    #region Constructors
+
+    public ZoomboxViewChangedEventArgs(
+      ZoomboxView oldView,
+      ZoomboxView newView,
+      int oldViewStackIndex,
+      int newViewStackIndex )
+      : base( Zoombox.CurrentViewChangedEvent, oldView, newView )
+    {
+      _newViewStackIndex = newViewStackIndex;
+      _oldViewStackIndex = oldViewStackIndex;
+    }
+
+    #endregion
+
+    #region NewViewStackIndex Property
+
+    public int NewViewStackIndex
+    {
+      get
+      {
+        return _newViewStackIndex;
+      }
+    }
+
+    private readonly int _newViewStackIndex = -1;
+
+    #endregion
+
+    #region NewViewStackIndex Property
+
+    public int OldViewStackIndex
+    {
+      get
+      {
+        return _oldViewStackIndex;
+      }
+    }
+
+    private readonly int _oldViewStackIndex = -1;
+
+    #endregion
+
+    #region NewViewStackIndex Property
+
+    public bool IsNewViewFromStack
+    {
+      get
+      {
+        return _newViewStackIndex >= 0;
+      }
+    }
+
+    #endregion
+
+    #region NewViewStackIndex Property
+
+    public bool IsOldViewFromStack
+    {
+      get
+      {
+        return _oldViewStackIndex >= 0;
+      }
+    }
+
+    #endregion
+
+    protected override void InvokeEventHandler( Delegate genericHandler, object genericTarget )
+    {
+      ( ( ZoomboxViewChangedEventHandler )genericHandler )( genericTarget, this );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewChangedEventHandler.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewChangedEventHandler.cs
new file mode 100644
index 00000000..8662caf5
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewChangedEventHandler.cs
@@ -0,0 +1,23 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit.Zoombox
+{
+  public delegate void ZoomboxViewChangedEventHandler( object sender, ZoomboxViewChangedEventArgs e );
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewConverter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewConverter.cs
new file mode 100644
index 00000000..6e77d7b1
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewConverter.cs
@@ -0,0 +1,210 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Globalization;
+using System.Windows;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+
+namespace Xceed.Wpf.Toolkit.Zoombox
+{
+  public sealed class ZoomboxViewConverter : TypeConverter
+  {
+    #region Converter Static Property
+
+    internal static ZoomboxViewConverter Converter
+    {
+      get
+      {
+        if( _converter == null )
+        {
+          _converter = new ZoomboxViewConverter();
+        }
+        return _converter;
+      }
+    }
+
+    private static ZoomboxViewConverter _converter; //null
+
+    #endregion
+
+    public override bool CanConvertFrom( ITypeDescriptorContext typeDescriptorContext, Type type )
+    {
+      return ( type == typeof( string ) )
+          || ( type == typeof( double ) )
+          || ( type == typeof( Point ) )
+          || ( type == typeof( Rect ) )
+          || ( base.CanConvertFrom( typeDescriptorContext, type ) );
+    }
+
+    public override bool CanConvertTo( ITypeDescriptorContext typeDescriptorContext, Type type )
+    {
+      return ( type == typeof( string ) )
+          || ( base.CanConvertTo( typeDescriptorContext, type ) );
+    }
+
+    public override object ConvertFrom( 
+      ITypeDescriptorContext typeDescriptorContext,
+      CultureInfo cultureInfo, 
+      object value )
+    {
+      ZoomboxView result = null;
+      if( value is double )
+      {
+        result = new ZoomboxView( ( double )value );
+      }
+      else if( value is Point )
+      {
+        result = new ZoomboxView( ( Point )value );
+      }
+      else if( value is Rect )
+      {
+        result = new ZoomboxView( ( Rect )value );
+      }
+      else if( value is string )
+      {
+        if( string.IsNullOrEmpty( ( value as string ).Trim() ) )
+        {
+          result = ZoomboxView.Empty;
+        }
+        else
+        {
+          switch( ( value as string ).Trim().ToLower() )
+          {
+            case "center":
+              result = ZoomboxView.Center;
+              break;
+
+            case "empty":
+              result = ZoomboxView.Empty;
+              break;
+
+            case "fill":
+              result = ZoomboxView.Fill;
+              break;
+
+            case "fit":
+              result = ZoomboxView.Fit;
+              break;
+
+            default:
+              // parse double values; respect the following separators: ' ', ';', or ','
+              List<double> values = new List<double>();
+              foreach( string token in ( value as string ).Split( new char[] { ' ', ';', ',' }, StringSplitOptions.RemoveEmptyEntries ) )
+              {
+                double d;
+                if( double.TryParse( token, out d ) )
+                {
+                  values.Add( d );
+                }
+                if( values.Count >= 4 )
+                {
+                  // disregard additional values
+                  break;
+                }
+              }
+
+              switch( values.Count )
+              {
+                case 1: // scale
+                  result = new ZoomboxView( values[ 0 ] );
+                  break;
+
+                case 2: // x, y
+                  result = new ZoomboxView( values[ 0 ], values[ 1 ] );
+                  break;
+
+                case 3: // scale, x, y
+                  result = new ZoomboxView( values[ 0 ], values[ 1 ], values[ 2 ] );
+                  break;
+
+                case 4: // x, y, width, height
+                  result = new ZoomboxView( values[ 0 ], values[ 1 ], values[ 2 ], values[ 3 ] );
+                  break;
+              }
+              break;
+          }
+        }
+      }
+      return ( result == null ? base.ConvertFrom( typeDescriptorContext, cultureInfo, value ) : result );
+    }
+
+    public override object ConvertTo( 
+      ITypeDescriptorContext typeDescriptorContext,
+      CultureInfo cultureInfo, 
+      object value, 
+      Type destinationType )
+    {
+      object result = null;
+      ZoomboxView view = value as ZoomboxView;
+
+      if( view != null )
+      {
+        if( destinationType == typeof( string ) )
+        {
+          result = "Empty";
+          switch( view.ViewKind )
+          {
+            case ZoomboxViewKind.Absolute:
+              if( PointHelper.IsEmpty( view.Position ) )
+              {
+                if( !DoubleHelper.IsNaN( view.Scale ) )
+                {
+                  result = view.Scale.ToString();
+                }
+              }
+              else if( DoubleHelper.IsNaN( view.Scale ) )
+              {
+                result = view.Position.X.ToString() + "," + view.Position.Y.ToString();
+              }
+              else
+              {
+                result = view.Scale.ToString() + ","
+                    + view.Position.X.ToString() + ","
+                    + view.Position.Y.ToString();
+              }
+              break;
+
+            case ZoomboxViewKind.Center:
+              result = "Center";
+              break;
+
+            case ZoomboxViewKind.Fill:
+              result = "Fill";
+              break;
+
+            case ZoomboxViewKind.Fit:
+              result = "Fit";
+              break;
+
+            case ZoomboxViewKind.Region:
+              result = view.Region.X.ToString() + ","
+                  + view.Region.Y.ToString() + ","
+                  + view.Region.Width.ToString() + ","
+                  + view.Region.Height.ToString();
+              break;
+          }
+        }
+      }
+      return ( result == null ? base.ConvertTo( typeDescriptorContext, cultureInfo, value, destinationType ) : result );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewException.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewException.cs
new file mode 100644
index 00000000..142be476
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewException.cs
@@ -0,0 +1,35 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+
+namespace Xceed.Wpf.Toolkit.Zoombox
+{
+  public class ZoomboxViewException : Exception
+  {
+    #region Constructors
+
+    public ZoomboxViewException( string message ) 
+      : base( message )
+    {
+    }
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewFinderDisplay.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewFinderDisplay.cs
new file mode 100644
index 00000000..f9f5baef
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewFinderDisplay.cs
@@ -0,0 +1,287 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Media;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+
+namespace Xceed.Wpf.Toolkit.Zoombox
+{
+  public class ZoomboxViewFinderDisplay : FrameworkElement
+  {
+    #region Constructors
+
+    static ZoomboxViewFinderDisplay()
+    {
+      ZoomboxViewFinderDisplay.DefaultStyleKeyProperty.OverrideMetadata( typeof( ZoomboxViewFinderDisplay ), new FrameworkPropertyMetadata( typeof( ZoomboxViewFinderDisplay ) ) );
+    }
+
+    public ZoomboxViewFinderDisplay()
+    {
+    }
+
+    #endregion
+
+    #region Background Property
+
+    public static readonly DependencyProperty BackgroundProperty =
+      DependencyProperty.Register( "Background", typeof( Brush ), typeof( ZoomboxViewFinderDisplay ),
+        new FrameworkPropertyMetadata( new SolidColorBrush( Color.FromArgb( 0xC0, 0xFF, 0xFF, 0xFF ) ), FrameworkPropertyMetadataOptions.AffectsRender ) );
+
+    public Brush Background
+    {
+      get
+      {
+        return ( Brush )this.GetValue( ZoomboxViewFinderDisplay.BackgroundProperty );
+      }
+      set
+      {
+        this.SetValue( ZoomboxViewFinderDisplay.BackgroundProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region ContentBounds Property
+
+    private static readonly DependencyPropertyKey ContentBoundsPropertyKey =
+      DependencyProperty.RegisterReadOnly( "ContentBounds", typeof( Rect ), typeof( ZoomboxViewFinderDisplay ),
+        new FrameworkPropertyMetadata( ( Rect )Rect.Empty, FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender ) );
+
+    public static readonly DependencyProperty ContentBoundsProperty = ZoomboxViewFinderDisplay.ContentBoundsPropertyKey.DependencyProperty;
+
+    internal Rect ContentBounds
+    {
+      get
+      {
+        return ( Rect )this.GetValue( ZoomboxViewFinderDisplay.ContentBoundsProperty );
+      }
+      set
+      {
+        this.SetValue( ZoomboxViewFinderDisplay.ContentBoundsPropertyKey, value );
+      }
+    }
+
+    #endregion
+
+    #region ShadowBrush Property
+
+    public static readonly DependencyProperty ShadowBrushProperty =
+      DependencyProperty.Register( "ShadowBrush", typeof( Brush ), typeof( ZoomboxViewFinderDisplay ),
+        new FrameworkPropertyMetadata( new SolidColorBrush( Color.FromArgb( 0x80, 0xFF, 0xFF, 0xFF ) ), FrameworkPropertyMetadataOptions.AffectsRender ) );
+
+    public Brush ShadowBrush
+    {
+      get
+      {
+        return ( Brush )this.GetValue( ZoomboxViewFinderDisplay.ShadowBrushProperty );
+      }
+      set
+      {
+        this.SetValue( ZoomboxViewFinderDisplay.ShadowBrushProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region ViewportBrush Property
+
+    public static readonly DependencyProperty ViewportBrushProperty =
+      DependencyProperty.Register( "ViewportBrush", typeof( Brush ), typeof( ZoomboxViewFinderDisplay ),
+        new FrameworkPropertyMetadata( Brushes.Transparent, FrameworkPropertyMetadataOptions.AffectsRender ) );
+
+    public Brush ViewportBrush
+    {
+      get
+      {
+        return ( Brush )this.GetValue( ZoomboxViewFinderDisplay.ViewportBrushProperty );
+      }
+      set
+      {
+        this.SetValue( ZoomboxViewFinderDisplay.ViewportBrushProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region ViewportPen Property
+
+    public static readonly DependencyProperty ViewportPenProperty =
+      DependencyProperty.Register( "ViewportPen", typeof( Pen ), typeof( ZoomboxViewFinderDisplay ),
+        new FrameworkPropertyMetadata( new Pen( new SolidColorBrush( Color.FromArgb( 0x80, 0x00, 0x00, 0x00 ) ), 1d ), FrameworkPropertyMetadataOptions.AffectsRender ) );
+
+    public Pen ViewportPen
+    {
+      get
+      {
+        return ( Pen )this.GetValue( ZoomboxViewFinderDisplay.ViewportPenProperty );
+      }
+      set
+      {
+        this.SetValue( ZoomboxViewFinderDisplay.ViewportPenProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region ViewportRect Property
+
+    public static readonly DependencyProperty ViewportRectProperty =
+      DependencyProperty.Register( "ViewportRect", typeof( Rect ), typeof( ZoomboxViewFinderDisplay ),
+        new FrameworkPropertyMetadata( Rect.Empty, FrameworkPropertyMetadataOptions.AffectsRender ) );
+
+    public Rect ViewportRect
+    {
+      get
+      {
+        return ( Rect )this.GetValue( ZoomboxViewFinderDisplay.ViewportRectProperty );
+      }
+      set
+      {
+        this.SetValue( ZoomboxViewFinderDisplay.ViewportRectProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region VisualBrush Property
+
+    private static readonly DependencyPropertyKey VisualBrushPropertyKey =
+      DependencyProperty.RegisterReadOnly( "VisualBrush", typeof( VisualBrush ), typeof( ZoomboxViewFinderDisplay ),
+        new FrameworkPropertyMetadata( ( VisualBrush )null ) );
+
+    public static readonly DependencyProperty VisualBrushProperty = ZoomboxViewFinderDisplay.VisualBrushPropertyKey.DependencyProperty;
+
+    internal VisualBrush VisualBrush
+    {
+      get
+      {
+        return ( VisualBrush )this.GetValue( ZoomboxViewFinderDisplay.VisualBrushProperty );
+      }
+      set
+      {
+        this.SetValue( ZoomboxViewFinderDisplay.VisualBrushPropertyKey, value );
+      }
+    }
+
+    #endregion
+
+    #region AvailableSize Internal Property
+
+    internal Size AvailableSize
+    {
+      get
+      {
+        return _availableSize;
+      }
+    }
+
+    private Size _availableSize = Size.Empty;
+
+    #endregion
+
+    #region Scale Internal Property
+
+    internal double Scale
+    {
+      get
+      {
+        return _scale;
+      }
+      set
+      {
+        _scale = value;
+      }
+    }
+
+    private double _scale = 1d;
+
+    #endregion
+
+    protected override Size ArrangeOverride( Size finalSize )
+    {
+      // Note that we do not call the Arrange method on any children
+      // because a ViewFinderDisplay has no children
+
+      // the control's RenderSize should always match its DesiredSize
+      return this.DesiredSize;
+    }
+
+    protected override Size MeasureOverride( Size availableSize )
+    {
+      // Note that we do not call the Measure method on any children
+      // because a ViewFinderDisplay has no children.  It is merely used 
+      // as a surface for the view finder's VisualBrush.
+
+      // store the available size for use by the Zoombox control
+      _availableSize = availableSize;
+
+      // Simulate size-to-content for the display panel by ensuring a width and height
+      // based on the content bounds. Otherwise, the display panel may have no size, since it doesn't 
+      // contain content.
+      double width = DoubleHelper.IsNaN( this.ContentBounds.Width ) ? 0 : Math.Max( 0, this.ContentBounds.Width );
+      double height = DoubleHelper.IsNaN( this.ContentBounds.Height ) ? 0 : Math.Max( 0, this.ContentBounds.Height );
+      Size displayPanelSize = new Size( width, height );
+
+      // Now ensure that the result fits within the available size while maintaining
+      // the width/height ratio of the content bounds
+      if( displayPanelSize.Width > availableSize.Width || displayPanelSize.Height > availableSize.Height )
+      {
+        double aspectX = availableSize.Width / displayPanelSize.Width;
+        double aspectY = availableSize.Height / displayPanelSize.Height;
+        double scale = ( aspectX < aspectY ) ? aspectX : aspectY;
+        displayPanelSize = new Size( displayPanelSize.Width * scale, displayPanelSize.Height * scale );
+      }
+
+      return displayPanelSize;
+    }
+
+    protected override void OnRender( DrawingContext dc )
+    {
+      base.OnRender( dc );
+
+      dc.DrawRectangle( this.Background, null, this.ContentBounds );
+
+      dc.DrawRectangle( this.VisualBrush, null, this.ContentBounds );
+
+      if( this.ViewportRect.IntersectsWith( new Rect( this.RenderSize ) ) )
+      {
+        // draw shadow rectangles over the non-viewport regions
+        Rect r1 = new Rect( new Point( 0, 0 ), new Size( this.RenderSize.Width, Math.Max( 0, this.ViewportRect.Top ) ) );
+        Rect r2 = new Rect( new Point( 0, this.ViewportRect.Top ), new Size( Math.Max( 0, this.ViewportRect.Left ), this.ViewportRect.Height ) );
+        Rect r3 = new Rect( new Point( this.ViewportRect.Right, this.ViewportRect.Top ), new Size( Math.Max( 0, this.RenderSize.Width - this.ViewportRect.Right ), this.ViewportRect.Height ) );
+        Rect r4 = new Rect( new Point( 0, this.ViewportRect.Bottom ), new Size( this.RenderSize.Width, Math.Max( 0, this.RenderSize.Height - this.ViewportRect.Bottom ) ) );
+        dc.DrawRectangle( this.ShadowBrush, null, r1 );
+        dc.DrawRectangle( this.ShadowBrush, null, r2 );
+        dc.DrawRectangle( this.ShadowBrush, null, r3 );
+        dc.DrawRectangle( this.ShadowBrush, null, r4 );
+
+        // draw the rectangle around the viewport region
+        dc.DrawRectangle( this.ViewportBrush, this.ViewportPen, this.ViewportRect );
+      }
+      else
+      {
+        // if no part of the Rect is visible, just draw a 
+        // shadow over the entire content bounds
+        dc.DrawRectangle( this.ShadowBrush, null, new Rect( this.RenderSize ) );
+      }
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewKind.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewKind.cs
new file mode 100644
index 00000000..f458c307
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewKind.cs
@@ -0,0 +1,32 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+
+namespace Xceed.Wpf.Toolkit.Zoombox
+{
+  public enum ZoomboxViewKind
+  {
+    Absolute = -5,
+    Fit = -4,
+    Fill = -3,
+    Center = -2,
+    Empty = -1,
+    Region,
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewStack.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewStack.cs
new file mode 100644
index 00000000..d083cd01
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewStack.cs
@@ -0,0 +1,558 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.Windows;
+using Xceed.Wpf.Toolkit.Core;
+
+namespace Xceed.Wpf.Toolkit.Zoombox
+{
+  public sealed class ZoomboxViewStack : Collection<ZoomboxView>, IWeakEventListener
+  {
+    #region Constructors
+
+    public ZoomboxViewStack( Zoombox zoombox )
+    {
+      _zoomboxRef = new WeakReference( zoombox );
+    }
+
+    #endregion
+
+    #region SelectedView Property
+
+    public ZoomboxView SelectedView
+    {
+      get
+      {
+        int currentIndex = this.Zoombox.ViewStackIndex;
+        return ( currentIndex < 0 || currentIndex > Count - 1 ) ? ZoomboxView.Empty : this[ currentIndex ];
+      }
+    }
+
+    #endregion
+
+    #region AreViewsFromSource Internal Property
+
+    internal bool AreViewsFromSource
+    {
+      get
+      {
+        return _cacheBits[ ( int )CacheBits.AreViewsFromSource ];
+      }
+      set
+      {
+        _cacheBits[ ( int )CacheBits.AreViewsFromSource ] = value;
+      }
+    }
+
+    #endregion
+
+    #region Source Internal Property
+
+    internal IEnumerable Source
+    {
+      get
+      {
+        return _source;
+      }
+    }
+
+    // if the view stack is generated by items within the ViewStackSource collection
+    // of the Zoombox, then we maintain a strong reference to the source
+    private IEnumerable _source; //null
+
+    #endregion
+
+    #region IsChangeFromSource Private Property
+
+    private bool IsChangeFromSource
+    {
+      get
+      {
+        return _cacheBits[ ( int )CacheBits.IsChangeFromSource ];
+      }
+      set
+      {
+        _cacheBits[ ( int )CacheBits.IsChangeFromSource ] = value;
+      }
+    }
+
+    #endregion
+
+    #region IsMovingViews Private Property
+
+    private bool IsMovingViews
+    {
+      get
+      {
+        return _cacheBits[ ( int )CacheBits.IsMovingViews ];
+      }
+      set
+      {
+        _cacheBits[ ( int )CacheBits.IsMovingViews ] = value;
+      }
+    }
+
+    #endregion
+
+    #region IsResettingViews Private Property
+
+    private bool IsResettingViews
+    {
+      get
+      {
+        return _cacheBits[ ( int )CacheBits.IsResettingViews ];
+      }
+      set
+      {
+        _cacheBits[ ( int )CacheBits.IsResettingViews ] = value;
+      }
+    }
+
+    #endregion
+
+    #region IsSettingInitialViewAfterClear Private Property
+
+    private bool IsSettingInitialViewAfterClear
+    {
+      get
+      {
+        return _cacheBits[ ( int )CacheBits.IsSettingInitialViewAfterClear ];
+      }
+      set
+      {
+        _cacheBits[ ( int )CacheBits.IsSettingInitialViewAfterClear ] = value;
+      }
+    }
+
+    #endregion
+
+    #region Zoombox Private Property
+
+    private Zoombox Zoombox
+    {
+      get
+      {
+        return _zoomboxRef.Target as Zoombox;
+      }
+    }
+
+    // maintain a weak reference to the Zoombox that owns the stack
+    private WeakReference _zoomboxRef;
+
+    #endregion
+
+    internal void ClearViewStackSource()
+    {
+      if( this.AreViewsFromSource )
+      {
+        this.AreViewsFromSource = false;
+        this.MonitorSource( false );
+        _source = null;
+        using( new SourceAccess( this ) )
+        {
+          this.Clear();
+        }
+        this.Zoombox.CoerceValue( Zoombox.ViewStackModeProperty );
+      }
+    }
+
+    internal void PushView( ZoomboxView view )
+    {
+      // clear the forward stack
+      int currentIndex = this.Zoombox.ViewStackIndex;
+      while( this.Count - 1 > currentIndex )
+      {
+        this.RemoveAt( Count - 1 );
+      }
+      this.Add( view );
+    }
+
+    internal void SetViewStackSource( IEnumerable source )
+    {
+      if( _source != source )
+      {
+        this.MonitorSource( false );
+        _source = source;
+        this.MonitorSource( true );
+        this.AreViewsFromSource = true;
+        this.Zoombox.CoerceValue( Zoombox.ViewStackModeProperty );
+        this.ResetViews();
+      }
+    }
+
+    protected override void ClearItems()
+    {
+      this.VerifyStackModification();
+
+      bool currentDeleted = ( this.Zoombox.CurrentViewIndex >= 0 );
+      base.ClearItems();
+      this.Zoombox.SetViewStackCount( Count );
+
+      // if resetting the views due to a change in the view source collection, just return
+      if( this.IsResettingViews )
+        return;
+
+      if( this.Zoombox.EffectiveViewStackMode == ZoomboxViewStackMode.Auto && this.Zoombox.CurrentView != ZoomboxView.Empty )
+      {
+        this.IsSettingInitialViewAfterClear = true;
+        try
+        {
+          this.Add( this.Zoombox.CurrentView );
+        }
+        finally
+        {
+          this.IsSettingInitialViewAfterClear = false;
+        }
+        this.Zoombox.ViewStackIndex = 0;
+        if( currentDeleted )
+        {
+          this.Zoombox.SetCurrentViewIndex( 0 );
+        }
+      }
+      else
+      {
+        this.Zoombox.ViewStackIndex = -1;
+        this.Zoombox.SetCurrentViewIndex( -1 );
+      }
+    }
+
+    protected override void InsertItem( int index, ZoomboxView view )
+    {
+      this.VerifyStackModification();
+
+      if( this.Zoombox.HasArrangedContentPresenter
+          && this.Zoombox.ViewStackIndex >= index
+          && !this.IsSettingInitialViewAfterClear
+          && !this.IsResettingViews
+          && !this.IsMovingViews )
+      {
+        bool oldUpdatingView = this.Zoombox.IsUpdatingView;
+        this.Zoombox.IsUpdatingView = true;
+        try
+        {
+          this.Zoombox.ViewStackIndex++;
+          if( this.Zoombox.CurrentViewIndex != -1 )
+          {
+            this.Zoombox.SetCurrentViewIndex( this.Zoombox.CurrentViewIndex + 1 );
+          }
+        }
+        finally
+        {
+          this.Zoombox.IsUpdatingView = oldUpdatingView;
+        }
+      }
+
+      base.InsertItem( index, view );
+      this.Zoombox.SetViewStackCount( Count );
+    }
+
+    protected override void RemoveItem( int index )
+    {
+      this.VerifyStackModification();
+
+      bool currentDeleted = ( this.Zoombox.ViewStackIndex == index );
+      if( !this.IsMovingViews )
+      {
+        // if an item below the current index was deleted 
+        // (or if the last item is currently selected and it was deleted),
+        // adjust the ViewStackIndex and CurrentViewIndex values
+        if( this.Zoombox.HasArrangedContentPresenter
+            && ( this.Zoombox.ViewStackIndex > index
+                || ( currentDeleted && this.Zoombox.ViewStackIndex == this.Zoombox.ViewStack.Count - 1 ) ) )
+        {
+          // if removing the last item, just clear the stack, which ensures the proper
+          // behavior based on the ViewStackMode
+          if( currentDeleted && this.Zoombox.ViewStack.Count == 1 )
+          {
+            this.Clear();
+            return;
+          }
+
+          bool oldUpdatingView = this.Zoombox.IsUpdatingView;
+          this.Zoombox.IsUpdatingView = true;
+          try
+          {
+            this.Zoombox.ViewStackIndex--;
+            if( this.Zoombox.CurrentViewIndex != -1 )
+            {
+              this.Zoombox.SetCurrentViewIndex( this.Zoombox.CurrentViewIndex - 1 );
+            }
+          }
+          finally
+          {
+            this.Zoombox.IsUpdatingView = oldUpdatingView;
+          }
+        }
+      }
+
+      base.RemoveItem( index );
+
+      // if the current view was deleted, we may need to update the view index 
+      // (unless a non-stack view is in effect)
+      if( !this.IsMovingViews && currentDeleted && this.Zoombox.CurrentViewIndex != -1 )
+      {
+        this.Zoombox.RefocusView();
+      }
+
+      this.Zoombox.SetViewStackCount( Count );
+    }
+
+    protected override void SetItem( int index, ZoomboxView view )
+    {
+      this.VerifyStackModification();
+
+      base.SetItem( index, view );
+
+      // if the set item is the current item, update the zoombox
+      if( index == this.Zoombox.CurrentViewIndex )
+      {
+        this.Zoombox.RefocusView();
+      }
+    }
+
+    private static ZoomboxView GetViewFromSourceItem( object item )
+    {
+      ZoomboxView view = ( item is ZoomboxView ) ? item as ZoomboxView : ZoomboxViewConverter.Converter.ConvertFrom( item ) as ZoomboxView;
+      if( view == null )
+        throw new InvalidCastException( string.Format( ErrorMessages.GetMessage( "UnableToConvertToZoomboxView" ), item ) );
+
+      return view;
+    }
+
+    private void InsertViews( int index, IList newItems )
+    {
+      using( new SourceAccess( this ) )
+      {
+        foreach( object item in newItems )
+        {
+          ZoomboxView view = ZoomboxViewStack.GetViewFromSourceItem( item );
+          if( index >= this.Count )
+          {
+            this.Add( view );
+          }
+          else
+          {
+            this.Insert( index, view );
+          }
+          index++;
+        }
+      }
+    }
+
+    private void MonitorSource( bool monitor )
+    {
+      if( _source != null && ( _source is INotifyCollectionChanged ) )
+      {
+        if( monitor )
+        {
+          CollectionChangedEventManager.AddListener( _source as INotifyCollectionChanged, this );
+        }
+        else
+        {
+          CollectionChangedEventManager.RemoveListener( _source as INotifyCollectionChanged, this );
+        }
+      }
+    }
+
+    private void MoveViews( int oldIndex, int newIndex, IList movedItems )
+    {
+      using( new SourceAccess( this ) )
+      {
+        int currentIndex = this.Zoombox.ViewStackIndex;
+        int indexAfterMove = currentIndex;
+
+        // adjust the current index, if it was affected by the move
+        if( !( ( oldIndex < currentIndex && newIndex < currentIndex )
+            || ( oldIndex > currentIndex && newIndex > currentIndex ) ) )
+        {
+          if( currentIndex >= oldIndex && currentIndex < oldIndex + movedItems.Count )
+          {
+            indexAfterMove += newIndex - oldIndex;
+          }
+          else if( currentIndex >= newIndex )
+          {
+            indexAfterMove += movedItems.Count;
+          }
+        }
+
+        this.IsMovingViews = true;
+        try
+        {
+          for( int i = 0; i < movedItems.Count; i++ )
+          {
+            this.RemoveAt( oldIndex );
+          }
+          for( int i = 0; i < movedItems.Count; i++ )
+          {
+            this.Insert( newIndex + i, ZoomboxViewStack.GetViewFromSourceItem( movedItems[ i ] ) );
+          }
+          if( indexAfterMove != currentIndex )
+          {
+            this.Zoombox.ViewStackIndex = indexAfterMove;
+            this.Zoombox.SetCurrentViewIndex( indexAfterMove );
+          }
+        }
+        finally
+        {
+          this.IsMovingViews = false;
+        }
+      }
+    }
+
+    private void OnSourceCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
+    {
+      switch( e.Action )
+      {
+        case NotifyCollectionChangedAction.Add:
+          this.InsertViews( e.NewStartingIndex, e.NewItems );
+          break;
+
+        case NotifyCollectionChangedAction.Move:
+          this.MoveViews( e.OldStartingIndex, e.NewStartingIndex, e.OldItems );
+          break;
+
+        case NotifyCollectionChangedAction.Remove:
+          this.RemoveViews( e.OldStartingIndex, e.OldItems );
+          break;
+
+        case NotifyCollectionChangedAction.Replace:
+          this.ResetViews();
+          break;
+
+        case NotifyCollectionChangedAction.Reset:
+          this.ResetViews();
+          break;
+      }
+    }
+
+    private void ResetViews()
+    {
+      using( new SourceAccess( this ) )
+      {
+        int currentIndex = this.Zoombox.ViewStackIndex;
+        this.IsResettingViews = true;
+        try
+        {
+          this.Clear();
+          foreach( object item in _source )
+          {
+            ZoomboxView view = ZoomboxViewStack.GetViewFromSourceItem( item );
+            this.Add( view );
+          }
+
+          currentIndex = Math.Min( Math.Max( 0, currentIndex ), this.Count - 1 );
+
+          this.Zoombox.ViewStackIndex = currentIndex;
+          this.Zoombox.SetCurrentViewIndex( currentIndex );
+          this.Zoombox.RefocusView();
+        }
+        finally
+        {
+          this.IsResettingViews = false;
+        }
+      }
+    }
+
+    private void RemoveViews( int index, IList removedItems )
+    {
+      using( new SourceAccess( this ) )
+      {
+        for( int i = 0; i < removedItems.Count; i++ )
+        {
+          this.RemoveAt( index );
+        }
+      }
+    }
+
+    private void VerifyStackModification()
+    {
+      if( this.AreViewsFromSource && !this.IsChangeFromSource )
+        throw new InvalidOperationException( ErrorMessages.GetMessage( "ViewStackCannotBeManipulatedNow" ) );
+    }
+
+    #region IWeakEventListener Members
+
+    public bool ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
+    {
+      if( managerType == typeof( CollectionChangedEventManager ) )
+      {
+        this.OnSourceCollectionChanged( sender, ( NotifyCollectionChangedEventArgs )e );
+      }
+      else
+      {
+        return false;
+      }
+
+      return true;
+    }
+
+    #endregion
+
+    #region Private Fields
+
+    // to save memory, store bool variables in a bit vector
+    private BitVector32 _cacheBits = new BitVector32( 0 );
+
+    #endregion
+
+    #region SourceAccess Nested Type
+
+    private sealed class SourceAccess : IDisposable
+    {
+      public SourceAccess( ZoomboxViewStack viewStack )
+      {
+        _viewStack = viewStack;
+        _viewStack.IsChangeFromSource = true;
+      }
+
+      ~SourceAccess()
+      {
+        this.Dispose();
+      }
+
+      public void Dispose()
+      {
+        _viewStack.IsChangeFromSource = false;
+        _viewStack = null;
+        GC.SuppressFinalize( this );
+      }
+
+      private ZoomboxViewStack _viewStack;
+    }
+
+    #endregion
+
+    #region CacheBits Nested Type
+
+    private enum CacheBits
+    {
+      AreViewsFromSource = 0x00000001,
+      IsChangeFromSource = 0x00000002,
+      IsResettingViews = 0x00000004,
+      IsMovingViews = 0x00000008,
+      IsSettingInitialViewAfterClear = 0x00000010,
+    }
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewStackMode.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewStackMode.cs
new file mode 100644
index 00000000..4b296f38
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewStackMode.cs
@@ -0,0 +1,29 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit.Zoombox
+{
+  public enum ZoomboxViewStackMode
+  {
+    Auto,
+    Default,
+    Disabled,
+    Manual,
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxZoomOn.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxZoomOn.cs
new file mode 100644
index 00000000..30eb5c0a
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Zoombox/ZoomboxZoomOn.cs
@@ -0,0 +1,27 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit.Zoombox
+{
+  public enum ZoomboxZoomOn
+  {
+    Content = 1,
+    View,
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/sn.snk b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/sn.snk
new file mode 100644
index 00000000..1bdc9120
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/sn.snk differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/ExtendedWPFToolkit.sln b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/ExtendedWPFToolkit.sln
new file mode 100644
index 00000000..399ab1f9
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/ExtendedWPFToolkit.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WPFToolkit.Extended", "Src\WPFToolkit.Extended\WPFToolkit.Extended.csproj", "{2C3149D9-832B-4754-A27B-898A392344B5}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{2C3149D9-832B-4754-A27B-898A392344B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2C3149D9-832B-4754-A27B-898A392344B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2C3149D9-832B-4754-A27B-898A392344B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2C3149D9-832B-4754-A27B-898A392344B5}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/AssemblyVersionInfo.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/AssemblyVersionInfo.cs
new file mode 100644
index 00000000..74011485
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/AssemblyVersionInfo.cs
@@ -0,0 +1,39 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+[assembly: System.Reflection.AssemblyVersion( _XceedVersionInfo.Version )]
+
+internal static class _XceedVersionInfo
+{
+  [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
+  public const string BaseVersion = "1.7";
+  [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
+  public const string Version = BaseVersion + 
+  _XceedVersionInfoCommon.Build;
+  [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
+  public const string PublicKeyToken = "ba83ff368b7563c6";
+  [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
+  public const string DesignFullName =
+    "Xceed.Wpf.Toolkit,Version=" +
+    Version +
+    ",Culture=neutral,PublicKeyToken=" + PublicKeyToken;
+
+
+
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/AssemblyVersionInfoCommon.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/AssemblyVersionInfoCommon.cs
new file mode 100644
index 00000000..d9308cb5
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/AssemblyVersionInfoCommon.cs
@@ -0,0 +1,25 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+internal static class _XceedVersionInfoCommon
+{
+[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
+  public const string Build = ".*";
+
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/BusyIndicator/Implementation/BusyIndicator.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/BusyIndicator/Implementation/BusyIndicator.cs
new file mode 100644
index 00000000..4a9e2678
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/BusyIndicator/Implementation/BusyIndicator.cs
@@ -0,0 +1,325 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Shapes;
+using System.Windows.Threading;
+
+namespace Xceed.Wpf.Toolkit
+{
+  /// <summary>
+  /// A control to provide a visual indicator when an application is busy.
+  /// </summary>
+  [TemplateVisualState( Name = VisualStates.StateIdle, GroupName = VisualStates.GroupBusyStatus )]
+  [TemplateVisualState( Name = VisualStates.StateBusy, GroupName = VisualStates.GroupBusyStatus )]
+  [TemplateVisualState( Name = VisualStates.StateVisible, GroupName = VisualStates.GroupVisibility )]
+  [TemplateVisualState( Name = VisualStates.StateHidden, GroupName = VisualStates.GroupVisibility )]
+  [StyleTypedProperty( Property = "OverlayStyle", StyleTargetType = typeof( Rectangle ) )]
+  [StyleTypedProperty( Property = "ProgressBarStyle", StyleTargetType = typeof( ProgressBar ) )]
+  public class BusyIndicator : ContentControl
+  {
+    #region Private Members
+
+    /// <summary>
+    /// Timer used to delay the initial display and avoid flickering.
+    /// </summary>
+    private DispatcherTimer _displayAfterTimer = new DispatcherTimer();
+
+    #endregion //Private Members
+
+    #region Constructors
+
+    static BusyIndicator()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( BusyIndicator ), new FrameworkPropertyMetadata( typeof( BusyIndicator ) ) );
+    }
+
+    public BusyIndicator()
+    {
+      _displayAfterTimer.Tick += DisplayAfterTimerElapsed;
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    /// <summary>
+    /// Overrides the OnApplyTemplate method.
+    /// </summary>
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+      ChangeVisualState( false );
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Properties
+
+    /// <summary>
+    /// Gets or sets a value indicating whether the BusyContent is visible.
+    /// </summary>
+    protected bool IsContentVisible
+    {
+      get;
+      set;
+    }
+
+    #endregion //Properties
+
+    #region Dependency Properties
+
+    #region IsBusy
+
+    /// <summary>
+    /// Identifies the IsBusy dependency property.
+    /// </summary>
+    public static readonly DependencyProperty IsBusyProperty = DependencyProperty.Register(
+        "IsBusy",
+        typeof( bool ),
+        typeof( BusyIndicator ),
+        new PropertyMetadata( false, new PropertyChangedCallback( OnIsBusyChanged ) ) );
+
+    /// <summary>
+    /// Gets or sets a value indicating whether the busy indicator should show.
+    /// </summary>
+    public bool IsBusy
+    {
+      get
+      {
+        return ( bool )GetValue( IsBusyProperty );
+      }
+      set
+      {
+        SetValue( IsBusyProperty, value );
+      }
+    }
+
+    /// <summary>
+    /// IsBusyProperty property changed handler.
+    /// </summary>
+    /// <param name="d">BusyIndicator that changed its IsBusy.</param>
+    /// <param name="e">Event arguments.</param>
+    private static void OnIsBusyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( BusyIndicator )d ).OnIsBusyChanged( e );
+    }
+
+    /// <summary>
+    /// IsBusyProperty property changed handler.
+    /// </summary>
+    /// <param name="e">Event arguments.</param>
+    protected virtual void OnIsBusyChanged( DependencyPropertyChangedEventArgs e )
+    {
+      if( IsBusy )
+      {
+        if( DisplayAfter.Equals( TimeSpan.Zero ) )
+        {
+          // Go visible now
+          IsContentVisible = true;
+        }
+        else
+        {
+          // Set a timer to go visible
+          _displayAfterTimer.Interval = DisplayAfter;
+          _displayAfterTimer.Start();
+        }
+      }
+      else
+      {
+        // No longer visible
+        _displayAfterTimer.Stop();
+        IsContentVisible = false;
+      }
+
+      ChangeVisualState( true );
+    }
+
+    #endregion //IsBusy
+
+    #region Busy Content
+
+    /// <summary>
+    /// Identifies the BusyContent dependency property.
+    /// </summary>
+    public static readonly DependencyProperty BusyContentProperty = DependencyProperty.Register(
+        "BusyContent",
+        typeof( object ),
+        typeof( BusyIndicator ),
+        new PropertyMetadata( null ) );
+
+    /// <summary>
+    /// Gets or sets a value indicating the busy content to display to the user.
+    /// </summary>
+    public object BusyContent
+    {
+      get
+      {
+        return ( object )GetValue( BusyContentProperty );
+      }
+      set
+      {
+        SetValue( BusyContentProperty, value );
+      }
+    }
+
+    #endregion //Busy Content
+
+    #region Busy Content Template
+
+    /// <summary>
+    /// Identifies the BusyTemplate dependency property.
+    /// </summary>
+    public static readonly DependencyProperty BusyContentTemplateProperty = DependencyProperty.Register(
+        "BusyContentTemplate",
+        typeof( DataTemplate ),
+        typeof( BusyIndicator ),
+        new PropertyMetadata( null ) );
+
+    /// <summary>
+    /// Gets or sets a value indicating the template to use for displaying the busy content to the user.
+    /// </summary>
+    public DataTemplate BusyContentTemplate
+    {
+      get
+      {
+        return ( DataTemplate )GetValue( BusyContentTemplateProperty );
+      }
+      set
+      {
+        SetValue( BusyContentTemplateProperty, value );
+      }
+    }
+
+    #endregion //Busy Content Template
+
+    #region Display After
+
+    /// <summary>
+    /// Identifies the DisplayAfter dependency property.
+    /// </summary>
+    public static readonly DependencyProperty DisplayAfterProperty = DependencyProperty.Register(
+        "DisplayAfter",
+        typeof( TimeSpan ),
+        typeof( BusyIndicator ),
+        new PropertyMetadata( TimeSpan.FromSeconds( 0.1 ) ) );
+
+    /// <summary>
+    /// Gets or sets a value indicating how long to delay before displaying the busy content.
+    /// </summary>
+    public TimeSpan DisplayAfter
+    {
+      get
+      {
+        return ( TimeSpan )GetValue( DisplayAfterProperty );
+      }
+      set
+      {
+        SetValue( DisplayAfterProperty, value );
+      }
+    }
+
+    #endregion //Display After
+
+    #region Overlay Style
+
+    /// <summary>
+    /// Identifies the OverlayStyle dependency property.
+    /// </summary>
+    public static readonly DependencyProperty OverlayStyleProperty = DependencyProperty.Register(
+        "OverlayStyle",
+        typeof( Style ),
+        typeof( BusyIndicator ),
+        new PropertyMetadata( null ) );
+
+    /// <summary>
+    /// Gets or sets a value indicating the style to use for the overlay.
+    /// </summary>
+    public Style OverlayStyle
+    {
+      get
+      {
+        return ( Style )GetValue( OverlayStyleProperty );
+      }
+      set
+      {
+        SetValue( OverlayStyleProperty, value );
+      }
+    }
+    #endregion //Overlay Style
+
+    #region ProgressBar Style
+
+    /// <summary>
+    /// Identifies the ProgressBarStyle dependency property.
+    /// </summary>
+    public static readonly DependencyProperty ProgressBarStyleProperty = DependencyProperty.Register(
+        "ProgressBarStyle",
+        typeof( Style ),
+        typeof( BusyIndicator ),
+        new PropertyMetadata( null ) );
+
+    /// <summary>
+    /// Gets or sets a value indicating the style to use for the progress bar.
+    /// </summary>
+    public Style ProgressBarStyle
+    {
+      get
+      {
+        return ( Style )GetValue( ProgressBarStyleProperty );
+      }
+      set
+      {
+        SetValue( ProgressBarStyleProperty, value );
+      }
+    }
+
+    #endregion //ProgressBar Style
+
+    #endregion //Dependency Properties
+
+    #region Methods
+
+    /// <summary>
+    /// Handler for the DisplayAfterTimer.
+    /// </summary>
+    /// <param name="sender">Event sender.</param>
+    /// <param name="e">Event arguments.</param>
+    private void DisplayAfterTimerElapsed( object sender, EventArgs e )
+    {
+      _displayAfterTimer.Stop();
+      IsContentVisible = true;
+      ChangeVisualState( true );
+    }
+
+    /// <summary>
+    /// Changes the control's visual state(s).
+    /// </summary>
+    /// <param name="useTransitions">True if state transitions should be used.</param>
+    protected virtual void ChangeVisualState( bool useTransitions )
+    {
+      VisualStateManager.GoToState( this, IsBusy ? VisualStates.StateBusy : VisualStates.StateIdle, useTransitions );
+      VisualStateManager.GoToState( this, IsContentVisible ? VisualStates.StateVisible : VisualStates.StateHidden, useTransitions );
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/BusyIndicator/Implementation/VisualStates.BusyIndicator.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/BusyIndicator/Implementation/VisualStates.BusyIndicator.cs
new file mode 100644
index 00000000..fa49289d
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/BusyIndicator/Implementation/VisualStates.BusyIndicator.cs
@@ -0,0 +1,54 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit
+{
+  internal static partial class VisualStates
+  {
+    /// <summary>
+    /// Busyness group name.
+    /// </summary>
+    public const string GroupBusyStatus = "BusyStatusStates";
+
+    /// <summary>
+    /// Busy state for BusyIndicator.
+    /// </summary>
+    public const string StateBusy = "Busy";
+
+    /// <summary>
+    /// Idle state for BusyIndicator.
+    /// </summary>
+    public const string StateIdle = "Idle";
+
+    /// <summary>
+    /// BusyDisplay group.
+    /// </summary>
+    public const string GroupVisibility = "VisibilityStates";
+
+    /// <summary>
+    /// Visible state name for BusyIndicator.
+    /// </summary>
+    public const string StateVisible = "Visible";
+
+    /// <summary>
+    /// Hidden state name for BusyIndicator.
+    /// </summary>
+    public const string StateHidden = "Hidden";
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/BusyIndicator/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/BusyIndicator/Themes/Generic.xaml
new file mode 100644
index 00000000..0e0b10cb
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/BusyIndicator/Themes/Generic.xaml
@@ -0,0 +1,163 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
+
+   <!-- =============================================================================== -->
+   <!-- BusyIndicator                                                                   -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type local:BusyIndicator}">
+      <Setter Property="BusyContent" Value="Please wait..." />
+      <Setter Property="IsTabStop" Value="False" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="OverlayStyle">
+         <Setter.Value>
+            <Style TargetType="Rectangle">
+               <Setter Property="Fill" Value="White" />
+               <Setter Property="Opacity" Value="0.5" />
+            </Style>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="ProgressBarStyle">
+         <Setter.Value>
+            <Style TargetType="ProgressBar">
+               <Setter Property="IsIndeterminate" Value="True" />
+               <Setter Property="Height" Value="15" />
+               <Setter Property="Margin" Value="8,0,8,8" />
+            </Style>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="DisplayAfter" Value="00:00:00.1" />
+      <Setter Property="HorizontalAlignment" Value="Stretch" />
+      <Setter Property="VerticalAlignment" Value="Stretch" />
+      <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+      <Setter Property="VerticalContentAlignment" Value="Stretch" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:BusyIndicator}">
+               <Grid>
+                  <VisualStateManager.VisualStateGroups>
+                     <VisualStateGroup x:Name="VisibilityStates">
+                        <VisualState x:Name="Hidden">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="busycontent" Storyboard.TargetProperty="(UIElement.Visibility)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Collapsed</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="overlay" Storyboard.TargetProperty="(UIElement.Visibility)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Collapsed</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Visible">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="busycontent" Storyboard.TargetProperty="(UIElement.Visibility)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="overlay" Storyboard.TargetProperty="(UIElement.Visibility)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                     </VisualStateGroup>
+                     <VisualStateGroup x:Name="BusyStatusStates">
+                        <VisualState x:Name="Idle">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="content" Storyboard.TargetProperty="(Control.IsEnabled)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <sys:Boolean>True</sys:Boolean>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Busy">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="content" Storyboard.TargetProperty="(Control.IsEnabled)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <sys:Boolean>False</sys:Boolean>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                     </VisualStateGroup>
+                  </VisualStateManager.VisualStateGroups>
+                  <ContentControl x:Name="content" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsTabStop="False" Focusable="False" />
+                  <Rectangle x:Name="overlay" Style="{TemplateBinding OverlayStyle}" />
+                  <ContentPresenter x:Name="busycontent">
+                     <ContentPresenter.Content>
+                        <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
+                           <Border Background="White" BorderThickness="1" CornerRadius="2">
+                              <Border.BorderBrush>
+                                 <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
+                                    <GradientStop Color="#FFA3AEB9" Offset="0" />
+                                    <GradientStop Color="#FF8399A9" Offset="0.375" />
+                                    <GradientStop Color="#FF718597" Offset="0.375" />
+                                    <GradientStop Color="#FF617584" Offset="1" />
+                                 </LinearGradientBrush>
+                              </Border.BorderBrush>
+                              <Border CornerRadius="1.5" Margin="1">
+                                 <Border.Background>
+                                    <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
+                                       <GradientStop Color="#FFF6F8F9" Offset="0.02" />
+                                       <GradientStop Color="#FFB8B8B8" Offset="0.996" />
+                                    </LinearGradientBrush>
+                                 </Border.Background>
+                                 <Grid MinWidth="150">
+                                    <Grid.RowDefinitions>
+                                       <RowDefinition />
+                                       <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+                                    <ContentControl Content="{TemplateBinding BusyContent}" ContentTemplate="{TemplateBinding BusyContentTemplate}" Margin="8" />
+                                    <ProgressBar Grid.Row="1" Style="{TemplateBinding ProgressBarStyle}" />
+                                 </Grid>
+                              </Border>
+                           </Border>
+                        </Grid>
+                     </ContentPresenter.Content>
+                  </ContentPresenter>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/ButtonSpinner.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/ButtonSpinner.cs
new file mode 100644
index 00000000..f05a0872
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/ButtonSpinner.cs
@@ -0,0 +1,280 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows;
+using System.Windows.Controls.Primitives;
+using System.Windows.Input;
+using System.Windows.Markup;
+
+namespace Xceed.Wpf.Toolkit
+{
+  /// <summary>
+  /// Represents a spinner control that includes two Buttons.
+  /// </summary>
+  [TemplatePart( Name = PART_IncreaseButton, Type = typeof( ButtonBase ) )]
+  [TemplatePart( Name = PART_DecreaseButton, Type = typeof( ButtonBase ) )]
+  [ContentProperty( "Content" )]
+  public class ButtonSpinner : Spinner
+  {
+    private const string PART_IncreaseButton = "PART_IncreaseButton";
+    private const string PART_DecreaseButton = "PART_DecreaseButton";
+
+    #region Properties
+
+    #region AllowSpin
+
+    public static readonly DependencyProperty AllowSpinProperty = DependencyProperty.Register( "AllowSpin", typeof( bool ), typeof( ButtonSpinner ), new UIPropertyMetadata( true ) );
+    public bool AllowSpin
+    {
+      get
+      {
+        return ( bool )GetValue( AllowSpinProperty );
+      }
+      set
+      {
+        SetValue( AllowSpinProperty, value );
+      }
+    }
+
+    #endregion //AllowSpin
+
+    #region Content
+
+    /// <summary>
+    /// Identifies the Content dependency property.
+    /// </summary>
+    public static readonly DependencyProperty ContentProperty = DependencyProperty.Register( "Content", typeof( object ), typeof( ButtonSpinner ), new PropertyMetadata( null, OnContentPropertyChanged ) );
+    public object Content
+    {
+      get
+      {
+        return GetValue( ContentProperty ) as object;
+      }
+      set
+      {
+        SetValue( ContentProperty, value );
+      }
+    }
+
+    /// <summary>
+    /// ContentProperty property changed handler.
+    /// </summary>
+    /// <param name="d">ButtonSpinner that changed its Content.</param>
+    /// <param name="e">Event arguments.</param>
+    private static void OnContentPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ButtonSpinner source = d as ButtonSpinner;
+      source.OnContentChanged( e.OldValue, e.NewValue );
+    }
+
+    #endregion //Content
+
+    #region DecreaseButton
+
+    private ButtonBase _decreaseButton;
+    /// <summary>
+    /// Gets or sets the DecreaseButton template part.
+    /// </summary>
+    private ButtonBase DecreaseButton
+    {
+      get
+      {
+        return _decreaseButton;
+      }
+      set
+      {
+        if( _decreaseButton != null )
+        {
+          _decreaseButton.Click -= OnButtonClick;
+        }
+
+        _decreaseButton = value;
+
+        if( _decreaseButton != null )
+        {
+          _decreaseButton.Click += OnButtonClick;
+        }
+      }
+    }
+
+    #endregion //DecreaseButton
+
+    #region IncreaseButton
+
+    private ButtonBase _increaseButton;
+    /// <summary>
+    /// Gets or sets the IncreaseButton template part.
+    /// </summary>
+    private ButtonBase IncreaseButton
+    {
+      get
+      {
+        return _increaseButton;
+      }
+      set
+      {
+        if( _increaseButton != null )
+        {
+          _increaseButton.Click -= OnButtonClick;
+        }
+
+        _increaseButton = value;
+
+        if( _increaseButton != null )
+        {
+          _increaseButton.Click += OnButtonClick;
+        }
+      }
+    }
+
+    #endregion //IncreaseButton
+
+    #region ShowButtonSpinner
+
+    public static readonly DependencyProperty ShowButtonSpinnerProperty = DependencyProperty.Register( "ShowButtonSpinner", typeof( bool ), typeof( ButtonSpinner ), new UIPropertyMetadata( true ) );
+    public bool ShowButtonSpinner
+    {
+      get
+      {
+        return ( bool )GetValue( ShowButtonSpinnerProperty );
+      }
+      set
+      {
+        SetValue( ShowButtonSpinnerProperty, value );
+      }
+    }
+
+    #endregion //ShowButtonSpinner
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static ButtonSpinner()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( ButtonSpinner ), new FrameworkPropertyMetadata( typeof( ButtonSpinner ) ) );
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+
+      IncreaseButton = GetTemplateChild( PART_IncreaseButton ) as ButtonBase;
+      DecreaseButton = GetTemplateChild( PART_DecreaseButton ) as ButtonBase;
+
+      SetButtonUsage();
+    }
+
+    /// <summary>
+    /// Cancel LeftMouseButtonUp events originating from a button that has
+    /// been changed to disabled.
+    /// </summary>
+    /// <param name="e">The data for the event.</param>
+    protected override void OnMouseLeftButtonUp( MouseButtonEventArgs e )
+    {
+      base.OnMouseLeftButtonUp( e );
+
+      Point mousePosition;
+      if( IncreaseButton != null && IncreaseButton.IsEnabled == false )
+      {
+        mousePosition = e.GetPosition( IncreaseButton );
+        if( mousePosition.X > 0 && mousePosition.X < IncreaseButton.ActualWidth &&
+            mousePosition.Y > 0 && mousePosition.Y < IncreaseButton.ActualHeight )
+        {
+          e.Handled = true;
+        }
+      }
+
+      if( DecreaseButton != null && DecreaseButton.IsEnabled == false )
+      {
+        mousePosition = e.GetPosition( DecreaseButton );
+        if( mousePosition.X > 0 && mousePosition.X < DecreaseButton.ActualWidth &&
+            mousePosition.Y > 0 && mousePosition.Y < DecreaseButton.ActualHeight )
+        {
+          e.Handled = true;
+        }
+      }
+    }
+
+    /// <summary>
+    /// Called when valid spin direction changed.
+    /// </summary>
+    /// <param name="oldValue">The old value.</param>
+    /// <param name="newValue">The new value.</param>
+    protected override void OnValidSpinDirectionChanged( ValidSpinDirections oldValue, ValidSpinDirections newValue )
+    {
+      SetButtonUsage();
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Event Handlers
+
+    /// <summary>
+    /// Handle click event of IncreaseButton and DecreaseButton template parts,
+    /// translating Click to appropriate Spin event.
+    /// </summary>
+    /// <param name="sender">Event sender, should be either IncreaseButton or DecreaseButton template part.</param>
+    /// <param name="e">Event args.</param>
+    private void OnButtonClick( object sender, RoutedEventArgs e )
+    {
+      if( AllowSpin )
+      {
+        SpinDirection direction = sender == IncreaseButton ? SpinDirection.Increase : SpinDirection.Decrease;
+        OnSpin( new SpinEventArgs( direction ) );
+      }
+    }
+
+    #endregion //Event Handlers
+
+    #region Methods
+
+    /// <summary>
+    /// Occurs when the Content property value changed.
+    /// </summary>
+    /// <param name="oldValue">The old value of the Content property.</param>
+    /// <param name="newValue">The new value of the Content property.</param>
+    protected virtual void OnContentChanged( object oldValue, object newValue )
+    {
+    }
+
+    /// <summary>
+    /// Disables or enables the buttons based on the valid spin direction.
+    /// </summary>
+    private void SetButtonUsage()
+    {
+      // buttonspinner adds buttons that spin, so disable accordingly.
+      if( IncreaseButton != null )
+      {
+        IncreaseButton.IsEnabled = ( ( ValidSpinDirection & ValidSpinDirections.Increase ) == ValidSpinDirections.Increase );
+      }
+
+      if( DecreaseButton != null )
+      {
+        DecreaseButton.IsEnabled = ( ( ValidSpinDirection & ValidSpinDirections.Decrease ) == ValidSpinDirections.Decrease );
+      }
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/SpinDirection.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/SpinDirection.cs
new file mode 100644
index 00000000..22bd9a6d
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/SpinDirection.cs
@@ -0,0 +1,38 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit
+{
+  /// <summary>
+  /// Represents spin directions that could be initiated by the end-user.
+  /// </summary>
+  /// <QualityBand>Preview</QualityBand>
+  public enum SpinDirection
+  {
+    /// <summary>
+    /// Represents a spin initiated by the end-user in order to Increase a value.
+    /// </summary>
+    Increase = 0,
+
+    /// <summary>
+    /// Represents a spin initiated by the end-user in order to Decrease a value.
+    /// </summary>
+    Decrease = 1
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/SpinEventArgs.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/SpinEventArgs.cs
new file mode 100644
index 00000000..bd432c2b
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/SpinEventArgs.cs
@@ -0,0 +1,50 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit
+{
+  /// <summary>
+  /// Provides data for the Spinner.Spin event.
+  /// </summary>
+  /// <QualityBand>Preview</QualityBand>
+  public class SpinEventArgs : RoutedEventArgs
+  {
+    /// <summary>
+    /// Gets the SpinDirection for the spin that has been initiated by the 
+    /// end-user.
+    /// </summary>
+    public SpinDirection Direction
+    {
+      get;
+      private set;
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the SpinEventArgs class.
+    /// </summary>
+    /// <param name="direction">Spin direction.</param>
+    public SpinEventArgs( SpinDirection direction )
+      : base()
+    {
+      Direction = direction;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/Spinner.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/Spinner.cs
new file mode 100644
index 00000000..3ca8296b
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/Spinner.cs
@@ -0,0 +1,104 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Xceed.Wpf.Toolkit
+{
+  /// <summary>
+  /// Base class for controls that represents controls that can spin.
+  /// </summary>
+  public abstract class Spinner : Control
+  {
+    #region Properties
+
+    /// <summary>
+    /// Identifies the ValidSpinDirection dependency property.
+    /// </summary>
+    public static readonly DependencyProperty ValidSpinDirectionProperty = DependencyProperty.Register( "ValidSpinDirection", typeof( ValidSpinDirections ), typeof( Spinner ), new PropertyMetadata( ValidSpinDirections.Increase | ValidSpinDirections.Decrease, OnValidSpinDirectionPropertyChanged ) );
+    public ValidSpinDirections ValidSpinDirection
+    {
+      get
+      {
+        return ( ValidSpinDirections )GetValue( ValidSpinDirectionProperty );
+      }
+      set
+      {
+        SetValue( ValidSpinDirectionProperty, value );
+      }
+    }
+
+    /// <summary>
+    /// ValidSpinDirectionProperty property changed handler.
+    /// </summary>
+    /// <param name="d">ButtonSpinner that changed its ValidSpinDirection.</param>
+    /// <param name="e">Event arguments.</param>
+    private static void OnValidSpinDirectionPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      Spinner source = ( Spinner )d;
+      ValidSpinDirections oldvalue = ( ValidSpinDirections )e.OldValue;
+      ValidSpinDirections newvalue = ( ValidSpinDirections )e.NewValue;
+      source.OnValidSpinDirectionChanged( oldvalue, newvalue );
+    }
+
+    #endregion //Properties
+
+    /// <summary>
+    /// Occurs when spinning is initiated by the end-user.
+    /// </summary>
+    public event EventHandler<SpinEventArgs> Spin;
+
+    /// <summary>
+    /// Initializes a new instance of the Spinner class.
+    /// </summary>
+    protected Spinner()
+    {
+    }
+
+    /// <summary>
+    /// Raises the OnSpin event when spinning is initiated by the end-user.
+    /// </summary>
+    /// <param name="e">Spin event args.</param>
+    protected virtual void OnSpin( SpinEventArgs e )
+    {
+      ValidSpinDirections valid = e.Direction == SpinDirection.Increase ? ValidSpinDirections.Increase : ValidSpinDirections.Decrease;
+
+      //Only raise the event if spin is allowed.
+      if( ( ValidSpinDirection & valid ) == valid )
+      {
+        EventHandler<SpinEventArgs> handler = Spin;
+        if( handler != null )
+        {
+          handler( this, e );
+        }
+      }
+    }
+
+    /// <summary>
+    /// Called when valid spin direction changed.
+    /// </summary>
+    /// <param name="oldValue">The old value.</param>
+    /// <param name="newValue">The new value.</param>
+    protected virtual void OnValidSpinDirectionChanged( ValidSpinDirections oldValue, ValidSpinDirections newValue )
+    {
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/ValidSpinDirections.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/ValidSpinDirections.cs
new file mode 100644
index 00000000..48108690
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/ValidSpinDirections.cs
@@ -0,0 +1,45 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+
+namespace Xceed.Wpf.Toolkit
+{
+  /// <summary>
+  /// Represents spin directions that are valid.
+  /// </summary>
+  [Flags]
+  public enum ValidSpinDirections
+  {
+    /// <summary>
+    /// Can not increase nor decrease.
+    /// </summary>
+    None = 0,
+
+    /// <summary>
+    /// Can increase.
+    /// </summary>
+    Increase = 1,
+
+    /// <summary>
+    /// Can decrease.
+    /// </summary>
+    Decrease = 2
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Themes/Generic.xaml
new file mode 100644
index 00000000..adaa75f3
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Themes/Generic.xaml
@@ -0,0 +1,90 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes">
+
+   <ResourceDictionary.MergedDictionaries>
+      <ResourceDictionary Source="../../Themes/Generic/Glyphs.xaml" />
+   </ResourceDictionary.MergedDictionaries>
+
+   <!-- =============================================================================== -->
+   <!-- ButtonSpinner                                                                   -->
+   <!-- =============================================================================== -->
+
+   <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+
+   <Style TargetType="{x:Type local:ButtonSpinner}">
+      <Setter Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBackgroundKey}}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+      <Setter Property="IsTabStop" Value="True" />
+      <Setter Property="Padding" Value="2" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:ButtonSpinner}">
+               <Grid SnapsToDevicePixels="True">
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="*" />
+                     <ColumnDefinition Width="Auto" />
+                  </Grid.ColumnDefinitions>
+
+                  <Border x:Name="Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Grid.ColumnSpan="2" />
+
+                  <ContentPresenter Focusable="False" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+
+                  <Grid Grid.Column="1" Visibility="{TemplateBinding ShowButtonSpinner, Converter={StaticResource BooleanToVisibilityConverter}}" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="*" />
+                        <RowDefinition Height="*" />
+                     </Grid.RowDefinitions>
+
+                     <RepeatButton x:Name="PART_IncreaseButton"
+                                   Style="{DynamicResource {x:Static themes:ResourceKeys.SpinnerButtonStyleKey}}"
+                                   IsTabStop="{TemplateBinding IsTabStop}" ContentTemplate="{StaticResource IncreaseGlyphNormalKey}" />
+
+                     <RepeatButton x:Name="PART_DecreaseButton"
+                                   Grid.Row="1"
+                                   Style="{DynamicResource {x:Static themes:ResourceKeys.SpinnerButtonStyleKey}}"
+                                   IsTabStop="{TemplateBinding IsTabStop}" ContentTemplate="{StaticResource DecreaseGlyphNormalKey}" />
+
+                  </Grid>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsEnabled" Value="False">
+                     <Setter Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}}" />
+                  </Trigger>
+                  <Trigger SourceName="PART_IncreaseButton" Property="IsEnabled" Value="False">
+                     <Setter TargetName="PART_IncreaseButton" Property="ContentTemplate" Value="{StaticResource IncreaseGlyphDisabledKey}" />
+                  </Trigger>
+                  <Trigger SourceName="PART_DecreaseButton" Property="IsEnabled" Value="False">
+                     <Setter TargetName="PART_DecreaseButton" Property="ContentTemplate" Value="{StaticResource DecreaseGlyphDisabledKey}" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Calculator/Implementation/Calculator.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Calculator/Implementation/Calculator.cs
new file mode 100644
index 00000000..c5aae90b
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Calculator/Implementation/Calculator.cs
@@ -0,0 +1,549 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Threading;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+
+namespace Xceed.Wpf.Toolkit
+{
+  [TemplatePart( Name = PART_CalculatorButtonPanel, Type = typeof( ContentControl ) )]
+  public class Calculator : Control
+  {
+    private const string PART_CalculatorButtonPanel = "PART_CalculatorButtonPanel";
+
+    #region Members
+
+    private ContentControl _buttonPanel;
+    private bool _showNewNumber = true;
+    private decimal _previousValue;
+    private Operation _lastOperation = Operation.None;
+    private CalculatorButtonType _lastButtonPressed;
+    private readonly Dictionary<Button, DispatcherTimer> _timers = new Dictionary<Button, DispatcherTimer>();
+
+    #endregion //Members
+
+    #region Enumerations
+
+    public enum CalculatorButtonType
+    {
+      Add,
+      Back,
+      Cancel,
+      Clear,
+      Decimal,
+      Divide,
+      Eight,
+      Equal,
+      Five,
+      Four,
+      Fraction,
+      MAdd,
+      MC,
+      MR,
+      MS,
+      MSub,
+      Multiply,
+      Negate,
+      Nine,
+      None,
+      One,
+      Percent,
+      Seven,
+      Six,
+      Sqrt,
+      Subtract,
+      Three,
+      Two,
+      Zero
+    }
+
+    public enum Operation
+    {
+      Add,
+      Subtract,
+      Divide,
+      Multiply,
+      Percent,
+      Sqrt,
+      Fraction,
+      None,
+      Clear,
+      Negate
+    }
+
+    #endregion //Enumerations
+
+    #region Properties
+
+    #region CalculatorButtonType
+
+    public static readonly DependencyProperty CalculatorButtonTypeProperty = DependencyProperty.RegisterAttached( "CalculatorButtonType", typeof( CalculatorButtonType ), typeof( Calculator ), new UIPropertyMetadata( CalculatorButtonType.None, OnCalculatorButtonTypeChanged ) );
+    public static CalculatorButtonType GetCalculatorButtonType( DependencyObject target )
+    {
+      return ( CalculatorButtonType )target.GetValue( CalculatorButtonTypeProperty );
+    }
+    public static void SetCalculatorButtonType( DependencyObject target, CalculatorButtonType value )
+    {
+      target.SetValue( CalculatorButtonTypeProperty, value );
+    }
+    private static void OnCalculatorButtonTypeChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      OnCalculatorButtonTypeChanged( o, ( CalculatorButtonType )e.OldValue, ( CalculatorButtonType )e.NewValue );
+    }
+    private static void OnCalculatorButtonTypeChanged( DependencyObject o, CalculatorButtonType oldValue, CalculatorButtonType newValue )
+    {
+      Button button = o as Button;
+      button.CommandParameter = newValue;
+      button.Content = CalculatorUtilities.GetCalculatorButtonContent( newValue );
+    }
+
+    #endregion //CalculatorButtonType
+
+    #region DisplayText
+
+    public static readonly DependencyProperty DisplayTextProperty = DependencyProperty.Register( "DisplayText", typeof( string ), typeof( Calculator ), new UIPropertyMetadata( "0", OnDisplayTextChanged ) );
+    public string DisplayText
+    {
+      get
+      {
+        return ( string )GetValue( DisplayTextProperty );
+      }
+      set
+      {
+        SetValue( DisplayTextProperty, value );
+      }
+    }
+
+    private static void OnDisplayTextChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      Calculator calculator = o as Calculator;
+      if( calculator != null )
+        calculator.OnDisplayTextChanged( ( string )e.OldValue, ( string )e.NewValue );
+    }
+
+    protected virtual void OnDisplayTextChanged( string oldValue, string newValue )
+    {
+      // TODO: Add your property changed side-effects. Descendants can override as well.
+    }
+
+    #endregion //DisplayText
+
+    #region Memory
+
+    public static readonly DependencyProperty MemoryProperty = DependencyProperty.Register( "Memory", typeof( decimal ), typeof( Calculator ), new UIPropertyMetadata( default( decimal ) ) );
+    public decimal Memory
+    {
+      get
+      {
+        return ( decimal )GetValue( MemoryProperty );
+      }
+      set
+      {
+        SetValue( MemoryProperty, value );
+      }
+    }
+
+    #endregion //Memory
+
+    #region Precision
+
+    public static readonly DependencyProperty PrecisionProperty = DependencyProperty.Register( "Precision", typeof( int ), typeof( Calculator ), new UIPropertyMetadata( 6 ) );
+    public int Precision
+    {
+      get
+      {
+        return ( int )GetValue( PrecisionProperty );
+      }
+      set
+      {
+        SetValue( PrecisionProperty, value );
+      }
+    }
+
+    #endregion //Precision
+
+    #region Value
+
+    public static readonly DependencyProperty ValueProperty = DependencyProperty.Register( "Value", typeof( decimal? ), typeof( Calculator ), new FrameworkPropertyMetadata( default( decimal ), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnValueChanged ) );
+    public decimal? Value
+    {
+      get
+      {
+        return ( decimal? )GetValue( ValueProperty );
+      }
+      set
+      {
+        SetValue( ValueProperty, value );
+      }
+    }
+
+    private static void OnValueChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      Calculator calculator = o as Calculator;
+      if( calculator != null )
+        calculator.OnValueChanged( ( decimal? )e.OldValue, ( decimal? )e.NewValue );
+    }
+
+    protected virtual void OnValueChanged( decimal? oldValue, decimal? newValue )
+    {
+      SetDisplayText( newValue );
+
+      RoutedPropertyChangedEventArgs<object> args = new RoutedPropertyChangedEventArgs<object>( oldValue, newValue );
+      args.RoutedEvent = ValueChangedEvent;
+      RaiseEvent( args );
+    }
+
+    #endregion //Value
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static Calculator()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( Calculator ), new FrameworkPropertyMetadata( typeof( Calculator ) ) );
+    }
+
+    public Calculator()
+    {
+      CommandBindings.Add( new CommandBinding( CalculatorCommands.CalculatorButtonClick, ExecuteCalculatorButtonClick ) );
+      AddHandler( MouseDownEvent, new MouseButtonEventHandler( Calculator_OnMouseDown ), true );
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+
+      _buttonPanel = GetTemplateChild( PART_CalculatorButtonPanel ) as ContentControl;
+    }
+
+    protected override void OnTextInput( TextCompositionEventArgs e )
+    {
+      var buttonType = CalculatorUtilities.GetCalculatorButtonTypeFromText( e.Text );
+      if( buttonType != CalculatorButtonType.None )
+      {
+        SimulateCalculatorButtonClick( buttonType );
+        ProcessCalculatorButton( buttonType );
+      }
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Event Handlers
+
+    private void Calculator_OnMouseDown( object sender, MouseButtonEventArgs e )
+    {
+      if( !IsFocused )
+      {
+        Focus();
+        e.Handled = true;
+      }
+    }
+
+    void Timer_Tick( object sender, EventArgs e )
+    {
+      DispatcherTimer timer = ( DispatcherTimer )sender;
+      timer.Stop();
+      timer.Tick -= Timer_Tick;
+
+      if( _timers.ContainsValue( timer ) )
+      {
+        var button = _timers.Where( x => x.Value == timer ).Select( x => x.Key ).FirstOrDefault();
+        if( button != null )
+        {
+          VisualStateManager.GoToState( button, button.IsMouseOver ? "MouseOver" : "Normal", true );
+          _timers.Remove( button );
+        }
+      }
+    }
+
+    #endregion //Event Handlers
+
+    #region Methods
+
+    private void Calculate()
+    {
+      if( _lastOperation == Operation.None )
+        return;
+
+      try
+      {
+        Value = Decimal.Round( CalculateValue( _lastOperation ), Precision );
+        SetDisplayText( Value ); //Set DisplayText even when Value doesn't change
+      }
+      catch
+      {
+        Value = null;
+        DisplayText = "ERROR";
+      }
+    }
+
+    private void SetDisplayText( decimal? newValue )
+    {
+      if( newValue.HasValue && ( newValue.Value != 0 ) )
+        DisplayText = newValue.ToString();
+      else
+        DisplayText = "0";
+    }
+
+    private void Calculate( Operation newOperation )
+    {
+      if( !_showNewNumber )
+        Calculate();
+
+      _lastOperation = newOperation;
+    }
+
+    private void Calculate( Operation currentOperation, Operation newOperation )
+    {
+      _lastOperation = currentOperation;
+      Calculate();
+      _lastOperation = newOperation;
+    }
+
+    private decimal CalculateValue( Operation operation )
+    {
+      decimal newValue = decimal.Zero;
+      decimal currentValue = CalculatorUtilities.ParseDecimal( DisplayText );
+
+      switch( operation )
+      {
+        case Operation.Add:
+          newValue = CalculatorUtilities.Add( _previousValue, currentValue );
+          break;
+        case Operation.Subtract:
+          newValue = CalculatorUtilities.Subtract( _previousValue, currentValue );
+          break;
+        case Operation.Multiply:
+          newValue = CalculatorUtilities.Multiply( _previousValue, currentValue );
+          break;
+        case Operation.Divide:
+          newValue = CalculatorUtilities.Divide( _previousValue, currentValue );
+          break;
+        //case Operation.Percent:
+        //    newValue = CalculatorUtilities.Percent(_previousValue, currentValue);
+        //    break;
+        case Operation.Sqrt:
+          newValue = CalculatorUtilities.SquareRoot( currentValue );
+          break;
+        case Operation.Fraction:
+          newValue = CalculatorUtilities.Fraction( currentValue );
+          break;
+        case Operation.Negate:
+          newValue = CalculatorUtilities.Negate( currentValue );
+          break;
+        default:
+          newValue = decimal.Zero;
+          break;
+      }
+
+      return newValue;
+    }
+
+    void ProcessBackKey()
+    {
+      string displayText;
+      if( DisplayText.Length > 1 && !( DisplayText.Length == 2 && DisplayText[ 0 ] == '-' ) )
+      {
+        displayText = DisplayText.Remove( DisplayText.Length - 1, 1 );
+      }
+      else
+      {
+        displayText = "0";
+        _showNewNumber = true;
+      }
+
+      DisplayText = displayText;
+    }
+
+    private void ProcessCalculatorButton( CalculatorButtonType buttonType )
+    {
+      if( CalculatorUtilities.IsDigit( buttonType ) )
+        ProcessDigitKey( buttonType );
+      else if( ( CalculatorUtilities.IsMemory( buttonType ) ) )
+        ProcessMemoryKey( buttonType );
+      else
+        ProcessOperationKey( buttonType );
+
+      _lastButtonPressed = buttonType;
+    }
+
+    private void ProcessDigitKey( CalculatorButtonType buttonType )
+    {
+      if( _showNewNumber )
+        DisplayText = CalculatorUtilities.GetCalculatorButtonContent( buttonType );
+      else
+        DisplayText += CalculatorUtilities.GetCalculatorButtonContent( buttonType );
+
+      _showNewNumber = false;
+    }
+
+    private void ProcessMemoryKey( Calculator.CalculatorButtonType buttonType )
+    {
+      decimal currentValue = CalculatorUtilities.ParseDecimal( DisplayText );
+
+      switch( buttonType )
+      {
+        case Calculator.CalculatorButtonType.MAdd:
+          Memory += currentValue;
+          break;
+        case Calculator.CalculatorButtonType.MC:
+          Memory = decimal.Zero;
+          break;
+        case Calculator.CalculatorButtonType.MR:
+          DisplayText = Memory.ToString();
+          break;
+        case Calculator.CalculatorButtonType.MS:
+          Memory = currentValue;
+          break;
+        case Calculator.CalculatorButtonType.MSub:
+          Memory -= currentValue;
+          break;
+        default:
+          break;
+      }
+
+      _showNewNumber = true;
+    }
+
+    private void ProcessOperationKey( CalculatorButtonType buttonType )
+    {
+      switch( buttonType )
+      {
+        case CalculatorButtonType.Add:
+          Calculate( Operation.Add );
+          break;
+        case CalculatorButtonType.Subtract:
+          Calculate( Operation.Subtract );
+          break;
+        case CalculatorButtonType.Multiply:
+          Calculate( Operation.Multiply );
+          break;
+        case CalculatorButtonType.Divide:
+          Calculate( Operation.Divide );
+          break;
+        case CalculatorButtonType.Percent:
+          if( _lastOperation != Operation.None )
+          {
+            decimal currentValue = CalculatorUtilities.ParseDecimal( DisplayText );
+            decimal newValue = CalculatorUtilities.Percent( _previousValue, currentValue );
+            DisplayText = newValue.ToString();
+          }
+          else
+          {
+            DisplayText = "0";
+            _showNewNumber = true;
+          }
+          return;
+        case CalculatorButtonType.Sqrt:
+          Calculate( Operation.Sqrt, Operation.None );
+          break;
+        case CalculatorButtonType.Fraction:
+          Calculate( Operation.Fraction, Operation.None );
+          break;
+        case CalculatorButtonType.Negate:
+          Calculate( Operation.Negate, Operation.None );
+          break;
+        case CalculatorButtonType.Equal:
+          Calculate( Operation.None );
+          break;
+        case CalculatorButtonType.Clear:
+          Calculate( Operation.Clear, Operation.None );
+          break;
+        case CalculatorButtonType.Cancel:
+          DisplayText = _previousValue.ToString();
+          _lastOperation = Operation.None;
+          _showNewNumber = true;
+          return;
+        case CalculatorButtonType.Back:
+          ProcessBackKey();
+          return;
+        default:
+          break;
+      }
+
+      Decimal.TryParse( DisplayText, out _previousValue );
+      _showNewNumber = true;
+    }
+
+    private void SimulateCalculatorButtonClick( CalculatorButtonType buttonType )
+    {
+      var button = CalculatorUtilities.FindButtonByCalculatorButtonType( _buttonPanel, buttonType );
+      if( button != null )
+      {
+        VisualStateManager.GoToState( button, "Pressed", true );
+        DispatcherTimer timer;
+        if( _timers.ContainsKey( button ) )
+        {
+          timer = _timers[ button ];
+          timer.Stop();
+        }
+        else
+        {
+          timer = new DispatcherTimer();
+          timer.Interval = TimeSpan.FromMilliseconds( 100 );
+          timer.Tick += Timer_Tick;
+          _timers.Add( button, timer );
+        }
+
+        timer.Start();
+      }
+    }
+
+    #endregion //Methods
+
+    #region Events
+
+    //Due to a bug in Visual Studio, you cannot create event handlers for nullable args in XAML, so I have to use object instead.
+    public static readonly RoutedEvent ValueChangedEvent = EventManager.RegisterRoutedEvent( "ValueChanged", RoutingStrategy.Bubble, typeof( RoutedPropertyChangedEventHandler<object> ), typeof( Calculator ) );
+    public event RoutedPropertyChangedEventHandler<object> ValueChanged
+    {
+      add
+      {
+        AddHandler( ValueChangedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( ValueChangedEvent, value );
+      }
+    }
+
+    #endregion //Events
+
+    #region Commands
+
+    private void ExecuteCalculatorButtonClick( object sender, ExecutedRoutedEventArgs e )
+    {
+      var buttonType = ( CalculatorButtonType )e.Parameter;
+      ProcessCalculatorButton( buttonType );
+    }
+
+    #endregion //Commands
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Calculator/Implementation/CalculatorCommands.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Calculator/Implementation/CalculatorCommands.cs
new file mode 100644
index 00000000..5d02c9d7
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Calculator/Implementation/CalculatorCommands.cs
@@ -0,0 +1,36 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows.Input;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public static class CalculatorCommands
+  {
+    private static RoutedCommand _calculatorButtonClickCommand = new RoutedCommand();
+
+    public static RoutedCommand CalculatorButtonClick
+    {
+      get
+      {
+        return _calculatorButtonClickCommand;
+      }
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Calculator/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Calculator/Themes/Generic.xaml
new file mode 100644
index 00000000..7924cb4b
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Calculator/Themes/Generic.xaml
@@ -0,0 +1,519 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
+
+   <conv:CalculatorMemoryToVisibilityConverter x:Key="CalculatorMemoryToVisibilityConverter" />
+
+   <Style x:Key="CalculatorOperatorButtonStyle" TargetType="{x:Type Button}">
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Foreground" Value="#FF5B636E" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Button}">
+               <Grid x:Name="Control">
+                  <VisualStateManager.VisualStateGroups>
+                     <VisualStateGroup x:Name="CommonStates">
+                        <VisualState x:Name="Normal" />
+                        <VisualState x:Name="MouseOver">
+                           <Storyboard>
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To="0" />
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_MouseOver" Storyboard.TargetProperty="Opacity" To="1" />
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Pressed">
+                           <Storyboard>
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To="0" />
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Pressed" Storyboard.TargetProperty="Opacity" To="1" />
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Disabled">
+                           <Storyboard>
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To=".5" />
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="contentPresenter" Storyboard.TargetProperty="Opacity" To=".5" />
+                           </Storyboard>
+                        </VisualState>
+                     </VisualStateGroup>
+                     <VisualStateGroup x:Name="MemoryStates">
+                        <VisualState x:Name="EmptyMemory" />
+                        <VisualState x:Name="MemoryAssigned">
+                           <Storyboard>
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Border1" Storyboard.TargetProperty="Opacity" To="0" />
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Border2" Storyboard.TargetProperty="Opacity" To="1" />
+                           </Storyboard>
+                        </VisualState>
+                     </VisualStateGroup>
+                  </VisualStateManager.VisualStateGroups>
+                  <Border Background="White" BorderBrush="{x:Null}" BorderThickness="0" CornerRadius="2" Margin="0,0,0,-1" Opacity="0.5" />
+                  <Grid x:Name="PART_Default">
+                     <Border BorderThickness="0" CornerRadius="2" Background="#FF9CA2AB">
+                        <Grid>
+                           <Border x:Name="PART_Border1" BorderThickness="0" CornerRadius="1" Margin="1">
+                              <Border.Background>
+                                 <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                                    <GradientStop Color="#FFEDF1F7" Offset="0" />
+                                    <GradientStop Color="#FFD5DBE3" Offset="1" />
+                                 </LinearGradientBrush>
+                              </Border.Background>
+                              <Border BorderThickness="0" CornerRadius="1" Margin="2">
+                                 <Border.Background>
+                                    <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                                       <GradientStop Color="#FFEDF1F7" Offset="0" />
+                                       <GradientStop Color="#FFD5DBE3" Offset="1" />
+                                    </LinearGradientBrush>
+                                 </Border.Background>
+                              </Border>
+                           </Border>
+                           <Border x:Name="PART_Border2" BorderThickness="0" CornerRadius="1" Margin="1" Opacity="0">
+                              <Border.Background>
+                                 <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                                    <GradientStop Color="#FF9CA2AB" Offset="0" />
+                                    <GradientStop Color="#FF9CA2AB" Offset="1" />
+                                 </LinearGradientBrush>
+                              </Border.Background>
+                              <Border BorderThickness="0" CornerRadius="1" Margin="2">
+                                 <Border.Background>
+                                    <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                                       <GradientStop Color="#FFEDF1F7" Offset="0" />
+                                       <GradientStop Color="#FFD5DBE3" Offset="1" />
+                                    </LinearGradientBrush>
+                                 </Border.Background>
+                              </Border>
+                           </Border>
+                        </Grid>
+                     </Border>
+                  </Grid>
+                  <Grid x:Name="PART_MouseOver" Opacity="0">
+                     <Border BorderThickness="0" CornerRadius="2" Background="#FF9CA2AB">
+                        <Border BorderThickness="0" CornerRadius="1" Margin="1">
+                           <Border.Background>
+                              <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                                 <GradientStop Color="#FFFDFEFF" Offset="0" />
+                                 <GradientStop Color="#FFD9DFE8" Offset="1" />
+                              </LinearGradientBrush>
+                           </Border.Background>
+                        </Border>
+                     </Border>
+                  </Grid>
+                  <Grid x:Name="PART_Pressed" Opacity="0">
+                     <Border BorderThickness="0" CornerRadius="2" Background="#FF90959D">
+                        <Border BorderThickness="0" CornerRadius="1" Margin="1" Background="#FFB5BBC5" />
+                     </Border>
+                  </Grid>
+                  <ContentPresenter x:Name="contentPresenter"
+							               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+							               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+							               SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="CalculatorClearButtonStyle" TargetType="{x:Type Button}">
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Foreground" Value="#FFBF5254" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Button}">
+               <Grid x:Name="Control">
+                  <VisualStateManager.VisualStateGroups>
+                     <VisualStateGroup x:Name="CommonStates">
+                        <VisualState x:Name="Normal" />
+                        <VisualState x:Name="MouseOver">
+                           <Storyboard>
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To="0" />
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_MouseOver" Storyboard.TargetProperty="Opacity" To="1" />
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Pressed">
+                           <Storyboard>
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To="0" />
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Pressed" Storyboard.TargetProperty="Opacity" To="1" />
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Disabled">
+                           <Storyboard>
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To=".5" />
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="contentPresenter" Storyboard.TargetProperty="Opacity" To=".5" />
+                           </Storyboard>
+                        </VisualState>
+                     </VisualStateGroup>
+                  </VisualStateManager.VisualStateGroups>
+                  <Border Background="White" BorderBrush="{x:Null}" BorderThickness="0" CornerRadius="2" Margin="0,0,0,-1" Opacity="0.5" />
+                  <Grid x:Name="PART_Default">
+                     <Border BorderThickness="0" CornerRadius="2">
+                        <Border.Background>
+                           <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                              <GradientStop Color="#FFC19497" Offset="0" />
+                              <GradientStop Color="#FFA67D80" Offset="1" />
+                           </LinearGradientBrush>
+                        </Border.Background>
+                        <Border BorderThickness="0" CornerRadius="1" Margin="1">
+                           <Border.Background>
+                              <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                                 <GradientStop Color="#FFFDB8B8" Offset="0" />
+                                 <GradientStop Color="#FFF39998" Offset="1" />
+                              </LinearGradientBrush>
+                           </Border.Background>
+                        </Border>
+                     </Border>
+                  </Grid>
+                  <Grid x:Name="PART_MouseOver" Opacity="0">
+                     <Border BorderThickness="0" CornerRadius="2">
+                        <Border.Background>
+                           <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                              <GradientStop Color="#FFC19497" Offset="0" />
+                              <GradientStop Color="#FFA67D80" Offset="1" />
+                           </LinearGradientBrush>
+                        </Border.Background>
+                        <Border BorderThickness="0" CornerRadius="1" Margin="1">
+                           <Border.Background>
+                              <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                                 <GradientStop Color="#FFFEC9C9" Offset="0" />
+                                 <GradientStop Color="#FFEAA4A3" Offset="1" />
+                              </LinearGradientBrush>
+                           </Border.Background>
+                        </Border>
+                     </Border>
+                  </Grid>
+                  <Grid x:Name="PART_Pressed" Opacity="0">
+                     <Border BorderThickness="0" CornerRadius="2" Background="#FF9B6F72">
+                        <Border BorderThickness="0" CornerRadius="1" Margin="1" Background="#FFE69197" />
+                     </Border>
+                  </Grid>
+                  <ContentPresenter x:Name="contentPresenter"
+							               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+							               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+							               SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="CalculatorDigitButtonStyle" TargetType="{x:Type Button}">
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Foreground" Value="#FF2A313A" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Button}">
+               <Grid x:Name="Control">
+                  <VisualStateManager.VisualStateGroups>
+                     <VisualStateGroup x:Name="CommonStates">
+                        <VisualState x:Name="Normal" />
+                        <VisualState x:Name="MouseOver">
+                           <Storyboard>
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To="0" />
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_MouseOver" Storyboard.TargetProperty="Opacity" To="1" />
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Pressed">
+                           <Storyboard>
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To="0" />
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Pressed" Storyboard.TargetProperty="Opacity" To="1" />
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Disabled">
+                           <Storyboard>
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To=".5" />
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="contentPresenter" Storyboard.TargetProperty="Opacity" To=".5" />
+                           </Storyboard>
+                        </VisualState>
+                     </VisualStateGroup>
+                  </VisualStateManager.VisualStateGroups>
+                  <Border BorderBrush="{x:Null}" BorderThickness="0" Background="White" CornerRadius="3" Margin="0,0,0,-1" Opacity="0.5" />
+                  <Grid x:Name="PART_Default">
+                     <Border BorderThickness="0" CornerRadius="2">
+                        <Border.Background>
+                           <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                              <GradientStop Color="#FFA9AAAB" Offset="0" />
+                              <GradientStop Color="#FF98999A" Offset="1" />
+                           </LinearGradientBrush>
+                        </Border.Background>
+                        <Border BorderThickness="0" CornerRadius="1" Margin="1">
+                           <Border.Background>
+                              <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                                 <GradientStop Color="#FFF6F7F7" Offset="0" />
+                                 <GradientStop Color="#FFDEE0E2" Offset="1" />
+                              </LinearGradientBrush>
+                           </Border.Background>
+                        </Border>
+                     </Border>
+                  </Grid>
+                  <Grid x:Name="PART_MouseOver" Opacity="0">
+                     <Border BorderThickness="0" CornerRadius="2">
+                        <Border.Background>
+                           <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                              <GradientStop Color="#FFA9AAAB" Offset="0" />
+                              <GradientStop Color="#FF98999A" Offset="1" />
+                           </LinearGradientBrush>
+                        </Border.Background>
+                        <Border BorderThickness="0" CornerRadius="1" Margin="1">
+                           <Border.Background>
+                              <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                                 <GradientStop Color="#FFFCFCFC" Offset="0" />
+                                 <GradientStop Color="#FFEEEFF2" Offset="1" />
+                              </LinearGradientBrush>
+                           </Border.Background>
+                        </Border>
+                     </Border>
+                  </Grid>
+                  <Grid x:Name="PART_Pressed" Opacity="0">
+                     <Border BorderThickness="0" CornerRadius="2" Background="#FF87888A">
+                        <Border BorderThickness="0" CornerRadius="1" Margin="1" Background="#FFB5BBC5" />
+                     </Border>
+                  </Grid>
+                  <ContentPresenter x:Name="contentPresenter"
+							               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+							               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+							               SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+
+   <ControlTemplate x:Key="CalculatorButtonPanel" TargetType="{x:Type ContentControl}">
+      <Grid>
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition />
+            <ColumnDefinition Width="3" />
+            <ColumnDefinition />
+            <ColumnDefinition Width="3" />
+            <ColumnDefinition />
+            <ColumnDefinition Width="3" />
+            <ColumnDefinition />
+            <ColumnDefinition Width="3" />
+            <ColumnDefinition />
+         </Grid.ColumnDefinitions>
+         <Grid.RowDefinitions>
+            <RowDefinition />
+            <RowDefinition Height="3" />
+            <RowDefinition />
+            <RowDefinition Height="3" />
+            <RowDefinition />
+            <RowDefinition Height="3" />
+            <RowDefinition />
+            <RowDefinition Height="3" />
+            <RowDefinition />
+            <RowDefinition Height="3" />
+            <RowDefinition />
+         </Grid.RowDefinitions>
+         <Button Grid.Column="0" Grid.Row="0" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="MC"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="2" Grid.Row="0" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="MR" 
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="0" Grid.Row="2" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Back" 
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" Grid.RowSpan="1" />
+
+         <Button Grid.Column="2" Grid.Row="2" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Cancel" 
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorClearButtonStyle}" />
+
+         <Button Grid.Column="4" Grid.Row="2" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Clear"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorClearButtonStyle}" Grid.ColumnSpan="1" Grid.RowSpan="1" />
+
+         <Button Grid.Column="4" Grid.Row="0" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="MS"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="6" Grid.Row="0" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="MAdd"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" Margin="0" />
+
+         <Button Grid.Column="8" Grid.Row="0" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="MSub"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="6" Grid.Row="2" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Negate"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="8" Grid.Row="2" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Sqrt"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="0" Grid.Row="4" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Seven"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="2" Grid.Row="4" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Eight"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="4" Grid.Row="4" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Nine"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="6" Grid.Row="4" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Divide"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="8" Grid.Row="4" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Percent"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="0" Grid.Row="6" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Four"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="2" Grid.Row="6" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Five"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="4" Grid.Row="6" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Six"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="6" Grid.Row="6" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Multiply"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="8" Grid.Row="6" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Fraction"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="0" Grid.Row="8" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="One"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"                                    
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="2" Grid.Row="8" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Two"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="4" Grid.Row="8" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Three"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="6" Grid.Row="8" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Subtract"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="8" Grid.Row="8" Grid.RowSpan="3" MinWidth="28" MinHeight="55"
+					  local:Calculator.CalculatorButtonType="Equal"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="0" Grid.Row="10" Grid.ColumnSpan="3" MinWidth="59" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Zero"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="4" Grid.Row="10" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Decimal"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="6" Grid.Row="10" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Add"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+      </Grid>
+   </ControlTemplate>
+
+   <Style TargetType="{x:Type local:Calculator}">
+      <Setter Property="Background">
+         <Setter.Value>
+            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+               <GradientStop Color="#FFFAFBFB" Offset="0" />
+               <GradientStop Color="#FFF4F4F4" Offset="1" />
+            </LinearGradientBrush>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="BorderBrush" Value="#FF949494" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:Calculator}">
+               <Border Background="{TemplateBinding Background}"
+                       BorderBrush="{TemplateBinding BorderBrush}"
+                       BorderThickness="{TemplateBinding BorderThickness}"
+                       CornerRadius="3">
+                  <Grid Margin="10">
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="*" />
+                     </Grid.RowDefinitions>
+                     <Border x:Name="PART_Display" Margin="0,0,0,10" Background="White" BorderBrush="#FF949494" BorderThickness="1">
+                        <StackPanel>
+                           <Path Stretch="Fill"
+                                 Height="9"
+                                 Width="9"
+                                 Fill="DarkGray"
+                                 Data="F1 M 508.172,390L 506.031,390L 504.612,393.385C 504.174,394.477 503.788,395.533 503.453,396.555L 503.417,396.555C 503.334,395.528 503.206,394.471 503.035,393.385L 502.454,390L 500.301,390L 498.637,399L 500.226,399L 500.807,395.537C 500.903,394.973 501,394.379 501.099,393.756C 501.198,393.133 501.287,392.534 501.367,391.957L 501.402,391.957C 501.444,392.514 501.499,393.08 501.567,393.655C 501.635,394.231 501.712,394.776 501.8,395.292L 502.382,398.871L 503.7,398.871L 505.231,395.233C 505.445,394.724 505.663,394.187 505.884,393.622C 506.105,393.057 506.313,392.502 506.508,391.957L 506.543,391.957C 506.411,393.11 506.304,394.292 506.223,395.502L 505.979,399L 507.637,399L 508.172,390 Z "
+                                 HorizontalAlignment="Left"
+                                 VerticalAlignment="Top"                                              
+                                 Margin="4,4,0,0"
+                                 Visibility="{Binding Memory, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CalculatorMemoryToVisibilityConverter}}" />
+                           <TextBlock FontSize="18"
+                                      HorizontalAlignment="Right"
+                                      Margin="0,0,4,0"
+                                      Text="{Binding DisplayText, RelativeSource={RelativeSource TemplatedParent}}" />
+                        </StackPanel>
+                     </Border>
+                     <ContentControl x:Name="PART_CalculatorButtonPanel" Grid.Row="1" Template="{StaticResource CalculatorButtonPanel}" DataContext="{Binding RelativeSource={RelativeSource TemplatedParent}}" />
+                  </Grid>
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsFocused" Value="True">
+                     <Setter TargetName="PART_Display" Property="Background" Value="#E7F5FF" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CalculatorUpDown/Implementation/CalculatorUpDown.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CalculatorUpDown/Implementation/CalculatorUpDown.cs
new file mode 100644
index 00000000..c29cf464
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CalculatorUpDown/Implementation/CalculatorUpDown.cs
@@ -0,0 +1,225 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Controls.Primitives;
+using System.Windows.Input;
+
+namespace Xceed.Wpf.Toolkit
+{
+  [TemplatePart( Name = PART_CalculatorPopup, Type = typeof( Popup ) )]
+  [TemplatePart( Name = PART_Calculator, Type = typeof( Calculator ) )]
+  public class CalculatorUpDown : DecimalUpDown
+  {
+    private const string PART_CalculatorPopup = "PART_CalculatorPopup";
+    private const string PART_Calculator = "PART_Calculator";
+
+    #region Members
+
+    private Popup _calculatorPopup;
+    private Calculator _calculator;
+
+    #endregion //Members
+
+    #region Properties
+
+    #region DisplayText
+
+    public static readonly DependencyProperty DisplayTextProperty = DependencyProperty.Register( "DisplayText", typeof( string ), typeof( CalculatorUpDown ), new UIPropertyMetadata( "0" ) );
+    public string DisplayText
+    {
+      get
+      {
+        return ( string )GetValue( DisplayTextProperty );
+      }
+      set
+      {
+        SetValue( DisplayTextProperty, value );
+      }
+    }
+
+    #endregion //DisplayText
+
+    #region EnterClosesCalculator
+
+    public static readonly DependencyProperty EnterClosesCalculatorProperty = DependencyProperty.Register( "EnterClosesCalculator", typeof( bool ), typeof( CalculatorUpDown ), new UIPropertyMetadata( false ) );
+    public bool EnterClosesCalculator
+    {
+      get
+      {
+        return ( bool )GetValue( EnterClosesCalculatorProperty );
+      }
+      set
+      {
+        SetValue( EnterClosesCalculatorProperty, value );
+      }
+    }
+
+    #endregion //EnterClosesCalculator
+
+    #region IsOpen
+
+    public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register( "IsOpen", typeof( bool ), typeof( CalculatorUpDown ), new UIPropertyMetadata( false, OnIsOpenChanged ) );
+    public bool IsOpen
+    {
+      get
+      {
+        return ( bool )GetValue( IsOpenProperty );
+      }
+      set
+      {
+        SetValue( IsOpenProperty, value );
+      }
+    }
+
+    private static void OnIsOpenChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      CalculatorUpDown calculatorUpDown = o as CalculatorUpDown;
+      if( calculatorUpDown != null )
+        calculatorUpDown.OnIsOpenChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnIsOpenChanged( bool oldValue, bool newValue )
+    {
+
+    }
+
+    #endregion //IsOpen
+
+    #region Memory
+
+    public static readonly DependencyProperty MemoryProperty = DependencyProperty.Register( "Memory", typeof( decimal ), typeof( CalculatorUpDown ), new UIPropertyMetadata( default( decimal ) ) );
+    public decimal Memory
+    {
+      get
+      {
+        return ( decimal )GetValue( MemoryProperty );
+      }
+      set
+      {
+        SetValue( MemoryProperty, value );
+      }
+    }
+
+    #endregion //Memory
+
+    #region Precision
+
+    public static readonly DependencyProperty PrecisionProperty = DependencyProperty.Register( "Precision", typeof( int ), typeof( CalculatorUpDown ), new UIPropertyMetadata( 6 ) );
+    public int Precision
+    {
+      get
+      {
+        return ( int )GetValue( PrecisionProperty );
+      }
+      set
+      {
+        SetValue( PrecisionProperty, value );
+      }
+    }
+
+    #endregion //Precision
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static CalculatorUpDown()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( CalculatorUpDown ), new FrameworkPropertyMetadata( typeof( CalculatorUpDown ) ) );
+    }
+
+    public CalculatorUpDown()
+    {
+      Keyboard.AddKeyDownHandler( this, OnKeyDown );
+      Mouse.AddPreviewMouseDownOutsideCapturedElementHandler( this, OnMouseDownOutsideCapturedElement );
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+
+      if( _calculatorPopup != null )
+        _calculatorPopup.Opened -= CalculatorPopup_Opened;
+
+      _calculatorPopup = GetTemplateChild( PART_CalculatorPopup ) as Popup;
+
+      if( _calculatorPopup != null )
+        _calculatorPopup.Opened += CalculatorPopup_Opened;
+
+      _calculator = GetTemplateChild( PART_Calculator ) as Calculator;
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Event Handlers
+
+    void CalculatorPopup_Opened( object sender, EventArgs e )
+    {
+      _calculator.Focus();
+    }
+
+    private void OnKeyDown( object sender, KeyEventArgs e )
+    {
+      switch( e.Key )
+      {
+        case Key.Enter:
+          {
+            if( EnterClosesCalculator && IsOpen )
+              CloseCalculatorUpDown();
+            break;
+          }
+        case Key.Escape:
+          {
+            CloseCalculatorUpDown();
+            e.Handled = true;
+            break;
+          }
+        case Key.Tab:
+          {
+            CloseCalculatorUpDown();
+            break;
+          }
+      }
+    }
+
+    private void OnMouseDownOutsideCapturedElement( object sender, MouseButtonEventArgs e )
+    {
+      CloseCalculatorUpDown();
+    }
+
+    #endregion //Event Handlers
+
+    #region Methods
+
+    private void CloseCalculatorUpDown()
+    {
+      if( IsOpen )
+        IsOpen = false;
+      ReleaseMouseCapture();
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CalculatorUpDown/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CalculatorUpDown/Themes/Generic.xaml
new file mode 100644
index 00000000..a861356e
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CalculatorUpDown/Themes/Generic.xaml
@@ -0,0 +1,160 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
+
+   <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+
+   <LinearGradientBrush x:Key="PopupDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="1" Color="#FFE8EBED" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <Style x:Key="CalculatorToggleButtonStyle" TargetType="ToggleButton">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="ToggleButton">
+               <Grid SnapsToDevicePixels="True">
+                  <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                       CornerRadius="0,2.75,2.75,0"
+                                       RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:CalculatorUpDown}}"
+                                       RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:CalculatorUpDown}}"
+											      RenderMouseOver="{TemplateBinding IsMouseOver}"
+											      RenderPressed="{TemplateBinding IsPressed}">
+
+                     <Grid>
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="*" />
+                           <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+
+                        <ContentPresenter HorizontalAlignment="Stretch" VerticalAlignment="Stretch" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+
+                        <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
+                           <Path x:Name="Arrow" Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000" />
+                        </Grid>
+                     </Grid>
+                  </chrome:ButtonChrome>
+               </Grid>
+                <ControlTemplate.Triggers>
+                    <Trigger Property="IsEnabled" Value="False">
+                        <Setter Property="Fill" TargetName="Arrow" Value="#AFAFAF" />
+                    </Trigger>
+                </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <DataTemplate x:Key="DefaultWatermarkTemplate">
+      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
+   </DataTemplate>
+
+   <!-- =============================================================================== -->
+   <!-- CalculatorUpDown                                                                -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type local:CalculatorUpDown}">
+      <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+      <Setter Property="BorderThickness" Value="1,1,0,1" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+      <Setter Property="HorizontalContentAlignment" Value="Right" />
+      <Setter Property="TextAlignment" Value="Right" />
+      <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:CalculatorUpDown}">
+               <Grid>
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                     </Grid.ColumnDefinitions>
+                     <local:ButtonSpinner x:Name="PART_Spinner"
+                                          IsTabStop="False"
+                                          Background="{TemplateBinding Background}"
+                                          BorderThickness="{TemplateBinding BorderThickness}"
+                                          AllowSpin="{TemplateBinding AllowSpin}"
+                                          ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
+                        <local:WatermarkTextBox x:Name="PART_TextBox"
+                                                BorderThickness="0" 
+                                                Background="Transparent"
+                                                ContextMenu="{TemplateBinding ContextMenu}"
+                                                FontFamily="{TemplateBinding FontFamily}" 
+                                                FontSize="{TemplateBinding FontSize}" 
+                                                FontStretch="{TemplateBinding FontStretch}"
+                                                FontStyle="{TemplateBinding FontStyle}" 
+                                                FontWeight="{TemplateBinding FontWeight}" 
+                                                Foreground="{TemplateBinding Foreground}" 
+                                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
+                                                MinWidth="20"
+                                                AcceptsReturn="False"
+                                                Padding="0"
+                                                TextAlignment="{TemplateBinding TextAlignment}"
+                                                TextWrapping="NoWrap" 
+                                                TabIndex="{TemplateBinding TabIndex}"
+                                                Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
+                                                Watermark="{TemplateBinding Watermark}"
+                                                WatermarkTemplate="{TemplateBinding WatermarkTemplate}" />
+                     </local:ButtonSpinner>
+                     <ToggleButton x:Name="_calculatorToggleButton"
+                                   Grid.Column="1"
+                                   IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                                   Style="{StaticResource CalculatorToggleButtonStyle}"
+                                   IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}" />
+                  </Grid>
+                  <Popup x:Name="PART_CalculatorPopup"
+                         IsOpen="{Binding IsChecked, ElementName=_calculatorToggleButton}"
+                         StaysOpen="False">
+                     <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}" Padding="3">
+                        <StackPanel>
+                           <local:Calculator x:Name="PART_Calculator"
+                                             Background="Transparent"
+                                             BorderThickness="0"
+                                             DisplayText="{Binding DisplayText, RelativeSource={RelativeSource TemplatedParent}}"
+                                             Memory="{Binding Memory, RelativeSource={RelativeSource TemplatedParent}}"
+                                             Precision="{Binding Precision, RelativeSource={RelativeSource TemplatedParent}}"
+                                             Value="{Binding Value, RelativeSource={RelativeSource TemplatedParent}}" />
+                        </StackPanel>
+                     </Border>
+                  </Popup>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CheckComboBox/Implementation/CheckComboBox.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CheckComboBox/Implementation/CheckComboBox.cs
new file mode 100644
index 00000000..be17afce
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CheckComboBox/Implementation/CheckComboBox.cs
@@ -0,0 +1,150 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Linq;
+using System.Windows;
+using System.Windows.Input;
+using Xceed.Wpf.Toolkit.Primitives;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class CheckComboBox : Selector
+  {
+    #region Constructors
+
+    static CheckComboBox()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( CheckComboBox ), new FrameworkPropertyMetadata( typeof( CheckComboBox ) ) );
+    }
+
+    public CheckComboBox()
+    {
+      Mouse.AddPreviewMouseDownOutsideCapturedElementHandler( this, OnMouseDownOutsideCapturedElement );
+    }
+
+    #endregion //Constructors
+
+    #region Properties
+
+    public static readonly DependencyProperty TextProperty = DependencyProperty.Register( "Text", typeof( string ), typeof( CheckComboBox ), new UIPropertyMetadata( null ) );
+    public string Text
+    {
+      get
+      {
+        return ( string )GetValue( TextProperty );
+      }
+      set
+      {
+        SetValue( TextProperty, value );
+      }
+    }
+
+    #region IsDropDownOpen
+
+    public static readonly DependencyProperty IsDropDownOpenProperty = DependencyProperty.Register( "IsDropDownOpen", typeof( bool ), typeof( CheckComboBox ), new UIPropertyMetadata( false, OnIsDropDownOpenChanged ) );
+    public bool IsDropDownOpen
+    {
+      get
+      {
+        return ( bool )GetValue( IsDropDownOpenProperty );
+      }
+      set
+      {
+        SetValue( IsDropDownOpenProperty, value );
+      }
+    }
+
+    private static void OnIsDropDownOpenChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      CheckComboBox comboBox = o as CheckComboBox;
+      if( comboBox != null )
+        comboBox.OnIsDropDownOpenChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnIsDropDownOpenChanged( bool oldValue, bool newValue )
+    {
+      // TODO: Add your property changed side-effects. Descendants can override as well.
+    }
+
+    #endregion //IsDropDownOpen
+
+    #endregion //Properties
+
+    #region Base Class Overrides
+
+    protected override void OnSelectedValueChanged( string oldValue, string newValue )
+    {
+      base.OnSelectedValueChanged( oldValue, newValue );
+      UpdateText();
+    }
+
+    protected override void OnDisplayMemberPathChanged( string oldDisplayMemberPath, string newDisplayMemberPath )
+    {
+      base.OnDisplayMemberPathChanged( oldDisplayMemberPath, newDisplayMemberPath );
+      UpdateText();
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Event Handlers
+
+    private void OnMouseDownOutsideCapturedElement( object sender, MouseButtonEventArgs e )
+    {
+      CloseDropDown();
+    }
+
+    #endregion //Event Handlers
+
+    #region Methods
+
+    private void UpdateText()
+    {
+#if VS2008
+      string newValue = String.Join( Delimiter, SelectedItems.Cast<object>().Select( x => GetItemDisplayValue( x ).ToString() ).ToArray() ); 
+#else
+      string newValue = String.Join( Delimiter, SelectedItems.Cast<object>().Select( x => GetItemDisplayValue( x ) ) );
+#endif
+
+      if( String.IsNullOrEmpty( Text ) || !Text.Equals( newValue ) )
+        Text = newValue;
+    }
+
+    protected object GetItemDisplayValue( object item )
+    {
+      if( !String.IsNullOrEmpty( DisplayMemberPath ) )
+      {
+        var property = item.GetType().GetProperty( DisplayMemberPath );
+        if( property != null )
+          return property.GetValue( item, null );
+      }
+
+      return item;
+    }
+
+    private void CloseDropDown()
+    {
+      if( IsDropDownOpen )
+        IsDropDownOpen = false;
+      ReleaseMouseCapture();
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CheckComboBox/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CheckComboBox/Themes/Generic.xaml
new file mode 100644
index 00000000..a2546a94
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CheckComboBox/Themes/Generic.xaml
@@ -0,0 +1,108 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
+                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes">
+
+   <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+
+   <SolidColorBrush x:Key="ButtonNormalBorder" Color="#FF707070" />
+
+   <Geometry x:Key="DownArrowGeometry">M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z</Geometry>
+
+   <Style x:Key="ComboBoxToggleButton" TargetType="{x:Type ToggleButton}">
+      <Setter Property="OverridesDefaultStyle" Value="true" />
+      <Setter Property="IsTabStop" Value="false" />
+      <Setter Property="Focusable" Value="false" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ToggleButton}">
+               <chrome:ButtonChrome x:Name="Chrome"
+                                    BorderBrush="{TemplateBinding BorderBrush}" 
+                                    Background="{TemplateBinding Background}"
+                                    CornerRadius="0"
+                                    RenderEnabled="{TemplateBinding IsEnabled}"
+                                    RenderMouseOver="{Binding IsMouseOver, ElementName=PART_DropDownButton}"
+                                    RenderNormal="False"
+                                    RenderPressed="{Binding IsPressed, ElementName=PART_DropDownButton}"
+                                    SnapsToDevicePixels="true">
+                  <Grid HorizontalAlignment="Right" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
+                     <Path x:Name="Arrow" Data="{StaticResource DownArrowGeometry}" Fill="Black" HorizontalAlignment="Center" Margin="3,0,3,0" VerticalAlignment="Center" />
+                  </Grid>
+               </chrome:ButtonChrome>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsChecked" Value="true">
+                     <Setter Property="RenderPressed" TargetName="Chrome" Value="true" />
+                  </Trigger>
+                  <Trigger Property="IsEnabled" Value="false">
+                     <Setter Property="Fill" TargetName="Arrow" Value="#AFAFAF" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style TargetType="{x:Type local:CheckComboBox}">
+      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+      <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+      <Setter Property="BorderBrush" Value="{StaticResource ButtonNormalBorder}" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+      <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+      <Setter Property="Padding" Value="2" />
+      <Setter Property="ScrollViewer.CanContentScroll" Value="true" />
+      <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:CheckComboBox}">
+               <Grid x:Name="MainGrid" SnapsToDevicePixels="true">
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="*" />
+                     <ColumnDefinition MinWidth="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" Width="0" />
+                  </Grid.ColumnDefinitions>
+                  <Popup x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" StaysOpen="False" Margin="1" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+                     <Grid MinWidth="{Binding ActualWidth, ElementName=MainGrid}">
+                        <Border x:Name="DropDownBorder" BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}" BorderThickness="1" Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}">
+                           <ScrollViewer x:Name="DropDownScrollViewer">
+                              <Grid>
+                                 <Canvas HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
+                                    <Rectangle x:Name="OpaqueRect" Fill="{Binding Background, ElementName=DropDownBorder}" Height="{Binding ActualHeight, ElementName=DropDownBorder}" Width="{Binding ActualWidth, ElementName=DropDownBorder}" />
+                                 </Canvas>
+                                 <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                              </Grid>
+                           </ScrollViewer>
+                        </Border>
+                     </Grid>
+                  </Popup>
+
+                  <Border Grid.ColumnSpan="2" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
+                  <TextBox Text="{TemplateBinding Text}" IsReadOnly="True" BorderThickness="0" Background="Transparent" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+                  <ToggleButton x:Name="PART_DropDownButton" Grid.Column="1" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxToggleButton}"
+                                IsHitTestVisible="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}" />
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CheckListBox/Implementation/CheckListBox.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CheckListBox/Implementation/CheckListBox.cs
new file mode 100644
index 00000000..956ac25e
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CheckListBox/Implementation/CheckListBox.cs
@@ -0,0 +1,41 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows;
+using Xceed.Wpf.Toolkit.Primitives;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class CheckListBox : Selector
+  {
+    #region Constructors
+
+    static CheckListBox()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( CheckListBox ), new FrameworkPropertyMetadata( typeof( CheckListBox ) ) );
+    }
+
+    public CheckListBox()
+    {
+
+    }
+
+    #endregion //Constructors
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CheckListBox/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CheckListBox/Themes/Generic.xaml
new file mode 100644
index 00000000..a3037418
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CheckListBox/Themes/Generic.xaml
@@ -0,0 +1,43 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
+
+   <Style TargetType="{x:Type local:CheckListBox}">
+      <Setter Property="BorderBrush" Value="#FF707070" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="KeyboardNavigation.TabNavigation" Value="Once" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:CheckListBox}">
+               <Border Background="{TemplateBinding Background}"
+                       BorderBrush="{TemplateBinding BorderBrush}"
+                       BorderThickness="{TemplateBinding BorderThickness}">
+                  <ScrollViewer Padding="{TemplateBinding Padding}" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
+                     <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                  </ScrollViewer>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ChildWindow/Implementation/ChildWindow.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ChildWindow/Implementation/ChildWindow.cs
new file mode 100644
index 00000000..b7eb67ec
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ChildWindow/Implementation/ChildWindow.cs
@@ -0,0 +1,902 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Shapes;
+using System.Windows.Threading;
+
+namespace Xceed.Wpf.Toolkit
+{
+  [TemplatePart( Name = PART_DragWidget, Type = typeof( Border ) )]
+  [TemplatePart( Name = PART_CloseButton, Type = typeof( Button ) )]
+  [TemplatePart( Name = PART_WindowRoot, Type = typeof( Grid ) )]
+  [TemplatePart( Name = PART_Root, Type = typeof( Grid ) )]
+  public class ChildWindow : ContentControl
+  {
+    private const string PART_DragWidget = "PART_DragWidget";
+    private const string PART_CloseButton = "PART_CloseButton";
+    private const string PART_WindowRoot = "PART_WindowRoot";
+    private const string PART_Root = "PART_Root";
+
+    #region Private Members
+
+    private Grid _root;
+    private TranslateTransform _moveTransform = new TranslateTransform();
+    private bool _startupPositionInitialized;
+    private bool _isMouseCaptured;
+    private Point _clickPoint;
+    private Point _oldPosition;
+    private Border _dragWidget;
+    private FrameworkElement _parentContainer;
+    private Rectangle _modalLayer = new Rectangle();
+    private Canvas _modalLayerPanel = new Canvas();
+
+    private const int _horizaontalOffset = 3;
+    private const int _verticalOffset = 3;
+
+    bool _ignorePropertyChanged;
+
+    #endregion //Private Members
+
+    #region Properties
+
+    #region Internal Properties
+
+    internal Grid WindowRoot
+    {
+      get;
+      private set;
+    }
+    internal Thumb DragWidget
+    {
+      get;
+      private set;
+    }
+    internal Button MinimizeButton
+    {
+      get;
+      private set;
+    }
+    internal Button MaximizeButton
+    {
+      get;
+      private set;
+    }
+    internal Button CloseButton
+    {
+      get;
+      private set;
+    }
+
+    #endregion //Internal Properties
+
+    #region Public Properties
+
+    #region Caption
+
+    public static readonly DependencyProperty CaptionProperty = DependencyProperty.Register( "Caption", typeof( object ), typeof( ChildWindow ), new UIPropertyMetadata( String.Empty ) );
+    public object Caption
+    {
+      get
+      {
+        return ( object )GetValue( CaptionProperty );
+      }
+      set
+      {
+        SetValue( CaptionProperty, value );
+      }
+    }
+
+    #endregion //Caption
+
+    #region CaptionForeground
+
+    public static readonly DependencyProperty CaptionForegroundProperty = DependencyProperty.Register( "CaptionForeground", typeof( Brush ), typeof( ChildWindow ), new UIPropertyMetadata( null ) );
+    public Brush CaptionForeground
+    {
+      get
+      {
+        return ( Brush )GetValue( CaptionForegroundProperty );
+      }
+      set
+      {
+        SetValue( CaptionForegroundProperty, value );
+      }
+    }
+
+    #endregion //CaptionForeground
+
+    #region CloseButtonStyle
+
+    public static readonly DependencyProperty CloseButtonStyleProperty = DependencyProperty.Register( "CloseButtonStyle", typeof( Style ), typeof( ChildWindow ), new PropertyMetadata( null ) );
+    public Style CloseButtonStyle
+    {
+      get
+      {
+        return ( Style )GetValue( CloseButtonStyleProperty );
+      }
+      set
+      {
+        SetValue( CloseButtonStyleProperty, value );
+      }
+    }
+
+    #endregion //CloseButtonStyle
+
+    #region CloseButtonVisibility
+
+    public static readonly DependencyProperty CloseButtonVisibilityProperty = DependencyProperty.Register( "CloseButtonVisibility", typeof( Visibility ), typeof( ChildWindow ), new PropertyMetadata( Visibility.Visible ) );
+    public Visibility CloseButtonVisibility
+    {
+      get
+      {
+        return ( Visibility )GetValue( CloseButtonVisibilityProperty );
+      }
+      set
+      {
+        SetValue( CloseButtonVisibilityProperty, value );
+      }
+    }
+
+    #endregion //CloseButtonVisibility
+
+    #region DialogResult
+
+    private bool? _dialogResult;
+    /// <summary>
+    /// Gets or sets a value indicating whether the ChildWindow was accepted or canceled.
+    /// </summary>
+    /// <value>
+    /// True if the child window was accepted; false if the child window was
+    /// canceled. The default is null.
+    /// </value>
+    [TypeConverter( typeof( NullableBoolConverter ) )]
+    public bool? DialogResult
+    {
+      get
+      {
+        return _dialogResult;
+      }
+      set
+      {
+        if( _dialogResult != value )
+        {
+          _dialogResult = value;
+          Close();
+        }
+      }
+    }
+
+    #endregion //DialogResult
+
+    #region DesignerWindowState
+
+    public static readonly DependencyProperty DesignerWindowStateProperty = DependencyProperty.Register( "DesignerWindowState", typeof( WindowState ), typeof( ChildWindow ), new PropertyMetadata( WindowState.Closed, OnDesignerWindowStatePropertyChanged ) );
+    public WindowState DesignerWindowState
+    {
+      get
+      {
+        return ( WindowState )GetValue( DesignerWindowStateProperty );
+      }
+      set
+      {
+        SetValue( DesignerWindowStateProperty, value );
+      }
+    }
+
+    private static void OnDesignerWindowStatePropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ChildWindow childWindow = d as ChildWindow;
+      if( childWindow != null )
+        childWindow.OnDesignerWindowStatePropertyChanged( ( WindowState )e.OldValue, ( WindowState )e.NewValue );
+    }
+
+    protected virtual void OnDesignerWindowStatePropertyChanged( WindowState oldValue, WindowState newValue )
+    {
+      if( DesignerProperties.GetIsInDesignMode( this ) )
+      {
+        Visibility = newValue == Xceed.Wpf.Toolkit.WindowState.Open ? Visibility.Visible : Visibility.Collapsed;
+      }
+    }
+
+    #endregion //DesignerWindowState
+
+    #region FocusedElement
+
+    public static readonly DependencyProperty FocusedElementProperty = DependencyProperty.Register( "FocusedElement", typeof( FrameworkElement ), typeof( ChildWindow ), new UIPropertyMetadata( null ) );
+    public FrameworkElement FocusedElement
+    {
+      get
+      {
+        return ( FrameworkElement )GetValue( FocusedElementProperty );
+      }
+      set
+      {
+        SetValue( FocusedElementProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region IsModal
+
+    public static readonly DependencyProperty IsModalProperty = DependencyProperty.Register( "IsModal", typeof( bool ), typeof( ChildWindow ), new UIPropertyMetadata( false, new PropertyChangedCallback( OnIsModalPropertyChanged ) ) );
+    public bool IsModal
+    {
+      get
+      {
+        return ( bool )GetValue( IsModalProperty );
+      }
+      set
+      {
+        SetValue( IsModalProperty, value );
+      }
+    }
+
+    private static void OnIsModalPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ChildWindow childWindow = d as ChildWindow;
+      if( childWindow != null )
+        childWindow.OnIsModalChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    private void OnIsModalChanged( bool oldValue, bool newValue )
+    {
+      if( newValue )
+      {
+        KeyboardNavigation.SetTabNavigation( this, KeyboardNavigationMode.Cycle );
+        ShowModalLayer();
+      }
+      else
+      {
+        KeyboardNavigation.SetTabNavigation( this, KeyboardNavigationMode.Continue );
+        HideModalLayer();
+      }
+    }
+
+    #endregion //IsModal
+
+    #region Left
+
+    public static readonly DependencyProperty LeftProperty = DependencyProperty.Register( "Left", typeof( double ), typeof( ChildWindow ), new PropertyMetadata( 0.0, new PropertyChangedCallback( OnLeftPropertyChanged ) ) );
+    public double Left
+    {
+      get
+      {
+        return ( double )GetValue( LeftProperty );
+      }
+      set
+      {
+        SetValue( LeftProperty, value );
+      }
+    }
+
+    private static void OnLeftPropertyChanged( DependencyObject obj, DependencyPropertyChangedEventArgs e )
+    {
+      ChildWindow childWindow = obj as ChildWindow;
+      if( childWindow != null )
+        childWindow.OnLeftPropertyChanged( ( double )e.OldValue, ( double )e.NewValue );
+    }
+
+    private void OnLeftPropertyChanged( double oldValue, double newValue )
+    {
+      Left = GetRestrictedLeft();
+      ProcessMove( newValue - oldValue, 0 );
+    }
+
+    #endregion //Left
+
+    #region OverlayBrush
+
+    public static readonly DependencyProperty OverlayBrushProperty = DependencyProperty.Register( "OverlayBrush", typeof( Brush ), typeof( ChildWindow ), new PropertyMetadata( Brushes.Gray, OnOverlayBrushChanged ) );
+    public Brush OverlayBrush
+    {
+      get
+      {
+        return ( Brush )GetValue( OverlayBrushProperty );
+      }
+      set
+      {
+        SetValue( OverlayBrushProperty, value );
+      }
+    }
+
+    private static void OnOverlayBrushChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ChildWindow childWindow = d as ChildWindow;
+      if( childWindow != null )
+        childWindow.OnOverlayBrushChanged( ( Brush )e.OldValue, ( Brush )e.NewValue );
+    }
+
+    protected virtual void OnOverlayBrushChanged( Brush oldValue, Brush newValue )
+    {
+      _modalLayer.Fill = newValue;
+    }
+
+    #endregion //OverlayBrush
+
+    #region OverlayOpacity
+
+    public static readonly DependencyProperty OverlayOpacityProperty = DependencyProperty.Register( "OverlayOpacity", typeof( double ), typeof( ChildWindow ), new PropertyMetadata( 0.5, OnOverlayOpacityChanged ) );
+    public double OverlayOpacity
+    {
+      get
+      {
+        return ( double )GetValue( OverlayOpacityProperty );
+      }
+      set
+      {
+        SetValue( OverlayOpacityProperty, value );
+      }
+    }
+
+    private static void OnOverlayOpacityChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ChildWindow childWindow = d as ChildWindow;
+      if( childWindow != null )
+        childWindow.OnOverlayOpacityChanged( ( double )e.OldValue, ( double )e.NewValue );
+    }
+
+    protected virtual void OnOverlayOpacityChanged( double oldValue, double newValue )
+    {
+      _modalLayer.Opacity = newValue;
+    }
+
+    #endregion //OverlayOpacity
+
+    #region Top
+
+    public static readonly DependencyProperty TopProperty = DependencyProperty.Register( "Top", typeof( double ), typeof( ChildWindow ), new PropertyMetadata( 0.0, new PropertyChangedCallback( OnTopPropertyChanged ) ) );
+    public double Top
+    {
+      get
+      {
+        return ( double )GetValue( TopProperty );
+      }
+      set
+      {
+        SetValue( TopProperty, value );
+      }
+    }
+
+    private static void OnTopPropertyChanged( DependencyObject obj, DependencyPropertyChangedEventArgs e )
+    {
+      ChildWindow childWindow = obj as ChildWindow;
+      if( childWindow != null )
+        childWindow.OnTopPropertyChanged( ( double )e.OldValue, ( double )e.NewValue );
+    }
+
+    private void OnTopPropertyChanged( double oldValue, double newValue )
+    {
+      Top = GetRestrictedTop();
+      ProcessMove( 0, newValue - oldValue );
+    }
+
+    #endregion //TopProperty
+
+    #region WindowBackground
+
+    public static readonly DependencyProperty WindowBackgroundProperty = DependencyProperty.Register( "WindowBackground", typeof( Brush ), typeof( ChildWindow ), new PropertyMetadata( null ) );
+    public Brush WindowBackground
+    {
+      get
+      {
+        return ( Brush )GetValue( WindowBackgroundProperty );
+      }
+      set
+      {
+        SetValue( WindowBackgroundProperty, value );
+      }
+    }
+
+    #endregion //WindowBackground
+
+    #region WindowBorderBrush
+
+    public static readonly DependencyProperty WindowBorderBrushProperty = DependencyProperty.Register( "WindowBorderBrush", typeof( Brush ), typeof( ChildWindow ), new PropertyMetadata( null ) );
+    public Brush WindowBorderBrush
+    {
+      get
+      {
+        return ( Brush )GetValue( WindowBorderBrushProperty );
+      }
+      set
+      {
+        SetValue( WindowBorderBrushProperty, value );
+      }
+    }
+
+    #endregion //WindowBorderBrush
+
+    #region WindowOpacity
+
+    public static readonly DependencyProperty WindowOpacityProperty = DependencyProperty.Register( "WindowOpacity", typeof( double ), typeof( ChildWindow ), new PropertyMetadata( null ) );
+    public double WindowOpacity
+    {
+      get
+      {
+        return ( double )GetValue( WindowOpacityProperty );
+      }
+      set
+      {
+        SetValue( WindowOpacityProperty, value );
+      }
+    }
+
+    #endregion //WindowOpacity
+
+    #region WindowStartupLocation
+
+    public static readonly DependencyProperty WindowStartupLocationProperty = DependencyProperty.Register( "WindowStartupLocation", typeof( WindowStartupLocation ), typeof( ChildWindow ), new UIPropertyMetadata( WindowStartupLocation.Manual, OnWindowStartupLocationChanged ) );
+    public WindowStartupLocation WindowStartupLocation
+    {
+      get
+      {
+        return ( WindowStartupLocation )GetValue( WindowStartupLocationProperty );
+      }
+      set
+      {
+        SetValue( WindowStartupLocationProperty, value );
+      }
+    }
+
+    private static void OnWindowStartupLocationChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ChildWindow childWindow = o as ChildWindow;
+      if( childWindow != null )
+        childWindow.OnWindowStartupLocationChanged( ( WindowStartupLocation )e.OldValue, ( WindowStartupLocation )e.NewValue );
+    }
+
+    protected virtual void OnWindowStartupLocationChanged( WindowStartupLocation oldValue, WindowStartupLocation newValue )
+    {
+      // TODO: Add your property changed side-effects. Descendants can override as well.
+    }
+
+    #endregion //WindowStartupLocation
+
+    #region WindowState
+
+    public static readonly DependencyProperty WindowStateProperty = DependencyProperty.Register( "WindowState", typeof( WindowState ), typeof( ChildWindow ), new FrameworkPropertyMetadata( WindowState.Closed, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnWindowStatePropertyChanged ) );
+    public WindowState WindowState
+    {
+      get
+      {
+        return ( WindowState )GetValue( WindowStateProperty );
+      }
+      set
+      {
+        SetValue( WindowStateProperty, value );
+      }
+    }
+
+    private static void OnWindowStatePropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ChildWindow childWindow = d as ChildWindow;
+      if( childWindow != null )
+        childWindow.OnWindowStatePropertyChanged( ( WindowState )e.OldValue, ( WindowState )e.NewValue );
+    }
+
+    protected virtual void OnWindowStatePropertyChanged( WindowState oldValue, WindowState newValue )
+    {
+      if( !DesignerProperties.GetIsInDesignMode( this ) )
+      {
+        if( !_ignorePropertyChanged )
+          SetWindowState( newValue );
+      }
+      else
+      {
+        Visibility = DesignerWindowState == Xceed.Wpf.Toolkit.WindowState.Open ? Visibility.Visible : System.Windows.Visibility.Collapsed;
+      }
+    }
+
+    #endregion //WindowState
+
+    #endregion //Public Properties
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static ChildWindow()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( ChildWindow ), new FrameworkPropertyMetadata( typeof( ChildWindow ) ) );
+    }
+
+    public ChildWindow()
+    {
+      DesignerWindowState = Xceed.Wpf.Toolkit.WindowState.Open;
+
+      IsVisibleChanged += ChildWindow_IsVisibleChanged;
+
+      _modalLayer.Fill = OverlayBrush;
+      _modalLayer.Opacity = OverlayOpacity;
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+
+      if( _dragWidget != null )
+      {
+        _dragWidget.RemoveHandler( UIElement.MouseLeftButtonDownEvent, new MouseButtonEventHandler( HeaderLeftMouseButtonDown ) );
+        _dragWidget.RemoveHandler( UIElement.MouseLeftButtonUpEvent, new MouseButtonEventHandler( HeaderMouseLeftButtonUp ) );
+        _dragWidget.MouseMove -= ( o, e ) => HeaderMouseMove( e );
+      }
+
+      _dragWidget = GetTemplateChild( PART_DragWidget ) as Border;
+
+      if( _dragWidget != null )
+      {
+        _dragWidget.AddHandler( UIElement.MouseLeftButtonDownEvent, new MouseButtonEventHandler( HeaderLeftMouseButtonDown ), true );
+        _dragWidget.AddHandler( UIElement.MouseLeftButtonUpEvent, new MouseButtonEventHandler( HeaderMouseLeftButtonUp ), true );
+        _dragWidget.MouseMove += ( o, e ) => HeaderMouseMove( e );
+      }
+
+      if( CloseButton != null )
+        CloseButton.Click -= ( o, e ) => Close();
+
+      CloseButton = GetTemplateChild( PART_CloseButton ) as Button;
+
+      if( CloseButton != null )
+        CloseButton.Click += ( o, e ) => Close();
+
+      WindowRoot = GetTemplateChild( PART_WindowRoot ) as Grid;
+      WindowRoot.RenderTransform = _moveTransform;
+
+      _parentContainer = VisualTreeHelper.GetParent( this ) as FrameworkElement;
+      _parentContainer.LayoutUpdated += ParentContainer_LayoutUpdated;
+      _parentContainer.SizeChanged += ParentContainer_SizeChanged;
+
+      //initialize our modal background width/height
+      _modalLayer.Height = _parentContainer.ActualHeight;
+      _modalLayer.Width = _parentContainer.ActualWidth;
+
+      //this is for XBAP applications only. When inside an XBAP the parent container has no height or width until it has loaded. Therefore
+      //we need to handle the loaded event and reposition the window.
+      if( System.Windows.Interop.BrowserInteropHelper.IsBrowserHosted )
+      {
+        _parentContainer.Loaded += ( o, e ) =>
+            {
+              ExecuteOpen();
+            };
+      }
+
+      _root = GetTemplateChild( PART_Root ) as Grid;
+
+#if VS2008
+      FocusVisualStyle = null;
+#else
+      Style focusStyle = _root.Resources[ "FocusVisualStyle" ] as Style;
+      if( focusStyle != null )
+      {
+        Setter focusStyleDataContext = new Setter( Control.DataContextProperty, this );
+        focusStyle.Setters.Add( focusStyleDataContext );
+        FocusVisualStyle = focusStyle;
+      }
+#endif
+      _root.Children.Add( _modalLayerPanel );
+    }
+
+    protected override void OnGotFocus( RoutedEventArgs e )
+    {
+      Action action = () =>
+      {
+        if( FocusedElement != null )
+          FocusedElement.Focus();
+      };
+
+      Dispatcher.BeginInvoke( DispatcherPriority.ApplicationIdle, action );
+    }
+
+    protected override void OnKeyDown( KeyEventArgs e )
+    {
+      base.OnKeyDown( e );
+
+      if( WindowState == WindowState.Open )
+      {
+        switch( e.Key )
+        {
+          case Key.Left:
+            this.Left -= _horizaontalOffset;
+            e.Handled = true;
+            break;
+
+          case Key.Right:
+            this.Left += _horizaontalOffset;
+            e.Handled = true;
+            break;
+
+          case Key.Down:
+            this.Top += _verticalOffset;
+            e.Handled = true;
+            break;
+
+          case Key.Up:
+            this.Top -= _verticalOffset;
+            e.Handled = true;
+            break;
+        }
+      }
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Event Handlers
+
+    void ChildWindow_IsVisibleChanged( object sender, DependencyPropertyChangedEventArgs e )
+    {
+      if( ( bool )e.NewValue )
+        Focus();
+    }
+
+    void HeaderLeftMouseButtonDown( object sender, MouseButtonEventArgs e )
+    {
+      e.Handled = true;
+      Focus();
+      _dragWidget.CaptureMouse();
+      _isMouseCaptured = true;
+      _clickPoint = e.GetPosition( null ); //save off the mouse position
+      _oldPosition = new Point( Left, Top ); //save off our original window position
+    }
+
+    private void HeaderMouseLeftButtonUp( object sender, MouseButtonEventArgs e )
+    {
+      e.Handled = true;
+      _dragWidget.ReleaseMouseCapture();
+      _isMouseCaptured = false;
+    }
+
+    private void HeaderMouseMove( MouseEventArgs e )
+    {
+      if( _isMouseCaptured && Visibility == Visibility.Visible )
+      {
+        Point currentPosition = e.GetPosition( null ); //our current mouse position
+
+        Left = _oldPosition.X + ( currentPosition.X - _clickPoint.X );
+        Top = _oldPosition.Y + ( currentPosition.Y - _clickPoint.Y );
+
+        //this helps keep our mouse position in sync with the drag widget position
+        Point dragWidgetPosition = e.GetPosition( _dragWidget );
+        if( dragWidgetPosition.X < 0 || dragWidgetPosition.X > _dragWidget.ActualWidth || dragWidgetPosition.Y < 0 || dragWidgetPosition.Y > _dragWidget.ActualHeight )
+        {
+          return;
+        }
+
+        _oldPosition = new Point( Left, Top );
+        _clickPoint = e.GetPosition( Window.GetWindow( this ) ); //store the point where we are relative to the window
+      }
+    }
+
+    private void ParentContainer_LayoutUpdated( object sender, EventArgs e )
+    {
+      if( DesignerProperties.GetIsInDesignMode( this ) )
+        return;
+
+      //we only want to set the start position if this is the first time the control has bee initialized
+      if( !_startupPositionInitialized )
+      {
+        ExecuteOpen();
+        _startupPositionInitialized = true;
+      }
+    }
+
+    void ParentContainer_SizeChanged( object sender, SizeChangedEventArgs e )
+    {
+      //resize our modal layer
+      _modalLayer.Height = e.NewSize.Height;
+      _modalLayer.Width = e.NewSize.Width;
+
+      //reposition our window
+      Left = GetRestrictedLeft();
+      Top = GetRestrictedTop();
+    }
+
+    #endregion //Event Handlers
+
+    #region Methods
+
+    #region Private
+
+    private double GetRestrictedLeft()
+    {
+      if( Left < 0 )
+        return 0;
+
+      if( _parentContainer != null )
+      {
+        if( Left + WindowRoot.ActualWidth > _parentContainer.ActualWidth && _parentContainer.ActualWidth != 0 )
+        {
+          double left = _parentContainer.ActualWidth - WindowRoot.ActualWidth;
+          return left < 0 ? 0 : left;
+        }
+      }
+
+      return Left;
+    }
+
+    private double GetRestrictedTop()
+    {
+      if( Top < 0 )
+        return 0;
+
+      if( _parentContainer != null )
+      {
+        if( Top + WindowRoot.ActualHeight > _parentContainer.ActualHeight && _parentContainer.ActualHeight != 0 )
+        {
+          double top = _parentContainer.ActualHeight - WindowRoot.ActualHeight;
+          return top < 0 ? 0 : top;
+        }
+      }
+
+      return Top;
+    }
+
+    private void SetWindowState( WindowState state )
+    {
+      switch( state )
+      {
+        case WindowState.Closed:
+          {
+            ExecuteClose();
+            break;
+          }
+        case WindowState.Open:
+          {
+            ExecuteOpen();
+            break;
+          }
+      }
+    }
+
+    private void ExecuteClose()
+    {
+      CancelEventArgs e = new CancelEventArgs();
+      OnClosing( e );
+
+      if( !e.Cancel )
+      {
+        if( !_dialogResult.HasValue )
+          _dialogResult = false;
+
+        OnClosed( EventArgs.Empty );
+      }
+      else
+      {
+        CancelClose();
+      }
+    }
+
+    private void CancelClose()
+    {
+      _dialogResult = null; //when the close is cancelled, DialogResult should be null
+
+      _ignorePropertyChanged = true;
+      WindowState = WindowState.Open; //now reset the window state to open because the close was cancelled
+      _ignorePropertyChanged = false;
+    }
+
+    private void ExecuteOpen()
+    {
+      _dialogResult = null; //reset the dialogResult to null each time the window is opened
+
+      if( WindowStartupLocation == Xceed.Wpf.Toolkit.WindowStartupLocation.Center )
+        CenterChildWindow();
+
+      BringToFront();
+    }
+
+    private void BringToFront()
+    {
+      int index = 0;
+
+      if( _parentContainer != null )
+        index = ( int )_parentContainer.GetValue( Canvas.ZIndexProperty );
+
+      SetValue( Canvas.ZIndexProperty, ++index );
+
+      if( IsModal )
+        Canvas.SetZIndex( _modalLayerPanel, index - 2 );
+    }
+
+    private void CenterChildWindow()
+    {
+      if( _parentContainer != null )
+      {
+        Left = ( _parentContainer.ActualWidth - WindowRoot.ActualWidth ) / 2.0;
+        Top = ( _parentContainer.ActualHeight - WindowRoot.ActualHeight ) / 2.0;
+      }
+    }
+
+    private void ShowModalLayer()
+    {
+      if( !DesignerProperties.GetIsInDesignMode( this ) )
+      {
+        if( !_modalLayerPanel.Children.Contains( _modalLayer ) )
+          _modalLayerPanel.Children.Add( _modalLayer );
+
+        _modalLayer.Visibility = System.Windows.Visibility.Visible;
+      }
+    }
+
+    private void HideModalLayer()
+    {
+      _modalLayer.Visibility = System.Windows.Visibility.Collapsed;
+    }
+
+    private void ProcessMove( double x, double y )
+    {
+      _moveTransform.X += x;
+      _moveTransform.Y += y;
+
+      InvalidateArrange();
+    }
+
+    #endregion //Private
+
+    #region Public
+
+    public void Show()
+    {
+      WindowState = WindowState.Open;
+    }
+
+    public void Close()
+    {
+      WindowState = WindowState.Closed;
+    }
+
+    #endregion //Public
+
+    #endregion //Methods
+
+    #region Events
+
+    /// <summary>
+    /// Occurs when the ChildWindow is closed.
+    /// </summary>
+    public event EventHandler Closed;
+    protected virtual void OnClosed( EventArgs e )
+    {
+      if( Closed != null )
+        Closed( this, e );
+    }
+
+    /// <summary>
+    /// Occurs when the ChildWindow is closing.
+    /// </summary>
+    public event EventHandler<CancelEventArgs> Closing;
+    protected virtual void OnClosing( CancelEventArgs e )
+    {
+      if( Closing != null )
+        Closing( this, e );
+    }
+
+    #endregion //Events
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ChildWindow/Implementation/WindowStartupLocation.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ChildWindow/Implementation/WindowStartupLocation.cs
new file mode 100644
index 00000000..eb5e3261
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ChildWindow/Implementation/WindowStartupLocation.cs
@@ -0,0 +1,27 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit
+{
+  public enum WindowStartupLocation
+  {
+    Center,
+    Manual
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ChildWindow/Implementation/WindowState.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ChildWindow/Implementation/WindowState.cs
new file mode 100644
index 00000000..f9f8f0d5
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ChildWindow/Implementation/WindowState.cs
@@ -0,0 +1,27 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit
+{
+  public enum WindowState
+  {
+    Closed,
+    Open
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ChildWindow/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ChildWindow/Themes/Generic.xaml
new file mode 100644
index 00000000..3208ade1
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ChildWindow/Themes/Generic.xaml
@@ -0,0 +1,240 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
+
+   <LinearGradientBrush x:Key="WindowDarkBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="WindowBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="0.479" Color="#FFf4f5f6" />
+            <GradientStop Offset="1" Color="#FFd0d6db" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="WindowButtonHoverBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFb5bdc8" />
+            <GradientStop Offset="0.370" Color="#FF8399a9" />
+            <GradientStop Offset="0.370" Color="#FF718597" />
+            <GradientStop Offset="0.906" Color="#FFb9c1ca" />
+            <GradientStop Offset="1" Color="#FFb9c1ca" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="WindowButtonPressedBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FF6b7c8d" />
+            <GradientStop Offset="0.370" Color="#FF4d606f" />
+            <GradientStop Offset="0.370" Color="#FF465460" />
+            <GradientStop Offset="0.906" Color="#FF262d33" />
+            <GradientStop Offset="1" Color="#FF262d33" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <Style x:Key="WindowCloseButtonStyle" TargetType="Button">
+      <Setter Property="Foreground" Value="#FF000000" />
+      <Setter Property="Padding" Value="3" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="Button">
+               <Grid>
+                  <VisualStateManager.VisualStateGroups>
+                     <VisualStateGroup x:Name="CommonStates">
+                        <VisualState x:Name="Normal" />
+                        <VisualState x:Name="MouseOver">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonHoverBrush}" />
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Pressed">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonPressedBrush}" />
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                     </VisualStateGroup>
+                  </VisualStateManager.VisualStateGroups>
+                  <Border x:Name="Background" CornerRadius="0,0,2,0" Background="{StaticResource WindowDarkBrush}">
+                     <Border Margin="1,0,1,1" BorderBrush="#59FFFFFF" BorderThickness="1" CornerRadius="0,0,1,0" />
+                  </Border>
+                  <ContentPresenter x:Name="contentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
+                  <Path x:Name="path"
+								Height="6"
+								Width="7"
+								Stretch="Fill"
+								Opacity="1"
+								Data="M 2,6 C2,6 3,6 3,6 3,6 3,5 3,5 3,5 4,5 4,5 4,5 4,6 4,6 4,6 5,6 5,6 5,6 7,6 7,6 7,6 7,5 7,5 7,5 6,5 6,5 6,5 6,4 6,4 6,4 5,4 5,4 5,4 5,2 5,2 5,2 6,2 6,2 6,2 6,1 6,1 6,1 7,1 7,1 7,1 7,0 7,0 7,0 5,0 5,0 5,0 4,0 4,0 4,0 4,1 4,1 4,1 3,1 3,1 3,1 3,0 3,0 3,0 2,0 2,0 2,0 0,0 0,0 0,0 0,1 0,1 0,1 1,1 1,1 1,1 1,2 1,2 1,2 2,2 2,2 2,2 2,4 2,4 2,4 1,4 1,4 1,4 1,5 1,5 1,5 0,5 0,5 0,5 0,6 0,6 0,6 2,6 2,6 z"
+								Fill="White"
+                        Margin="0,0,0,1"
+                        Visibility="Collapsed" />
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <!-- =============================================================================== -->
+   <!-- ChildWindow                                                                      -->
+   <!-- =============================================================================== -->
+
+   <SolidColorBrush x:Key="ChildWindowMainBrushColor" Color="#FF3C688D" />
+   <LinearGradientBrush x:Key="BorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#7FFFFFFF" Offset="0.05" />
+      <GradientStop Color="#B2FFFFFF" Offset="0.07" />
+      <GradientStop Color="#00FFFFFF" Offset="1" />
+   </LinearGradientBrush>
+
+   <Style TargetType="{x:Type local:ChildWindow}">
+      <Setter Property="Background" Value="#FFFFFFFF" />
+      <Setter Property="BorderBrush" Value="{StaticResource WindowDarkBrush}" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="CaptionForeground" Value="#FF000000" />
+      <Setter Property="CloseButtonStyle" Value="{StaticResource WindowCloseButtonStyle}" />
+      <Setter Property="HorizontalAlignment" Value="Left" />
+      <Setter Property="HorizontalContentAlignment" Value="Left" />
+      <Setter Property="IsTabStop" Value="False" />
+      <Setter Property="VerticalAlignment" Value="Top" />
+      <Setter Property="VerticalContentAlignment" Value="Top" />
+      <Setter Property="WindowBorderBrush" Value="{StaticResource WindowDarkBrush}" />
+      <Setter Property="WindowBackground" Value="{StaticResource WindowBackgroundBrush}" />
+      <Setter Property="WindowOpacity" Value="1.0" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:ChildWindow}">
+               <Grid x:Name="PART_Root">
+                  <Grid.Resources>
+                     <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+                     <Style x:Key="FocusVisualStyle" TargetType="Control">
+                        <Setter Property="BorderBrush" Value="Black" />
+                        <Setter Property="Background" Value="Transparent" />
+                        <Setter Property="Margin" Value="-1" />
+                        <Setter Property="Template">
+                           <Setter.Value>
+                              <ControlTemplate>
+                                 <Rectangle Stroke="{TemplateBinding BorderBrush}" Fill="{TemplateBinding Background}" Margin="{TemplateBinding Margin}" StrokeDashArray="4 3" StrokeThickness="0.5">
+                                    <Rectangle.RenderTransform>
+                                       <TranslateTransform X="{Binding Left}" Y="{Binding Top}" />
+                                    </Rectangle.RenderTransform>
+                                 </Rectangle>
+                              </ControlTemplate>
+                           </Setter.Value>
+                        </Setter>
+                     </Style>
+                  </Grid.Resources>
+
+                  <Grid x:Name="PART_WindowRoot" HorizontalAlignment="Left" VerticalAlignment="Top" MinWidth="{TemplateBinding MinWidth}" MinHeight="{TemplateBinding MinHeight}" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
+                     <Grid.RenderTransform>
+                        <TransformGroup>
+                           <ScaleTransform />
+                           <SkewTransform />
+                           <RotateTransform />
+                           <TranslateTransform />
+                        </TransformGroup>
+                     </Grid.RenderTransform>
+
+                     <!-- Borders -->
+                     <Grid  x:Name="WindowGrid">
+                        <Border BorderBrush="{TemplateBinding WindowBorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="5,5,0,0" Opacity="{TemplateBinding WindowOpacity}" />
+                        <Grid Margin="0" Background="{x:Null}">
+                           <Border x:Name="WindowBorder" Margin="1,1,1,1" Background="{TemplateBinding WindowBackground}" CornerRadius="4,4,0,0" Opacity="{TemplateBinding WindowOpacity}" />
+                           <Border BorderBrush="White" BorderThickness="1" CornerRadius="4,4,0,0" Margin="1" Opacity="0.7" />
+                        </Grid>
+                     </Grid>
+
+                     <Grid>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="Auto" MinHeight="26" />
+                           <RowDefinition />
+                        </Grid.RowDefinitions>
+
+                        <!-- Content Border -->
+                        <Grid Margin="6,0,6,6" x:Name="ContentGrid" Grid.Row="1">
+                           <Grid.RowDefinitions>
+                              <RowDefinition />
+                              <RowDefinition Height="Auto" />
+                           </Grid.RowDefinitions>
+                           <Border BorderBrush="#FFFFFFFF" BorderThickness="1" CornerRadius="1" />
+                           <Border Margin="1"  BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="0.1" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}">
+                              <ContentPresenter x:Name="Content"
+                                                Content="{TemplateBinding Content}" 
+                                                ContentTemplate="{TemplateBinding ContentTemplate}" />
+                           </Border>
+                        </Grid>
+
+                        <!-- Header -->
+                        <Border x:Name="PART_DragWidget" Background="Transparent" Grid.Column="1" CornerRadius="5,5,0,0" Margin="1,1,1,0">
+                           <Grid>
+                              <Grid x:Name="CaptionHeader" Margin="1,1,105,0" VerticalAlignment="Center">
+                                 <!-- Caption -->
+                                 <ContentControl x:Name="Caption"
+                                                 Margin="5,0,0,0"
+                                                 IsTabStop="False"
+                                                 HorizontalAlignment="Stretch"
+                                                 Content="{TemplateBinding Caption}"
+                                                 Foreground="{TemplateBinding CaptionForeground}" />
+                              </Grid>
+                           </Grid>
+                        </Border>
+                     </Grid>
+
+                     <!-- Buttons -->
+                     <Border BorderBrush="#A5FFFFFF" BorderThickness="1,0,1,1" CornerRadius="0,0,3,3" VerticalAlignment="Top" Margin="0,1,7,0" HorizontalAlignment="Right">
+                        <Button x:Name="PART_CloseButton" Style="{TemplateBinding CloseButtonStyle}" Visibility="{TemplateBinding CloseButtonVisibility}" Height="17" Width="43" IsTabStop="False">
+                           <Path Height="10"
+                                 HorizontalAlignment="Center"
+                                 VerticalAlignment="Center"
+                                 Width="12"
+                                 Fill="#E4FFFFFF"
+                                 Stretch="Fill"
+                                 Stroke="#FF535666" 
+                                 Data="M0.5,0.5 L4.5178828,0.5 L6.0620003,3.125 L7.4936447,0.5 L11.5,0.5 L11.5,1.5476431 L8.7425003,6.1201854 L11.5,10.359666 L11.5,11.5 L7.4941902,11.5 L6.0620003,8.8740005 L4.5172949,11.5 L0.5,11.5 L0.5,10.43379 L3.3059995,6.1201582 L0.5,1.4676378 L0.5,0.5 z" />
+                        </Button>
+                     </Border>
+                  </Grid>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="WindowState" Value="Closed">
+                     <Setter Property="Visibility" Value="Collapsed" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Chromes/Implementation/ButtonChrome.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Chromes/Implementation/ButtonChrome.cs
new file mode 100644
index 00000000..a8ab8c26
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Chromes/Implementation/ButtonChrome.cs
@@ -0,0 +1,275 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Xceed.Wpf.Toolkit.Chromes
+{
+  public class ButtonChrome : ContentControl
+  {
+    #region CornerRadius
+
+    public static readonly DependencyProperty CornerRadiusProperty = DependencyProperty.Register( "CornerRadius", typeof( CornerRadius ), typeof( ButtonChrome ), new UIPropertyMetadata( default( CornerRadius ), new PropertyChangedCallback( OnCornerRadiusChanged ) ) );
+    public CornerRadius CornerRadius
+    {
+      get
+      {
+        return ( CornerRadius )GetValue( CornerRadiusProperty );
+      }
+      set
+      {
+        SetValue( CornerRadiusProperty, value );
+      }
+    }
+
+    private static void OnCornerRadiusChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ButtonChrome buttonChrome = o as ButtonChrome;
+      if( buttonChrome != null )
+        buttonChrome.OnCornerRadiusChanged( ( CornerRadius )e.OldValue, ( CornerRadius )e.NewValue );
+    }
+
+    protected virtual void OnCornerRadiusChanged( CornerRadius oldValue, CornerRadius newValue )
+    {
+      //we always want the InnerBorderRadius to be one less than the CornerRadius
+      CornerRadius newInnerCornerRadius = new CornerRadius( Math.Max( 0, newValue.TopLeft - 1 ),
+                                                           Math.Max( 0, newValue.TopRight - 1 ),
+                                                           Math.Max( 0, newValue.BottomRight - 1 ),
+                                                           Math.Max( 0, newValue.BottomLeft - 1 ) );
+
+      InnerCornerRadius = newInnerCornerRadius;
+    }
+
+    #endregion //CornerRadius
+
+    #region InnerCornerRadius
+
+    public static readonly DependencyProperty InnerCornerRadiusProperty = DependencyProperty.Register( "InnerCornerRadius", typeof( CornerRadius ), typeof( ButtonChrome ), new UIPropertyMetadata( default( CornerRadius ), new PropertyChangedCallback( OnInnerCornerRadiusChanged ) ) );
+    public CornerRadius InnerCornerRadius
+    {
+      get
+      {
+        return ( CornerRadius )GetValue( InnerCornerRadiusProperty );
+      }
+      set
+      {
+        SetValue( InnerCornerRadiusProperty, value );
+      }
+    }
+
+    private static void OnInnerCornerRadiusChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ButtonChrome buttonChrome = o as ButtonChrome;
+      if( buttonChrome != null )
+        buttonChrome.OnInnerCornerRadiusChanged( ( CornerRadius )e.OldValue, ( CornerRadius )e.NewValue );
+    }
+
+    protected virtual void OnInnerCornerRadiusChanged( CornerRadius oldValue, CornerRadius newValue )
+    {
+      // TODO: Add your property changed side-effects. Descendants can override as well.
+    }
+
+    #endregion //InnerCornerRadius
+
+    #region RenderChecked
+
+    public static readonly DependencyProperty RenderCheckedProperty = DependencyProperty.Register( "RenderChecked", typeof( bool ), typeof( ButtonChrome ), new UIPropertyMetadata( false, OnRenderCheckedChanged ) );
+    public bool RenderChecked
+    {
+      get
+      {
+        return ( bool )GetValue( RenderCheckedProperty );
+      }
+      set
+      {
+        SetValue( RenderCheckedProperty, value );
+      }
+    }
+
+    private static void OnRenderCheckedChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ButtonChrome buttonChrome = o as ButtonChrome;
+      if( buttonChrome != null )
+        buttonChrome.OnRenderCheckedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnRenderCheckedChanged( bool oldValue, bool newValue )
+    {
+      // TODO: Add your property changed side-effects. Descendants can override as well.
+    }
+
+    #endregion //RenderChecked
+
+    #region RenderEnabled
+
+    public static readonly DependencyProperty RenderEnabledProperty = DependencyProperty.Register( "RenderEnabled", typeof( bool ), typeof( ButtonChrome ), new UIPropertyMetadata( true, OnRenderEnabledChanged ) );
+    public bool RenderEnabled
+    {
+      get
+      {
+        return ( bool )GetValue( RenderEnabledProperty );
+      }
+      set
+      {
+        SetValue( RenderEnabledProperty, value );
+      }
+    }
+
+    private static void OnRenderEnabledChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ButtonChrome buttonChrome = o as ButtonChrome;
+      if( buttonChrome != null )
+        buttonChrome.OnRenderEnabledChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnRenderEnabledChanged( bool oldValue, bool newValue )
+    {
+      // TODO: Add your property changed side-effects. Descendants can override as well.
+    }
+
+    #endregion //RenderEnabled
+
+    #region RenderFocused
+
+    public static readonly DependencyProperty RenderFocusedProperty = DependencyProperty.Register( "RenderFocused", typeof( bool ), typeof( ButtonChrome ), new UIPropertyMetadata( false, OnRenderFocusedChanged ) );
+    public bool RenderFocused
+    {
+      get
+      {
+        return ( bool )GetValue( RenderFocusedProperty );
+      }
+      set
+      {
+        SetValue( RenderFocusedProperty, value );
+      }
+    }
+
+    private static void OnRenderFocusedChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ButtonChrome buttonChrome = o as ButtonChrome;
+      if( buttonChrome != null )
+        buttonChrome.OnRenderFocusedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnRenderFocusedChanged( bool oldValue, bool newValue )
+    {
+      // TODO: Add your property changed side-effects. Descendants can override as well.
+    }
+
+    #endregion //RenderFocused
+
+    #region RenderMouseOver
+
+    public static readonly DependencyProperty RenderMouseOverProperty = DependencyProperty.Register( "RenderMouseOver", typeof( bool ), typeof( ButtonChrome ), new UIPropertyMetadata( false, OnRenderMouseOverChanged ) );
+    public bool RenderMouseOver
+    {
+      get
+      {
+        return ( bool )GetValue( RenderMouseOverProperty );
+      }
+      set
+      {
+        SetValue( RenderMouseOverProperty, value );
+      }
+    }
+
+    private static void OnRenderMouseOverChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ButtonChrome buttonChrome = o as ButtonChrome;
+      if( buttonChrome != null )
+        buttonChrome.OnRenderMouseOverChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnRenderMouseOverChanged( bool oldValue, bool newValue )
+    {
+      // TODO: Add your property changed side-effects. Descendants can override as well.
+    }
+
+    #endregion //RenderMouseOver
+
+    #region RenderNormal
+
+    public static readonly DependencyProperty RenderNormalProperty = DependencyProperty.Register( "RenderNormal", typeof( bool ), typeof( ButtonChrome ), new UIPropertyMetadata( true, OnRenderNormalChanged ) );
+    public bool RenderNormal
+    {
+      get
+      {
+        return ( bool )GetValue( RenderNormalProperty );
+      }
+      set
+      {
+        SetValue( RenderNormalProperty, value );
+      }
+    }
+
+    private static void OnRenderNormalChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ButtonChrome buttonChrome = o as ButtonChrome;
+      if( buttonChrome != null )
+        buttonChrome.OnRenderNormalChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnRenderNormalChanged( bool oldValue, bool newValue )
+    {
+      // TODO: Add your property changed side-effects. Descendants can override as well.
+    }
+
+    #endregion //RenderNormal
+
+    #region RenderPressed
+
+    public static readonly DependencyProperty RenderPressedProperty = DependencyProperty.Register( "RenderPressed", typeof( bool ), typeof( ButtonChrome ), new UIPropertyMetadata( false, OnRenderPressedChanged ) );
+    public bool RenderPressed
+    {
+      get
+      {
+        return ( bool )GetValue( RenderPressedProperty );
+      }
+      set
+      {
+        SetValue( RenderPressedProperty, value );
+      }
+    }
+
+    private static void OnRenderPressedChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ButtonChrome buttonChrome = o as ButtonChrome;
+      if( buttonChrome != null )
+        buttonChrome.OnRenderPressedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnRenderPressedChanged( bool oldValue, bool newValue )
+    {
+      // TODO: Add your property changed side-effects. Descendants can override as well.
+    }
+
+    #endregion //RenderPressed
+
+    #region Contsructors
+
+    static ButtonChrome()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( ButtonChrome ), new FrameworkPropertyMetadata( typeof( ButtonChrome ) ) );
+    }
+
+    #endregion //Contsructors
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Chromes/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Chromes/Themes/Generic.xaml
new file mode 100644
index 00000000..24d7d2b0
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Chromes/Themes/Generic.xaml
@@ -0,0 +1,231 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes">
+
+   <!-- =============================================================================== -->
+   <!-- ButtonChrome                                                                    -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type chrome:ButtonChrome}">
+      <Setter Property="IsTabStop" Value="False" />
+      <Setter Property="SnapsToDevicePixels" Value="True" />
+      <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+      <Setter Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}}" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type chrome:ButtonChrome}">
+               <Grid>
+
+                  <Border x:Name="OuterBorder" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
+                     <Border x:Name="InnerBorder" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding InnerCornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalInnerBorderKey}}" />
+                  </Border>
+
+                  <Border x:Name="MouseOverVisual" Opacity="0" Visibility="Collapsed" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}}" Background="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}}">
+                     <Border x:Name="MouseOverInnerVisual" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding InnerCornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverInnerBorderKey}}" />
+                  </Border>
+                  <Border x:Name="PressedVisual" Opacity="0" Visibility="Collapsed" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}}" Background="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}}">
+                     <Border x:Name="PressedInnerVisual" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding InnerCornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedInnerBorderKey}}" />
+                  </Border>
+
+                  <Border x:Name="FocusVisual" Opacity="0" Visibility="Collapsed" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonFocusedOuterBorderKey}}" Background="{DynamicResource {x:Static themes:ResourceKeys.ButtonFocusedBackgroundKey}}">
+                     <Border x:Name="FocusInnerVisual" BorderThickness="1" CornerRadius="{TemplateBinding InnerCornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonFocusedInnerBorderKey}}" />
+                  </Border>
+
+                  <ContentPresenter Margin="{TemplateBinding Padding}"
+										      IsEnabled="{TemplateBinding IsEnabled}"
+										      Content="{TemplateBinding Content}"
+										      ContentStringFormat="{TemplateBinding ContentStringFormat}"
+										      ContentTemplate="{TemplateBinding ContentTemplate}"
+										      ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
+
+               </Grid>
+               <ControlTemplate.Triggers>
+
+                  <!-- If button is disabled, not checked, and is rendered normal -->
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="RenderEnabled" Value="False" />
+                        <Condition Property="RenderChecked" Value="False" />
+                     </MultiTrigger.Conditions>
+                     <Setter TargetName="OuterBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonDisabledOuterBorderKey}}" />
+                     <Setter TargetName="InnerBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonInnerBorderDisabledKey}}" />
+                     <Setter TargetName="OuterBorder" Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}}" />
+                  </MultiTrigger>
+
+                  <!-- if button is enabled and pressed -->
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="RenderEnabled" Value="True" />
+                        <Condition Property="RenderPressed" Value="True" />
+                     </MultiTrigger.Conditions>
+                     <MultiTrigger.EnterActions>
+                        <BeginStoryboard>
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PressedVisual" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PressedVisual" Storyboard.TargetProperty="Opacity">
+                                 <LinearDoubleKeyFrame KeyTime="00:00:00.050" Value="1" />
+                              </DoubleAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </BeginStoryboard>
+                     </MultiTrigger.EnterActions>
+                     <MultiTrigger.ExitActions>
+                        <BeginStoryboard>
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PressedVisual" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00.115">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Collapsed</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PressedVisual" Storyboard.TargetProperty="Opacity">
+                                 <LinearDoubleKeyFrame KeyTime="00:00:00.115" Value="0" />
+                              </DoubleAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </BeginStoryboard>
+                     </MultiTrigger.ExitActions>
+                  </MultiTrigger>
+
+                  <!-- if button is enabled, is not checked, the mouse is over, and not pressed -->
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="RenderEnabled" Value="True" />
+                        <Condition Property="RenderChecked" Value="False" />
+                        <Condition Property="RenderMouseOver" Value="True" />
+                        <Condition Property="RenderPressed" Value="False" />
+                     </MultiTrigger.Conditions>
+                     <MultiTrigger.EnterActions>
+                        <BeginStoryboard>
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MouseOverVisual" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <DoubleAnimationUsingKeyFrames Storyboard.TargetName="MouseOverVisual" Storyboard.TargetProperty="Opacity">
+                                 <LinearDoubleKeyFrame KeyTime="00:00:00.115" Value="1" />
+                              </DoubleAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </BeginStoryboard>
+                     </MultiTrigger.EnterActions>
+                     <MultiTrigger.ExitActions>
+                        <BeginStoryboard>
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MouseOverVisual" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00.150">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Collapsed</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <DoubleAnimationUsingKeyFrames Storyboard.TargetName="MouseOverVisual" Storyboard.TargetProperty="Opacity">
+                                 <LinearDoubleKeyFrame KeyTime="00:00:00.150" Value="0" />
+                              </DoubleAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </BeginStoryboard>
+                     </MultiTrigger.ExitActions>
+                  </MultiTrigger>
+
+                  <!-- if button is enabled, checked, he mouse is not over, and it is not pressed -->
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="RenderEnabled" Value="True" />
+                        <Condition Property="RenderChecked" Value="True" />
+                        <Condition Property="RenderMouseOver" Value="False" />
+                        <Condition Property="RenderPressed" Value="False" />
+                     </MultiTrigger.Conditions>
+                     <Setter TargetName="OuterBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}}" />
+                     <Setter TargetName="InnerBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedInnerBorderKey}}" />
+                     <Setter TargetName="OuterBorder" Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}}" />
+                  </MultiTrigger>
+
+                  <!-- if button is focused, is enabled, not pressed, and the mouse is not over -->
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="RenderFocused" Value="True" />
+                        <Condition Property="RenderEnabled" Value="True" />
+                        <Condition Property="RenderPressed" Value="False" />
+                        <Condition Property="RenderMouseOver" Value="False" />
+                     </MultiTrigger.Conditions>
+                     <MultiTrigger.EnterActions>
+                        <BeginStoryboard>
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="FocusVisual" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <DoubleAnimationUsingKeyFrames Storyboard.TargetName="FocusVisual" Storyboard.TargetProperty="Opacity">
+                                 <LinearDoubleKeyFrame KeyTime="00:00:00.25" Value="1" />
+                              </DoubleAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </BeginStoryboard>
+                     </MultiTrigger.EnterActions>
+                     <MultiTrigger.ExitActions>
+                        <BeginStoryboard>
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="FocusVisual" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00.115">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Collapsed</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <DoubleAnimationUsingKeyFrames Storyboard.TargetName="FocusVisual" Storyboard.TargetProperty="Opacity">
+                                 <LinearDoubleKeyFrame KeyTime="00:00:00.115" Value="0" />
+                              </DoubleAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </BeginStoryboard>
+                     </MultiTrigger.ExitActions>
+                  </MultiTrigger>
+
+                  <!-- if not rendered normally -->
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="RenderNormal" Value="False" />
+                        <Condition Property="RenderChecked" Value="False" />
+                     </MultiTrigger.Conditions>
+                     <Setter TargetName="OuterBorder" Property="BorderBrush" Value="Transparent" />
+                     <Setter TargetName="InnerBorder" Property="BorderBrush" Value="{x:Null}" />
+                     <Setter TargetName="OuterBorder" Property="Background" Value="Transparent" />
+                  </MultiTrigger>
+
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CollectionEditors/Images/Delete16.png b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CollectionEditors/Images/Delete16.png
new file mode 100644
index 00000000..dee2496a
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CollectionEditors/Images/Delete16.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CollectionEditors/Implementation/CollectionEditor.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CollectionEditors/Implementation/CollectionEditor.cs
new file mode 100644
index 00000000..8693a5ea
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CollectionEditors/Implementation/CollectionEditor.cs
@@ -0,0 +1,290 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Reflection;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class CollectionEditor : Control
+  {
+    #region Properties
+
+    public static readonly DependencyProperty ItemsProperty = DependencyProperty.Register( "Items", typeof( ObservableCollection<object> ), typeof( CollectionEditor ), new UIPropertyMetadata( null ) );
+    public ObservableCollection<object> Items
+    {
+      get
+      {
+        return ( ObservableCollection<object> )GetValue( ItemsProperty );
+      }
+      set
+      {
+        SetValue( ItemsProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty ItemsSourceProperty = DependencyProperty.Register( "ItemsSource", typeof( IList ), typeof( CollectionEditor ), new UIPropertyMetadata( null, OnItemsSourceChanged ) );
+    public IList ItemsSource
+    {
+      get
+      {
+        return ( IList )GetValue( ItemsSourceProperty );
+      }
+      set
+      {
+        SetValue( ItemsSourceProperty, value );
+      }
+    }
+
+    private static void OnItemsSourceChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      CollectionEditor collectionEditor = ( CollectionEditor )d;
+      if( collectionEditor != null )
+        collectionEditor.OnItemSourceChanged( ( IList )e.OldValue, ( IList )e.NewValue );
+    }
+
+    public void OnItemSourceChanged( IList oldValue, IList newValue )
+    {
+      if( newValue != null )
+      {
+        foreach( var item in newValue )
+          Items.Add( CreateClone( item ) );
+      }
+    }
+
+    public static readonly DependencyProperty ItemsSourceTypeProperty = DependencyProperty.Register( "ItemsSourceType", typeof( Type ), typeof( CollectionEditor ), new UIPropertyMetadata( null, new PropertyChangedCallback( ItemsSourceTypeChanged ) ) );
+    public Type ItemsSourceType
+    {
+      get
+      {
+        return ( Type )GetValue( ItemsSourceTypeProperty );
+      }
+      set
+      {
+        SetValue( ItemsSourceTypeProperty, value );
+      }
+    }
+
+    private static void ItemsSourceTypeChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      CollectionEditor collectionEditor = ( CollectionEditor )d;
+      if( collectionEditor != null )
+        collectionEditor.ItemsSourceTypeChanged( ( Type )e.OldValue, ( Type )e.NewValue );
+    }
+
+    protected virtual void ItemsSourceTypeChanged( Type oldValue, Type newValue )
+    {
+      List<Type> types = new List<Type>();
+      Type listType = GetListItemType( newValue );
+
+      if( listType != null )
+      {
+        types.Add( listType );
+      }
+
+      NewItemTypes = types;
+    }
+
+    public static readonly DependencyProperty NewItemTypesProperty = DependencyProperty.Register( "NewItemTypes", typeof( IList ), typeof( CollectionEditor ), new UIPropertyMetadata( null ) );
+    public IList<Type> NewItemTypes
+    {
+      get
+      {
+        return ( IList<Type> )GetValue( NewItemTypesProperty );
+      }
+      set
+      {
+        SetValue( NewItemTypesProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty SelectedItemProperty = DependencyProperty.Register( "SelectedItem", typeof( object ), typeof( CollectionEditor ), new UIPropertyMetadata( null ) );
+    public object SelectedItem
+    {
+      get
+      {
+        return ( object )GetValue( SelectedItemProperty );
+      }
+      set
+      {
+        SetValue( SelectedItemProperty, value );
+      }
+    }
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static CollectionEditor()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( CollectionEditor ), new FrameworkPropertyMetadata( typeof( CollectionEditor ) ) );
+    }
+
+    public CollectionEditor()
+    {
+      Items = new ObservableCollection<object>();
+      CommandBindings.Add( new CommandBinding( ApplicationCommands.New, AddNew, CanAddNew ) );
+      CommandBindings.Add( new CommandBinding( ApplicationCommands.Delete, Delete, CanDelete ) );
+      CommandBindings.Add( new CommandBinding( ComponentCommands.MoveDown, MoveDown, CanMoveDown ) );
+      CommandBindings.Add( new CommandBinding( ComponentCommands.MoveUp, MoveUp, CanMoveUp ) );
+    }
+
+    #endregion //Constructors
+
+    #region Commands
+
+    private void AddNew( object sender, ExecutedRoutedEventArgs e )
+    {
+      var newItem = CreateNewItem( ( Type )e.Parameter );
+      Items.Add( newItem );
+      SelectedItem = newItem;
+    }
+
+    private void CanAddNew( object sender, CanExecuteRoutedEventArgs e )
+    {
+      Type t = e.Parameter as Type;
+      if( t != null && t.GetConstructor( Type.EmptyTypes ) != null )
+        e.CanExecute = true;
+    }
+
+    private void Delete( object sender, ExecutedRoutedEventArgs e )
+    {
+      Items.Remove( e.Parameter );
+    }
+
+    private void CanDelete( object sender, CanExecuteRoutedEventArgs e )
+    {
+      e.CanExecute = e.Parameter != null;
+    }
+
+    private void MoveDown( object sender, ExecutedRoutedEventArgs e )
+    {
+      var selectedItem = e.Parameter;
+      var index = Items.IndexOf( selectedItem );
+      Items.RemoveAt( index );
+      Items.Insert( ++index, selectedItem );
+      SelectedItem = selectedItem;
+    }
+
+    private void CanMoveDown( object sender, CanExecuteRoutedEventArgs e )
+    {
+      if( e.Parameter != null && Items.IndexOf( e.Parameter ) < ( Items.Count - 1 ) )
+        e.CanExecute = true;
+    }
+
+    private void MoveUp( object sender, ExecutedRoutedEventArgs e )
+    {
+      var selectedItem = e.Parameter;
+      var index = Items.IndexOf( selectedItem );
+      Items.RemoveAt( index );
+      Items.Insert( --index, selectedItem );
+      SelectedItem = selectedItem;
+    }
+
+    private void CanMoveUp( object sender, CanExecuteRoutedEventArgs e )
+    {
+      if( e.Parameter != null && Items.IndexOf( e.Parameter ) > 0 )
+        e.CanExecute = true;
+    }
+
+    #endregion //Commands
+
+    #region Methods
+
+    private static void CopyValues( object source, object destination )
+    {
+      FieldInfo[] myObjectFields = source.GetType().GetFields( BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance );
+      foreach( FieldInfo fi in myObjectFields )
+      {
+        fi.SetValue( destination, fi.GetValue( source ) );
+      }
+    }
+
+    private object CreateClone( object source )
+    {
+      object clone = null;
+
+      Type type = source.GetType();
+      clone = Activator.CreateInstance( type );
+      CopyValues( source, clone );
+
+      return clone;
+    }
+
+    private IList CreateItemsSource()
+    {
+      IList list = null;
+
+      if( ItemsSourceType != null )
+      {
+        ConstructorInfo constructor = ItemsSourceType.GetConstructor( Type.EmptyTypes );
+        list = ( IList )constructor.Invoke( null );
+      }
+
+      return list;
+    }
+
+    private object CreateNewItem( Type type )
+    {
+      return Activator.CreateInstance( type );
+    }
+
+    internal static Type GetListItemType(Type listType)
+    {
+      Type iListOfT = listType.GetInterfaces().FirstOrDefault(
+        ( i ) => i.IsGenericType && i.GetGenericTypeDefinition() == typeof( IList<> ) );
+
+      return ( iListOfT != null )
+        ? iListOfT.GetGenericArguments()[ 0 ]
+        : null;
+    }
+
+    public void PersistChanges()
+    {
+      IList list = ResolveItemsSource();
+      if( list == null )
+        return;
+
+      //the easiest way to persist changes to the source is to just clear the source list and then add all items to it.
+      list.Clear();
+
+      foreach( var item in Items )
+      {
+        list.Add( item );
+      }
+    }
+
+    private IList ResolveItemsSource()
+    {
+      if( ItemsSource == null )
+        ItemsSource = CreateItemsSource();
+
+      return ItemsSource;
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CollectionEditors/Implementation/CollectionEditorDialog.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CollectionEditors/Implementation/CollectionEditorDialog.xaml
new file mode 100644
index 00000000..496bbbe6
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CollectionEditors/Implementation/CollectionEditorDialog.xaml
@@ -0,0 +1,46 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<Window x:Class="Xceed.Wpf.Toolkit.CollectionEditorDialog"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+        Title="Collection Editor" 
+        Height="400" 
+        Width="600" 
+        WindowStartupLocation="CenterScreen">
+
+   <Grid Margin="10">
+      <Grid.RowDefinitions>
+         <RowDefinition Height="*" />
+         <RowDefinition Height="Auto" />
+      </Grid.RowDefinitions>
+
+      <local:CollectionEditor x:Name="_propertyGrid"
+                              ItemsSourceType="{Binding ItemsSourceType, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"
+                              ItemsSource="{Binding ItemsSource, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"
+                              NewItemTypes="{Binding NewItemTypes, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" />
+
+      <StackPanel Orientation="Horizontal" Grid.Row="1" HorizontalAlignment="Right" Margin="5">
+         <Button Width="75" Margin="2" Click="OkButton_Click" IsDefault="True">OK</Button>
+         <Button Width="75" Margin="2" IsCancel="True">Cancel</Button>
+      </StackPanel>
+
+   </Grid>
+</Window>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CollectionEditors/Implementation/CollectionEditorDialog.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CollectionEditors/Implementation/CollectionEditorDialog.xaml.cs
new file mode 100644
index 00000000..e73003dc
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CollectionEditors/Implementation/CollectionEditorDialog.xaml.cs
@@ -0,0 +1,100 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit
+{
+  /// <summary>
+  /// Interaction logic for CollectionEditorDialog.xaml
+  /// </summary>
+  public partial class CollectionEditorDialog : Window
+  {
+    #region Properties
+
+    public static readonly DependencyProperty ItemsSourceProperty = DependencyProperty.Register( "ItemsSource", typeof( IList ), typeof( CollectionEditorDialog ), new UIPropertyMetadata( null ) );
+    public IList ItemsSource
+    {
+      get
+      {
+        return ( IList )GetValue( ItemsSourceProperty );
+      }
+      set
+      {
+        SetValue( ItemsSourceProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty ItemsSourceTypeProperty = DependencyProperty.Register( "ItemsSourceType", typeof( Type ), typeof( CollectionEditorDialog ), new UIPropertyMetadata( null ) );
+    public Type ItemsSourceType
+    {
+      get
+      {
+        return ( Type )GetValue( ItemsSourceTypeProperty );
+      }
+      set
+      {
+        SetValue( ItemsSourceTypeProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty NewItemTypesProperty = DependencyProperty.Register( "NewItemTypes", typeof( IList ), typeof( CollectionEditorDialog ), new UIPropertyMetadata( null ) );
+    public IList<Type> NewItemTypes
+    {
+      get
+      {
+        return ( IList<Type> )GetValue( NewItemTypesProperty );
+      }
+      set
+      {
+        SetValue( NewItemTypesProperty, value );
+      }
+    }
+
+    #endregion //Properties
+
+    #region Constructors
+
+    public CollectionEditorDialog()
+    {
+      InitializeComponent();
+    }
+
+    public CollectionEditorDialog( Type type )
+      : this()
+    {
+      ItemsSourceType = type;
+    }
+
+    #endregion //Constructors
+
+    #region Event Handlers
+
+    private void OkButton_Click( object sender, RoutedEventArgs e )
+    {
+      _propertyGrid.PersistChanges();
+      Close();
+    }
+
+    #endregion //Event Hanlders
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CollectionEditors/Implementation/PrimitiveTypeCollectionEditor.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CollectionEditors/Implementation/PrimitiveTypeCollectionEditor.cs
new file mode 100644
index 00000000..b843784c
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CollectionEditors/Implementation/PrimitiveTypeCollectionEditor.cs
@@ -0,0 +1,272 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class PrimitiveTypeCollectionEditor : ContentControl
+  {
+    #region Members
+
+    bool _surpressTextChanged;
+    bool _conversionFailed;
+
+    #endregion //Members
+
+    #region Properties
+
+    #region IsOpen
+
+    public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register( "IsOpen", typeof( bool ), typeof( PrimitiveTypeCollectionEditor ), new UIPropertyMetadata( false, OnIsOpenChanged ) );
+    public bool IsOpen
+    {
+      get
+      {
+        return ( bool )GetValue( IsOpenProperty );
+      }
+      set
+      {
+        SetValue( IsOpenProperty, value );
+      }
+    }
+
+    private static void OnIsOpenChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PrimitiveTypeCollectionEditor primitiveTypeCollectionEditor = o as PrimitiveTypeCollectionEditor;
+      if( primitiveTypeCollectionEditor != null )
+        primitiveTypeCollectionEditor.OnIsOpenChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnIsOpenChanged( bool oldValue, bool newValue )
+    {
+
+    }
+
+    #endregion //IsOpen
+
+    #region ItemsSource
+
+    public static readonly DependencyProperty ItemsSourceProperty = DependencyProperty.Register( "ItemsSource", typeof( IList ), typeof( PrimitiveTypeCollectionEditor ), new UIPropertyMetadata( null, OnItemsSourceChanged ) );
+    public IList ItemsSource
+    {
+      get
+      {
+        return ( IList )GetValue( ItemsSourceProperty );
+      }
+      set
+      {
+        SetValue( ItemsSourceProperty, value );
+      }
+    }
+
+    private static void OnItemsSourceChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PrimitiveTypeCollectionEditor primitiveTypeCollectionEditor = o as PrimitiveTypeCollectionEditor;
+      if( primitiveTypeCollectionEditor != null )
+        primitiveTypeCollectionEditor.OnItemsSourceChanged( ( IList )e.OldValue, ( IList )e.NewValue );
+    }
+
+    protected virtual void OnItemsSourceChanged( IList oldValue, IList newValue )
+    {
+      if( newValue == null )
+        return;
+
+      if( ItemsSourceType == null )
+        ItemsSourceType = newValue.GetType();
+
+      if( ItemType == null )
+        ItemType = newValue.GetType().GetGenericArguments()[ 0 ];
+
+      if( newValue.Count > 0 )
+        SetText( newValue );
+    }
+
+    #endregion //ItemsSource
+
+    public static readonly DependencyProperty ItemsSourceTypeProperty = DependencyProperty.Register( "ItemsSourceType", typeof( Type ), typeof( PrimitiveTypeCollectionEditor ), new UIPropertyMetadata( null ) );
+    public Type ItemsSourceType
+    {
+      get
+      {
+        return ( Type )GetValue( ItemsSourceTypeProperty );
+      }
+      set
+      {
+        SetValue( ItemsSourceTypeProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty ItemTypeProperty = DependencyProperty.Register( "ItemType", typeof( Type ), typeof( PrimitiveTypeCollectionEditor ), new UIPropertyMetadata( null ) );
+    public Type ItemType
+    {
+      get
+      {
+        return ( Type )GetValue( ItemTypeProperty );
+      }
+      set
+      {
+        SetValue( ItemTypeProperty, value );
+      }
+    }
+
+    #region Text
+
+    public static readonly DependencyProperty TextProperty = DependencyProperty.Register( "Text", typeof( string ), typeof( PrimitiveTypeCollectionEditor ), new UIPropertyMetadata( null, OnTextChanged ) );
+    public string Text
+    {
+      get
+      {
+        return ( string )GetValue( TextProperty );
+      }
+      set
+      {
+        SetValue( TextProperty, value );
+      }
+    }
+
+    private static void OnTextChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PrimitiveTypeCollectionEditor primitiveTypeCollectionEditor = o as PrimitiveTypeCollectionEditor;
+      if( primitiveTypeCollectionEditor != null )
+        primitiveTypeCollectionEditor.OnTextChanged( ( string )e.OldValue, ( string )e.NewValue );
+    }
+
+    protected virtual void OnTextChanged( string oldValue, string newValue )
+    {
+      if( !_surpressTextChanged )
+        PersistChanges();
+    }
+
+    #endregion //Text
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static PrimitiveTypeCollectionEditor()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( PrimitiveTypeCollectionEditor ), new FrameworkPropertyMetadata( typeof( PrimitiveTypeCollectionEditor ) ) );
+    }
+
+    public PrimitiveTypeCollectionEditor()
+    {
+
+    }
+
+    #endregion //Constructors
+
+    #region Methods
+
+    private void PersistChanges()
+    {
+      IList list = ResolveItemsSource();
+      if( list == null )
+        return;
+
+      //the easiest way to persist changes to the source is to just clear the source list and then add all items to it.
+      list.Clear();
+
+      IList items = ResolveItems();
+      foreach( var item in items )
+      {
+        list.Add( item );
+      };
+
+      // if something went wrong during conversion we want to reload the text to show only valid entries
+      if( _conversionFailed )
+        SetText( list );
+    }
+
+    private IList ResolveItems()
+    {
+      IList items = new List<object>();
+
+      if( ItemType == null )
+        return items;
+
+      string[] textArray = Text.Split( '\n' );
+
+      foreach( string s in textArray )
+      {
+        string valueString = s.TrimEnd( '\r' );
+        if( !String.IsNullOrEmpty( valueString ) )
+        {
+          object value = null;
+          try
+          {
+            value = Convert.ChangeType( valueString, ItemType );
+          }
+          catch
+          {
+            //a conversion failed
+            _conversionFailed = true;
+          }
+
+          if( value != null )
+            items.Add( value );
+        }
+      }
+
+      return items;
+    }
+
+    private IList ResolveItemsSource()
+    {
+      if( ItemsSource == null )
+        ItemsSource = CreateItemsSource();
+
+      return ItemsSource;
+    }
+
+    private IList CreateItemsSource()
+    {
+      IList list = null;
+
+      if( ItemsSourceType != null )
+      {
+        ConstructorInfo constructor = ItemsSourceType.GetConstructor( Type.EmptyTypes );
+        list = ( IList )constructor.Invoke( null );
+      }
+
+      return list;
+    }
+
+    private void SetText( IEnumerable collection )
+    {
+      _surpressTextChanged = true;
+      StringBuilder builder = new StringBuilder();
+      foreach( object obj2 in collection )
+      {
+        builder.Append( obj2.ToString() );
+        builder.AppendLine();
+      }
+      Text = builder.ToString().Trim();
+      _surpressTextChanged = false;
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CollectionEditors/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CollectionEditors/Themes/Generic.xaml
new file mode 100644
index 00000000..31ead62b
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CollectionEditors/Themes/Generic.xaml
@@ -0,0 +1,162 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
+                    xmlns:pg="clr-namespace:Xceed.Wpf.Toolkit.PropertyGrid">
+
+   <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+   <conv:ObjectTypeToNameConverter x:Key="ObjectTypeToNameConverter" />
+
+   <Style x:Key="CollectionEditorButtonStyle" TargetType="{x:Type Button}">
+      <Style.Triggers>
+         <Trigger Property="IsEnabled" Value="false">
+            <Setter Property="Opacity" Value="0.6" />
+         </Trigger>
+      </Style.Triggers>
+      <Setter Property="HorizontalContentAlignment" Value="Center" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Height" Value="26" />
+      <Setter Property="Width" Value="26" />
+   </Style>
+
+   <Style TargetType="{x:Type local:CollectionEditor}">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:CollectionEditor}">
+               <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="1.5*" />
+                     </Grid.ColumnDefinitions>
+                     <Grid>
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition />
+                           <ColumnDefinition Width="Auto" />
+                           <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="Auto" />
+                           <RowDefinition Height="Auto" />
+                           <RowDefinition />
+                        </Grid.RowDefinitions>
+                        <TextBlock Margin="0,0,0,5" Text="Select type:" />
+                        <ComboBox x:Name="_newItemTypes"
+                                  Grid.Row="1"
+                                  Margin="0,0,0,3"
+                                  HorizontalAlignment="Stretch"
+                                  ItemsSource="{Binding NewItemTypes, RelativeSource={RelativeSource TemplatedParent}}"
+                                  DisplayMemberPath="Name"
+                                  SelectedIndex="0" />
+                        <Button Margin="3,0,0,3"
+                                Grid.Row="1"
+                                Grid.Column="1"
+                                Padding="5,0"
+                                Content="Add" 
+                                Command="New"
+                                CommandParameter="{Binding SelectedItem, ElementName=_newItemTypes}" />
+                        <ListBox x:Name="_itemsListBox"
+                                 Grid.Row="2"
+                                 Grid.ColumnSpan="2"
+                                 ItemsSource="{Binding Items, RelativeSource={RelativeSource TemplatedParent}}"
+                                 SelectedItem="{Binding SelectedItem, RelativeSource={RelativeSource TemplatedParent}}"
+                                 SelectedIndex="0">
+                           <ListBox.ItemTemplate>
+                              <DataTemplate>
+                                 <TextBlock Text="{Binding Converter={StaticResource ObjectTypeToNameConverter}}" />
+                              </DataTemplate>
+                           </ListBox.ItemTemplate>
+                        </ListBox>
+                        <StackPanel Margin="7,2,0,0" VerticalAlignment="Top" Grid.Column="2" Grid.Row="2">
+                           <Button Style="{StaticResource CollectionEditorButtonStyle}"
+                                   Command="ComponentCommands.MoveUp"
+                                   CommandParameter="{Binding SelectedItem, ElementName=_itemsListBox}">
+                              <Path Fill="#FF404040" Data="F0 M 6,0 L 12,7 8,7 8,12 4,12 4,7 0,7 Z" />
+                           </Button>
+                           <Button Margin="0,1,0,0"
+                                   Style="{StaticResource CollectionEditorButtonStyle}"
+                                   Command="ComponentCommands.MoveDown"
+                                   CommandParameter="{Binding SelectedItem, ElementName=_itemsListBox}">
+                              <Path Fill="#FF404040" Data="F0 M 4,0 L 8,0 8,5 12,5 6,12 0,5 4,5 Z" />
+                           </Button>
+                           <Button Margin="0,7,0,0"
+                                   Style="{StaticResource CollectionEditorButtonStyle}"
+                                   Command="Delete"
+                                   CommandParameter="{Binding SelectedItem, ElementName=_itemsListBox}">
+                              <Image Stretch="None" Height="16" Width="16" Margin="1" Source="/WPFToolkit.Extended;component/CollectionEditors/Images/Delete16.png" />
+                           </Button>
+                        </StackPanel>
+                     </Grid>
+                     <Grid Column="1" Margin="20,0,0,0">
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="Auto" />
+                           <RowDefinition />
+                        </Grid.RowDefinitions>
+                        <TextBlock Grid.Column="1" Text="Properties:" />
+                        <pg:PropertyGrid Grid.Row="1"
+                                         Grid.Column="1"
+                                         Margin="0,5,0,0"
+                                         HorizontalAlignment="Stretch"
+                                         VerticalAlignment="Stretch"
+                                         SelectedObject="{Binding SelectedItem, RelativeSource={RelativeSource TemplatedParent}}" />
+                     </Grid>
+                  </Grid>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style TargetType="{x:Type local:PrimitiveTypeCollectionEditor}">
+      <Setter Property="BorderBrush">
+         <Setter.Value>
+            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+               <GradientStop Color="#FFA3AEB9" Offset="0" />
+               <GradientStop Color="#FF8399A9" Offset="0.375" />
+               <GradientStop Color="#FF718597" Offset="0.375" />
+               <GradientStop Color="#FF617584" Offset="1" />
+            </LinearGradientBrush>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="BorderThickness" Value="1,1,0,1" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Padding" Value="2,0,0,0" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:PrimitiveTypeCollectionEditor}">
+               <local:MultiLineTextEditor Background="{TemplateBinding Background}"
+                                          BorderBrush="{TemplateBinding BorderBrush}"
+                                          BorderThickness="{TemplateBinding BorderThickness}"
+                                          Content="{TemplateBinding Content}"  
+                                          Padding="{TemplateBinding Padding}"
+                                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          IsOpen="{TemplateBinding IsOpen}"
+                                          Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
+                                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorCanvas/Implementation/ColorCanvas.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorCanvas/Implementation/ColorCanvas.cs
new file mode 100644
index 00000000..01a0031c
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorCanvas/Implementation/ColorCanvas.cs
@@ -0,0 +1,521 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Input;
+using System.Windows.Media;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+using Xceed.Wpf.Toolkit.Primitives;
+using System.IO;
+
+namespace Xceed.Wpf.Toolkit
+{
+  [TemplatePart( Name = PART_ColorShadingCanvas, Type = typeof( Canvas ) )]
+  [TemplatePart( Name = PART_ColorShadeSelector, Type = typeof( Canvas ) )]
+  [TemplatePart( Name = PART_SpectrumSlider, Type = typeof( ColorSpectrumSlider ) )]
+  public class ColorCanvas : Control
+  {
+    private const string PART_ColorShadingCanvas = "PART_ColorShadingCanvas";
+    private const string PART_ColorShadeSelector = "PART_ColorShadeSelector";
+    private const string PART_SpectrumSlider = "PART_SpectrumSlider";
+
+    #region Private Members
+
+    private TranslateTransform _colorShadeSelectorTransform = new TranslateTransform();
+    private Canvas _colorShadingCanvas;
+    private Canvas _colorShadeSelector;
+    private ColorSpectrumSlider _spectrumSlider;
+    private Point? _currentColorPosition;
+    private bool _surpressPropertyChanged;
+
+    #endregion //Private Members
+
+    #region Properties
+
+    #region SelectedColor
+
+    public static readonly DependencyProperty SelectedColorProperty = DependencyProperty.Register( "SelectedColor", typeof( Color ), typeof( ColorCanvas ), new FrameworkPropertyMetadata( Colors.Black, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnSelectedColorChanged ) );
+    public Color SelectedColor
+    {
+      get
+      {
+        return ( Color )GetValue( SelectedColorProperty );
+      }
+      set
+      {
+        SetValue( SelectedColorProperty, value );
+      }
+    }
+
+    private static void OnSelectedColorChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ColorCanvas colorCanvas = o as ColorCanvas;
+      if( colorCanvas != null )
+        colorCanvas.OnSelectedColorChanged( ( Color )e.OldValue, ( Color )e.NewValue );
+    }
+
+    protected virtual void OnSelectedColorChanged( Color oldValue, Color newValue )
+    {
+      HexadecimalString = GetFormatedColorString( newValue );
+      UpdateRGBValues( newValue );
+      UpdateColorShadeSelectorPosition( newValue );
+
+      RoutedPropertyChangedEventArgs<Color> args = new RoutedPropertyChangedEventArgs<Color>( oldValue, newValue );
+      args.RoutedEvent = SelectedColorChangedEvent;
+      RaiseEvent( args );
+    }
+
+    #endregion //SelectedColor
+
+    #region RGB
+
+    #region A
+
+    public static readonly DependencyProperty AProperty = DependencyProperty.Register( "A", typeof( byte ), typeof( ColorCanvas ), new UIPropertyMetadata( ( byte )255, OnAChanged ) );
+    public byte A
+    {
+      get
+      {
+        return ( byte )GetValue( AProperty );
+      }
+      set
+      {
+        SetValue( AProperty, value );
+      }
+    }
+
+    private static void OnAChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ColorCanvas colorCanvas = o as ColorCanvas;
+      if( colorCanvas != null )
+        colorCanvas.OnAChanged( ( byte )e.OldValue, ( byte )e.NewValue );
+    }
+
+    protected virtual void OnAChanged( byte oldValue, byte newValue )
+    {
+      if( !_surpressPropertyChanged )
+        UpdateSelectedColor();
+    }
+
+    #endregion //A
+
+    #region R
+
+    public static readonly DependencyProperty RProperty = DependencyProperty.Register( "R", typeof( byte ), typeof( ColorCanvas ), new UIPropertyMetadata( ( byte )0, OnRChanged ) );
+    public byte R
+    {
+      get
+      {
+        return ( byte )GetValue( RProperty );
+      }
+      set
+      {
+        SetValue( RProperty, value );
+      }
+    }
+
+    private static void OnRChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ColorCanvas colorCanvas = o as ColorCanvas;
+      if( colorCanvas != null )
+        colorCanvas.OnRChanged( ( byte )e.OldValue, ( byte )e.NewValue );
+    }
+
+    protected virtual void OnRChanged( byte oldValue, byte newValue )
+    {
+      if( !_surpressPropertyChanged )
+        UpdateSelectedColor();
+    }
+
+    #endregion //R
+
+    #region G
+
+    public static readonly DependencyProperty GProperty = DependencyProperty.Register( "G", typeof( byte ), typeof( ColorCanvas ), new UIPropertyMetadata( ( byte )0, OnGChanged ) );
+    public byte G
+    {
+      get
+      {
+        return ( byte )GetValue( GProperty );
+      }
+      set
+      {
+        SetValue( GProperty, value );
+      }
+    }
+
+    private static void OnGChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ColorCanvas colorCanvas = o as ColorCanvas;
+      if( colorCanvas != null )
+        colorCanvas.OnGChanged( ( byte )e.OldValue, ( byte )e.NewValue );
+    }
+
+    protected virtual void OnGChanged( byte oldValue, byte newValue )
+    {
+      if( !_surpressPropertyChanged )
+        UpdateSelectedColor();
+    }
+
+    #endregion //G
+
+    #region B
+
+    public static readonly DependencyProperty BProperty = DependencyProperty.Register( "B", typeof( byte ), typeof( ColorCanvas ), new UIPropertyMetadata( ( byte )0, OnBChanged ) );
+    public byte B
+    {
+      get
+      {
+        return ( byte )GetValue( BProperty );
+      }
+      set
+      {
+        SetValue( BProperty, value );
+      }
+    }
+
+    private static void OnBChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ColorCanvas colorCanvas = o as ColorCanvas;
+      if( colorCanvas != null )
+        colorCanvas.OnBChanged( ( byte )e.OldValue, ( byte )e.NewValue );
+    }
+
+    protected virtual void OnBChanged( byte oldValue, byte newValue )
+    {
+      if( !_surpressPropertyChanged )
+        UpdateSelectedColor();
+    }
+
+    #endregion //B
+
+    #endregion //RGB
+
+    #region HexadecimalString
+
+    public static readonly DependencyProperty HexadecimalStringProperty = DependencyProperty.Register( "HexadecimalString", typeof( string ), typeof( ColorCanvas ), new UIPropertyMetadata( "#FFFFFFFF", OnHexadecimalStringChanged, OnCoerceHexadecimalString ) );
+    public string HexadecimalString
+    {
+      get
+      {
+        return ( string )GetValue( HexadecimalStringProperty );
+      }
+      set
+      {
+        SetValue( HexadecimalStringProperty, value );
+      }
+    }
+
+    private static void OnHexadecimalStringChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ColorCanvas colorCanvas = o as ColorCanvas;
+      if( colorCanvas != null )
+        colorCanvas.OnHexadecimalStringChanged( ( string )e.OldValue, ( string )e.NewValue );
+    }
+
+    protected virtual void OnHexadecimalStringChanged( string oldValue, string newValue )
+    {
+      string newColorString = GetFormatedColorString( newValue );
+      string currentColorString = GetFormatedColorString( SelectedColor );
+      if( !currentColorString.Equals( newColorString ) )
+        UpdateSelectedColor( ( Color )ColorConverter.ConvertFromString( newColorString ) );
+    }
+
+    private static object OnCoerceHexadecimalString( DependencyObject d, object basevalue )
+    {
+      var colorCanvas = ( ColorCanvas )d;
+      if( colorCanvas == null )
+        return basevalue;
+
+      return colorCanvas.OnCoerceHexadecimalString( basevalue );
+    }
+
+    private object OnCoerceHexadecimalString( object newValue )
+    {
+      var value = newValue as string;
+      try
+      {
+        ColorConverter.ConvertFromString( value );
+      }
+      catch
+      {
+        throw new InvalidDataException( "Color provided is not in the correct format." );
+      }
+
+      return value;
+    }
+
+    #endregion //HexadecimalString
+
+    #region UsingAlphaChannel
+
+    public static readonly DependencyProperty UsingAlphaChannelProperty = DependencyProperty.Register( "UsingAlphaChannel", typeof( bool ), typeof( ColorCanvas ), new FrameworkPropertyMetadata( true, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, new PropertyChangedCallback( OnUsingAlphaChannelPropertyChanged ) ) );
+    public bool UsingAlphaChannel
+    {
+      get
+      {
+        return ( bool )GetValue( UsingAlphaChannelProperty );
+      }
+      set
+      {
+        SetValue( UsingAlphaChannelProperty, value );
+      }
+    }
+
+    private static void OnUsingAlphaChannelPropertyChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ColorCanvas colorCanvas = o as ColorCanvas;
+      if( colorCanvas != null )
+        colorCanvas.OnUsingAlphaChannelChanged();
+    }
+
+    protected virtual void OnUsingAlphaChannelChanged()
+    {
+      HexadecimalString = GetFormatedColorString( SelectedColor );
+    }
+
+    #endregion //UsingAlphaChannel
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static ColorCanvas()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( ColorCanvas ), new FrameworkPropertyMetadata( typeof( ColorCanvas ) ) );
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+
+      if( _colorShadingCanvas != null )
+      {
+        _colorShadingCanvas.MouseLeftButtonDown -= ColorShadingCanvas_MouseLeftButtonDown;
+        _colorShadingCanvas.MouseLeftButtonUp -= ColorShadingCanvas_MouseLeftButtonUp;
+        _colorShadingCanvas.MouseMove -= ColorShadingCanvas_MouseMove;
+        _colorShadingCanvas.SizeChanged -= ColorShadingCanvas_SizeChanged;
+      }
+
+      _colorShadingCanvas = GetTemplateChild( PART_ColorShadingCanvas ) as Canvas;
+
+      if( _colorShadingCanvas != null )
+      {
+        _colorShadingCanvas.MouseLeftButtonDown += ColorShadingCanvas_MouseLeftButtonDown;
+        _colorShadingCanvas.MouseLeftButtonUp += ColorShadingCanvas_MouseLeftButtonUp;
+        _colorShadingCanvas.MouseMove += ColorShadingCanvas_MouseMove;
+        _colorShadingCanvas.SizeChanged += ColorShadingCanvas_SizeChanged;
+      }
+
+      _colorShadeSelector = GetTemplateChild( PART_ColorShadeSelector ) as Canvas;
+
+      if( _colorShadeSelector != null )
+        _colorShadeSelector.RenderTransform = _colorShadeSelectorTransform;
+
+      if( _spectrumSlider != null )
+        _spectrumSlider.ValueChanged -= SpectrumSlider_ValueChanged;
+
+      _spectrumSlider = GetTemplateChild( PART_SpectrumSlider ) as ColorSpectrumSlider;
+
+      if( _spectrumSlider != null )
+        _spectrumSlider.ValueChanged += SpectrumSlider_ValueChanged;
+
+      UpdateRGBValues( SelectedColor );
+      UpdateColorShadeSelectorPosition( SelectedColor );
+    }
+
+    protected override void OnPreviewKeyDown( KeyEventArgs e )
+    {
+      //hitting enter on textbox will update value of underlying source
+      if( e.Key == Key.Enter && e.OriginalSource is TextBox )
+      {
+        BindingExpression be = ( ( TextBox )e.OriginalSource ).GetBindingExpression( TextBox.TextProperty );
+        be.UpdateSource();
+      }
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Event Handlers
+
+    void ColorShadingCanvas_MouseLeftButtonDown( object sender, MouseButtonEventArgs e )
+    {
+      Point p = e.GetPosition( _colorShadingCanvas );
+      UpdateColorShadeSelectorPositionAndCalculateColor( p, true );
+      _colorShadingCanvas.CaptureMouse();
+    }
+
+    void ColorShadingCanvas_MouseLeftButtonUp( object sender, MouseButtonEventArgs e )
+    {
+      _colorShadingCanvas.ReleaseMouseCapture();
+    }
+
+    void ColorShadingCanvas_MouseMove( object sender, MouseEventArgs e )
+    {
+      if( e.LeftButton == MouseButtonState.Pressed )
+      {
+        Point p = e.GetPosition( _colorShadingCanvas );
+        UpdateColorShadeSelectorPositionAndCalculateColor( p, true );
+        Mouse.Synchronize();
+      }
+    }
+
+    void ColorShadingCanvas_SizeChanged( object sender, SizeChangedEventArgs e )
+    {
+      if( _currentColorPosition != null )
+      {
+        Point _newPoint = new Point
+        {
+          X = ( ( Point )_currentColorPosition ).X * e.NewSize.Width,
+          Y = ( ( Point )_currentColorPosition ).Y * e.NewSize.Height
+        };
+
+        UpdateColorShadeSelectorPositionAndCalculateColor( _newPoint, false );
+      }
+    }
+
+    void SpectrumSlider_ValueChanged( object sender, RoutedPropertyChangedEventArgs<double> e )
+    {
+      if( _currentColorPosition != null )
+      {
+        CalculateColor( ( Point )_currentColorPosition );
+      }
+    }
+
+    #endregion //Event Handlers
+
+    #region Events
+
+    public static readonly RoutedEvent SelectedColorChangedEvent = EventManager.RegisterRoutedEvent( "SelectedColorChanged", RoutingStrategy.Bubble, typeof( RoutedPropertyChangedEventHandler<Color> ), typeof( ColorCanvas ) );
+    public event RoutedPropertyChangedEventHandler<Color> SelectedColorChanged
+    {
+      add
+      {
+        AddHandler( SelectedColorChangedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( SelectedColorChangedEvent, value );
+      }
+    }
+
+    #endregion //Events
+
+    #region Methods
+
+    private void UpdateSelectedColor()
+    {
+      SelectedColor = Color.FromArgb( A, R, G, B );
+    }
+
+    private void UpdateSelectedColor( Color color )
+    {
+      SelectedColor = Color.FromArgb( color.A, color.R, color.G, color.B );
+    }
+
+    private void UpdateRGBValues( Color color )
+    {
+      _surpressPropertyChanged = true;
+
+      A = color.A;
+      R = color.R;
+      G = color.G;
+      B = color.B;
+
+      _surpressPropertyChanged = false;
+    }
+
+    private void UpdateColorShadeSelectorPositionAndCalculateColor( Point p, bool calculateColor )
+    {
+      if( p.Y < 0 )
+        p.Y = 0;
+
+      if( p.X < 0 )
+        p.X = 0;
+
+      if( p.X > _colorShadingCanvas.ActualWidth )
+        p.X = _colorShadingCanvas.ActualWidth;
+
+      if( p.Y > _colorShadingCanvas.ActualHeight )
+        p.Y = _colorShadingCanvas.ActualHeight;
+
+      _colorShadeSelectorTransform.X = p.X - ( _colorShadeSelector.Width / 2 );
+      _colorShadeSelectorTransform.Y = p.Y - ( _colorShadeSelector.Height / 2 );
+
+      p.X = p.X / _colorShadingCanvas.ActualWidth;
+      p.Y = p.Y / _colorShadingCanvas.ActualHeight;
+
+      _currentColorPosition = p;
+
+      if( calculateColor )
+        CalculateColor( p );
+    }
+
+    private void UpdateColorShadeSelectorPosition( Color color )
+    {
+      if( _spectrumSlider == null || _colorShadingCanvas == null )
+        return;
+
+      _currentColorPosition = null;
+
+      HsvColor hsv = ColorUtilities.ConvertRgbToHsv( color.R, color.G, color.B );
+
+      if( !( color.R == color.G && color.R == color.B ) )
+        _spectrumSlider.Value = hsv.H;
+
+      Point p = new Point( hsv.S, 1 - hsv.V );
+
+      _currentColorPosition = p;
+
+      _colorShadeSelectorTransform.X = ( p.X * _colorShadingCanvas.Width ) - 5;
+      _colorShadeSelectorTransform.Y = ( p.Y * _colorShadingCanvas.Height ) - 5;
+    }
+
+    private void CalculateColor( Point p )
+    {
+      HsvColor hsv = new HsvColor( 360 - _spectrumSlider.Value, 1, 1 )
+      {
+        S = p.X,
+        V = 1 - p.Y
+      };
+      var currentColor = ColorUtilities.ConvertHsvToRgb( hsv.H, hsv.S, hsv.V );
+      currentColor.A = A;
+      SelectedColor = currentColor;
+      HexadecimalString = GetFormatedColorString( SelectedColor );
+    }
+
+    private string GetFormatedColorString( Color colorToFormat )
+    {
+      return ColorUtilities.FormatColorString( colorToFormat.ToString(), UsingAlphaChannel );
+    }
+
+    private string GetFormatedColorString( string stringToFormat )
+    {
+      return ColorUtilities.FormatColorString( stringToFormat, UsingAlphaChannel );
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorCanvas/Implementation/ColorSpectrumSlider.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorCanvas/Implementation/ColorSpectrumSlider.cs
new file mode 100644
index 00000000..30553408
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorCanvas/Implementation/ColorSpectrumSlider.cs
@@ -0,0 +1,114 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+using System.Windows.Shapes;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+
+namespace Xceed.Wpf.Toolkit
+{
+  [TemplatePart( Name = PART_SpectrumDisplay, Type = typeof( Rectangle ) )]
+  public class ColorSpectrumSlider : Slider
+  {
+    private const string PART_SpectrumDisplay = "PART_SpectrumDisplay";
+
+    #region Private Members
+
+    private Rectangle _spectrumDisplay;
+    private LinearGradientBrush _pickerBrush;
+
+    #endregion //Private Members
+
+    #region Constructors
+
+    static ColorSpectrumSlider()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( ColorSpectrumSlider ), new FrameworkPropertyMetadata( typeof( ColorSpectrumSlider ) ) );
+    }
+
+    #endregion //Constructors
+
+    #region Dependency Properties
+
+    public static readonly DependencyProperty SelectedColorProperty = DependencyProperty.Register( "SelectedColor", typeof( Color ), typeof( ColorSpectrumSlider ), new PropertyMetadata( System.Windows.Media.Colors.Transparent ) );
+    public Color SelectedColor
+    {
+      get
+      {
+        return ( Color )GetValue( SelectedColorProperty );
+      }
+      set
+      {
+        SetValue( SelectedColorProperty, value );
+      }
+    }
+
+    #endregion //Dependency Properties
+
+    #region Base Class Overrides
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+
+      _spectrumDisplay = ( Rectangle )GetTemplateChild( PART_SpectrumDisplay );
+      CreateSpectrum();
+      OnValueChanged( Double.NaN, Value );
+    }
+
+    protected override void OnValueChanged( double oldValue, double newValue )
+    {
+      base.OnValueChanged( oldValue, newValue );
+
+      Color color = ColorUtilities.ConvertHsvToRgb( 360 - newValue, 1, 1 );
+      SelectedColor = color;
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Methods
+
+    private void CreateSpectrum()
+    {
+      _pickerBrush = new LinearGradientBrush();
+      _pickerBrush.StartPoint = new Point( 0.5, 0 );
+      _pickerBrush.EndPoint = new Point( 0.5, 1 );
+      _pickerBrush.ColorInterpolationMode = ColorInterpolationMode.SRgbLinearInterpolation;
+
+      List<Color> colorsList = ColorUtilities.GenerateHsvSpectrum();
+
+      double stopIncrement = ( double )1 / colorsList.Count;
+
+      int i;
+      for( i = 0; i < colorsList.Count; i++ )
+      {
+        _pickerBrush.GradientStops.Add( new GradientStop( colorsList[ i ], i * stopIncrement ) );
+      }
+
+      _pickerBrush.GradientStops[ i - 1 ].Offset = 1.0;
+      _spectrumDisplay.Fill = _pickerBrush;
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorCanvas/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorCanvas/Themes/Generic.xaml
new file mode 100644
index 00000000..7164d0a0
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorCanvas/Themes/Generic.xaml
@@ -0,0 +1,408 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
+
+   <conv:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
+   <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+
+   <LinearGradientBrush x:Key="ColorPickerDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="ColorCanvasBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="1" Color="#FFE8EBED" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <DrawingBrush  x:Key="CheckerBrush" Viewport="0,0,10,10" ViewportUnits="Absolute" TileMode="Tile">
+      <DrawingBrush.Drawing>
+         <DrawingGroup>
+            <GeometryDrawing Brush="White">
+               <GeometryDrawing.Geometry>
+                  <RectangleGeometry Rect="0,0 100,100" />
+               </GeometryDrawing.Geometry>
+            </GeometryDrawing>
+            <GeometryDrawing Brush="LightGray">
+               <GeometryDrawing.Geometry>
+                  <GeometryGroup>
+                     <RectangleGeometry Rect="0,0 50,50" />
+                     <RectangleGeometry Rect="50,50 50,50" />
+                  </GeometryGroup>
+               </GeometryDrawing.Geometry>
+            </GeometryDrawing>
+         </DrawingGroup>
+      </DrawingBrush.Drawing>
+   </DrawingBrush>
+
+   <SolidColorBrush x:Key="HorizontalSliderTrackNormalBackground" Color="#FFE7EAEA" />
+
+   <LinearGradientBrush x:Key="HorizontalSliderTrackNormalBorder" EndPoint="0,1" StartPoint="0,0">
+      <GradientStop Color="#FFAEB1AF" Offset="0.1" />
+      <GradientStop Color="White" Offset=".9" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="ThumbStroke" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="ThumbFill" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFfefefe" />
+            <GradientStop Offset="0.5" Color="#FFeff1f2" />
+            <GradientStop Offset="1" Color="#FFd0d6db" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <SolidColorBrush x:Key="ThumbMouseOver" Color="#FFE5F2F6" />
+
+   <Style x:Key="ColorCanvasTextBoxStyle" TargetType="TextBox" BasedOn="{StaticResource {x:Type TextBox}}">
+      <Setter Property="Background" Value="Transparent" />
+      <Style.Triggers>
+         <Trigger Property="IsFocused" Value="False">
+            <Setter Property="BorderBrush" Value="Transparent" />
+         </Trigger>
+      </Style.Triggers>
+   </Style>
+
+   <Style x:Key="SliderRepeatButtonStyle"
+         TargetType="{x:Type RepeatButton}">
+      <Setter Property="OverridesDefaultStyle" Value="true" />
+      <Setter Property="IsTabStop" Value="false" />
+      <Setter Property="Focusable" Value="false" />
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type RepeatButton}">
+               <Border Background="{TemplateBinding Background}" />
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="CustomThumbForSlider" TargetType="{x:Type Thumb}">
+      <Setter Property="OverridesDefaultStyle" Value="True" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Thumb}">
+               <Rectangle x:Name="_thumb" Fill="{StaticResource ThumbFill}" Stroke="{StaticResource ThumbStroke}" Height="14" Width="8" RadiusX="1" RadiusY="1" />
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsMouseOver" Value="True">
+                     <Setter TargetName="_thumb" Property="Rectangle.Fill" Value="{StaticResource ThumbMouseOver}" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="VerticalSlideThumbStyle" TargetType="{x:Type Thumb}">
+      <Setter Property="Focusable" Value="false" />
+      <Setter Property="OverridesDefaultStyle" Value="true" />
+      <Setter Property="Height" Value="12" />
+      <Setter Property="Width" Value="11" />
+      <Setter Property="Foreground" Value="Gray" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Thumb}">
+               <Canvas SnapsToDevicePixels="true">
+                  <Path x:Name="LeftArrow" Stretch="Fill" StrokeLineJoin="Round" Stroke="#FF000000" Fill="#FF000000" Data="F1 M 276.761,316L 262.619,307.835L 262.619,324.165L 276.761,316 Z " RenderTransformOrigin="0.5,0.5" Width="6" Height="8">
+                     <Path.RenderTransform>
+                        <TransformGroup>
+                           <ScaleTransform />
+                           <SkewTransform />
+                           <RotateTransform />
+                           <TranslateTransform Y="6" X="-3" />
+                        </TransformGroup>
+                     </Path.RenderTransform>
+                  </Path>
+                  <Path x:Name="RightArrow" Stretch="Fill" StrokeLineJoin="Round" Stroke="#FF000000" Fill="#FF000000" Data="F1 M 276.761,316L 262.619,307.835L 262.619,324.165L 276.761,316 Z " RenderTransformOrigin="0.5,0.5" Width="6" Height="8">
+                     <Path.RenderTransform>
+                        <TransformGroup>
+                           <ScaleTransform />
+                           <SkewTransform />
+                           <RotateTransform Angle="-180" />
+                           <TranslateTransform Y="6" X="8" />
+                        </TransformGroup>
+                     </Path.RenderTransform>
+                  </Path>
+               </Canvas>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="ColorCanvasSliderStyle" TargetType="{x:Type Slider}">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Slider}">
+               <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+                  <Grid>
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" MinHeight="{TemplateBinding MinHeight}" />
+                        <RowDefinition Height="Auto" />
+                     </Grid.RowDefinitions>
+                     <TickBar x:Name="TopTick" Fill="{TemplateBinding Foreground}" Height="4" Placement="Top" Grid.Row="0" Visibility="Collapsed" />
+                     <TickBar x:Name="BottomTick" Fill="{TemplateBinding Foreground}" Height="4" Placement="Bottom" Grid.Row="2" Visibility="Collapsed" />
+                     <Border x:Name="TrackBackground" BorderBrush="{StaticResource HorizontalSliderTrackNormalBorder}" BorderThickness="1" Background="{StaticResource HorizontalSliderTrackNormalBackground}" CornerRadius="1" Height="4.0" Margin="5,0" Grid.Row="1" VerticalAlignment="center">
+                        <Canvas Margin="-6,-1">
+                           <Rectangle x:Name="PART_SelectionRange" Fill="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" Height="4.0" Stroke="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}" StrokeThickness="1.0" Visibility="Hidden" />
+                        </Canvas>
+                     </Border>
+                     <Track x:Name="PART_Track" Grid.Row="1">
+                        <Track.DecreaseRepeatButton>
+                           <RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource SliderRepeatButtonStyle}" />
+                        </Track.DecreaseRepeatButton>
+                        <Track.IncreaseRepeatButton>
+                           <RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource SliderRepeatButtonStyle}" />
+                        </Track.IncreaseRepeatButton>
+                        <Track.Thumb>
+                           <Thumb x:Name="Thumb" Style="{StaticResource CustomThumbForSlider}" />
+                        </Track.Thumb>
+                     </Track>
+                  </Grid>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style TargetType="{x:Type local:ColorCanvas}">
+      <Setter Property="Background" Value="{StaticResource ColorCanvasBackgroundBrush}" />
+      <Setter Property="BorderBrush" Value="{StaticResource ColorPickerDarkBorderBrush}" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:ColorCanvas}">
+               <Border Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Padding="3">
+                  <Grid Margin="2">
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                     </Grid.RowDefinitions>
+                     <Grid>
+                        <Grid.ColumnDefinitions >
+                           <ColumnDefinition Width="200" />
+                           <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="Auto" />
+                           <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+
+                        <Border BorderThickness="1" BorderBrush="DarkGray" ClipToBounds="True" Background="{StaticResource CheckerBrush}">
+                           <Canvas x:Name="PART_ColorShadingCanvas" Width="200" Height="100" HorizontalAlignment="Left" VerticalAlignment="Top">
+                              <Rectangle x:Name="ColorShadingRectangle"
+                                         Height="{Binding ElementName=PART_ColorShadingCanvas, Path=Height}"
+                                         Width="{Binding ElementName=PART_ColorShadingCanvas, Path=Width}"
+                                         Fill="{Binding SelectedColor, ElementName=PART_SpectrumSlider, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
+                              <Rectangle x:Name="WhiteGradient" Width="{Binding ElementName=PART_ColorShadingCanvas,Path=Width}" Height="{Binding ElementName=PART_ColorShadingCanvas,Path=Height}">
+                                 <Rectangle.Fill>
+                                    <LinearGradientBrush StartPoint="0,0" EndPoint="1,0">
+                                       <GradientStop Offset="0" Color="#ffffffff" />
+                                       <GradientStop Offset="1" Color="Transparent" />
+                                    </LinearGradientBrush>
+                                 </Rectangle.Fill>
+                              </Rectangle>
+                              <Rectangle x:Name="BlackGradient" Width="{Binding ElementName=PART_ColorShadingCanvas,Path=Width}" Height="{Binding ElementName=PART_ColorShadingCanvas,Path=Height}">
+                                 <Rectangle.Fill>
+                                    <LinearGradientBrush StartPoint="0,1" EndPoint="0, 0">
+                                       <GradientStop Offset="0" Color="#ff000000" />
+                                       <GradientStop Offset="1" Color="#00000000" />
+                                    </LinearGradientBrush>
+                                 </Rectangle.Fill>
+                              </Rectangle>
+                              <Canvas x:Name="PART_ColorShadeSelector" Width="10" Height="10" IsHitTestVisible="False">
+                                 <Ellipse Width="10" Height="10" StrokeThickness="3" Stroke="#FFFFFFFF" IsHitTestVisible="False" />
+                                 <Ellipse Width="10" Height="10" StrokeThickness="1" Stroke="#FF000000" IsHitTestVisible="False" />
+                              </Canvas>
+                           </Canvas>
+                        </Border>
+
+                        <Border Grid.Row="1" Margin="0,5,0,0">
+                           <Grid>
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="*" />
+                                 <ColumnDefinition Width="*" />
+                              </Grid.ColumnDefinitions>
+                              <Border Background="{StaticResource CheckerBrush}" Height="22" Margin="2,0,2,0" BorderThickness="1" BorderBrush="#FFC9CACA">
+                                 <Rectangle x:Name="SelectedColor" Fill="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
+                              </Border>
+                              <TextBox Grid.Column="1" Text="{Binding HexadecimalString, RelativeSource={RelativeSource TemplatedParent}}" Margin="2,0,2,0" VerticalAlignment="Center" Style="{StaticResource ColorCanvasTextBoxStyle}" />
+                           </Grid>
+                        </Border>
+
+                        <Border Grid.Column="1" Grid.RowSpan="2" Margin="4,-8,0,0" ClipToBounds="False">
+                           <local:ColorSpectrumSlider x:Name="PART_SpectrumSlider" VerticalAlignment="Stretch" />
+                        </Border>
+                     </Grid>
+
+                     <Border MinWidth="180" Grid.Row="1" BorderThickness="1" ClipToBounds="True" Margin="0,10,0,0">
+                        <Grid>
+                           <Grid.RowDefinitions>
+                              <RowDefinition Height="Auto" />
+                              <RowDefinition Height="Auto" />
+                              <RowDefinition Height="Auto" />
+                              <RowDefinition Height="Auto" />
+                           </Grid.RowDefinitions>
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="Auto" />
+                              <ColumnDefinition Width="*" />
+                              <ColumnDefinition Width="Auto" />
+                           </Grid.ColumnDefinitions>
+
+                           <TextBlock Grid.Row="0"
+                                      Grid.Column="0"
+                                      Text="R"
+                                      VerticalAlignment="Center" />
+                           <Slider x:Name="PART_RSlider"
+                                   Maximum="255"
+                                   TickFrequency="1"
+                                   Grid.Row="0"
+                                   Grid.Column="1"
+                                   Margin="4,6,4,6"
+                                   Style="{StaticResource ColorCanvasSliderStyle}"
+                                   Value="{Binding R, RelativeSource={RelativeSource TemplatedParent}}"
+                                   VerticalAlignment="Center" />
+                           <TextBox Grid.Row="0"
+                                    Grid.Column="2"
+                                    Text="{Binding Value, ElementName=PART_RSlider}"
+                                    VerticalAlignment="Center"
+                                    Style="{StaticResource ColorCanvasTextBoxStyle}" />
+
+                           <TextBlock Grid.Row="1"
+                                      Grid.Column="0"
+                                      Text="G"
+                                      VerticalAlignment="Center" />
+                           <Slider x:Name="PART_GSlider"
+                                   Maximum="255"
+                                   TickFrequency="1"
+                                   Grid.Row="1"
+                                   Grid.Column="1"
+                                   Margin="4,6,4,6"
+                                   Style="{StaticResource ColorCanvasSliderStyle}"
+                                   Value="{Binding G, RelativeSource={RelativeSource TemplatedParent}}"
+                                   VerticalAlignment="Center" />
+                           <TextBox Grid.Row="1"
+                                    Grid.Column="2"
+                                    Text="{Binding Value, ElementName=PART_GSlider}"
+                                    VerticalAlignment="Center"
+                                    Style="{StaticResource ColorCanvasTextBoxStyle}" />
+
+                           <TextBlock Grid.Row="2"
+                                      Grid.Column="0"
+                                      Text="B"
+                                      VerticalAlignment="Center" />
+                           <Slider x:Name="PART_BSlider"
+                                   Maximum="255"
+                                   TickFrequency="1"
+                                   Grid.Row="2"
+                                   Grid.Column="1"
+                                   Margin="4,6,4,6"
+                                   Style="{StaticResource ColorCanvasSliderStyle}"
+                                   Value="{Binding B, RelativeSource={RelativeSource TemplatedParent}}"
+                                   VerticalAlignment="Center" />
+                           <TextBox Grid.Row="2"
+                                    Grid.Column="3"
+                                    Text="{Binding Value, ElementName=PART_BSlider}"
+                                    VerticalAlignment="Center"
+                                    Style="{StaticResource ColorCanvasTextBoxStyle}" />
+
+                           <TextBlock Grid.Row="3"
+                                      Grid.Column="0"
+                                      Text="A"
+                                      VerticalAlignment="Center"
+                                      Visibility="{Binding Path=UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}"/>
+                           <Slider x:Name="PART_OpacitySlider"
+                                   Grid.Row="3"
+                                   Grid.Column="1"
+                                   Maximum="255"
+                                   Margin="4,6,4,6"
+                                   Style="{StaticResource ColorCanvasSliderStyle}"
+                                   Value="{Binding Path=A, RelativeSource={RelativeSource TemplatedParent}}"
+                                   VerticalAlignment="Center"
+                                   Visibility="{Binding Path=UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}"/>
+                           <TextBox Grid.Row="3"
+                                    Grid.Column="3"
+                                    Text="{Binding Value, ElementName=PART_OpacitySlider}"
+                                    VerticalAlignment="Center"
+                                    Style="{StaticResource ColorCanvasTextBoxStyle}" 
+                                    Visibility="{Binding Path=UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}"/>
+                         </Grid>
+                     </Border>
+                  </Grid>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style TargetType="{x:Type local:ColorSpectrumSlider}">
+      <Setter Property="Orientation" Value="Vertical" />
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+      <Setter Property="Minimum" Value="1" />
+      <Setter Property="Maximum" Value="360" />
+      <Setter Property="TickFrequency" Value="0.001" />
+      <Setter Property="IsSnapToTickEnabled" Value="True" />
+      <Setter Property="IsDirectionReversed" Value="False" />
+      <Setter Property="IsMoveToPointEnabled" Value="True" />
+      <Setter Property="Value" Value="0" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:ColorSpectrumSlider}">
+               <Grid>
+                  <Border x:Name="PART_TrackBackground" BorderBrush="DarkGray" BorderThickness="1" Width="15" Margin="0,8,0,0">
+                     <Rectangle x:Name="PART_SpectrumDisplay" Stretch="Fill" VerticalAlignment="Stretch" />
+                  </Border>
+
+                  <Track Name="PART_Track">
+                     <Track.DecreaseRepeatButton>
+                        <RepeatButton Style="{StaticResource SliderRepeatButtonStyle}" Command="Slider.DecreaseLarge" />
+                     </Track.DecreaseRepeatButton>
+                     <Track.IncreaseRepeatButton>
+                        <RepeatButton Style="{StaticResource SliderRepeatButtonStyle}" Command="Slider.IncreaseLarge" />
+                     </Track.IncreaseRepeatButton>
+                     <Track.Thumb>
+                        <Thumb Style="{StaticResource VerticalSlideThumbStyle}" />
+                     </Track.Thumb>
+                  </Track>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorPicker/Implementation/ColorItem.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorPicker/Implementation/ColorItem.cs
new file mode 100644
index 00000000..b9b25a8b
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorPicker/Implementation/ColorItem.cs
@@ -0,0 +1,43 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows.Media;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class ColorItem
+  {
+    public Color Color
+    {
+      get;
+      set;
+    }
+    public string Name
+    {
+      get;
+      set;
+    }
+
+    public ColorItem( Color color, string name )
+    {
+      Color = color;
+      Name = name;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorPicker/Implementation/ColorPicker.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorPicker/Implementation/ColorPicker.cs
new file mode 100644
index 00000000..42aca48a
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorPicker/Implementation/ColorPicker.cs
@@ -0,0 +1,525 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections.ObjectModel;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+
+namespace Xceed.Wpf.Toolkit
+{
+  [TemplatePart( Name = PART_AvailableColors, Type = typeof( ListBox ) )]
+  [TemplatePart( Name = PART_StandardColors, Type = typeof( ListBox ) )]
+  [TemplatePart( Name = PART_RecentColors, Type = typeof( ListBox ) )]
+  public class ColorPicker : Control
+  {
+    private const string PART_AvailableColors = "PART_AvailableColors";
+    private const string PART_StandardColors = "PART_StandardColors";
+    private const string PART_RecentColors = "PART_RecentColors";
+
+    #region Members
+
+    private ListBox _availableColors;
+    private ListBox _standardColors;
+    private ListBox _recentColors;
+
+    #endregion //Members
+
+    #region Properties
+
+    #region AvailableColors
+
+    public static readonly DependencyProperty AvailableColorsProperty = DependencyProperty.Register( "AvailableColors", typeof( ObservableCollection<ColorItem> ), typeof( ColorPicker ), new UIPropertyMetadata( CreateAvailableColors() ) );
+    public ObservableCollection<ColorItem> AvailableColors
+    {
+      get
+      {
+        return ( ObservableCollection<ColorItem> )GetValue( AvailableColorsProperty );
+      }
+      set
+      {
+        SetValue( AvailableColorsProperty, value );
+      }
+    }
+
+    #endregion //AvailableColors
+
+    #region AvailableColorsHeader
+
+    public static readonly DependencyProperty AvailableColorsHeaderProperty = DependencyProperty.Register( "AvailableColorsHeader", typeof( string ), typeof( ColorPicker ), new UIPropertyMetadata( "Available Colors" ) );
+    public string AvailableColorsHeader
+    {
+      get
+      {
+        return ( string )GetValue( AvailableColorsHeaderProperty );
+      }
+      set
+      {
+        SetValue( AvailableColorsHeaderProperty, value );
+      }
+    }
+
+    #endregion //AvailableColorsHeader
+
+    #region ButtonStyle
+
+    public static readonly DependencyProperty ButtonStyleProperty = DependencyProperty.Register( "ButtonStyle", typeof( Style ), typeof( ColorPicker ) );
+    public Style ButtonStyle
+    {
+      get
+      {
+        return ( Style )GetValue( ButtonStyleProperty );
+      }
+      set
+      {
+        SetValue( ButtonStyleProperty, value );
+      }
+    }
+
+    #endregion //ButtonStyle
+
+    #region DisplayColorAndName
+
+    public static readonly DependencyProperty DisplayColorAndNameProperty = DependencyProperty.Register( "DisplayColorAndName", typeof( bool ), typeof( ColorPicker ), new UIPropertyMetadata( false ) );
+    public bool DisplayColorAndName
+    {
+      get
+      {
+        return ( bool )GetValue( DisplayColorAndNameProperty );
+      }
+      set
+      {
+        SetValue( DisplayColorAndNameProperty, value );
+      }
+    }
+
+    #endregion //DisplayColorAndName
+
+    #region IsOpen
+
+    public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register( "IsOpen", typeof( bool ), typeof( ColorPicker ), new UIPropertyMetadata( false ) );
+    public bool IsOpen
+    {
+      get
+      {
+        return ( bool )GetValue( IsOpenProperty );
+      }
+      set
+      {
+        SetValue( IsOpenProperty, value );
+      }
+    }
+
+    #endregion //IsOpen
+
+    #region RecentColors
+
+    public static readonly DependencyProperty RecentColorsProperty = DependencyProperty.Register( "RecentColors", typeof( ObservableCollection<ColorItem> ), typeof( ColorPicker ), new UIPropertyMetadata( null ) );
+    public ObservableCollection<ColorItem> RecentColors
+    {
+      get
+      {
+        return ( ObservableCollection<ColorItem> )GetValue( RecentColorsProperty );
+      }
+      set
+      {
+        SetValue( RecentColorsProperty, value );
+      }
+    }
+
+    #endregion //RecentColors
+
+    #region RecentColorsHeader
+
+    public static readonly DependencyProperty RecentColorsHeaderProperty = DependencyProperty.Register( "RecentColorsHeader", typeof( string ), typeof( ColorPicker ), new UIPropertyMetadata( "Recent Colors" ) );
+    public string RecentColorsHeader
+    {
+      get
+      {
+        return ( string )GetValue( RecentColorsHeaderProperty );
+      }
+      set
+      {
+        SetValue( RecentColorsHeaderProperty, value );
+      }
+    }
+
+    #endregion //RecentColorsHeader
+
+    #region SelectedColor
+
+    public static readonly DependencyProperty SelectedColorProperty = DependencyProperty.Register( "SelectedColor", typeof( Color ), typeof( ColorPicker ), new FrameworkPropertyMetadata( Colors.Black, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, new PropertyChangedCallback( OnSelectedColorPropertyChanged ) ) );
+    public Color SelectedColor
+    {
+      get
+      {
+        return ( Color )GetValue( SelectedColorProperty );
+      }
+      set
+      {
+        SetValue( SelectedColorProperty, value );
+      }
+    }
+
+    private static void OnSelectedColorPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ColorPicker colorPicker = ( ColorPicker )d;
+      if( colorPicker != null )
+        colorPicker.OnSelectedColorChanged( ( Color )e.OldValue, ( Color )e.NewValue );
+    }
+
+    private void OnSelectedColorChanged( Color oldValue, Color newValue )
+    {
+      SelectedColorText = GetFormatedColorString( newValue );
+
+      RoutedPropertyChangedEventArgs<Color> args = new RoutedPropertyChangedEventArgs<Color>( oldValue, newValue );
+      args.RoutedEvent = ColorPicker.SelectedColorChangedEvent;
+      RaiseEvent( args );
+    }
+
+    #endregion //SelectedColor
+
+    #region SelectedColorText
+
+    public static readonly DependencyProperty SelectedColorTextProperty = DependencyProperty.Register( "SelectedColorText", typeof( string ), typeof( ColorPicker ), new UIPropertyMetadata( "Black" ) );
+    public string SelectedColorText
+    {
+      get
+      {
+        return ( string )GetValue( SelectedColorTextProperty );
+      }
+      protected set
+      {
+        SetValue( SelectedColorTextProperty, value );
+      }
+    }
+
+    #endregion //SelectedColorText
+
+    #region ShowAdvancedButton
+
+    public static readonly DependencyProperty ShowAdvancedButtonProperty = DependencyProperty.Register( "ShowAdvancedButton", typeof( bool ), typeof( ColorPicker ), new UIPropertyMetadata( true ) );
+    public bool ShowAdvancedButton
+    {
+      get
+      {
+        return ( bool )GetValue( ShowAdvancedButtonProperty );
+      }
+      set
+      {
+        SetValue( ShowAdvancedButtonProperty, value );
+      }
+    }
+
+    #endregion //ShowAdvancedButton
+
+    #region ShowAvailableColors
+
+    public static readonly DependencyProperty ShowAvailableColorsProperty = DependencyProperty.Register( "ShowAvailableColors", typeof( bool ), typeof( ColorPicker ), new UIPropertyMetadata( true ) );
+    public bool ShowAvailableColors
+    {
+      get
+      {
+        return ( bool )GetValue( ShowAvailableColorsProperty );
+      }
+      set
+      {
+        SetValue( ShowAvailableColorsProperty, value );
+      }
+    }
+
+    #endregion //ShowAvailableColors
+
+    #region ShowRecentColors
+
+    public static readonly DependencyProperty ShowRecentColorsProperty = DependencyProperty.Register( "ShowRecentColors", typeof( bool ), typeof( ColorPicker ), new UIPropertyMetadata( false ) );
+    public bool ShowRecentColors
+    {
+      get
+      {
+        return ( bool )GetValue( ShowRecentColorsProperty );
+      }
+      set
+      {
+        SetValue( ShowRecentColorsProperty, value );
+      }
+    }
+
+    #endregion //DisplayRecentColors
+
+    #region ShowStandardColors
+
+    public static readonly DependencyProperty ShowStandardColorsProperty = DependencyProperty.Register( "ShowStandardColors", typeof( bool ), typeof( ColorPicker ), new UIPropertyMetadata( true ) );
+    public bool ShowStandardColors
+    {
+      get
+      {
+        return ( bool )GetValue( ShowStandardColorsProperty );
+      }
+      set
+      {
+        SetValue( ShowStandardColorsProperty, value );
+      }
+    }
+
+    #endregion //DisplayStandardColors
+
+    #region ShowDropDownButton
+
+    public static readonly DependencyProperty ShowDropDownButtonProperty = DependencyProperty.Register( "ShowDropDownButton", typeof( bool ), typeof( ColorPicker ), new UIPropertyMetadata( true ) );
+    public bool ShowDropDownButton
+    {
+      get
+      {
+        return ( bool )GetValue( ShowDropDownButtonProperty );
+      }
+      set
+      {
+        SetValue( ShowDropDownButtonProperty, value );
+      }
+    }
+
+    #endregion //ShowDropDownButton
+
+    #region StandardColors
+
+    public static readonly DependencyProperty StandardColorsProperty = DependencyProperty.Register( "StandardColors", typeof( ObservableCollection<ColorItem> ), typeof( ColorPicker ), new UIPropertyMetadata( CreateStandardColors() ) );
+    public ObservableCollection<ColorItem> StandardColors
+    {
+      get
+      {
+        return ( ObservableCollection<ColorItem> )GetValue( StandardColorsProperty );
+      }
+      set
+      {
+        SetValue( StandardColorsProperty, value );
+      }
+    }
+
+    #endregion //StandardColors
+
+    #region StandardColorsHeader
+
+    public static readonly DependencyProperty StandardColorsHeaderProperty = DependencyProperty.Register( "StandardColorsHeader", typeof( string ), typeof( ColorPicker ), new UIPropertyMetadata( "Standard Colors" ) );
+    public string StandardColorsHeader
+    {
+      get
+      {
+        return ( string )GetValue( StandardColorsHeaderProperty );
+      }
+      set
+      {
+        SetValue( StandardColorsHeaderProperty, value );
+      }
+    }
+
+    #endregion //StandardColorsHeader
+
+    #region UsingAlphaChannel
+
+    public static readonly DependencyProperty UsingAlphaChannelProperty = DependencyProperty.Register( "UsingAlphaChannel", typeof( bool ), typeof( ColorPicker ), new FrameworkPropertyMetadata( true, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, new PropertyChangedCallback( OnUsingAlphaChannelPropertyChanged ) ) );
+    public bool UsingAlphaChannel
+    {
+      get
+      {
+        return ( bool )GetValue( UsingAlphaChannelProperty );
+      }
+      protected set
+      {
+        SetValue( UsingAlphaChannelProperty, value );
+      }
+    }
+
+    private static void OnUsingAlphaChannelPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ColorPicker colorPicker = ( ColorPicker )d;
+      if( colorPicker != null )
+        colorPicker.OnUsingAlphaChannelChanged();
+    }
+
+    private void OnUsingAlphaChannelChanged()
+    {
+      SelectedColorText = GetFormatedColorString( SelectedColor );
+    }
+
+    #endregion //UsingAlphaChannel
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static ColorPicker()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( ColorPicker ), new FrameworkPropertyMetadata( typeof( ColorPicker ) ) );
+    }
+
+    public ColorPicker()
+    {
+      RecentColors = new ObservableCollection<ColorItem>();
+      Keyboard.AddKeyDownHandler( this, OnKeyDown );
+      Mouse.AddPreviewMouseDownOutsideCapturedElementHandler( this, OnMouseDownOutsideCapturedElement );
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+
+      if( _availableColors != null )
+        _availableColors.SelectionChanged -= Color_SelectionChanged;
+
+      _availableColors = GetTemplateChild( PART_AvailableColors ) as ListBox;
+      if( _availableColors != null )
+        _availableColors.SelectionChanged += Color_SelectionChanged;
+
+      if( _standardColors != null )
+        _standardColors.SelectionChanged -= Color_SelectionChanged;
+
+      _standardColors = GetTemplateChild( PART_StandardColors ) as ListBox;
+      if( _standardColors != null )
+        _standardColors.SelectionChanged += Color_SelectionChanged;
+
+      if( _recentColors != null )
+        _recentColors.SelectionChanged -= Color_SelectionChanged;
+
+      _recentColors = GetTemplateChild( PART_RecentColors ) as ListBox;
+      if( _recentColors != null )
+        _recentColors.SelectionChanged += Color_SelectionChanged;
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Event Handlers
+
+    private void OnKeyDown( object sender, KeyEventArgs e )
+    {
+      switch( e.Key )
+      {
+        case Key.Escape:
+        case Key.Tab:
+          {
+            CloseColorPicker();
+            break;
+          }
+      }
+    }
+
+    private void OnMouseDownOutsideCapturedElement( object sender, MouseButtonEventArgs e )
+    {
+      CloseColorPicker();
+    }
+
+    private void Color_SelectionChanged( object sender, SelectionChangedEventArgs e )
+    {
+      ListBox lb = ( ListBox )sender;
+
+      if( e.AddedItems.Count > 0 )
+      {
+        var colorItem = ( ColorItem )e.AddedItems[ 0 ];
+        SelectedColor = colorItem.Color;
+        UpdateRecentColors( colorItem );
+        CloseColorPicker();
+        lb.SelectedIndex = -1; //for now I don't care about keeping track of the selected color
+      }
+    }
+
+    #endregion //Event Handlers
+
+    #region Events
+
+    public static readonly RoutedEvent SelectedColorChangedEvent = EventManager.RegisterRoutedEvent( "SelectedColorChanged", RoutingStrategy.Bubble, typeof( RoutedPropertyChangedEventHandler<Color> ), typeof( ColorPicker ) );
+    public event RoutedPropertyChangedEventHandler<Color> SelectedColorChanged
+    {
+      add
+      {
+        AddHandler( SelectedColorChangedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( SelectedColorChangedEvent, value );
+      }
+    }
+
+    #endregion //Events
+
+    #region Methods
+
+    private void CloseColorPicker()
+    {
+      if( IsOpen )
+        IsOpen = false;
+      ReleaseMouseCapture();
+    }
+
+    private void UpdateRecentColors( ColorItem colorItem )
+    {
+      if( !RecentColors.Contains( colorItem ) )
+        RecentColors.Add( colorItem );
+
+      if( RecentColors.Count > 10 ) //don't allow more than ten, maybe make a property that can be set by the user.
+        RecentColors.RemoveAt( 0 );
+    }
+
+    private string GetFormatedColorString( Color colorToFormat )
+    {
+      return ColorUtilities.FormatColorString( colorToFormat.GetColorName(), UsingAlphaChannel );
+    }
+
+    private static ObservableCollection<ColorItem> CreateStandardColors()
+    {
+      ObservableCollection<ColorItem> _standardColors = new ObservableCollection<ColorItem>();
+      _standardColors.Add( new ColorItem( Colors.Transparent, "Transparent" ) );
+      _standardColors.Add( new ColorItem( Colors.White, "White" ) );
+      _standardColors.Add( new ColorItem( Colors.Gray, "Gray" ) );
+      _standardColors.Add( new ColorItem( Colors.Black, "Black" ) );
+      _standardColors.Add( new ColorItem( Colors.Red, "Red" ) );
+      _standardColors.Add( new ColorItem( Colors.Green, "Green" ) );
+      _standardColors.Add( new ColorItem( Colors.Blue, "Blue" ) );
+      _standardColors.Add( new ColorItem( Colors.Yellow, "Yellow" ) );
+      _standardColors.Add( new ColorItem( Colors.Orange, "Orange" ) );
+      _standardColors.Add( new ColorItem( Colors.Purple, "Purple" ) );
+      return _standardColors;
+    }
+
+    private static ObservableCollection<ColorItem> CreateAvailableColors()
+    {
+      ObservableCollection<ColorItem> _standardColors = new ObservableCollection<ColorItem>();
+
+      foreach( var item in ColorUtilities.KnownColors )
+      {
+        if( !String.Equals( item.Key, "Transparent" ) )
+        {
+          var colorItem = new ColorItem( item.Value, item.Key );
+          if( !_standardColors.Contains( colorItem ) )
+            _standardColors.Add( colorItem );
+        }
+      }
+
+      return _standardColors;
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorPicker/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorPicker/Themes/Generic.xaml
new file mode 100644
index 00000000..dd7c3188
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorPicker/Themes/Generic.xaml
@@ -0,0 +1,323 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
+                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes">
+
+   <SolidColorBrush x:Key="ButtonHover" Color="#C2E0FF" />
+   <SolidColorBrush x:Key="ButtonHoverBorder" Color="#3399FF" />
+   <SolidColorBrush x:Key="ButtonChecked" Color="#E6F0FA" />
+   <SolidColorBrush x:Key="ButtonPressed" Color="#99CCFF" />
+   <SolidColorBrush x:Key="ButtonPressedBorder" Color="#3399FF" />
+
+   <!-- =============================================================================== -->
+   <!-- ColorPicker                                                                     -->
+   <!-- =============================================================================== -->
+
+   <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+   <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+   <conv:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
+
+   <LinearGradientBrush x:Key="ColorPickerDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="1" Color="#FFE8EBED" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <DrawingBrush  x:Key="CheckerBrush" Viewport="0,0,10,10" ViewportUnits="Absolute" TileMode="Tile">
+      <DrawingBrush.Drawing>
+         <DrawingGroup>
+            <GeometryDrawing Brush="White">
+               <GeometryDrawing.Geometry>
+                  <RectangleGeometry Rect="0,0 100,100" />
+               </GeometryDrawing.Geometry>
+            </GeometryDrawing>
+            <GeometryDrawing Brush="LightGray">
+               <GeometryDrawing.Geometry>
+                  <GeometryGroup>
+                     <RectangleGeometry Rect="0,0 50,50" />
+                     <RectangleGeometry Rect="50,50 50,50" />
+                  </GeometryGroup>
+               </GeometryDrawing.Geometry>
+            </GeometryDrawing>
+         </DrawingGroup>
+      </DrawingBrush.Drawing>
+   </DrawingBrush>
+
+   <Style x:Key="ColorItemContainerStyle" TargetType="{x:Type ListBoxItem}">
+      <Setter Property="ToolTip" Value="{Binding Name}" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ListBoxItem}">
+               <Grid ToolTip="{Binding Name}">
+                  <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
+                  <Border BorderThickness="1" Background="Transparent" BorderBrush="Transparent" x:Name="_outerBorder" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                     <Border Background="Transparent" BorderThickness="1" BorderBrush="Transparent" x:Name="_innerBorder" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" />
+                  </Border>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsMouseOver" Value="True">
+                     <Setter TargetName="_outerBorder" Property="BorderBrush" Value="#FFFF0000" />
+                     <Setter TargetName="_innerBorder" Property="BorderBrush" Value="#FFFFFF00" />
+                  </Trigger>
+                  <Trigger Property="IsSelected" Value="True">
+                     <Setter TargetName="_outerBorder" Property="BorderBrush" Value="#FFFF0000" />
+                     <Setter TargetName="_innerBorder" Property="BorderBrush" Value="#FFFFFF00" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <DataTemplate x:Key="ColorItemTemplate">
+      <Grid>
+         <Border BorderBrush="#FFC9CACA" BorderThickness="1" Margin="2,2,2,2" >
+            <Rectangle Width="14" Height="14">
+               <Rectangle.Style>
+                  <Style TargetType="Rectangle">
+                     <Setter Property="Fill" Value="{Binding Color, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
+                     <Style.Triggers>
+                        <DataTrigger Binding="{Binding Name}" Value="Transparent">
+                           <Setter Property="Fill" Value="{StaticResource CheckerBrush}" />
+                        </DataTrigger>
+                     </Style.Triggers>
+                  </Style>
+               </Rectangle.Style>
+            </Rectangle>
+         </Border>
+      </Grid>
+   </DataTemplate>
+
+   <Style x:Key="ColorPickerToggleButtonStyle" TargetType="ToggleButton">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="ToggleButton">
+               <Grid SnapsToDevicePixels="True">
+
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+
+                     <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
+                        <ContentPresenter Content="{TemplateBinding Content}"
+                                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                                          ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                     </Border>
+
+                     <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                          Grid.Column="1"
+                                          CornerRadius="0,2.75,2.75,0"
+                                          Visibility="{Binding ShowDropDownButton, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}, Converter={StaticResource BooleanToVisibilityConverter}}"
+                                          RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}}"
+                                          RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}}"
+											         RenderMouseOver="{TemplateBinding IsMouseOver}"
+											         RenderPressed="{TemplateBinding IsPressed}">
+
+                        <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
+                           <Path x:Name="Arrow" Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000" />
+                        </Grid>
+                     </chrome:ButtonChrome>
+                  </Grid>
+
+               </Grid>
+                <ControlTemplate.Triggers>
+                    <Trigger Property="IsEnabled" Value="False">
+                        <Setter Property="Fill" TargetName="Arrow" Value="#AFAFAF" />
+                    </Trigger>
+                </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="ColorDisplayStyle" TargetType="Border">
+      <Setter Property="Background" Value="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
+      <Style.Triggers>
+         <DataTrigger Binding="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}}" Value="Transparent">
+            <Setter Property="Background" Value="{StaticResource CheckerBrush}" />
+         </DataTrigger>
+      </Style.Triggers>
+   </Style>
+
+   <Style x:Key="ColorListStyle" TargetType="ListBox">
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="BorderThickness" Value="0" />
+      <Setter Property="ItemsPanel">
+         <Setter.Value>
+            <ItemsPanelTemplate>
+               <WrapPanel Width="200" />
+            </ItemsPanelTemplate>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="ItemContainerStyle" Value="{StaticResource ColorItemContainerStyle}" />
+      <Setter Property="ItemTemplate" Value="{StaticResource ColorItemTemplate}" />
+      <Setter Property="SelectionMode" Value="Single" />
+   </Style>
+
+   <Style TargetType="{x:Type local:ColorPicker}">
+      <Setter Property="Background" Value="White" />
+      <Setter Property="BorderBrush" Value="{StaticResource ColorPickerDarkBorderBrush}" />
+      <Setter Property="BorderThickness" Value="1,1,1,1" />
+      <Setter Property="ButtonStyle" Value="{StaticResource ColorPickerToggleButtonStyle}" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:ColorPicker}">
+               <Grid>
+                  <ToggleButton x:Name="PART_ColorPickerToggleButton"
+                                IsTabStop="True"
+                                MinHeight="22" 
+                                Background="{TemplateBinding Background}" 
+                                BorderBrush="{TemplateBinding BorderBrush}" 
+                                BorderThickness="{TemplateBinding BorderThickness}" 
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                Padding="{TemplateBinding Padding}"
+                                IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
+                                Style="{TemplateBinding ButtonStyle}">
+                     <Grid Margin="2">
+                        <Border x:Name="ColorOnly" Style="{StaticResource ColorDisplayStyle}" />
+
+                        <Border x:Name="ColorAndName" Background="White" Visibility="Hidden">
+                           <StackPanel Orientation="Horizontal">
+                              <Border HorizontalAlignment="Left" Width="20" Margin="2,1,4,1" Style="{StaticResource ColorDisplayStyle}" BorderThickness="1" BorderBrush="#FFC9CACA" />
+                              <TextBlock Text="{Binding SelectedColorText, RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="Center" />
+                           </StackPanel>
+                        </Border>
+                     </Grid>
+                  </ToggleButton>
+
+                  <Popup x:Name="PART_ColorPickerPalettePopup" VerticalAlignment="Bottom" IsOpen="{Binding ElementName=PART_ColorPickerToggleButton, Path=IsChecked}" StaysOpen="False" AllowsTransparency="True" Focusable="False" HorizontalOffset="1" VerticalOffset="1" PopupAnimation="Slide">
+                     <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource ColorPickerDarkBorderBrush}" Padding="3">
+                        <Grid>
+                           <Grid.RowDefinitions>
+                              <RowDefinition Height="Auto" />
+                              <RowDefinition />
+                              <RowDefinition Height="Auto" />
+                           </Grid.RowDefinitions>
+
+                           <Grid x:Name="_gridStandardColorsHost" Margin="4">
+                              <Grid.RowDefinitions>
+                                 <RowDefinition Height="Auto" />
+                                 <RowDefinition Height="Auto" />
+                                 <RowDefinition Height="Auto" />
+                                 <RowDefinition Height="Auto" />
+                              </Grid.RowDefinitions>
+
+                              <!-- Available Colors -->
+                              <Grid Grid.Row="1" Visibility="{TemplateBinding ShowAvailableColors, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                 <Grid>
+                                    <Grid.RowDefinitions>
+                                       <RowDefinition Height="Auto" />
+                                       <RowDefinition />
+                                    </Grid.RowDefinitions>
+                                    <TextBlock Text="{TemplateBinding AvailableColorsHeader}" Background="AliceBlue" Padding="2" Margin="0,0,0,1" />
+                                    <ListBox x:Name="PART_AvailableColors"
+                                             Grid.Row="1"
+                                             ItemsSource="{Binding AvailableColors, RelativeSource={RelativeSource TemplatedParent}}"
+                                             Style="{StaticResource ColorListStyle}" />
+                                 </Grid>
+                              </Grid>
+
+                              <!-- Standard Colors-->
+                              <Grid Grid.Row="2" Visibility="{TemplateBinding ShowStandardColors, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                 <Grid>
+                                    <Grid.RowDefinitions>
+                                       <RowDefinition Height="Auto" />
+                                       <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+                                    <TextBlock Text="{TemplateBinding StandardColorsHeader}" Background="AliceBlue" Padding="2" Margin="0,1,0,1" />
+                                    <ListBox x:Name="PART_StandardColors"
+                                             Grid.Row="1"
+                                             ItemsSource="{Binding StandardColors, RelativeSource={RelativeSource TemplatedParent}}"                                                      
+                                             Style="{StaticResource ColorListStyle}" />
+                                 </Grid>
+                              </Grid>
+
+                              <!-- Recent Colors-->
+                              <Grid Grid.Row="3" Margin="0,1,0,1" Visibility="{TemplateBinding ShowRecentColors, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                 <Grid>
+                                    <Grid.RowDefinitions>
+                                       <RowDefinition Height="Auto" />
+                                       <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+                                    <TextBlock Text="{TemplateBinding RecentColorsHeader}" Background="AliceBlue" Padding="2" Margin="0,1,0,1" />
+                                    <ListBox x:Name="PART_RecentColors"
+                                             Grid.Row="1"
+                                             ItemsSource="{Binding RecentColors, RelativeSource={RelativeSource TemplatedParent}}"
+                                             Style="{StaticResource ColorListStyle}" />
+                                 </Grid>
+                              </Grid>
+                           </Grid>
+
+                           <!-- ColorCanvas -->
+                           <Grid x:Name="_colorCanvasHost" Visibility="Collapsed">
+                              <local:ColorCanvas x:Name="PART_ColorCanvas"
+                                                 Background="Transparent"
+                                                 BorderThickness="0"
+                                                 UsingAlphaChannel="{Binding UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}}"
+                                                 SelectedColor="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}}" />
+                           </Grid>
+
+                           <Separator Grid.Row="1" HorizontalAlignment="Stretch" Margin="5,0,5,0" />
+
+                           <!-- More Colors Button -->
+                           <ToggleButton x:Name="_colorMode" Grid.Row="2" Content="Advanced" Margin="5" Visibility="{TemplateBinding ShowAdvancedButton, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                        </Grid>
+                     </Border>
+                  </Popup>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="DisplayColorAndName" Value="True">
+                     <Setter TargetName="ColorOnly" Property="Visibility" Value="Collapsed" />
+                     <Setter TargetName="ColorAndName" Property="Visibility" Value="Visible" />
+                  </Trigger>
+                  <Trigger SourceName="_colorMode" Property="IsChecked" Value="True">
+                     <Setter TargetName="_colorMode" Property="Content" Value="Standard" />
+                     <Setter TargetName="_colorCanvasHost" Property="Visibility" Value="Visible" />
+                     <Setter TargetName="_gridStandardColorsHost" Property="Visibility" Value="Collapsed" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/CalculatorMemoryToVisibilityConverter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/CalculatorMemoryToVisibilityConverter.cs
new file mode 100644
index 00000000..e9a35daa
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/CalculatorMemoryToVisibilityConverter.cs
@@ -0,0 +1,38 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.Core.Converters
+{
+  public class CalculatorMemoryToVisibilityConverter : IValueConverter
+  {
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      return ( decimal )value == decimal.Zero ? Visibility.Hidden : Visibility.Visible;
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/ColorToSolidColorBrushConverter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/ColorToSolidColorBrushConverter.cs
new file mode 100644
index 00000000..7ecc05f5
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/ColorToSolidColorBrushConverter.cs
@@ -0,0 +1,70 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows.Data;
+using System.Windows.Media;
+
+namespace Xceed.Wpf.Toolkit.Core.Converters
+{
+  public class ColorToSolidColorBrushConverter : IValueConverter
+  {
+    #region IValueConverter Members
+
+    /// <summary>
+    /// Converts a Color to a SolidColorBrush.
+    /// </summary>
+    /// <param name="value">The Color produced by the binding source.</param>
+    /// <param name="targetType">The type of the binding target property.</param>
+    /// <param name="parameter">The converter parameter to use.</param>
+    /// <param name="culture">The culture to use in the converter.</param>
+    /// <returns>
+    /// A converted SolidColorBrush. If the method returns null, the valid null value is used.
+    /// </returns>
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      if( value != null )
+        return new SolidColorBrush( ( Color )value );
+
+      return value;
+    }
+
+
+    /// <summary>
+    /// Converts a SolidColorBrush to a Color.
+    /// </summary>
+    /// <remarks>Currently not used in toolkit, but provided for developer use in their own projects</remarks>
+    /// <param name="value">The SolidColorBrush that is produced by the binding target.</param>
+    /// <param name="targetType">The type to convert to.</param>
+    /// <param name="parameter">The converter parameter to use.</param>
+    /// <param name="culture">The culture to use in the converter.</param>
+    /// <returns>
+    /// A converted value. If the method returns null, the valid null value is used.
+    /// </returns>
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      if( value != null )
+        return ( ( SolidColorBrush )value ).Color;
+
+      return value;
+    }
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/InverseBoolConverter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/InverseBoolConverter.cs
new file mode 100644
index 00000000..2d1df1fb
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/InverseBoolConverter.cs
@@ -0,0 +1,41 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.Core.Converters
+{
+  public class InverseBoolConverter : IValueConverter
+  {
+    #region IValueConverter Members
+
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      return !( bool )value;
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/ObjectTypeToNameConverter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/ObjectTypeToNameConverter.cs
new file mode 100644
index 00000000..276b4de4
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/ObjectTypeToNameConverter.cs
@@ -0,0 +1,36 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.Core.Converters
+{
+  public class ObjectTypeToNameConverter : IValueConverter
+  {
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      return value.GetType().Name;
+    }
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/RoundedValueConverter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/RoundedValueConverter.cs
new file mode 100644
index 00000000..e5fa5f52
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/RoundedValueConverter.cs
@@ -0,0 +1,68 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.Core.Converters
+{
+  public class RoundedValueConverter : IValueConverter
+  {
+    #region Precision Property
+
+    public int Precision
+    {
+      get
+      {
+        return _precision;
+      }
+      set
+      {
+        _precision = value;
+      }
+    }
+
+    private int _precision = 0;
+
+    #endregion
+
+    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
+    {
+      if( value is double )
+      {
+        return Math.Round( ( double )value, _precision );
+      }
+      else if( value is Point )
+      {
+        return new Point( Math.Round( ( ( Point )value ).X, _precision ), Math.Round( ( ( Point )value ).Y, _precision ) );
+      }
+      else
+      {
+        return value;
+      }
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
+    {
+      return value;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/SolidColorBrushToColorConverter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/SolidColorBrushToColorConverter.cs
new file mode 100644
index 00000000..f318b655
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/SolidColorBrushToColorConverter.cs
@@ -0,0 +1,52 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows.Data;
+using System.Windows.Media;
+
+namespace Xceed.Wpf.Toolkit.Core.Converters
+{
+  public class SolidColorBrushToColorConverter : IValueConverter
+  {
+    #region IValueConverter Members
+
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      SolidColorBrush brush = value as SolidColorBrush;
+      if( brush != null )
+        return brush.Color;
+
+      return default( Color );
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      if( value != null )
+      {
+        Color color = ( Color )value;
+        return new SolidColorBrush( color );
+      }
+
+      return default( SolidColorBrush );
+    }
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/TimeFormatToDateTimeFormatConverter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/TimeFormatToDateTimeFormatConverter.cs
new file mode 100644
index 00000000..e36cc204
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/TimeFormatToDateTimeFormatConverter.cs
@@ -0,0 +1,52 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.Core.Converters
+{
+  public class TimeFormatToDateTimeFormatConverter : IValueConverter
+  {
+    #region IValueConverter Members
+
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      TimeFormat timeFormat = ( TimeFormat )value;
+      switch( timeFormat )
+      {
+        case TimeFormat.Custom:
+          return DateTimeFormat.Custom;
+        case TimeFormat.ShortTime:
+          return DateTimeFormat.ShortTime;
+        case TimeFormat.LongTime:
+          return DateTimeFormat.LongTime;
+        default:
+          return DateTimeFormat.ShortTime;
+      }
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/VisibilityToBoolConverter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/VisibilityToBoolConverter.cs
new file mode 100644
index 00000000..79ccaee6
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/VisibilityToBoolConverter.cs
@@ -0,0 +1,92 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+using Xceed.Wpf.Toolkit.Core;
+
+namespace Xceed.Wpf.Toolkit.Core.Converters
+{
+  public class VisibilityToBoolConverter : IValueConverter
+  {
+    #region Inverted Property
+
+    public bool Inverted
+    {
+      get
+      {
+        return _inverted;
+      }
+      set
+      {
+        _inverted = value;
+      }
+    }
+
+    private bool _inverted; //false
+
+    #endregion
+
+    #region Not Property
+
+    public bool Not
+    {
+      get
+      {
+        return _not;
+      }
+      set
+      {
+        _not = value;
+      }
+    }
+
+    private bool _not; //false
+
+    #endregion
+
+    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
+    {
+      return this.Inverted ? this.BoolToVisibility( value ) : this.VisibilityToBool( value );
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
+    {
+      return this.Inverted ? this.VisibilityToBool( value ) : this.BoolToVisibility( value );
+    }
+
+    private object VisibilityToBool( object value )
+    {
+      if( !( value is Visibility ) )
+        throw new InvalidOperationException( ErrorMessages.GetMessage( "SuppliedValueWasNotVisibility" ) );
+
+      return ( ( ( Visibility )value ) == Visibility.Visible ) ^ Not;
+    }
+
+    private object BoolToVisibility( object value )
+    {
+      if( !( value is bool ) )
+        throw new InvalidOperationException( ErrorMessages.GetMessage( "SuppliedValueWasNotBool" ) );
+
+      return ( ( bool )value ^ Not ) ? Visibility.Visible : Visibility.Collapsed;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/WizardPageButtonVisibilityConverter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/WizardPageButtonVisibilityConverter.cs
new file mode 100644
index 00000000..1c8bc7a9
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Converters/WizardPageButtonVisibilityConverter.cs
@@ -0,0 +1,59 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.Core.Converters
+{
+  public class WizardPageButtonVisibilityConverter : IMultiValueConverter
+  {
+    public object Convert( object[] values, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      Visibility wizardVisibility = ( Visibility )values[ 0 ];
+      WizardPageButtonVisibility wizardPageVisibility = ( WizardPageButtonVisibility )values[ 1 ];
+
+      Visibility visibility = Visibility.Visible;
+
+      switch( wizardPageVisibility )
+      {
+        case WizardPageButtonVisibility.Inherit:
+          visibility = wizardVisibility;
+          break;
+        case WizardPageButtonVisibility.Collapsed:
+          visibility = Visibility.Collapsed;
+          break;
+        case WizardPageButtonVisibility.Hidden:
+          visibility = Visibility.Hidden;
+          break;
+        case WizardPageButtonVisibility.Visible:
+          visibility = Visibility.Visible;
+          break;
+      }
+
+      return visibility;
+    }
+
+    public object[] ConvertBack( object value, Type[] targetTypes, object parameter, System.Globalization.CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/ErrorMessages.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/ErrorMessages.cs
new file mode 100644
index 00000000..9702be3b
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/ErrorMessages.cs
@@ -0,0 +1,65 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Resources;
+
+namespace Xceed.Wpf.Toolkit.Core
+{
+  internal static class ErrorMessages
+  {
+    #region Static Fields
+
+
+    public const string EndAngleCannotBeSetDirectlyInSlice = "EndAngleCannotBeSetDirectlyInSlice";
+    public const string SliceCannotBeSetDirectlyInEndAngle = "SliceCannotBeSetDirectlyInEndAngle";
+    public const string SliceOOR = "SliceOOR";
+    public const string AnimationAccelerationRatioOOR = "AnimationAccelerationRatioOOR";
+    public const string AnimationDecelerationRatioOOR = "AnimationDecelerationRatioOOR";
+    public const string ZoomboxContentMustBeUIElement = "ZoomboxContentMustBeUIElement";
+    public const string ViewModeInvalidForSource = "ViewModeInvalidForSource";
+    public const string ZoomboxTemplateNeedsContent = "ZoomboxTemplateNeedsContent";
+    public const string ZoomboxHasViewFinderButNotDisplay = "ZoomboxHasViewFinderButNotDisplay";
+    public const string PositionOnlyAccessibleOnAbsolute = "PositionOnlyAccessibleOnAbsolute";
+    public const string ZoomboxViewAlreadyInitialized = "ZoomboxViewAlreadyInitialized";
+    public const string ScaleOnlyAccessibleOnAbsolute = "ScaleOnlyAccessibleOnAbsolute";
+    public const string RegionOnlyAccessibleOnRegionalView = "RegionOnlyAccessibleOnRegionalView";
+    public const string UnableToConvertToZoomboxView = "UnableToConvertToZoomboxView";
+    public const string ViewStackCannotBeManipulatedNow = "ViewStackCannotBeManipulatedNow";
+
+    public const string SuppliedValueWasNotVisibility = "SuppliedValueWasNotVisibility";
+
+    private static readonly ResourceManager _resourceManager;
+
+    #endregion
+
+    #region Constructor
+
+    static ErrorMessages()
+    {
+      _resourceManager = new ResourceManager( "Xceed.Wpf.Toolkit.Core.ErrorMessages", typeof( ErrorMessages ).Assembly );
+    }
+
+    #endregion
+
+    public static string GetMessage( string msgId )
+    {
+      return _resourceManager.GetString( msgId );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/ErrorMessages.resx b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/ErrorMessages.resx
new file mode 100644
index 00000000..f06c5874
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/ErrorMessages.resx
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="AnimationAccelerationRatioOOR" xml:space="preserve">
+    <value>AnimationAccelerationRatio must be between 0.0 and 1.0.</value>
+  </data>
+  <data name="AnimationDecelerationRatioOOR" xml:space="preserve">
+    <value>AnimationDecelerationRatio must be between 0.0 and 1.0.</value>
+  </data>
+  <data name="AnimationStateNeedsHelper" xml:space="preserve">
+    <value>ItemAnimationState can only be used once the animation helper has been assigned</value>
+  </data>
+  <data name="CannotConvertBackToRange" xml:space="preserve">
+    <value>Cannot convert back to a range.</value>
+  </data>
+  <data name="ContainerModelAlreadyRemoved" xml:space="preserve">
+    <value>Container model was already removed from children collection.</value>
+  </data>
+  <data name="EndAngleCannotBeSetDirectlyInSlice" xml:space="preserve">
+    <value>The EndAngle property cannot be set directly while a Pie's Mode is Slice. You must set the Slice property instead.</value>
+  </data>
+  <data name="GlassEnabledNeedsFullTrust" xml:space="preserve">
+    <value>GlassEnabled can be set only in Full Trust enviornments</value>
+  </data>
+  <data name="ItemMustBeAVisual" xml:space="preserve">
+    <value>item must be a Visual</value>
+  </data>
+  <data name="ItemMustBeMode3DOrVisual3D" xml:space="preserve">
+    <value>item must be either a Model3D or a Visual3D.</value>
+  </data>
+  <data name="MethodNotImplemented" xml:space="preserve">
+    <value>The method or operation is not implemented.</value>
+  </data>
+  <data name="OperationNotSupported" xml:space="preserve">
+    <value>Operation not supported on the platform</value>
+  </data>
+  <data name="OrderedItemsNeedEveryVisible" xml:space="preserve">
+    <value>orderedItems must contain every item in the visible items.</value>
+  </data>
+  <data name="PositionOnlyAccessibleOnAbsolute" xml:space="preserve">
+    <value>The Position property can only be accessed on an absolute view.</value>
+  </data>
+  <data name="RegionOnlyAccessibleOnRegionalView" xml:space="preserve">
+    <value>The Region property can only be accessed on a region-based view.</value>
+  </data>
+  <data name="ScaleOnlyAccessibleOnAbsolute" xml:space="preserve">
+    <value>The Scale property can only be accessed on an absolute view.</value>
+  </data>
+  <data name="SetNewToValueSetOnCompletedHelper" xml:space="preserve">
+    <value>SetNewToValue set on a completed animation helper</value>
+  </data>
+  <data name="SliceCannotBeSetDirectlyInEndAngle" xml:space="preserve">
+    <value>The Slice property cannot be set directly while a Pie's Mode is EndAngle. You must set the EndAngle property instead.</value>
+  </data>
+  <data name="SliceOOR" xml:space="preserve">
+    <value>Slice must be between 0.0 and 1.0.</value>
+  </data>
+  <data name="SuppliedValueWasNotBool" xml:space="preserve">
+    <value>Error converting from bool value to Visibility value. Supplied value was not of type bool.</value>
+  </data>
+  <data name="SuppliedValueWasNotVisibility" xml:space="preserve">
+    <value>Error converting from Visibility value to bool value. Supplied value was not of type Visibility.</value>
+  </data>
+  <data name="ToAndFromMatrixAreEqual" xml:space="preserve">
+    <value>To and from matrix are equal</value>
+  </data>
+  <data name="UnableToConvertToZoomboxView" xml:space="preserve">
+    <value>Unable to convert object '{0}' to ZoomboxView.</value>
+  </data>
+  <data name="ValueToConvertMustBeNumber" xml:space="preserve">
+    <value>Value to convert must be a number.</value>
+  </data>
+  <data name="ViewModeInvalidForSource" xml:space="preserve">
+    <value>The ViewStackMode must be Default or Manual while ViewStackSource is in use.</value>
+  </data>
+  <data name="ViewStackCannotBeManipulatedNow" xml:space="preserve">
+    <value>The ViewStack cannot be directly manipulated. Operation is not valid while ViewStackSource is in use. Access and modify members of the Zoombox.ViewStackSource instead.</value>
+  </data>
+  <data name="VisibleMustEqualOrdered" xml:space="preserve">
+    <value>VisibleItemCount and orderedItems count must be equal.</value>
+  </data>
+  <data name="ZoomboxContentMustBeUIElement" xml:space="preserve">
+    <value>The Content property of a Zoombox control must specify a UIElement.</value>
+  </data>
+  <data name="ZoomboxHasViewFinderButNotDisplay" xml:space="preserve">
+    <value>The Zoombox template contains a ViewFinder element but it does not contain a ZoomboxViewFinderDisplay element</value>
+  </data>
+  <data name="ZoomboxTemplateNeedsContent" xml:space="preserve">
+    <value>The Zoombox template does not contain a content presenter.</value>
+  </data>
+  <data name="ZoomboxViewAlreadyInitialized" xml:space="preserve">
+    <value>The ZoomboxView instance is already initialized for a different type of view: {0}</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/IndexChangedEventArgs.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/IndexChangedEventArgs.cs
new file mode 100644
index 00000000..4f3a2482
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/IndexChangedEventArgs.cs
@@ -0,0 +1,41 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.Core
+{
+  public class IndexChangedEventArgs : PropertyChangedEventArgs<int>
+  {
+    #region Constructors
+
+    public IndexChangedEventArgs( RoutedEvent routedEvent, int oldIndex, int newIndex )
+      : base( routedEvent, oldIndex, newIndex )
+    {
+    }
+
+    #endregion
+
+    protected override void InvokeEventHandler( Delegate genericHandler, object genericTarget )
+    {
+      ( ( IndexChangedEventHandler )genericHandler )( genericTarget, this );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/IndexChangedEventHandler.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/IndexChangedEventHandler.cs
new file mode 100644
index 00000000..90b8efc4
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/IndexChangedEventHandler.cs
@@ -0,0 +1,23 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit.Core
+{
+  public delegate void IndexChangedEventHandler( object sender, IndexChangedEventArgs e );
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Input/KeyModifier.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Input/KeyModifier.cs
new file mode 100644
index 00000000..b3213eb4
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Input/KeyModifier.cs
@@ -0,0 +1,38 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+
+namespace Xceed.Wpf.Toolkit.Core.Input
+{
+  public enum KeyModifier
+  {
+    None,
+    Blocked,
+    Ctrl,
+    LeftCtrl,
+    RightCtrl,
+    Shift,
+    LeftShift,
+    RightShift,
+    Alt,
+    LeftAlt,
+    RightAlt,
+    Exact,
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Input/KeyModifierCollection.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Input/KeyModifierCollection.cs
new file mode 100644
index 00000000..7479759d
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Input/KeyModifierCollection.cs
@@ -0,0 +1,226 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Windows.Input;
+
+namespace Xceed.Wpf.Toolkit.Core.Input
+{
+  [TypeConverter( typeof( KeyModifierCollectionConverter ) )]
+  public class KeyModifierCollection : Collection<KeyModifier>
+  {
+    #region AreActive Property
+
+    public bool AreActive
+    {
+      get
+      {
+        if( this.Count == 0 )
+          return true;
+
+        // if the Blocked modifier is present, then the action is not allowed
+        // so simply return false
+        if( this.Contains( KeyModifier.Blocked ) )
+          return false;
+
+        if( this.Contains( KeyModifier.Exact ) )
+          return this.IsExactMatch();
+
+        return this.MatchAny();
+      }
+    }
+
+    #endregion
+
+    private static bool IsKeyPressed( KeyModifier modifier, ICollection<Key> keys )
+    {
+      switch( modifier )
+      {
+        case KeyModifier.Alt:
+          return keys.Contains( Key.LeftAlt )
+              || keys.Contains( Key.RightAlt );
+
+        case KeyModifier.LeftAlt:
+          return keys.Contains( Key.LeftAlt );
+
+        case KeyModifier.RightAlt:
+          return keys.Contains( Key.RightAlt );
+
+        case KeyModifier.Ctrl:
+          return keys.Contains( Key.LeftCtrl )
+              || keys.Contains( Key.RightCtrl );
+
+        case KeyModifier.LeftCtrl:
+          return keys.Contains( Key.LeftCtrl );
+
+        case KeyModifier.RightCtrl:
+          return keys.Contains( Key.RightCtrl );
+
+        case KeyModifier.Shift:
+          return keys.Contains( Key.LeftShift )
+              || keys.Contains( Key.RightShift );
+
+        case KeyModifier.LeftShift:
+          return keys.Contains( Key.LeftShift );
+
+        case KeyModifier.RightShift:
+          return keys.Contains( Key.RightShift );
+
+        case KeyModifier.None:
+          return true;
+
+        default:
+          throw new NotSupportedException( "Unknown modifier" );
+      }
+    }
+
+    private static bool HasModifier( Key key, ICollection<KeyModifier> modifiers )
+    {
+      switch( key )
+      {
+        case Key.LeftAlt:
+          return modifiers.Contains( KeyModifier.Alt )
+              || modifiers.Contains( KeyModifier.LeftAlt );
+
+        case Key.RightAlt:
+          return modifiers.Contains( KeyModifier.Alt )
+              || modifiers.Contains( KeyModifier.RightAlt );
+
+        case Key.LeftCtrl:
+          return modifiers.Contains( KeyModifier.Ctrl )
+              || modifiers.Contains( KeyModifier.LeftCtrl );
+
+        case Key.RightCtrl:
+          return modifiers.Contains( KeyModifier.Ctrl )
+              || modifiers.Contains( KeyModifier.RightCtrl );
+
+        case Key.LeftShift:
+          return modifiers.Contains( KeyModifier.Shift )
+              || modifiers.Contains( KeyModifier.LeftShift );
+
+        case Key.RightShift:
+          return modifiers.Contains( KeyModifier.Shift )
+              || modifiers.Contains( KeyModifier.RightShift );
+
+        default:
+          throw new NotSupportedException( "Unknown key" );
+      }
+    }
+
+    private bool IsExactMatch()
+    {
+      HashSet<KeyModifier> modifiers = this.GetKeyModifiers();
+      HashSet<Key> keys = this.GetKeysPressed();
+
+      // No key must be pressed for the modifier None.
+      if( this.Contains( KeyModifier.None ) )
+        return ( modifiers.Count == 0 )
+            && ( keys.Count == 0 );
+
+      // Make sure every modifier has a matching key pressed.
+      foreach( KeyModifier modifier in modifiers )
+      {
+        if( !KeyModifierCollection.IsKeyPressed( modifier, keys ) )
+          return false;
+      }
+
+      // Make sure every key pressed has a matching modifier.
+      foreach( Key key in keys )
+      {
+        if( !KeyModifierCollection.HasModifier( key, modifiers ) )
+          return false;
+      }
+
+      return true;
+    }
+
+    private bool MatchAny()
+    {
+      if( this.Contains( KeyModifier.None ) )
+        return true;
+
+      HashSet<KeyModifier> modifiers = this.GetKeyModifiers();
+      HashSet<Key> keys = this.GetKeysPressed();
+
+      foreach( KeyModifier modifier in modifiers )
+      {
+        if( KeyModifierCollection.IsKeyPressed( modifier, keys ) )
+          return true;
+      }
+
+      return false;
+    }
+
+    private HashSet<KeyModifier> GetKeyModifiers()
+    {
+      HashSet<KeyModifier> modifiers = new HashSet<KeyModifier>();
+
+      foreach( KeyModifier modifier in this )
+      {
+        switch( modifier )
+        {
+          case KeyModifier.Alt:
+          case KeyModifier.LeftAlt:
+          case KeyModifier.RightAlt:
+          case KeyModifier.Ctrl:
+          case KeyModifier.LeftCtrl:
+          case KeyModifier.RightCtrl:
+          case KeyModifier.Shift:
+          case KeyModifier.LeftShift:
+          case KeyModifier.RightShift:
+            {
+              if( !modifiers.Contains( modifier ) )
+              {
+                modifiers.Add( modifier );
+              }
+            }
+            break;
+
+          default:
+            break;
+        }
+      }
+
+      return modifiers;
+    }
+
+    private HashSet<Key> GetKeysPressed()
+    {
+      HashSet<Key> keys = new HashSet<Key>();
+
+      if( Keyboard.IsKeyDown( Key.LeftAlt ) )
+        keys.Add( Key.LeftAlt );
+      if( Keyboard.IsKeyDown( Key.RightAlt ) )
+        keys.Add( Key.RightAlt );
+      if( Keyboard.IsKeyDown( Key.LeftCtrl ) )
+        keys.Add( Key.LeftCtrl );
+      if( Keyboard.IsKeyDown( Key.RightCtrl ) )
+        keys.Add( Key.RightCtrl );
+      if( Keyboard.IsKeyDown( Key.LeftShift ) )
+        keys.Add( Key.LeftShift );
+      if( Keyboard.IsKeyDown( Key.RightShift ) )
+        keys.Add( Key.RightShift );
+
+      return keys;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Input/KeyModifierCollectionConverter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Input/KeyModifierCollectionConverter.cs
new file mode 100644
index 00000000..1c1b1561
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Input/KeyModifierCollectionConverter.cs
@@ -0,0 +1,125 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design.Serialization;
+using System.Globalization;
+using System.Reflection;
+using System.Security;
+
+namespace Xceed.Wpf.Toolkit.Core.Input
+{
+  public sealed class KeyModifierCollectionConverter : TypeConverter
+  {
+    #region Static Fields
+
+    private static readonly TypeConverter _keyModifierConverter = TypeDescriptor.GetConverter( typeof( KeyModifier ) );
+
+    #endregion
+
+    public override bool CanConvertFrom( ITypeDescriptorContext typeDescriptorContext, Type type )
+    {
+      return _keyModifierConverter.CanConvertFrom( typeDescriptorContext, type );
+    }
+
+    public override bool CanConvertTo( ITypeDescriptorContext typeDescriptorContext, Type type )
+    {
+      return ( type == typeof( InstanceDescriptor )
+          || type == typeof( KeyModifierCollection )
+          || type == typeof( string ) );
+    }
+
+    public override object ConvertFrom( ITypeDescriptorContext typeDescriptorContext,
+        CultureInfo cultureInfo, object value )
+    {
+      KeyModifierCollection result = new KeyModifierCollection();
+      string stringValue = value as string;
+
+      // convert null as None
+      if( value == null
+          || ( stringValue != null && stringValue.Trim() == string.Empty ) )
+      {
+        result.Add( KeyModifier.None );
+      }
+      else
+      {
+        // respect the following separators: '+', ' ', '|', or ','
+        foreach( string token in stringValue.Split( new char[] { '+', ' ', '|', ',' },
+                StringSplitOptions.RemoveEmptyEntries ) )
+          result.Add( ( KeyModifier )_keyModifierConverter.ConvertFrom( typeDescriptorContext, cultureInfo, token ) );
+
+        // if nothing added, assume None
+        if( result.Count == 0 )
+          result.Add( KeyModifier.None );
+      }
+      return result;
+    }
+
+    public override object ConvertTo( ITypeDescriptorContext typeDescriptorContext,
+        CultureInfo cultureInfo, object value, Type destinationType )
+    {
+      // special handling for null or an empty collection
+      if( value == null || ( ( KeyModifierCollection )value ).Count == 0 )
+      {
+        if( destinationType == typeof( InstanceDescriptor ) )
+        {
+          object result = null;
+          try
+          {
+            result = ConstructInstanceDescriptor();
+          }
+          catch( SecurityException )
+          {
+          }
+          return result;
+        }
+        else if( destinationType == typeof( string ) )
+        {
+          return _keyModifierConverter.ConvertTo( typeDescriptorContext,
+                  cultureInfo, KeyModifier.None, destinationType );
+        }
+      }
+
+      // return a '+' delimited string containing the modifiers
+      if( destinationType == typeof( string ) )
+      {
+        string result = string.Empty;
+        foreach( KeyModifier modifier in ( KeyModifierCollection )value )
+        {
+          if( result != string.Empty )
+            result = result + '+';
+
+          result = result + _keyModifierConverter.ConvertTo( typeDescriptorContext,
+                  cultureInfo, modifier, destinationType );
+        }
+        return result;
+      }
+
+      // unexpected type requested so return null
+      return null;
+    }
+
+    private static object ConstructInstanceDescriptor()
+    {
+      ConstructorInfo ci = typeof( KeyModifierCollection ).GetConstructor( new Type[] { } );
+      return new InstanceDescriptor( ci, new Object[] { } );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/InvalidContentException.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/InvalidContentException.cs
new file mode 100644
index 00000000..401615f8
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/InvalidContentException.cs
@@ -0,0 +1,40 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+
+namespace Xceed.Wpf.Toolkit.Core
+{
+  public class InvalidContentException : Exception
+  {
+    #region Constructors
+
+    public InvalidContentException( string message )
+      : base( message )
+    {
+    }
+
+    public InvalidContentException( string message, Exception innerException )
+      : base( message, innerException )
+    {
+    }
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/InvalidTemplateException.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/InvalidTemplateException.cs
new file mode 100644
index 00000000..40e8d8f5
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/InvalidTemplateException.cs
@@ -0,0 +1,40 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+
+namespace Xceed.Wpf.Toolkit.Core
+{
+  public class InvalidTemplateException : Exception
+  {
+    #region Constructors
+
+    public InvalidTemplateException( string message )
+      : base( message )
+    {
+    }
+
+    public InvalidTemplateException( string message, Exception innerException )
+      : base( message, innerException )
+    {
+    }
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Primitives/HsvColor.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Primitives/HsvColor.cs
new file mode 100644
index 00000000..09454084
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Primitives/HsvColor.cs
@@ -0,0 +1,35 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit.Primitives
+{
+  internal struct HsvColor
+  {
+    public double H;
+    public double S;
+    public double V;
+
+    public HsvColor( double h, double s, double v )
+    {
+      H = h;
+      S = s;
+      V = v;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Primitives/InputBase.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Primitives/InputBase.cs
new file mode 100644
index 00000000..392b1354
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Primitives/InputBase.cs
@@ -0,0 +1,161 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.Primitives
+{
+  public abstract class InputBase : Control
+  {
+    #region Properties
+
+    #region CultureInfo
+
+    public static readonly DependencyProperty CultureInfoProperty = DependencyProperty.Register( "CultureInfo", typeof( CultureInfo ), typeof( InputBase ), new UIPropertyMetadata( CultureInfo.CurrentCulture, OnCultureInfoChanged ) );
+    public CultureInfo CultureInfo
+    {
+      get
+      {
+        return ( CultureInfo )GetValue( CultureInfoProperty );
+      }
+      set
+      {
+        SetValue( CultureInfoProperty, value );
+      }
+    }
+
+    private static void OnCultureInfoChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      InputBase inputBase = o as InputBase;
+      if( inputBase != null )
+        inputBase.OnCultureInfoChanged( ( CultureInfo )e.OldValue, ( CultureInfo )e.NewValue );
+    }
+
+    protected virtual void OnCultureInfoChanged( CultureInfo oldValue, CultureInfo newValue )
+    {
+
+    }
+
+    #endregion //CultureInfo
+
+    #region IsReadOnly
+
+    public static readonly DependencyProperty IsReadOnlyProperty = DependencyProperty.Register( "IsReadOnly", typeof( bool ), typeof( InputBase ), new UIPropertyMetadata( false ) );
+    public bool IsReadOnly
+    {
+      get
+      {
+        return ( bool )GetValue( IsReadOnlyProperty );
+      }
+      set
+      {
+        SetValue( IsReadOnlyProperty, value );
+      }
+    }
+
+    #endregion //IsReadOnly
+
+    #region Text
+
+    public static readonly DependencyProperty TextProperty = DependencyProperty.Register( "Text", typeof( string ), typeof( InputBase ), new FrameworkPropertyMetadata( default( String ), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnTextChanged, null, false, UpdateSourceTrigger.LostFocus ) );
+    public string Text
+    {
+      get
+      {
+        return ( string )GetValue( TextProperty );
+      }
+      set
+      {
+        SetValue( TextProperty, value );
+      }
+    }
+
+    private static void OnTextChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      InputBase inputBase = o as InputBase;
+      if( inputBase != null )
+        inputBase.OnTextChanged( ( string )e.OldValue, ( string )e.NewValue );
+    }
+
+    protected virtual void OnTextChanged( string oldValue, string newValue )
+    {
+
+    }
+
+    #endregion //Text
+
+    #region TextAlignment
+
+    public static readonly DependencyProperty TextAlignmentProperty = DependencyProperty.Register( "TextAlignment", typeof( TextAlignment ), typeof( InputBase ), new UIPropertyMetadata( TextAlignment.Left ) );
+    public TextAlignment TextAlignment
+    {
+      get
+      {
+        return ( TextAlignment )GetValue( TextAlignmentProperty );
+      }
+      set
+      {
+        SetValue( TextAlignmentProperty, value );
+      }
+    }
+
+
+    #endregion //TextAlignment
+
+    #region Watermark
+
+    public static readonly DependencyProperty WatermarkProperty = DependencyProperty.Register( "Watermark", typeof( object ), typeof( InputBase ), new UIPropertyMetadata( null ) );
+    public object Watermark
+    {
+      get
+      {
+        return ( object )GetValue( WatermarkProperty );
+      }
+      set
+      {
+        SetValue( WatermarkProperty, value );
+      }
+    }
+
+    #endregion //Watermark
+
+    #region WatermarkTemplate
+
+    public static readonly DependencyProperty WatermarkTemplateProperty = DependencyProperty.Register( "WatermarkTemplate", typeof( DataTemplate ), typeof( InputBase ), new UIPropertyMetadata( null ) );
+    public DataTemplate WatermarkTemplate
+    {
+      get
+      {
+        return ( DataTemplate )GetValue( WatermarkTemplateProperty );
+      }
+      set
+      {
+        SetValue( WatermarkTemplateProperty, value );
+      }
+    }
+
+    #endregion //WatermarkTemplate
+
+    #endregion //Properties
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Primitives/Selector.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Primitives/Selector.cs
new file mode 100644
index 00000000..f8cfcd3f
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Primitives/Selector.cs
@@ -0,0 +1,463 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Input;
+
+namespace Xceed.Wpf.Toolkit.Primitives
+{
+  public class Selector : ItemsControl //should probably make this control an ICommandSource
+  {
+    #region Members
+
+    private bool _ignoreSetSelectedValue;
+    private bool _surpressSelectionChanged;
+    private bool _surpressSelectedValueChanged;
+
+    #endregion //Members
+
+    #region Constructors
+
+    public Selector()
+    {
+      SelectedItems = new ObservableCollection<object>();
+      AddHandler( Selector.SelectedEvent, new RoutedEventHandler( Selector_ItemSelected ) );
+      AddHandler( Selector.UnSelectedEvent, new RoutedEventHandler( Selector_ItemUnselected ) );
+    }
+
+    #endregion //Constructors
+
+    #region Properties
+
+    public static readonly DependencyProperty CommandProperty = DependencyProperty.Register( "Command", typeof( ICommand ), typeof( Selector ), new PropertyMetadata( ( ICommand )null ) );
+    [TypeConverter( typeof( CommandConverter ) )]
+    public ICommand Command
+    {
+      get
+      {
+        return ( ICommand )GetValue( CommandProperty );
+      }
+      set
+      {
+        SetValue( CommandProperty, value );
+      }
+    }
+
+    #region Delimiter
+
+    public static readonly DependencyProperty DelimiterProperty = DependencyProperty.Register( "Delimiter", typeof( string ), typeof( Selector ), new UIPropertyMetadata( ",", OnDelimiterChanged ) );
+    public string Delimiter
+    {
+      get
+      {
+        return ( string )GetValue( DelimiterProperty );
+      }
+      set
+      {
+        SetValue( DelimiterProperty, value );
+      }
+    }
+
+    private static void OnDelimiterChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( Selector )o ).UpdateSelectedValue();
+    }
+
+    #endregion
+
+    public static readonly DependencyProperty SelectedItemProperty = DependencyProperty.Register( "SelectedItem", typeof( object ), typeof( Selector ), new UIPropertyMetadata( null ) );
+    public object SelectedItem
+    {
+      get
+      {
+        return ( object )GetValue( SelectedItemProperty );
+      }
+      set
+      {
+        SetValue( SelectedItemProperty, value );
+      }
+    }
+
+    //Since you cannot data bind to ReadOnly DependencyProperty, I am leaving this a public get/set DP.  This will allow you to data bind to the SelectedItems from a ViewModel, but it is
+    //intended to be ReadOnly.  So you MUST set the binding Mode=OneWayToSource.  Otherwise it will not behave as expected.
+    public static readonly DependencyProperty SelectedItemsProperty = DependencyProperty.Register( "SelectedItems", typeof( IList ), typeof( Selector ), new UIPropertyMetadata( null ) );
+    public IList SelectedItems
+    {
+      get
+      {
+        return ( IList )GetValue( SelectedItemsProperty );
+      }
+      set
+      {
+        SetValue( SelectedItemsProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty SelectedMemberPathProperty = DependencyProperty.Register( "SelectedMemberPath", typeof( string ), typeof( Selector ), new UIPropertyMetadata( null ) );
+    public string SelectedMemberPath
+    {
+      get
+      {
+        return ( string )GetValue( SelectedMemberPathProperty );
+      }
+      set
+      {
+        SetValue( SelectedMemberPathProperty, value );
+      }
+    }
+
+    #region SelectedValue
+
+    public static readonly DependencyProperty SelectedValueProperty = DependencyProperty.Register( "SelectedValue", typeof( string ), typeof( Selector ), new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnSelectedValueChanged ) );
+    public string SelectedValue
+    {
+      get
+      {
+        return ( string )GetValue( SelectedValueProperty );
+      }
+      set
+      {
+        SetValue( SelectedValueProperty, value );
+      }
+    }
+
+    private static void OnSelectedValueChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      Selector selector = o as Selector;
+      if( selector != null )
+        selector.OnSelectedValueChanged( ( string )e.OldValue, ( string )e.NewValue );
+    }
+
+    protected virtual void OnSelectedValueChanged( string oldValue, string newValue )
+    {
+      if( _surpressSelectedValueChanged )
+        return;
+
+      UpdateSelectedItemsFromSelectedValue();
+    }
+
+    #endregion //SelectedValue
+
+    #region ValueMemberPath
+
+    public static readonly DependencyProperty ValueMemberPathProperty = DependencyProperty.Register( "ValueMemberPath", typeof( string ), typeof( Selector ), new UIPropertyMetadata( OnValueMemberPathChanged ) );
+    public string ValueMemberPath
+    {
+      get
+      {
+        return ( string )GetValue( ValueMemberPathProperty );
+      }
+      set
+      {
+        SetValue( ValueMemberPathProperty, value );
+      }
+    }
+
+    private static void OnValueMemberPathChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( Selector )o ).UpdateSelectedValue();
+    }
+
+    #endregion
+
+    #endregion //Properties
+
+    #region Base Class Overrides
+
+    protected override bool IsItemItsOwnContainerOverride( object item )
+    {
+      return item is SelectorItem;
+    }
+
+    protected override DependencyObject GetContainerForItemOverride()
+    {
+      return new SelectorItem();
+    }
+
+    protected override void PrepareContainerForItemOverride( DependencyObject element, object item )
+    {
+      _surpressSelectionChanged = true;
+      var selectorItem = element as FrameworkElement;
+
+      //first try resolving SelectorItem.IsSelected by data binding to the SelectedMemeberPath property
+      if( !String.IsNullOrEmpty( SelectedMemberPath ) )
+      {
+        Binding selectedBinding = new Binding( SelectedMemberPath )
+        {
+          Mode = BindingMode.TwoWay,
+          Source = item
+        };
+        selectorItem.SetBinding( SelectorItem.IsSelectedProperty, selectedBinding );
+      }
+
+      //now let's search the SelectedItems for the current item.  If it's there then mark it as selected
+      if( SelectedItems != null )
+      {
+        foreach( object selectedItem in SelectedItems )
+        {
+          //a match was found so select it and get the hell out of here
+          if( item.Equals( selectedItem ) )
+          {
+            selectorItem.SetValue( SelectorItem.IsSelectedProperty, true );
+            break;
+          }
+        }
+      }
+
+      base.PrepareContainerForItemOverride( element, item );
+      _surpressSelectionChanged = false;
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Events
+
+    public static readonly RoutedEvent SelectedEvent = EventManager.RegisterRoutedEvent( "SelectedEvent", RoutingStrategy.Bubble, typeof( SelectedItemChangedEventHandler ), typeof( Selector ) );
+    public static readonly RoutedEvent UnSelectedEvent = EventManager.RegisterRoutedEvent( "UnSelectedEvent", RoutingStrategy.Bubble, typeof( SelectedItemChangedEventHandler ), typeof( Selector ) );
+
+    public static readonly RoutedEvent SelectedItemChangedEvent = EventManager.RegisterRoutedEvent( "SelectedItemChanged", RoutingStrategy.Bubble, typeof( SelectedItemChangedEventHandler ), typeof( Selector ) );
+    public event SelectedItemChangedEventHandler SelectedItemChanged
+    {
+      add
+      {
+        AddHandler( SelectedItemChangedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( SelectedItemChangedEvent, value );
+      }
+    }
+
+    #endregion //Events
+
+    #region Event Handlers
+
+    protected virtual void Selector_ItemSelected( object sender, RoutedEventArgs e )
+    {
+      OnItemSelected( e.OriginalSource, false );
+    }
+
+    protected virtual void Selector_ItemUnselected( object sender, RoutedEventArgs e )
+    {
+      OnItemSelected( e.OriginalSource, true );
+    }
+
+    #endregion //Event Handlers
+
+    #region Methods
+
+    protected object GetItemValue( object item )
+    {
+      if( !String.IsNullOrEmpty( ValueMemberPath ) && (item != null))
+      {
+        var property = item.GetType().GetProperty( ValueMemberPath );
+        if( property != null )
+          return property.GetValue( item, null );
+      }
+
+      return item;
+    }
+
+    protected string GetDelimitedValue( object value )
+    {
+      return String.Format( "{0}{1}", value, Delimiter );
+    }
+
+    protected virtual void OnItemSelected( object itemContainer, bool remove )
+    {
+      object item = this.ItemContainerGenerator.ItemFromContainer( ( DependencyObject )itemContainer );
+      Update( item, remove );
+      RaiseSelectedItemChangedEvent( item, !remove ); //inverse the remove paramter to correctly reflect the IsSelected state
+    }
+
+    protected virtual void RaiseSelectedItemChangedEvent( object item, bool isSelected )
+    {
+      if( _surpressSelectionChanged )
+        return;
+
+      RaiseEvent( new SelectedItemChangedEventArgs( Selector.SelectedItemChangedEvent, this, item, isSelected ) );
+
+      if( Command != null )
+        Command.Execute( item );
+    }
+
+    protected virtual void Update( object item, bool remove )
+    {
+      UpdateSelectedItem( item );
+      UpdateSelectedItems( item, remove );
+      UpdateSelectedValue();
+    }
+
+    private void UpdateSelectedItem( object item )
+    {
+      SelectedItem = item;
+    }
+
+    private void UpdateSelectedItems( object item, bool remove )
+    {
+      if( SelectedItems == null )
+        SelectedItems = new ObservableCollection<object>();
+
+      if( remove )
+      {
+        if( SelectedItems.Contains( item ) )
+          SelectedItems.Remove( item );
+      }
+      else
+      {
+        if( !SelectedItems.Contains( item ) )
+          SelectedItems.Add( item );
+      }
+    }
+
+    private void UpdateSelectedValue()
+    {
+      //get out of here if we don't want to set the SelectedValue
+      if( _ignoreSetSelectedValue )
+        return;
+
+      _surpressSelectedValueChanged = true;
+
+#if VS2008
+      string newValue = String.Join( Delimiter, SelectedItems.Cast<object>().Select( x => GetItemValue( x ).ToString() ).ToArray() );
+#else
+      string newValue = String.Join( Delimiter, SelectedItems.Cast<object>().Select( x => GetItemValue( x ) ) );
+#endif
+      if( String.IsNullOrEmpty( SelectedValue ) || !SelectedValue.Equals( newValue ) )
+        SelectedValue = newValue;
+
+      _surpressSelectedValueChanged = false;
+    }
+
+    private void UpdateSelectedItemsFromSelectedValue()
+    {
+      _surpressSelectionChanged = true;
+
+      //first we have to unselect everything
+      ClearSelectedItems();
+
+      if( !String.IsNullOrEmpty( SelectedValue ) )
+      {
+        string[] values = SelectedValue.Split( new string[] { Delimiter }, StringSplitOptions.RemoveEmptyEntries );
+        foreach( string value in values )
+        {
+          var item = ResolveItemByValue( value );
+
+          if( item != null )
+          {
+            SelectedItems.Add( item );
+
+            //now try to select it in the list
+            var selectorItem = ItemContainerGenerator.ContainerFromItem( item ) as SelectorItem;
+            if( selectorItem != null )
+            {
+              if( !selectorItem.IsSelected )
+                selectorItem.IsSelected = true;
+            }
+          }
+        }
+      }
+
+      _surpressSelectionChanged = false;
+    }
+
+    private void ClearSelectedItems()
+    {
+      if( SelectedItems != null )
+        SelectedItems.Clear();
+      else
+        SelectedItems = new ObservableCollection<object>();
+
+      UnselectAllInternal();
+    }
+
+    private void UnselectAllInternal()
+    {
+      _ignoreSetSelectedValue = true;
+
+      if( ItemsSource != null )
+      {
+        foreach( object item in ItemsSource )
+        {
+          var selectorItem = ItemContainerGenerator.ContainerFromItem( item ) as SelectorItem;
+          if( selectorItem != null )
+          {
+            if( selectorItem.IsSelected )
+              selectorItem.IsSelected = false;
+          }
+        }
+      }
+
+      _ignoreSetSelectedValue = false;
+    }
+
+    protected object ResolveItemByValue( string value )
+    {
+      if( !String.IsNullOrEmpty( ValueMemberPath ) )
+      {
+        if( ItemsSource != null )
+        {
+          foreach( object item in ItemsSource )
+          {
+            var property = item.GetType().GetProperty( ValueMemberPath );
+            if( property != null )
+            {
+              var propertyValue = property.GetValue( item, null );
+              if( value.Equals( propertyValue.ToString(), StringComparison.InvariantCultureIgnoreCase ) )
+                return item;
+            }
+          }
+        }
+      }
+
+      return value;
+    }
+
+    #endregion //Methods
+  }
+
+  public delegate void SelectedItemChangedEventHandler( object sender, SelectedItemChangedEventArgs e );
+  public class SelectedItemChangedEventArgs : RoutedEventArgs
+  {
+    public bool IsSelected
+    {
+      get;
+      private set;
+    }
+    public object Item
+    {
+      get;
+      private set;
+    }
+
+    public SelectedItemChangedEventArgs( RoutedEvent routedEvent, object source, object item, bool isSelected )
+      : base( routedEvent, source )
+    {
+      Item = item;
+      IsSelected = isSelected;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Primitives/SelectorItem.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Primitives/SelectorItem.cs
new file mode 100644
index 00000000..ab70ae5b
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Primitives/SelectorItem.cs
@@ -0,0 +1,107 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace Xceed.Wpf.Toolkit.Primitives
+{
+  public class SelectorItem : ContentControl
+  {
+    #region Constructors
+
+    static SelectorItem()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( SelectorItem ), new FrameworkPropertyMetadata( typeof( SelectorItem ) ) );
+    }
+
+    public SelectorItem()
+    {
+      AddHandler( Mouse.MouseDownEvent, new MouseButtonEventHandler( OnMouseDown ) );
+    }
+
+    #endregion //Constructors
+
+    #region Properties
+
+    public static readonly DependencyProperty IsSelectedProperty = DependencyProperty.Register( "IsSelected", typeof( bool ), typeof( SelectorItem ), new UIPropertyMetadata( false, OnIsSelectedChanged ) );
+    public bool IsSelected
+    {
+      get
+      {
+        return ( bool )GetValue( IsSelectedProperty );
+      }
+      set
+      {
+        SetValue( IsSelectedProperty, value );
+      }
+    }
+
+    private static void OnIsSelectedChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      SelectorItem selectorItem = o as SelectorItem;
+      if( selectorItem != null )
+        selectorItem.OnIsSelectedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnIsSelectedChanged( bool oldValue, bool newValue )
+    {
+      if( newValue )
+        RaiseSelectionChangedEvent( new RoutedEventArgs( Selector.SelectedEvent, this ) );
+      else
+        RaiseSelectionChangedEvent( new RoutedEventArgs( Selector.UnSelectedEvent, this ) );
+    }
+
+    internal Selector ParentSelector
+    {
+      get
+      {
+        return ItemsControl.ItemsControlFromItemContainer( this ) as Selector;
+      }
+    }
+
+    #endregion //Properties
+
+    #region Events
+
+    public static readonly RoutedEvent SelectedEvent = Selector.SelectedEvent.AddOwner( typeof( SelectorItem ) );
+    public static readonly RoutedEvent UnselectedEvent = Selector.UnSelectedEvent.AddOwner( typeof( SelectorItem ) );
+
+    #endregion
+
+    #region Event Hanlders
+
+    void OnMouseDown( object sender, MouseButtonEventArgs e )
+    {
+      IsSelected = !IsSelected;
+    }
+
+    #endregion //Event Hanlders
+
+    #region Methods
+
+    private void RaiseSelectionChangedEvent( RoutedEventArgs e )
+    {
+      base.RaiseEvent( e );
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Primitives/ShapeBase.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Primitives/ShapeBase.cs
new file mode 100644
index 00000000..497453f3
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Primitives/ShapeBase.cs
@@ -0,0 +1,145 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Media;
+using System.Windows.Shapes;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+
+namespace Xceed.Wpf.Toolkit.Primitives
+{
+  public abstract class ShapeBase : Shape
+  {
+    #region Constructors
+
+    static ShapeBase()
+    {
+      ShapeBase.StrokeDashArrayProperty.OverrideMetadata( typeof( ShapeBase ), new FrameworkPropertyMetadata( new PropertyChangedCallback( ShapeBase.OnStrokeChanged ) ) );
+      ShapeBase.StrokeDashCapProperty.OverrideMetadata( typeof( ShapeBase ), new FrameworkPropertyMetadata( new PropertyChangedCallback( ShapeBase.OnStrokeChanged ) ) );
+      ShapeBase.StrokeDashOffsetProperty.OverrideMetadata( typeof( ShapeBase ), new FrameworkPropertyMetadata( new PropertyChangedCallback( ShapeBase.OnStrokeChanged ) ) );
+      ShapeBase.StrokeEndLineCapProperty.OverrideMetadata( typeof( ShapeBase ), new FrameworkPropertyMetadata( new PropertyChangedCallback( ShapeBase.OnStrokeChanged ) ) );
+      ShapeBase.StrokeLineJoinProperty.OverrideMetadata( typeof( ShapeBase ), new FrameworkPropertyMetadata( new PropertyChangedCallback( ShapeBase.OnStrokeChanged ) ) );
+      ShapeBase.StrokeMiterLimitProperty.OverrideMetadata( typeof( ShapeBase ), new FrameworkPropertyMetadata( new PropertyChangedCallback( ShapeBase.OnStrokeChanged ) ) );
+      ShapeBase.StrokeProperty.OverrideMetadata( typeof( ShapeBase ), new FrameworkPropertyMetadata( new PropertyChangedCallback( ShapeBase.OnStrokeChanged ) ) );
+      ShapeBase.StrokeStartLineCapProperty.OverrideMetadata( typeof( ShapeBase ), new FrameworkPropertyMetadata( new PropertyChangedCallback( ShapeBase.OnStrokeChanged ) ) );
+      ShapeBase.StrokeThicknessProperty.OverrideMetadata( typeof( ShapeBase ), new FrameworkPropertyMetadata( new PropertyChangedCallback( ShapeBase.OnStrokeChanged ) ) );
+    }
+
+    #endregion
+
+    #region IsPenEmptyOrUndefined Internal Property
+
+    internal bool IsPenEmptyOrUndefined
+    {
+      get
+      {
+        double strokeThickness = this.StrokeThickness;
+        return ( this.Stroke == null ) || DoubleHelper.IsNaN( strokeThickness ) || DoubleHelper.AreVirtuallyEqual( 0, strokeThickness );
+      }
+    }
+
+    #endregion
+
+    #region DefiningGeometry Protected Property
+
+    protected abstract override Geometry DefiningGeometry
+    {
+      get;
+    }
+
+    #endregion
+
+    internal virtual Rect GetDefiningGeometryBounds()
+    {
+      Geometry geometry = this.DefiningGeometry;
+
+      Debug.Assert( geometry != null );
+
+      return geometry.Bounds;
+    }
+
+    internal virtual Size GetNaturalSize()
+    {
+      Geometry geometry = this.DefiningGeometry;
+
+      Debug.Assert( geometry != null );
+
+      Rect bounds = geometry.GetRenderBounds( GetPen() );
+
+      return new Size( Math.Max( bounds.Right, 0 ), Math.Max( bounds.Bottom, 0 ) );
+    }
+
+    internal Pen GetPen()
+    {
+      if( this.IsPenEmptyOrUndefined )
+        return null;
+
+      if( _pen == null )
+      {
+        _pen = this.MakePen();
+      }
+
+      return _pen;
+    }
+
+    internal double GetStrokeThickness()
+    {
+      if( this.IsPenEmptyOrUndefined )
+        return 0d;
+
+      return Math.Abs( this.StrokeThickness );
+    }
+
+    internal bool IsSizeEmptyOrUndefined( Size size )
+    {
+      return ( DoubleHelper.IsNaN( size.Width ) || DoubleHelper.IsNaN( size.Height ) || size.IsEmpty );
+    }
+
+    private static void OnStrokeChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( ShapeBase )d )._pen = null;
+    }
+
+    private Pen MakePen()
+    {
+      Pen pen = new Pen();
+      pen.Brush = this.Stroke;
+      pen.DashCap = this.StrokeDashCap;
+      if( this.StrokeDashArray != null || this.StrokeDashOffset != 0.0 )
+      {
+        pen.DashStyle = new DashStyle( this.StrokeDashArray, this.StrokeDashOffset );
+      }
+      pen.EndLineCap = this.StrokeEndLineCap;
+      pen.LineJoin = this.StrokeLineJoin;
+      pen.MiterLimit = this.StrokeMiterLimit;
+      pen.StartLineCap = this.StrokeStartLineCap;
+      pen.Thickness = Math.Abs( this.StrokeThickness );
+
+      return pen;
+    }
+
+    #region Private Fields
+
+    private Pen _pen = null;
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Primitives/UpDownBase.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Primitives/UpDownBase.cs
new file mode 100644
index 00000000..86893750
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Primitives/UpDownBase.cs
@@ -0,0 +1,373 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Input;
+
+namespace Xceed.Wpf.Toolkit.Primitives
+{
+  [TemplatePart( Name = PART_TextBox, Type = typeof( TextBox ) )]
+  [TemplatePart( Name = PART_Spinner, Type = typeof( Spinner ) )]
+  public abstract class UpDownBase<T> : InputBase
+  {
+    #region Members
+
+    /// <summary>
+    /// Name constant for Text template part.
+    /// </summary>
+    internal const string PART_TextBox = "PART_TextBox";
+
+    /// <summary>
+    /// Name constant for Spinner template part.
+    /// </summary>
+    internal const string PART_Spinner = "PART_Spinner";
+
+    /// <summary>
+    /// Flags if the Text and Value properties are in the process of being sync'd
+    /// </summary>
+    private bool _isSyncingTextAndValueProperties;
+
+    #endregion //Members
+
+    #region Properties
+
+    protected Spinner Spinner
+    {
+      get;
+      private set;
+    }
+    protected TextBox TextBox
+    {
+      get;
+      private set;
+    }
+
+    #region AllowSpin
+
+    public static readonly DependencyProperty AllowSpinProperty = DependencyProperty.Register( "AllowSpin", typeof( bool ), typeof( UpDownBase<T> ), new UIPropertyMetadata( true ) );
+    public bool AllowSpin
+    {
+      get
+      {
+        return ( bool )GetValue( AllowSpinProperty );
+      }
+      set
+      {
+        SetValue( AllowSpinProperty, value );
+      }
+    }
+
+    #endregion //AllowSpin
+
+    #region MouseWheelActiveOnFocus
+
+    public static readonly DependencyProperty MouseWheelActiveOnFocusProperty = DependencyProperty.Register( "MouseWheelActiveOnFocus", typeof( bool ), typeof( UpDownBase<T> ), new UIPropertyMetadata( true ) );
+    public bool MouseWheelActiveOnFocus
+    {
+      get
+      {
+        return ( bool )GetValue( MouseWheelActiveOnFocusProperty );
+      }
+      set
+      {
+        SetValue( MouseWheelActiveOnFocusProperty, value );
+      }
+    }
+
+    #endregion //MouseWheelActiveOnFocus
+
+    #region ShowButtonSpinner
+
+    public static readonly DependencyProperty ShowButtonSpinnerProperty = DependencyProperty.Register( "ShowButtonSpinner", typeof( bool ), typeof( UpDownBase<T> ), new UIPropertyMetadata( true ) );
+    public bool ShowButtonSpinner
+    {
+      get
+      {
+        return ( bool )GetValue( ShowButtonSpinnerProperty );
+      }
+      set
+      {
+        SetValue( ShowButtonSpinnerProperty, value );
+      }
+    }
+
+    #endregion //ShowButtonSpinner
+
+    #region Value
+
+    public static readonly DependencyProperty ValueProperty = DependencyProperty.Register( "Value", typeof( T ), typeof( UpDownBase<T> ), new FrameworkPropertyMetadata( default( T ), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnValueChanged, null, false, UpdateSourceTrigger.LostFocus ) );
+    public T Value
+    {
+      get
+      {
+        return ( T )GetValue( ValueProperty );
+      }
+      set
+      {
+        SetValue( ValueProperty, value );
+      }
+    }
+
+    private static void OnValueChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      UpDownBase<T> upDownBase = o as UpDownBase<T>;
+      if( upDownBase != null )
+        upDownBase.OnValueChanged( ( T )e.OldValue, ( T )e.NewValue );
+    }
+
+    protected virtual void OnValueChanged( T oldValue, T newValue )
+    {
+      ValidateValue( newValue );
+
+      SyncTextAndValueProperties( ValueProperty, string.Empty );
+
+      SetValidSpinDirection();
+
+      RoutedPropertyChangedEventArgs<object> args = new RoutedPropertyChangedEventArgs<object>( oldValue, newValue );
+      args.RoutedEvent = ValueChangedEvent;
+      RaiseEvent( args );
+    }
+
+    #endregion //Value
+
+    #endregion //Properties
+
+    #region Constructors
+
+    internal UpDownBase()
+    {
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    protected override void OnAccessKey( AccessKeyEventArgs e )
+    {
+      if( TextBox != null )
+        TextBox.Focus();
+
+      base.OnAccessKey( e );
+    }
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+
+      TextBox = GetTemplateChild( PART_TextBox ) as TextBox;
+
+      if( Spinner != null )
+        Spinner.Spin -= OnSpinnerSpin;
+
+      Spinner = GetTemplateChild( PART_Spinner ) as Spinner;
+
+      if( Spinner != null )
+        Spinner.Spin += OnSpinnerSpin;
+
+      SetValidSpinDirection();
+    }
+
+    protected override void OnGotFocus( RoutedEventArgs e )
+    {
+      if( TextBox != null )
+        TextBox.Focus();
+    }
+
+    protected override void OnPreviewKeyDown( KeyEventArgs e )
+    {
+      switch( e.Key )
+      {
+        case Key.Up:
+          {
+            if( AllowSpin && !IsReadOnly )
+              DoIncrement();
+            e.Handled = true;
+            break;
+          }
+        case Key.Down:
+          {
+            if( AllowSpin && !IsReadOnly )
+              DoDecrement();
+            e.Handled = true;
+            break;
+          }
+      }
+    }
+
+    protected override void OnMouseWheel( MouseWheelEventArgs e )
+    {
+      base.OnMouseWheel( e );
+
+      if( !e.Handled && AllowSpin && !IsReadOnly && ( ( TextBox.IsFocused && MouseWheelActiveOnFocus ) || !MouseWheelActiveOnFocus ) )
+      {
+        if( e.Delta < 0 )
+        {
+          DoDecrement();
+        }
+        else if( 0 < e.Delta )
+        {
+          DoIncrement();
+        }
+
+        e.Handled = true;
+      }
+    }
+
+    protected override void OnTextChanged( string oldValue, string newValue )
+    {
+      SyncTextAndValueProperties( InputBase.TextProperty, newValue );
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Event Handlers
+
+    private void OnSpinnerSpin( object sender, SpinEventArgs e )
+    {
+      if( AllowSpin && !IsReadOnly )
+        OnSpin( e );
+    }
+
+    #endregion //Event Handlers
+
+    #region Events
+
+    //Due to a bug in Visual Studio, you cannot create event handlers for generic T args in XAML, so I have to use object instead.
+    public static readonly RoutedEvent ValueChangedEvent = EventManager.RegisterRoutedEvent( "ValueChanged", RoutingStrategy.Bubble, typeof( RoutedPropertyChangedEventHandler<object> ), typeof( UpDownBase<T> ) );
+    public event RoutedPropertyChangedEventHandler<object> ValueChanged
+    {
+      add
+      {
+        AddHandler( ValueChangedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( ValueChangedEvent, value );
+      }
+    }
+
+    #endregion //Events
+
+    #region Methods
+
+    protected virtual void OnSpin( SpinEventArgs e )
+    {
+      if( e == null )
+        throw new ArgumentNullException( "e" );
+
+      if( e.Direction == SpinDirection.Increase )
+        DoIncrement();
+      else
+        DoDecrement();
+    }
+
+    /// <summary>
+    /// Performs an increment if conditions allow it.
+    /// </summary>
+    private void DoDecrement()
+    {
+      if( Spinner == null || ( Spinner.ValidSpinDirection & ValidSpinDirections.Decrease ) == ValidSpinDirections.Decrease )
+      {
+        OnDecrement();
+      }
+    }
+
+    /// <summary>
+    /// Performs a decrement if conditions allow it.
+    /// </summary>
+    private void DoIncrement()
+    {
+      if( Spinner == null || ( Spinner.ValidSpinDirection & ValidSpinDirections.Increase ) == ValidSpinDirections.Increase )
+      {
+        OnIncrement();
+      }
+    }
+
+    protected void SyncTextAndValueProperties( DependencyProperty p, string text )
+    {
+      //prevents recursive syncing properties
+      if( _isSyncingTextAndValueProperties )
+        return;
+
+      _isSyncingTextAndValueProperties = true;
+
+      //this only occures when the user typed in the value
+      if( InputBase.TextProperty == p )
+      {
+        Value = ConvertTextToValue( text );
+      }
+
+      Text = ConvertValueToText();
+
+#if VS2008
+      //there is a bug in .NET 3.5 which will not correctly update the textbox text through binding.
+      if ( TextBox != null )
+        TextBox.Text = Text;
+#endif
+
+      _isSyncingTextAndValueProperties = false;
+    }
+
+    #region Abstract
+
+    /// <summary>
+    /// Coerces the value.
+    /// </summary>
+    protected abstract T CoerceValue( T value );
+
+    /// <summary>
+    /// Converts the formatted text to a value.
+    /// </summary>
+    protected abstract T ConvertTextToValue( string text );
+
+    /// <summary>
+    /// Converts the value to formatted text.
+    /// </summary>
+    /// <returns></returns>
+    protected abstract string ConvertValueToText();
+
+    /// <summary>
+    /// Called by OnSpin when the spin direction is SpinDirection.Increase.
+    /// </summary>
+    protected abstract void OnIncrement();
+
+    /// <summary>
+    /// Called by OnSpin when the spin direction is SpinDirection.Descrease.
+    /// </summary>
+    protected abstract void OnDecrement();
+
+    /// <summary>
+    /// Sets the valid spin directions.
+    /// </summary>
+    protected abstract void SetValidSpinDirection();
+
+    /// <summary>
+    /// Validates the value and keeps it between the Min and Max values.
+    /// </summary>
+    /// <param name="value">The value.</param>
+    protected abstract void ValidateValue( T value );
+
+    #endregion //Abstract
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/PropertyChangedEventArgs.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/PropertyChangedEventArgs.cs
new file mode 100644
index 00000000..103003bc
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/PropertyChangedEventArgs.cs
@@ -0,0 +1,73 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.Core
+{
+  public class PropertyChangedEventArgs<T> : RoutedEventArgs
+  {
+    #region Constructors
+
+    public PropertyChangedEventArgs( RoutedEvent Event, T oldValue, T newValue )
+      : base()
+    {
+      _oldValue = oldValue;
+      _newValue = newValue;
+      this.RoutedEvent = Event;
+    }
+
+    #endregion
+
+    #region NewValue Property
+
+    public T NewValue
+    {
+      get
+      {
+        return _newValue;
+      }
+    }
+
+    private readonly T _newValue;
+
+    #endregion
+
+    #region OldValue Property
+
+    public T OldValue
+    {
+      get
+      {
+        return _oldValue;
+      }
+    }
+
+    private readonly T _oldValue;
+
+    #endregion
+
+    protected override void InvokeEventHandler( Delegate genericHandler, object genericTarget )
+    {
+      PropertyChangedEventHandler<T> handler = ( PropertyChangedEventHandler<T> )genericHandler;
+      handler( genericTarget, this );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/PropertyChangedEventHandler.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/PropertyChangedEventHandler.cs
new file mode 100644
index 00000000..ada4a8aa
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/PropertyChangedEventHandler.cs
@@ -0,0 +1,23 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit.Core
+{
+  public delegate void PropertyChangedEventHandler<T>( object sender, PropertyChangedEventArgs<T> e );
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Themes/ResourceKeys.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Themes/ResourceKeys.cs
new file mode 100644
index 00000000..eaca3cd0
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Themes/ResourceKeys.cs
@@ -0,0 +1,66 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.Themes
+{
+  public static class ResourceKeys
+  {
+    #region Brush Keys
+
+    public static readonly ResourceKey ControlNormalBackgroundKey = new StaticResourceKey( typeof( ResourceKeys ), "ControlNormalBackgroundKey" );
+    public static readonly ResourceKey ControlDisabledBackgroundKey = new StaticResourceKey( typeof( ResourceKeys ), "ControlDisabledBackgroundKey" );
+    public static readonly ResourceKey ControlNormalBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ControlNormalBorderKey" );
+    public static readonly ResourceKey ControlMouseOverBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ControlMouseOverBorderKey" );
+    public static readonly ResourceKey ControlFocusedBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ControlFocusedBorderKey" );
+
+    public static readonly ResourceKey ButtonNormalOuterBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonNormalOuterBorderKey" );
+    public static readonly ResourceKey ButtonNormalInnerBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonNormalInnerBorderKey" );
+    public static readonly ResourceKey ButtonNormalBackgroundKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonNormalBackgroundKey" );
+
+    public static readonly ResourceKey ButtonMouseOverBackgroundKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonMouseOverBackgroundKey" );
+    public static readonly ResourceKey ButtonMouseOverOuterBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonMouseOverOuterBorderKey" );
+    public static readonly ResourceKey ButtonMouseOverInnerBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonMouseOverInnerBorderKey" );
+
+    public static readonly ResourceKey ButtonPressedOuterBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonPressedOuterBorderKey" );
+    public static readonly ResourceKey ButtonPressedInnerBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonPressedInnerBorderKey" );
+    public static readonly ResourceKey ButtonPressedBackgroundKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonPressedBackgroundKey" );
+
+    public static readonly ResourceKey ButtonFocusedOuterBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonFocusedOuterBorderKey" );
+    public static readonly ResourceKey ButtonFocusedInnerBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonFocusedInnerBorderKey" );
+    public static readonly ResourceKey ButtonFocusedBackgroundKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonFocusedBackgroundKey" );
+
+    public static readonly ResourceKey ButtonDisabledOuterBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonDisabledOuterBorderKey" );
+    public static readonly ResourceKey ButtonInnerBorderDisabledKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonInnerBorderDisabledKey" );
+
+    #endregion //Brush Keys
+
+    public static readonly ResourceKey GlyphNormalForegroundKey = new StaticResourceKey( typeof( ResourceKeys ), "GlyphNormalForegroundKey" );
+    public static readonly ResourceKey GlyphDisabledForegroundKey = new StaticResourceKey( typeof( ResourceKeys ), "GlyphDisabledForegroundKey" );
+
+
+
+    public static readonly ResourceKey SpinButtonCornerRadiusKey = new StaticResourceKey( typeof( ResourceKeys ), "SpinButtonCornerRadiusKey" );
+
+
+
+    public static readonly ResourceKey SpinnerButtonStyleKey = new StaticResourceKey( typeof( ResourceKeys ), "SpinnerButtonStyleKey" );
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Themes/StaticResourceKey.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Themes/StaticResourceKey.cs
new file mode 100644
index 00000000..9adfd914
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Themes/StaticResourceKey.cs
@@ -0,0 +1,59 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.Themes
+{
+  public sealed class StaticResourceKey : ResourceKey
+  {
+    private string _key;
+    public string Key
+    {
+      get
+      {
+        return _key;
+      }
+    }
+
+    private Type _type;
+    public Type Type
+    {
+      get
+      {
+        return _type;
+      }
+    }
+
+    public StaticResourceKey( Type type, string key )
+    {
+      _type = type;
+      _key = key;
+    }
+
+    public override System.Reflection.Assembly Assembly
+    {
+      get
+      {
+        return _type.Assembly;
+      }
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/UIElementAdorner.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/UIElementAdorner.cs
new file mode 100644
index 00000000..25af7c72
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/UIElementAdorner.cs
@@ -0,0 +1,243 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Collections;
+using System.Windows;
+using System.Windows.Documents;
+using System.Windows.Media;
+
+namespace Xceed.Wpf.Toolkit.Core
+{
+  /// <summary>
+  /// An adorner that can display one and only one UIElement.  
+  /// That element can be a panel, which contains multiple other elements.
+  /// The element is added to the adorner's visual and logical trees, enabling it to 
+  /// particpate in dependency property value inheritance, amongst other things.
+  /// </summary>
+  internal class UIElementAdorner<TElement> : Adorner where TElement : UIElement
+  {
+    #region Fields
+
+    TElement _child = null;
+    double _offsetLeft = 0;
+    double _offsetTop = 0;
+
+    #endregion // Fields
+
+    #region Constructor
+
+    /// <summary>
+    /// Constructor. 
+    /// </summary>
+    /// <param name="adornedElement">The element to which the adorner will be bound.</param>
+    public UIElementAdorner( UIElement adornedElement )
+      : base( adornedElement )
+    {
+    }
+
+    #endregion // Constructor
+
+    #region Public Interface
+
+    #region Child
+
+    /// <summary>
+    /// Gets/sets the child element hosted in the adorner.
+    /// </summary>
+    public TElement Child
+    {
+      get
+      {
+        return _child;
+      }
+      set
+      {
+        if( value == _child )
+          return;
+
+        if( _child != null )
+        {
+          base.RemoveLogicalChild( _child );
+          base.RemoveVisualChild( _child );
+        }
+
+        _child = value;
+
+        if( _child != null )
+        {
+          base.AddLogicalChild( _child );
+          base.AddVisualChild( _child );
+        }
+      }
+    }
+
+    #endregion // Child
+
+    #region GetDesiredTransform
+
+    /// <summary>
+    /// Override.
+    /// </summary>
+    /// <param name="transform"></param>
+    /// <returns></returns>
+    public override GeneralTransform GetDesiredTransform( GeneralTransform transform )
+    {
+      GeneralTransformGroup result = new GeneralTransformGroup();
+      result.Children.Add( base.GetDesiredTransform( transform ) );
+      result.Children.Add( new TranslateTransform( _offsetLeft, _offsetTop ) );
+      return result;
+    }
+
+    #endregion // GetDesiredTransform
+
+    #region OffsetLeft
+
+    /// <summary>
+    /// Gets/sets the horizontal offset of the adorner.
+    /// </summary>
+    public double OffsetLeft
+    {
+      get
+      {
+        return _offsetLeft;
+      }
+      set
+      {
+        _offsetLeft = value;
+        UpdateLocation();
+      }
+    }
+
+    #endregion // OffsetLeft
+
+    #region SetOffsets
+
+    /// <summary>
+    /// Updates the location of the adorner in one atomic operation.
+    /// </summary>
+    public void SetOffsets( double left, double top )
+    {
+      _offsetLeft = left;
+      _offsetTop = top;
+      this.UpdateLocation();
+    }
+
+    #endregion // SetOffsets
+
+    #region OffsetTop
+
+    /// <summary>
+    /// Gets/sets the vertical offset of the adorner.
+    /// </summary>
+    public double OffsetTop
+    {
+      get
+      {
+        return _offsetTop;
+      }
+      set
+      {
+        _offsetTop = value;
+        UpdateLocation();
+      }
+    }
+
+    #endregion // OffsetTop
+
+    #endregion // Public Interface
+
+    #region Protected Overrides
+
+    /// <summary>
+    /// Override.
+    /// </summary>
+    /// <param name="constraint"></param>
+    /// <returns></returns>
+    protected override Size MeasureOverride( Size constraint )
+    {
+      if( _child == null )
+        return base.MeasureOverride( constraint );
+
+      _child.Measure( constraint );
+      return _child.DesiredSize;
+    }
+
+    /// <summary>
+    /// Override.
+    /// </summary>
+    /// <param name="finalSize"></param>
+    /// <returns></returns>
+    protected override Size ArrangeOverride( Size finalSize )
+    {
+      if( _child == null )
+        return base.ArrangeOverride( finalSize );
+
+      _child.Arrange( new Rect( finalSize ) );
+      return finalSize;
+    }
+
+    /// <summary>
+    /// Override.
+    /// </summary>
+    protected override IEnumerator LogicalChildren
+    {
+      get
+      {
+        ArrayList list = new ArrayList();
+        if( _child != null )
+          list.Add( _child );
+        return list.GetEnumerator();
+      }
+    }
+
+    /// <summary>
+    /// Override.
+    /// </summary>
+    /// <param name="index"></param>
+    /// <returns></returns>
+    protected override Visual GetVisualChild( int index )
+    {
+      return _child;
+    }
+
+    /// <summary>
+    /// Override.
+    /// </summary>
+    protected override int VisualChildrenCount
+    {
+      get
+      {
+        return _child == null ? 0 : 1;
+      }
+    }
+
+    #endregion // Protected Overrides
+
+    #region Private Helpers
+
+    void UpdateLocation()
+    {
+      AdornerLayer adornerLayer = base.Parent as AdornerLayer;
+      if( adornerLayer != null )
+        adornerLayer.Update( base.AdornedElement );
+    }
+
+    #endregion // Private Helpers
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/CalculatorUtilities.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/CalculatorUtilities.cs
new file mode 100644
index 00000000..bddce5b5
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/CalculatorUtilities.cs
@@ -0,0 +1,281 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+
+namespace Xceed.Wpf.Toolkit.Core.Utilities
+{
+  static class CalculatorUtilities
+  {
+    public static Calculator.CalculatorButtonType GetCalculatorButtonTypeFromText( string text )
+    {
+      switch( text )
+      {
+        case "0":
+          return Calculator.CalculatorButtonType.Zero;
+        case "1":
+          return Calculator.CalculatorButtonType.One;
+        case "2":
+          return Calculator.CalculatorButtonType.Two;
+        case "3":
+          return Calculator.CalculatorButtonType.Three;
+        case "4":
+          return Calculator.CalculatorButtonType.Four;
+        case "5":
+          return Calculator.CalculatorButtonType.Five;
+        case "6":
+          return Calculator.CalculatorButtonType.Six;
+        case "7":
+          return Calculator.CalculatorButtonType.Seven;
+        case "8":
+          return Calculator.CalculatorButtonType.Eight;
+        case "9":
+          return Calculator.CalculatorButtonType.Nine;
+        case "+":
+          return Calculator.CalculatorButtonType.Add;
+        case "-":
+          return Calculator.CalculatorButtonType.Subtract;
+        case "*":
+          return Calculator.CalculatorButtonType.Multiply;
+        case "/":
+          return Calculator.CalculatorButtonType.Divide;
+        case "%":
+          return Calculator.CalculatorButtonType.Percent;
+        case "\b":
+          return Calculator.CalculatorButtonType.Back;
+        case "\r":
+        case "=":
+          return Calculator.CalculatorButtonType.Equal;
+      }
+
+      //the check for the decimal is not in the switch statement. To help localize we check against the current culture's decimal seperator
+      if( text == CultureInfo.CurrentCulture.NumberFormat.CurrencyDecimalSeparator )
+        return Calculator.CalculatorButtonType.Decimal;
+
+      //check for the escape key
+      if( text == ( ( char )27 ).ToString() )
+        return Calculator.CalculatorButtonType.Clear;
+
+      return Calculator.CalculatorButtonType.None;
+    }
+
+    public static Button FindButtonByCalculatorButtonType( DependencyObject parent, Calculator.CalculatorButtonType type )
+    {
+      for( int i = 0; i < VisualTreeHelper.GetChildrenCount( parent ); i++ )
+      {
+        var child = VisualTreeHelper.GetChild( parent, i );
+
+        object buttonType = child.GetValue( Button.CommandParameterProperty );
+
+        if( buttonType != null && ( Calculator.CalculatorButtonType )buttonType == type )
+        {
+          return child as Button;
+        }
+        else
+        {
+          var result = FindButtonByCalculatorButtonType( child, type );
+
+          if( result != null )
+            return result;
+        }
+      }
+      return null;
+    }
+
+    public static string GetCalculatorButtonContent( Calculator.CalculatorButtonType type )
+    {
+      string content = string.Empty;
+      switch( type )
+      {
+        case Calculator.CalculatorButtonType.Add:
+          content = "+";
+          break;
+        case Calculator.CalculatorButtonType.Back:
+          content = "Back";
+          break;
+        case Calculator.CalculatorButtonType.Cancel:
+          content = "CE";
+          break;
+        case Calculator.CalculatorButtonType.Clear:
+          content = "C";
+          break;
+        case Calculator.CalculatorButtonType.Decimal:
+          content = CultureInfo.CurrentCulture.NumberFormat.CurrencyDecimalSeparator;
+          break;
+        case Calculator.CalculatorButtonType.Divide:
+          content = "/";
+          break;
+        case Calculator.CalculatorButtonType.Eight:
+          content = "8";
+          break;
+        case Calculator.CalculatorButtonType.Equal:
+          content = "=";
+          break;
+        case Calculator.CalculatorButtonType.Five:
+          content = "5";
+          break;
+        case Calculator.CalculatorButtonType.Four:
+          content = "4";
+          break;
+        case Calculator.CalculatorButtonType.Fraction:
+          content = "1/x";
+          break;
+        case Calculator.CalculatorButtonType.MAdd:
+          content = "M+";
+          break;
+        case Calculator.CalculatorButtonType.MC:
+          content = "MC";
+          break;
+        case Calculator.CalculatorButtonType.MR:
+          content = "MR";
+          break;
+        case Calculator.CalculatorButtonType.MS:
+          content = "MS";
+          break;
+        case Calculator.CalculatorButtonType.MSub:
+          content = "M-";
+          break;
+        case Calculator.CalculatorButtonType.Multiply:
+          content = "*";
+          break;
+        case Calculator.CalculatorButtonType.Nine:
+          content = "9";
+          break;
+        case Calculator.CalculatorButtonType.None:
+          break;
+        case Calculator.CalculatorButtonType.One:
+          content = "1";
+          break;
+        case Calculator.CalculatorButtonType.Percent:
+          content = "%";
+          break;
+        case Calculator.CalculatorButtonType.Seven:
+          content = "7";
+          break;
+        case Calculator.CalculatorButtonType.Negate:
+          content = "+/-";
+          break;
+        case Calculator.CalculatorButtonType.Six:
+          content = "6";
+          break;
+        case Calculator.CalculatorButtonType.Sqrt:
+          content = "Sqrt";
+          break;
+        case Calculator.CalculatorButtonType.Subtract:
+          content = "-";
+          break;
+        case Calculator.CalculatorButtonType.Three:
+          content = "3";
+          break;
+        case Calculator.CalculatorButtonType.Two:
+          content = "2";
+          break;
+        case Calculator.CalculatorButtonType.Zero:
+          content = "0";
+          break;
+      }
+      return content;
+    }
+
+    public static bool IsDigit( Calculator.CalculatorButtonType buttonType )
+    {
+      switch( buttonType )
+      {
+        case Calculator.CalculatorButtonType.Zero:
+        case Calculator.CalculatorButtonType.One:
+        case Calculator.CalculatorButtonType.Two:
+        case Calculator.CalculatorButtonType.Three:
+        case Calculator.CalculatorButtonType.Four:
+        case Calculator.CalculatorButtonType.Five:
+        case Calculator.CalculatorButtonType.Six:
+        case Calculator.CalculatorButtonType.Seven:
+        case Calculator.CalculatorButtonType.Eight:
+        case Calculator.CalculatorButtonType.Nine:
+        case Calculator.CalculatorButtonType.Decimal:
+          return true;
+        default:
+          return false;
+      }
+    }
+
+    public static bool IsMemory( Calculator.CalculatorButtonType buttonType )
+    {
+      switch( buttonType )
+      {
+        case Calculator.CalculatorButtonType.MAdd:
+        case Calculator.CalculatorButtonType.MC:
+        case Calculator.CalculatorButtonType.MR:
+        case Calculator.CalculatorButtonType.MS:
+        case Calculator.CalculatorButtonType.MSub:
+          return true;
+        default:
+          return false;
+      }
+    }
+
+    public static decimal ParseDecimal( string text )
+    {
+      return Decimal.Parse( text, CultureInfo.CurrentCulture );
+    }
+
+    public static decimal Add( decimal firstNumber, decimal secondNumber )
+    {
+      return firstNumber + secondNumber;
+    }
+
+    public static decimal Subtract( decimal firstNumber, decimal secondNumber )
+    {
+      return firstNumber - secondNumber;
+    }
+
+    public static decimal Multiply( decimal firstNumber, decimal secondNumber )
+    {
+      return firstNumber * secondNumber;
+    }
+
+    public static decimal Divide( decimal firstNumber, decimal secondNumber )
+    {
+      return firstNumber / secondNumber;
+    }
+
+    public static decimal Percent( decimal firstNumber, decimal secondNumber )
+    {
+      return firstNumber * secondNumber / 100M;
+    }
+
+    public static decimal SquareRoot( decimal operand )
+    {
+      return Convert.ToDecimal( Math.Sqrt( Convert.ToDouble( operand ) ) );
+    }
+
+    public static decimal Fraction( decimal operand )
+    {
+      return 1 / operand;
+    }
+
+    public static decimal Negate( decimal operand )
+    {
+      return operand * -1M;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/ColorUtilities.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/ColorUtilities.cs
new file mode 100644
index 00000000..db088862
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/ColorUtilities.cs
@@ -0,0 +1,208 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Windows.Media;
+using Xceed.Wpf.Toolkit.Primitives;
+
+namespace Xceed.Wpf.Toolkit.Core.Utilities
+{
+  static class ColorUtilities
+  {
+    public static readonly Dictionary<string, Color> KnownColors = GetKnownColors();
+
+    public static string GetColorName( this Color color )
+    {
+      string colorName = KnownColors.Where( kvp => kvp.Value.Equals( color ) ).Select( kvp => kvp.Key ).FirstOrDefault();
+
+      if( String.IsNullOrEmpty( colorName ) )
+        colorName = color.ToString();
+
+      return colorName;
+    }
+
+    public static string FormatColorString( string stringToFormat, bool isUsingAlphaChannel )
+    {
+      if( !isUsingAlphaChannel && ( stringToFormat.Length == 9 ) )
+        return stringToFormat.Remove( 1, 2 );
+      return stringToFormat;
+    }
+
+    private static Dictionary<string, Color> GetKnownColors()
+    {
+      var colorProperties = typeof( Colors ).GetProperties( BindingFlags.Static | BindingFlags.Public );
+      return colorProperties.ToDictionary( p => p.Name, p => ( Color )p.GetValue( null, null ) );
+    }
+
+    /// <summary>
+    /// Converts an RGB color to an HSV color.
+    /// </summary>
+    /// <param name="r"></param>
+    /// <param name="b"></param>
+    /// <param name="g"></param>
+    /// <returns></returns>
+    public static HsvColor ConvertRgbToHsv( int r, int b, int g )
+    {
+      double delta, min;
+      double h = 0, s, v;
+
+      min = Math.Min( Math.Min( r, g ), b );
+      v = Math.Max( Math.Max( r, g ), b );
+      delta = v - min;
+
+      if( v == 0.0 )
+      {
+        s = 0;
+      }
+      else
+        s = delta / v;
+
+      if( s == 0 )
+        h = 0.0;
+
+      else
+      {
+        if( r == v )
+          h = ( g - b ) / delta;
+        else if( g == v )
+          h = 2 + ( b - r ) / delta;
+        else if( b == v )
+          h = 4 + ( r - g ) / delta;
+
+        h *= 60;
+        if( h < 0.0 )
+          h = h + 360;
+
+      }
+
+      return new HsvColor
+      {
+        H = h,
+        S = s,
+        V = v / 255
+      };
+    }
+
+    /// <summary>
+    ///  Converts an HSV color to an RGB color.
+    /// </summary>
+    /// <param name="h"></param>
+    /// <param name="s"></param>
+    /// <param name="v"></param>
+    /// <returns></returns>
+    public static Color ConvertHsvToRgb( double h, double s, double v )
+    {
+      double r = 0, g = 0, b = 0;
+
+      if( s == 0 )
+      {
+        r = v;
+        g = v;
+        b = v;
+      }
+      else
+      {
+        int i;
+        double f, p, q, t;
+
+        if( h == 360 )
+          h = 0;
+        else
+          h = h / 60;
+
+        i = ( int )Math.Truncate( h );
+        f = h - i;
+
+        p = v * ( 1.0 - s );
+        q = v * ( 1.0 - ( s * f ) );
+        t = v * ( 1.0 - ( s * ( 1.0 - f ) ) );
+
+        switch( i )
+        {
+          case 0:
+            {
+              r = v;
+              g = t;
+              b = p;
+              break;
+            }
+          case 1:
+            {
+              r = q;
+              g = v;
+              b = p;
+              break;
+            }
+          case 2:
+            {
+              r = p;
+              g = v;
+              b = t;
+              break;
+            }
+          case 3:
+            {
+              r = p;
+              g = q;
+              b = v;
+              break;
+            }
+          case 4:
+            {
+              r = t;
+              g = p;
+              b = v;
+              break;
+            }
+          default:
+            {
+              r = v;
+              g = p;
+              b = q;
+              break;
+            }
+        }
+
+      }
+
+      return Color.FromArgb( 255, ( byte )( r * 255 ), ( byte )( g * 255 ), ( byte )( b * 255 ) );
+    }
+
+    /// <summary>
+    /// Generates a list of colors with hues ranging from 0 360 and a saturation and value of 1. 
+    /// </summary>
+    /// <returns></returns>
+    public static List<Color> GenerateHsvSpectrum()
+    {
+      List<Color> colorsList = new List<Color>( 8 );
+
+      for( int i = 0; i < 29; i++ )
+      {
+        colorsList.Add( ColorUtilities.ConvertHsvToRgb( i * 12, 1, 1 ) );
+      }
+
+      colorsList.Add( ColorUtilities.ConvertHsvToRgb( 0, 1, 1 ) );
+
+      return colorsList;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/ContextMenuUtilities.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/ContextMenuUtilities.cs
new file mode 100644
index 00000000..d7fdf67e
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/ContextMenuUtilities.cs
@@ -0,0 +1,53 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.Core.Utilities
+{
+  public class ContextMenuUtilities
+  {
+    public static readonly DependencyProperty OpenOnMouseLeftButtonClickProperty = DependencyProperty.RegisterAttached( "OpenOnMouseLeftButtonClick", typeof( bool ), typeof( ContextMenuUtilities ), new FrameworkPropertyMetadata( false, OpenOnMouseLeftButtonClickChanged ) );
+    public static void SetOpenOnMouseLeftButtonClick( FrameworkElement element, bool value )
+    {
+      element.SetValue( OpenOnMouseLeftButtonClickProperty, value );
+    }
+    public static bool GetOpenOnMouseLeftButtonClick( FrameworkElement element )
+    {
+      return ( bool )element.GetValue( OpenOnMouseLeftButtonClickProperty );
+    }
+
+    public static void OpenOnMouseLeftButtonClickChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
+    {
+      var control = ( FrameworkElement )sender;
+      if( ( bool )e.NewValue )
+      {
+        control.PreviewMouseLeftButtonDown += ( s, args ) =>
+        {
+          if( control.ContextMenu != null )
+          {
+            control.ContextMenu.PlacementTarget = control;
+            control.ContextMenu.IsOpen = true;
+          }
+        };
+      }
+      //TODO: remove handler when set to false
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/DoubleHelper.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/DoubleHelper.cs
new file mode 100644
index 00000000..37572ffb
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/DoubleHelper.cs
@@ -0,0 +1,100 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.Core.Utilities
+{
+  internal static class DoubleHelper
+  {
+    public static bool AreVirtuallyEqual( double d1, double d2 )
+    {
+      if( double.IsPositiveInfinity( d1 ) )
+        return double.IsPositiveInfinity( d2 );
+
+      if( double.IsNegativeInfinity( d1 ) )
+        return double.IsNegativeInfinity( d2 );
+
+      if( IsNaN( d1 ) )
+        return IsNaN( d2 );
+
+      double n = d1 - d2;
+      double d = ( Math.Abs( d1 ) + Math.Abs( d2 ) + 10 ) * 1.0e-15;
+      return ( -d < n ) && ( d > n );
+    }
+
+    public static bool AreVirtuallyEqual( Size s1, Size s2 )
+    {
+      return ( AreVirtuallyEqual( s1.Width, s2.Width )
+          && AreVirtuallyEqual( s1.Height, s2.Height ) );
+    }
+
+    public static bool AreVirtuallyEqual( Point p1, Point p2 )
+    {
+      return ( AreVirtuallyEqual( p1.X, p2.X )
+          && AreVirtuallyEqual( p1.Y, p2.Y ) );
+    }
+
+    public static bool AreVirtuallyEqual( Rect r1, Rect r2 )
+    {
+      return ( AreVirtuallyEqual( r1.TopLeft, r2.TopLeft )
+          && AreVirtuallyEqual( r1.BottomRight, r2.BottomRight ) );
+    }
+
+    public static bool AreVirtuallyEqual( Vector v1, Vector v2 )
+    {
+      return ( AreVirtuallyEqual( v1.X, v2.X )
+          && AreVirtuallyEqual( v1.Y, v2.Y ) );
+    }
+
+    public static bool AreVirtuallyEqual( Segment s1, Segment s2 )
+    {
+      // note: Segment struct already uses "virtually equal" approach
+      return ( s1 == s2 );
+    }
+
+    public static bool IsNaN( double value )
+    {
+      // used reflector to borrow the high performance IsNan function 
+      // from the WPF MS.Internal namespace
+      NanUnion t = new NanUnion();
+      t.DoubleValue = value;
+
+      UInt64 exp = t.UintValue & 0xfff0000000000000;
+      UInt64 man = t.UintValue & 0x000fffffffffffff;
+
+      return ( exp == 0x7ff0000000000000 || exp == 0xfff0000000000000 ) && ( man != 0 );
+    }
+
+    #region NanUnion Nested Types
+
+    [StructLayout( LayoutKind.Explicit )]
+    private struct NanUnion
+    {
+      [FieldOffset( 0 )]
+      internal double DoubleValue;
+      [FieldOffset( 0 )]
+      internal UInt64 UintValue;
+    }
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/EllipseHelper.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/EllipseHelper.cs
new file mode 100644
index 00000000..1b68fdcb
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/EllipseHelper.cs
@@ -0,0 +1,72 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.Core.Utilities
+{
+  internal static class EllipseHelper
+  {
+    public static Point PointOfRadialIntersection( Rect ellipseRect, double angle )
+    {
+      // given by the formula:
+      //
+      // x =  a cos q,
+      // y =  b sin q,
+      //
+      // where a is the elliptical radius along the major axis
+      //       b is the elliptical radius along the minor axis
+      //       q is the central angle from the major axis
+
+      double a = ellipseRect.Width / 2;
+      double b = ellipseRect.Height / 2;
+
+      // since this is WPF, we can assume angle is currently specified in degrees, so convert to radians
+      double q = angle * Math.PI / 180;
+
+      return RectHelper.Center( ellipseRect ) + new Vector( a * Math.Cos( q ), b * Math.Sin( q ) );
+    }
+
+    public static double RadialDistanceFromCenter( Rect ellipseRect, double angle )
+    {
+      // given by the formula:
+      //
+      //              2 2
+      //   2         a b
+      //  r  = -----------------
+      //        2   2     2   2
+      //       a sin q + b cos q
+      //
+      // where a is the elliptical radius along the major axis
+      //       b is the elliptical radius along the minor axis
+      //       q is the central angle from the major axis
+
+      double a = ellipseRect.Width / 2;
+      double b = ellipseRect.Height / 2;
+
+      // since this is WPF, we can assume angle is currently specified in degrees, so convert to radians
+      double q = angle * Math.PI / 180;
+
+      double sinq = Math.Sin( q );
+      double cosq = Math.Cos( q );
+      return Math.Sqrt( ( a * a * b * b ) / ( ( a * a * sinq * sinq ) + ( b * b * cosq * cosq ) ) );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/PointHelper.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/PointHelper.cs
new file mode 100644
index 00000000..7554e634
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/PointHelper.cs
@@ -0,0 +1,45 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.Core.Utilities
+{
+  internal static class PointHelper
+  {
+    public static double DistanceBetween( Point p1, Point p2 )
+    {
+      return Math.Sqrt( Math.Pow( p1.X - p2.X, 2 ) + Math.Pow( p1.Y - p2.Y, 2 ) );
+    }
+
+    public static Point Empty
+    {
+      get
+      {
+        return new Point( double.NaN, double.NaN );
+      }
+    }
+
+    public static bool IsEmpty( Point point )
+    {
+      return DoubleHelper.IsNaN( point.X ) && DoubleHelper.IsNaN( point.Y );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/RectHelper.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/RectHelper.cs
new file mode 100644
index 00000000..bdab9e41
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/RectHelper.cs
@@ -0,0 +1,89 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.Core.Utilities
+{
+  internal static class RectHelper
+  {
+    public static Point Center( Rect rect )
+    {
+      return new Point( rect.Left + rect.Width / 2, rect.Top + rect.Height / 2 );
+    }
+
+    public static Nullable<Point> GetNearestPointOfIntersectionBetweenRectAndSegment( Rect rect, Segment segment, Point point )
+    {
+      Nullable<Point> result = null;
+      double distance = double.PositiveInfinity;
+
+      Segment leftIntersection = segment.Intersection( new Segment( rect.BottomLeft, rect.TopLeft ) );
+      Segment topIntersection = segment.Intersection( new Segment( rect.TopLeft, rect.TopRight ) );
+      Segment rightIntersection = segment.Intersection( new Segment( rect.TopRight, rect.BottomRight ) );
+      Segment bottomIntersection = segment.Intersection( new Segment( rect.BottomRight, rect.BottomLeft ) );
+
+      RectHelper.AdjustResultForIntersectionWithSide( ref result, ref distance, leftIntersection, point );
+      RectHelper.AdjustResultForIntersectionWithSide( ref result, ref distance, topIntersection, point );
+      RectHelper.AdjustResultForIntersectionWithSide( ref result, ref distance, rightIntersection, point );
+      RectHelper.AdjustResultForIntersectionWithSide( ref result, ref distance, bottomIntersection, point );
+
+      return result;
+    }
+
+    public static Rect GetRectCenteredOnPoint( Point center, Size size )
+    {
+      return new Rect( new Point( center.X - size.Width / 2, center.Y - size.Height / 2 ), size );
+    }
+
+    private static void AdjustResultForIntersectionWithSide( ref Nullable<Point> result, ref double distance, Segment intersection, Point point )
+    {
+      if( !intersection.IsEmpty )
+      {
+        if( intersection.Contains( point ) )
+        {
+          distance = 0;
+          result = point;
+          return;
+        }
+
+        double p1Distance = PointHelper.DistanceBetween( point, intersection.P1 );
+        double p2Distance = double.PositiveInfinity;
+        if( !intersection.IsPoint )
+        {
+          p2Distance = PointHelper.DistanceBetween( point, intersection.P2 );
+        }
+
+        if( Math.Min( p1Distance, p2Distance ) < distance )
+        {
+          if( p1Distance < p2Distance )
+          {
+            distance = p1Distance;
+            result = intersection.P1;
+          }
+          else
+          {
+            distance = p2Distance;
+            result = intersection.P2;
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/ResourceHelper.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/ResourceHelper.cs
new file mode 100644
index 00000000..d66e1196
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/ResourceHelper.cs
@@ -0,0 +1,39 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.IO;
+using System.Reflection;
+using System.Resources;
+
+namespace Xceed.Wpf.Toolkit.Core.Utilities
+{
+  internal class ResourceHelper
+  {
+    internal static Stream LoadResourceStream( Assembly assembly, string resId )
+    {
+      string basename = System.IO.Path.GetFileNameWithoutExtension( assembly.ManifestModule.Name ) + ".g";
+      ResourceManager resourceManager = new ResourceManager( basename, assembly );
+
+      // resource names are lower case and contain only forward slashes
+      resId = resId.ToLower();
+      resId = resId.Replace( '\\', '/' );
+      return ( resourceManager.GetObject( resId ) as Stream );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/Segment.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/Segment.cs
new file mode 100644
index 00000000..3015f02f
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/Segment.cs
@@ -0,0 +1,387 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.Core.Utilities
+{
+  internal struct Segment
+  {
+    #region Constructors
+
+    public Segment( Point point )
+    {
+      _p1 = point;
+      _p2 = point;
+      _isP1Excluded = false;
+      _isP2Excluded = false;
+    }
+
+    public Segment( Point p1, Point p2 )
+    {
+      _p1 = p1;
+      _p2 = p2;
+      _isP1Excluded = false;
+      _isP2Excluded = false;
+    }
+
+    public Segment( Point p1, Point p2, bool excludeP1, bool excludeP2 )
+    {
+      _p1 = p1;
+      _p2 = p2;
+      _isP1Excluded = excludeP1;
+      _isP2Excluded = excludeP2;
+    }
+
+    #endregion
+
+    #region Empty Static Properties
+
+    public static Segment Empty
+    {
+      get
+      {
+        Segment result = new Segment( new Point( 0, 0 ) );
+        result._isP1Excluded = true;
+        result._isP2Excluded = true;
+        return result;
+      }
+    }
+
+    #endregion
+
+    #region P1 Property
+
+    public Point P1
+    {
+      get
+      {
+        return _p1;
+      }
+    }
+
+    #endregion
+
+    #region P2 Property
+
+    public Point P2
+    {
+      get
+      {
+        return _p2;
+      }
+    }
+
+    #endregion
+
+    #region IsP1Excluded Property
+
+    public bool IsP1Excluded
+    {
+      get
+      {
+        return _isP1Excluded;
+      }
+    }
+
+    #endregion
+
+    #region IsP2Excluded Property
+
+    public bool IsP2Excluded
+    {
+      get
+      {
+        return _isP2Excluded;
+      }
+    }
+
+    #endregion
+
+    #region IsEmpty Property
+
+    public bool IsEmpty
+    {
+      get
+      {
+        return DoubleHelper.AreVirtuallyEqual( _p1, _p2 ) && ( _isP1Excluded || _isP2Excluded );
+      }
+    }
+
+    #endregion
+
+    #region IsPoint Property
+
+    public bool IsPoint
+    {
+      get
+      {
+        return DoubleHelper.AreVirtuallyEqual( _p1, _p2 );
+      }
+    }
+
+    #endregion
+
+    #region Length Property
+
+    public double Length
+    {
+      get
+      {
+        return ( this.P2 - this.P1 ).Length;
+      }
+    }
+
+    #endregion
+
+    #region Slope Property
+
+    public double Slope
+    {
+      get
+      {
+        return ( this.P2.X == this.P1.X ) ? double.NaN : ( this.P2.Y - this.P1.Y ) / ( this.P2.X - this.P1.X );
+      }
+    }
+
+    #endregion
+
+    public bool Contains( Point point )
+    {
+      if( IsEmpty )
+        return false;
+
+      // if the point is an endpoint, ensure that it is not excluded
+      if( DoubleHelper.AreVirtuallyEqual( _p1, point ) )
+        return _isP1Excluded;
+
+      if( DoubleHelper.AreVirtuallyEqual( _p2, point ) )
+        return _isP2Excluded;
+
+      bool result = false;
+
+      // ensure that a line through P1 and the point is parallel to the current segment
+      if( DoubleHelper.AreVirtuallyEqual( Slope, new Segment( _p1, point ).Slope ) )
+      {
+        // finally, ensure that the point is between the segment's endpoints
+        result = ( point.X >= Math.Min( _p1.X, _p2.X ) )
+              && ( point.X <= Math.Max( _p1.X, _p2.X ) )
+              && ( point.Y >= Math.Min( _p1.Y, _p2.Y ) )
+              && ( point.Y <= Math.Max( _p1.Y, _p2.Y ) );
+      }
+      return result;
+    }
+
+    public bool Contains( Segment segment )
+    {
+      return ( segment == this.Intersection( segment ) );
+    }
+
+    public override bool Equals( object o )
+    {
+      if( !( o is Segment ) )
+        return false;
+
+      Segment other = ( Segment )o;
+
+      // empty segments are always considered equal
+      if( this.IsEmpty )
+        return other.IsEmpty;
+
+      // segments are considered equal if
+      //    1) the endpoints are equal and equally excluded
+      //    2) the opposing endpoints are equal and equally excluded
+      if( DoubleHelper.AreVirtuallyEqual( _p1, other._p1 ) )
+      {
+        return ( DoubleHelper.AreVirtuallyEqual( _p2, other._p2 )
+             && _isP1Excluded == other._isP1Excluded
+             && _isP2Excluded == other._isP2Excluded );
+      }
+      else
+      {
+        return ( DoubleHelper.AreVirtuallyEqual( _p1, other._p2 )
+             && DoubleHelper.AreVirtuallyEqual( _p2, other._p1 )
+             && _isP1Excluded == other._isP2Excluded
+             && _isP2Excluded == other._isP1Excluded );
+      }
+    }
+
+    public override int GetHashCode()
+    {
+      return _p1.GetHashCode() ^ _p2.GetHashCode() ^ _isP1Excluded.GetHashCode() ^ _isP2Excluded.GetHashCode();
+    }
+
+    public Segment Intersection( Segment segment )
+    {
+      // if either segment is empty, the intersection is also empty
+      if( this.IsEmpty || segment.IsEmpty )
+        return Segment.Empty;
+
+      // if the segments are equal, just return a new equal segment
+      if( this == segment )
+        return new Segment( this._p1, this._p2, this._isP1Excluded, this._isP2Excluded );
+
+      // if either segment is a Point, just see if the point is contained in the other segment
+      if( this.IsPoint )
+        return segment.Contains( this._p1 ) ? new Segment( this._p1 ) : Segment.Empty;
+
+      if( segment.IsPoint )
+        return this.Contains( segment._p1 ) ? new Segment( segment._p1 ) : Segment.Empty;
+
+      // okay, no easy answer, so let's do the math...
+      Point p1 = this._p1;
+      Vector v1 = this._p2 - this._p1;
+      Point p2 = segment._p1;
+      Vector v2 = segment._p2 - segment._p1;
+      Vector endpointVector = p2 - p1;
+
+      double xProd = Vector.CrossProduct( v1, v2 );
+
+      // if segments are not parallel, then look for intersection on each segment
+      if( !DoubleHelper.AreVirtuallyEqual( Slope, segment.Slope ) )
+      {
+        // check for intersection on other segment
+        double s = ( Vector.CrossProduct( endpointVector, v1 ) ) / xProd;
+        if( s < 0 || s > 1 )
+          return Segment.Empty;
+
+        // check for intersection on this segment
+        s = ( Vector.CrossProduct( endpointVector, v2 ) ) / xProd;
+        if( s < 0 || s > 1 )
+          return Segment.Empty;
+
+        // intersection of segments is a point
+        return new Segment( p1 + s * v1 );
+      }
+
+      // segments are parallel
+      xProd = Vector.CrossProduct( endpointVector, v1 );
+      if( xProd * xProd > 1.0e-06 * v1.LengthSquared * endpointVector.LengthSquared )
+      {
+        // segments do not intersect
+        return Segment.Empty;
+      }
+
+      // intersection is overlapping segment
+      Segment result = new Segment();
+
+      // to determine the overlapping segment, create reference segments where the endpoints are *not* excluded
+      Segment refThis = new Segment( this._p1, this._p2 );
+      Segment refSegment = new Segment( segment._p1, segment._p2 );
+
+      // check whether this segment is contained in the other segment
+      bool includeThisP1 = refSegment.Contains( refThis._p1 );
+      bool includeThisP2 = refSegment.Contains( refThis._p2 );
+      if( includeThisP1 && includeThisP2 )
+      {
+        result._p1 = this._p1;
+        result._p2 = this._p2;
+        result._isP1Excluded = this._isP1Excluded || !segment.Contains( this._p1 );
+        result._isP2Excluded = this._isP2Excluded || !segment.Contains( this._p2 );
+        return result;
+      }
+
+      // check whether the other segment is contained in this segment
+      bool includeSegmentP1 = refThis.Contains( refSegment._p1 );
+      bool includeSegmentP2 = refThis.Contains( refSegment._p2 );
+      if( includeSegmentP1 && includeSegmentP2 )
+      {
+        result._p1 = segment._p1;
+        result._p2 = segment._p2;
+        result._isP1Excluded = segment._isP1Excluded || !this.Contains( segment._p1 );
+        result._isP2Excluded = segment._isP2Excluded || !this.Contains( segment._p2 );
+        return result;
+      }
+
+      // the intersection must include one endpoint from this segment and one endpoint from the other segment
+      if( includeThisP1 )
+      {
+        result._p1 = this._p1;
+        result._isP1Excluded = this._isP1Excluded || !segment.Contains( this._p1 );
+      }
+      else
+      {
+        result._p1 = this._p2;
+        result._isP1Excluded = this._isP2Excluded || !segment.Contains( this._p2 );
+      }
+      if( includeSegmentP1 )
+      {
+        result._p2 = segment._p1;
+        result._isP2Excluded = segment._isP1Excluded || !this.Contains( segment._p1 );
+      }
+      else
+      {
+        result._p2 = segment._p2;
+        result._isP2Excluded = segment._isP2Excluded || !this.Contains( segment._p2 );
+      }
+      return result;
+    }
+
+    public override string ToString()
+    {
+      string s = base.ToString();
+
+      if( this.IsEmpty )
+      {
+        s = s + ": {Empty}";
+      }
+      else if( this.IsPoint )
+      {
+        s = s + ", Point: " + _p1.ToString();
+      }
+      else
+      {
+        s = s + ": " + _p1.ToString() + ( _isP1Excluded ? " (excl)" : " (incl)" )
+            + " to " + _p2.ToString() + ( _isP2Excluded ? " (excl)" : " (incl)" );
+      }
+
+      return s;
+    }
+
+    #region Operators Methods
+
+    public static bool operator ==( Segment s1, Segment s2 )
+    {
+      if( ( object )s1 == null )
+        return ( object )s2 == null;
+
+      if( ( object )s2 == null )
+        return ( object )s1 == null;
+
+      return s1.Equals( s2 );
+    }
+
+    public static bool operator !=( Segment s1, Segment s2 )
+    {
+      return !( s1 == s2 );
+    }
+
+    #endregion
+
+    #region Private Fields
+
+    private bool _isP1Excluded;
+    private bool _isP2Excluded;
+    private Point _p1;
+    private Point _p2;
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/VisualTreeHelperEx.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/VisualTreeHelperEx.cs
new file mode 100644
index 00000000..b9d42b71
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Core/Utilities/VisualTreeHelperEx.cs
@@ -0,0 +1,138 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Media;
+
+namespace Xceed.Wpf.Toolkit.Core.Utilities
+{
+  internal static class VisualTreeHelperEx
+  {
+    public static DependencyObject FindAncestorByType( DependencyObject element, Type type, bool specificTypeOnly )
+    {
+      if( element == null )
+        return null;
+
+      if( specificTypeOnly ? ( element.GetType() == type )
+          : ( element.GetType() == type ) || ( element.GetType().IsSubclassOf( type ) ) )
+        return element;
+
+      return VisualTreeHelperEx.FindAncestorByType( VisualTreeHelper.GetParent( element ), type, specificTypeOnly );
+    }
+
+    public static T FindAncestorByType<T>( DependencyObject depObj ) where T : DependencyObject
+    {
+      if( depObj == null )
+      {
+        return default( T );
+      }
+      if( depObj is T )
+      {
+        return ( T )depObj;
+      }
+
+      T parent = default( T );
+
+      parent = VisualTreeHelperEx.FindAncestorByType<T>( VisualTreeHelper.GetParent( depObj ) );
+
+      return parent;
+    }
+
+    public static Visual FindDescendantByName( Visual element, string name )
+    {
+      if( element != null && ( element is FrameworkElement ) && ( element as FrameworkElement ).Name == name )
+        return element;
+
+      Visual foundElement = null;
+      if( element is FrameworkElement )
+        ( element as FrameworkElement ).ApplyTemplate();
+
+      for( int i = 0; i < VisualTreeHelper.GetChildrenCount( element ); i++ )
+      {
+        Visual visual = VisualTreeHelper.GetChild( element, i ) as Visual;
+        foundElement = VisualTreeHelperEx.FindDescendantByName( visual, name );
+        if( foundElement != null )
+          break;
+      }
+
+      return foundElement;
+    }
+
+    public static Visual FindDescendantByType( Visual element, Type type )
+    {
+      return VisualTreeHelperEx.FindDescendantByType( element, type, true );
+    }
+
+    public static Visual FindDescendantByType( Visual element, Type type, bool specificTypeOnly )
+    {
+      if( element == null )
+        return null;
+
+      if( specificTypeOnly ? ( element.GetType() == type )
+          : ( element.GetType() == type ) || ( element.GetType().IsSubclassOf( type ) ) )
+        return element;
+
+      Visual foundElement = null;
+      if( element is FrameworkElement )
+        ( element as FrameworkElement ).ApplyTemplate();
+
+      for( int i = 0; i < VisualTreeHelper.GetChildrenCount( element ); i++ )
+      {
+        Visual visual = VisualTreeHelper.GetChild( element, i ) as Visual;
+        foundElement = VisualTreeHelperEx.FindDescendantByType( visual, type, specificTypeOnly );
+        if( foundElement != null )
+          break;
+      }
+
+      return foundElement;
+    }
+
+    public static T FindDescendantByType<T>( Visual element ) where T : Visual
+    {
+      Visual temp = VisualTreeHelperEx.FindDescendantByType( element, typeof( T ) );
+
+      return ( T )temp;
+    }
+
+    public static Visual FindDescendantWithPropertyValue( Visual element,
+        DependencyProperty dp, object value )
+    {
+      if( element == null )
+        return null;
+
+      if( element.GetValue( dp ).Equals( value ) )
+        return element;
+
+      Visual foundElement = null;
+      if( element is FrameworkElement )
+        ( element as FrameworkElement ).ApplyTemplate();
+
+      for( int i = 0; i < VisualTreeHelper.GetChildrenCount( element ); i++ )
+      {
+        Visual visual = VisualTreeHelper.GetChild( element, i ) as Visual;
+        foundElement = VisualTreeHelperEx.FindDescendantWithPropertyValue( visual, dp, value );
+        if( foundElement != null )
+          break;
+      }
+
+      return foundElement;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimePicker/Implementation/DateTimePicker.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimePicker/Implementation/DateTimePicker.cs
new file mode 100644
index 00000000..3c7b4ad0
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimePicker/Implementation/DateTimePicker.cs
@@ -0,0 +1,242 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+#if VS2008
+using Microsoft.Windows.Controls;
+using Microsoft.Windows.Controls.Primitives;
+#else
+using System.Windows.Controls.Primitives;
+#endif
+
+namespace Xceed.Wpf.Toolkit
+{
+  [TemplatePart( Name = PART_Calendar, Type = typeof( Calendar ) )]
+  public class DateTimePicker : DateTimeUpDown
+  {
+    private const string PART_Calendar = "PART_Calendar";
+
+    #region Members
+
+    private Calendar _calendar;
+
+    #endregion //Members
+
+    #region Properties
+
+    #region IsOpen
+
+    public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register( "IsOpen", typeof( bool ), typeof( DateTimePicker ), new UIPropertyMetadata( false ) );
+    public bool IsOpen
+    {
+      get
+      {
+        return ( bool )GetValue( IsOpenProperty );
+      }
+      set
+      {
+        SetValue( IsOpenProperty, value );
+      }
+    }
+
+    #endregion //IsOpen
+
+    #region TimeFormat
+
+    public static readonly DependencyProperty TimeFormatProperty = DependencyProperty.Register( "TimeFormat", typeof( TimeFormat ), typeof( DateTimePicker ), new UIPropertyMetadata( TimeFormat.ShortTime ) );
+    public TimeFormat TimeFormat
+    {
+      get
+      {
+        return ( TimeFormat )GetValue( TimeFormatProperty );
+      }
+      set
+      {
+        SetValue( TimeFormatProperty, value );
+      }
+    }
+
+    #endregion //TimeFormat
+
+    #region TimeFormatString
+
+    public static readonly DependencyProperty TimeFormatStringProperty = DependencyProperty.Register( "TimeFormatString", typeof( string ), typeof( DateTimePicker ), new UIPropertyMetadata( default( String ) ) );
+    public string TimeFormatString
+    {
+      get
+      {
+        return ( string )GetValue( TimeFormatStringProperty );
+      }
+      set
+      {
+        SetValue( TimeFormatStringProperty, value );
+      }
+    }
+
+    #endregion //TimeFormatString
+
+    #region TimeWatermark
+
+    public static readonly DependencyProperty TimeWatermarkProperty = DependencyProperty.Register( "TimeWatermark", typeof( object ), typeof( DateTimePicker ), new UIPropertyMetadata( null ) );
+    public object TimeWatermark
+    {
+      get
+      {
+        return ( object )GetValue( TimeWatermarkProperty );
+      }
+      set
+      {
+        SetValue( TimeWatermarkProperty, value );
+      }
+    }
+
+    #endregion //TimeWatermark
+
+    #region TimeWatermarkTemplate
+
+    public static readonly DependencyProperty TimeWatermarkTemplateProperty = DependencyProperty.Register( "TimeWatermarkTemplate", typeof( DataTemplate ), typeof( DateTimePicker ), new UIPropertyMetadata( null ) );
+    public DataTemplate TimeWatermarkTemplate
+    {
+      get
+      {
+        return ( DataTemplate )GetValue( TimeWatermarkTemplateProperty );
+      }
+      set
+      {
+        SetValue( TimeWatermarkTemplateProperty, value );
+      }
+    }
+
+    #endregion //TimeWatermarkTemplate
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static DateTimePicker()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( DateTimePicker ), new FrameworkPropertyMetadata( typeof( DateTimePicker ) ) );
+    }
+
+    public DateTimePicker()
+    {
+      Keyboard.AddKeyDownHandler( this, OnKeyDown );
+      Mouse.AddPreviewMouseDownOutsideCapturedElementHandler( this, OnMouseDownOutsideCapturedElement );
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+
+      if( _calendar != null )
+      {
+        _calendar.SelectedDatesChanged -= Calendar_SelectedDatesChanged;
+      }
+
+      _calendar = GetTemplateChild( PART_Calendar ) as Calendar;
+
+      if( _calendar != null )
+      {
+        _calendar.SelectedDatesChanged += Calendar_SelectedDatesChanged;
+        _calendar.SelectedDate = Value ?? null;
+        _calendar.DisplayDate = Value ?? DateTime.Now;
+      }
+    }
+
+    protected override void OnPreviewMouseUp( MouseButtonEventArgs e )
+    {
+      if( Mouse.Captured is CalendarItem )
+        Mouse.Capture( null );
+    }
+
+    protected override void OnValueChanged( DateTime? oldValue, DateTime? newValue )
+    {
+      if( _calendar != null && _calendar.SelectedDate != newValue )
+      {
+        _calendar.SelectedDate = newValue;
+        _calendar.DisplayDate = newValue ?? DateTime.Now;
+      }
+
+      base.OnValueChanged( oldValue, newValue );
+    }
+
+    protected override void OnPreviewKeyDown( KeyEventArgs e )
+    {
+      //if the calendar is open then we don't want to modify the behavior of navigating the calendar control with the Up/Down keys.
+      if( !IsOpen )
+        base.OnPreviewKeyDown( e );
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Event Handlers
+
+    private void OnKeyDown( object sender, KeyEventArgs e )
+    {
+      switch( e.Key )
+      {
+        case Key.Escape:
+        case Key.Tab:
+          {
+            CloseDateTimePicker();
+            break;
+          }
+      }
+    }
+
+    private void OnMouseDownOutsideCapturedElement( object sender, MouseButtonEventArgs e )
+    {
+      CloseDateTimePicker();
+    }
+
+    void Calendar_SelectedDatesChanged( object sender, SelectionChangedEventArgs e )
+    {
+      if( e.AddedItems.Count > 0 )
+      {
+        var newDate = ( DateTime? )e.AddedItems[ 0 ];
+
+        if( (Value != null) && (newDate != null) && newDate.HasValue )
+          newDate = new DateTime( newDate.Value.Year, newDate.Value.Month, newDate.Value.Day, Value.Value.Hour, Value.Value.Minute, Value.Value.Second );
+
+        if( !object.Equals( newDate, Value ) )
+          Value = newDate;
+      }
+    }
+
+    #endregion //Event Handlers
+
+    #region Methods
+
+    private void CloseDateTimePicker()
+    {
+      if( IsOpen )
+        IsOpen = false;
+      ReleaseMouseCapture();
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimePicker/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimePicker/Themes/Generic.xaml
new file mode 100644
index 00000000..ebfa82fe
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimePicker/Themes/Generic.xaml
@@ -0,0 +1,156 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
+                    xmlns:toolkit="http://schemas.microsoft.com/wpf/2008/toolkit">
+
+   <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+
+   <DataTemplate x:Key="DefaultWatermarkTemplate">
+      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
+   </DataTemplate>
+
+   <LinearGradientBrush x:Key="PopupDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="1" Color="#FFE8EBED" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <Style x:Key="DateTimePickerToggleButtonStyle" TargetType="ToggleButton">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="ToggleButton">
+               <Grid SnapsToDevicePixels="True">
+                  <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                       CornerRadius="0,2.75,2.75,0"
+											      RenderMouseOver="{TemplateBinding IsMouseOver}"
+											      RenderPressed="{TemplateBinding IsPressed}" />
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                     </Grid.ColumnDefinitions>
+
+                     <ContentPresenter HorizontalAlignment="Stretch" VerticalAlignment="Stretch" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+
+                     <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
+                        <Path Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000" />
+                     </Grid>
+                  </Grid>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <!-- =============================================================================== -->
+   <!-- DateTimePicker                                                                  -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type local:DateTimePicker}">
+      <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+      <Setter Property="HorizontalContentAlignment" Value="Right" />
+      <Setter Property="TextAlignment" Value="Right" />
+      <Setter Property="TimeWatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+      <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:DateTimePicker}">
+               <Border>
+                  <Grid>
+                     <Grid>
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="*" />
+                           <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <local:ButtonSpinner x:Name="Spinner"
+                                             IsTabStop="False"
+                                             Background="{TemplateBinding Background}"
+                                             BorderThickness="{TemplateBinding BorderThickness}"
+                                             AllowSpin="{TemplateBinding AllowSpin}"
+                                             ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
+                           <local:WatermarkTextBox x:Name="TextBox"
+                                                   BorderThickness="0" 
+                                                   Background="Transparent"
+                                                   FontFamily="{TemplateBinding FontFamily}" 
+                                                   FontSize="{TemplateBinding FontSize}" 
+                                                   FontStretch="{TemplateBinding FontStretch}"
+                                                   FontStyle="{TemplateBinding FontStyle}" 
+                                                   FontWeight="{TemplateBinding FontWeight}" 
+                                                   Foreground="{TemplateBinding Foreground}" 
+                                                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                   IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
+                                                   MinWidth="20"
+                                                   AcceptsReturn="False"
+                                                   Padding="0"
+                                                   TextAlignment="{TemplateBinding TextAlignment}"
+                                                   TextWrapping="NoWrap" 
+                                                   TabIndex="{TemplateBinding TabIndex}"
+                                                   Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
+                                                   Watermark="{TemplateBinding Watermark}"
+                                                   WatermarkTemplate="{TemplateBinding WatermarkTemplate}" />
+                        </local:ButtonSpinner>
+                        <ToggleButton x:Name="_calendarToggleButton"
+                                      Grid.Column="1"
+                                      Background="White"
+                                      IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                                      Style="{StaticResource DateTimePickerToggleButtonStyle}"
+                                      IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
+                                      IsEnabled="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}" />
+                     </Grid>
+                     <Popup IsOpen="{Binding IsChecked, ElementName=_calendarToggleButton}" StaysOpen="False">
+                        <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}" Padding="3">
+                           <StackPanel>
+                              <toolkit:Calendar x:Name="PART_Calendar" BorderThickness="0" />
+                              <local:TimePicker x:Name="PART_TimeUpDown"
+                                                Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"
+                                                Foreground="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" 
+                                                Format="{TemplateBinding TimeFormat}"
+                                                FormatString="{TemplateBinding TimeFormatString}"
+                                                Value="{Binding Value, RelativeSource={RelativeSource TemplatedParent}}"
+                                                Watermark="{TemplateBinding TimeWatermark}"
+                                                WatermarkTemplate="{TemplateBinding TimeWatermarkTemplate}" />
+                           </StackPanel>
+                        </Border>
+                     </Popup>
+                  </Grid>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeFormat.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeFormat.cs
new file mode 100644
index 00000000..8e8a2e81
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeFormat.cs
@@ -0,0 +1,36 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit
+{
+  public enum DateTimeFormat
+  {
+    Custom,
+    FullDateTime,
+    LongDate,
+    LongTime,
+    MonthDay,
+    RFC1123,
+    ShortDate,
+    ShortTime,
+    SortableDateTime,
+    UniversalSortableDateTime,
+    YearMonth
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeInfo.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeInfo.cs
new file mode 100644
index 00000000..0c1fdf84
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeInfo.cs
@@ -0,0 +1,55 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit
+{
+  internal class DateTimeInfo
+  {
+    public string Content
+    {
+      get;
+      set;
+    }
+    public string Format
+    {
+      get;
+      set;
+    }
+    public bool IsReadOnly
+    {
+      get;
+      set;
+    }
+    public int Length
+    {
+      get;
+      set;
+    }
+    public int StartPosition
+    {
+      get;
+      set;
+    }
+    public DateTimePart Type
+    {
+      get;
+      set;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeParser.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeParser.cs
new file mode 100644
index 00000000..2539efab
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeParser.cs
@@ -0,0 +1,140 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+
+namespace Xceed.Wpf.Toolkit
+{
+  internal class DateTimeParser
+  {
+    public static bool TryParse( string value, string format, DateTime currentDate, CultureInfo cultureInfo, out DateTime result )
+    {
+      bool success = false;
+      result = currentDate;
+
+      if( string.IsNullOrEmpty( value ) || string.IsNullOrEmpty( format ) )
+        return false;
+
+      var dateTimeString = ResolveDateTimeString( value, format, currentDate, cultureInfo ).Trim();
+
+      if( !String.IsNullOrEmpty( dateTimeString ) )
+        success = DateTime.TryParse( dateTimeString, cultureInfo.DateTimeFormat, DateTimeStyles.None, out result );
+
+      if( !success )
+        result = currentDate;
+
+      return success;
+    }
+
+    private static string ResolveDateTimeString( string dateTime, string format, DateTime currentDate, CultureInfo cultureInfo )
+    {
+      Dictionary<string, string> dateParts = GetDateParts( currentDate, cultureInfo );
+      string[] timeParts = new string[ 3 ] { currentDate.Hour.ToString(), currentDate.Minute.ToString(), currentDate.Second.ToString() };
+      string designator = "";
+      string[] dateTimeSeparators = new string[] { ",", " ", "-", ".", "/", cultureInfo.DateTimeFormat.DateSeparator, cultureInfo.DateTimeFormat.TimeSeparator };
+
+      ResolveSortableDateTimeString( ref dateTime, ref format, cultureInfo );
+
+      var dateTimeParts = dateTime.Split( dateTimeSeparators, StringSplitOptions.RemoveEmptyEntries ).ToList();
+      var formats = format.Split( dateTimeSeparators, StringSplitOptions.RemoveEmptyEntries ).ToList();
+
+      //something went wrong
+      if( dateTimeParts.Count != formats.Count )
+        return string.Empty;
+
+      for( int i = 0; i < formats.Count; i++ )
+      {
+        var f = formats[ i ];
+        if( !f.Contains( "ddd" ) && !f.Contains( "GMT" ) )
+        {
+          if( f.Contains( "M" ) )
+            dateParts[ "Month" ] = dateTimeParts[ i ];
+          else if( f.Contains( "d" ) )
+            dateParts[ "Day" ] = dateTimeParts[ i ];
+          else if( f.Contains( "y" ) )
+          {
+            dateParts[ "Year" ] = dateTimeParts[ i ];
+
+            if( dateParts[ "Year" ].Length == 2 )
+              dateParts[ "Year" ] = string.Format( "{0}{1}", currentDate.Year / 100, dateParts[ "Year" ] );
+          }
+          else if( f.Contains( "h" ) || f.Contains( "H" ) )
+            timeParts[ 0 ] = dateTimeParts[ i ];
+          else if( f.Contains( "m" ) )
+            timeParts[ 1 ] = dateTimeParts[ i ];
+          else if( f.Contains( "s" ) )
+            timeParts[ 2 ] = dateTimeParts[ i ];
+          else if( f.Contains( "t" ) )
+            designator = dateTimeParts[ i ];
+        }
+      }
+
+      var date = string.Join( cultureInfo.DateTimeFormat.DateSeparator, dateParts.Select( x => x.Value ).ToArray() );
+      var time = string.Join( cultureInfo.DateTimeFormat.TimeSeparator, timeParts );
+
+      return String.Format( "{0} {1} {2}", date, time, designator );
+    }
+
+    private static void ResolveSortableDateTimeString( ref string dateTime, ref string format, CultureInfo cultureInfo )
+    {
+      if( format == cultureInfo.DateTimeFormat.SortableDateTimePattern )
+      {
+        format = format.Replace( "'", "" ).Replace( "T", " " );
+        dateTime = dateTime.Replace( "'", "" ).Replace( "T", " " );
+      }
+      else if( format == cultureInfo.DateTimeFormat.UniversalSortableDateTimePattern )
+      {
+        format = format.Replace( "'", "" ).Replace( "Z", "" );
+        dateTime = dateTime.Replace( "'", "" ).Replace( "Z", "" );
+      }
+    }
+
+    private static Dictionary<string, string> GetDateParts( DateTime currentDate, CultureInfo cultureInfo )
+    {
+      Dictionary<string, string> dateParts = new Dictionary<string, string>();
+      var dateFormatParts = cultureInfo.DateTimeFormat.ShortDatePattern.Split( new string[] { cultureInfo.DateTimeFormat.DateSeparator }, StringSplitOptions.RemoveEmptyEntries ).ToList();
+      dateFormatParts.ForEach( item =>
+      {
+        string key = string.Empty;
+        string value = string.Empty;
+
+        if( item.Contains( "M" ) )
+        {
+          key = "Month";
+          value = currentDate.Month.ToString();
+        }
+        else if( item.Contains( "d" ) )
+        {
+          key = "Day";
+          value = currentDate.Day.ToString();
+        }
+        else if( item.Contains( "y" ) )
+        {
+          key = "Year";
+          value = currentDate.Year.ToString();
+        }
+        dateParts.Add( key, value );
+      } );
+      return dateParts;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimePart.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimePart.cs
new file mode 100644
index 00000000..be69eb5b
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimePart.cs
@@ -0,0 +1,39 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit
+{
+  public enum DateTimePart
+  {
+    Day,
+    DayName,
+    AmPmDesignator,
+    Millisecond,
+    Hour12,
+    Hour24,
+    Minute,
+    Month,
+    MonthName,
+    Other,
+    Period,
+    TimeZone,
+    Second,
+    Year
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeUpDown.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeUpDown.cs
new file mode 100644
index 00000000..e3d85839
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeUpDown.cs
@@ -0,0 +1,703 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+using System.Windows.Input;
+using Xceed.Wpf.Toolkit.Primitives;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class DateTimeUpDown : UpDownBase<DateTime?>
+  {
+    #region Members
+
+    private List<DateTimeInfo> _dateTimeInfoList = new List<DateTimeInfo>();
+    private DateTimeInfo _selectedDateTimeInfo;
+    private bool _fireSelectionChangedEvent = true;
+    private bool _processTextChanged = true;
+
+    #endregion //Members
+
+    #region Properties
+
+    #region DefaultValue
+
+    public static readonly DependencyProperty DefaultValueProperty = DependencyProperty.Register( "DefaultValue", typeof( DateTime ), typeof( DateTimeUpDown ), new UIPropertyMetadata( DateTime.Now ) );
+    public DateTime DefaultValue
+    {
+      get
+      {
+        return ( DateTime )GetValue( DefaultValueProperty );
+      }
+      set
+      {
+        SetValue( DefaultValueProperty, value );
+      }
+    }
+
+    #endregion //DefaultValue
+
+    #region Format
+
+    public static readonly DependencyProperty FormatProperty = DependencyProperty.Register( "Format", typeof( DateTimeFormat ), typeof( DateTimeUpDown ), new UIPropertyMetadata( DateTimeFormat.FullDateTime, OnFormatChanged ) );
+    public DateTimeFormat Format
+    {
+      get
+      {
+        return ( DateTimeFormat )GetValue( FormatProperty );
+      }
+      set
+      {
+        SetValue( FormatProperty, value );
+      }
+    }
+
+    private static void OnFormatChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      DateTimeUpDown dateTimeUpDown = o as DateTimeUpDown;
+      if( dateTimeUpDown != null )
+        dateTimeUpDown.OnFormatChanged( ( DateTimeFormat )e.OldValue, ( DateTimeFormat )e.NewValue );
+    }
+
+    protected virtual void OnFormatChanged( DateTimeFormat oldValue, DateTimeFormat newValue )
+    {
+      InitializeDateTimeInfoListAndParseValue();
+      UpdateTextFormatting();
+    }
+
+    #endregion //Format
+
+    #region FormatString
+
+    public static readonly DependencyProperty FormatStringProperty = DependencyProperty.Register( "FormatString", typeof( string ), typeof( DateTimeUpDown ), new UIPropertyMetadata( default( String ), OnFormatStringChanged ) );
+    public string FormatString
+    {
+      get
+      {
+        return ( string )GetValue( FormatStringProperty );
+      }
+      set
+      {
+        SetValue( FormatStringProperty, value );
+      }
+    }
+
+    private static void OnFormatStringChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      DateTimeUpDown dateTimeUpDown = o as DateTimeUpDown;
+      if( dateTimeUpDown != null )
+        dateTimeUpDown.OnFormatStringChanged( ( string )e.OldValue, ( string )e.NewValue );
+    }
+
+    protected virtual void OnFormatStringChanged( string oldValue, string newValue )
+    {
+      InitializeDateTimeInfoListAndParseValue();
+      UpdateTextFormatting();
+    }
+
+    #endregion //FormatString
+
+    #region Maximum
+
+
+
+    #endregion //Maximum
+
+    #region Minimum
+
+
+
+    #endregion //Minimum
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static DateTimeUpDown()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( DateTimeUpDown ), new FrameworkPropertyMetadata( typeof( DateTimeUpDown ) ) );
+    }
+
+    public DateTimeUpDown()
+    {
+      InitializeDateTimeInfoList();
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    public override void OnApplyTemplate()
+    {
+      if( TextBox != null )
+        TextBox.SelectionChanged -= TextBox_SelectionChanged;
+
+      base.OnApplyTemplate();
+
+      if( TextBox != null )
+        TextBox.SelectionChanged += TextBox_SelectionChanged;
+    }
+
+    protected override void OnCultureInfoChanged( CultureInfo oldValue, CultureInfo newValue )
+    {
+      InitializeDateTimeInfoList();
+    }
+
+    protected override DateTime? CoerceValue( DateTime? value )
+    {
+      //TODO: implement Minimum and Maximum
+      return value;
+    }
+
+    protected override void OnIncrement()
+    {
+      if( Value.HasValue )
+        UpdateDateTime( 1 );
+      else
+        Value = DefaultValue;
+    }
+
+    protected override void OnDecrement()
+    {
+      if( Value.HasValue )
+        UpdateDateTime( -1 );
+      else
+        Value = DefaultValue;
+    }
+
+    protected override void OnPreviewKeyDown( KeyEventArgs e )
+    {
+      switch( e.Key )
+      {
+        case Key.Enter:
+          {
+            if( !IsReadOnly )
+            {
+              _fireSelectionChangedEvent = false;
+              BindingExpression binding = BindingOperations.GetBindingExpression( TextBox, System.Windows.Controls.TextBox.TextProperty );
+              binding.UpdateSource();
+              _fireSelectionChangedEvent = true;
+              e.Handled = true;
+            }
+            return;
+          }
+        default:
+          {
+            _fireSelectionChangedEvent = false;
+            break;
+          }
+      }
+
+      base.OnPreviewKeyDown( e );
+    }
+
+    protected override void OnTextChanged( string previousValue, string currentValue )
+    {
+      if( !_processTextChanged )
+        return;
+
+      //TODO: clean this up and make sure it doesn't fire recursively
+      if( String.IsNullOrEmpty( currentValue ) )
+      {
+        Value = null;
+        return;
+      }
+
+      DateTime current = Value.HasValue ? Value.Value : DateTime.Parse( DateTime.Now.ToString(), CultureInfo.DateTimeFormat );
+      DateTime result;
+      var success = DateTimeParser.TryParse( currentValue, GetFormatString( Format ), current, CultureInfo, out result );
+
+      SyncTextAndValueProperties( InputBase.TextProperty, result.ToString( CultureInfo ) );
+    }
+
+    protected override DateTime? ConvertTextToValue( string text )
+    {
+      if( string.IsNullOrEmpty( text ) )
+        return null;
+
+      return DateTime.Parse( text, CultureInfo );
+    }
+
+    protected override string ConvertValueToText()
+    {
+      if( Value == null )
+        return string.Empty;
+
+      return Value.Value.ToString( GetFormatString( Format ), CultureInfo );
+    }
+
+    protected override void SetValidSpinDirection()
+    {
+      //TODO: implement Minimum and Maximum
+    }
+
+    protected override void OnValueChanged( DateTime? oldValue, DateTime? newValue )
+    {
+      //whenever the value changes we need to parse out the value into out DateTimeInfo segments so we can keep track of the individual pieces
+      //but only if it is not null
+      if( newValue != null )
+        ParseValueIntoDateTimeInfo();
+
+      base.OnValueChanged( oldValue, newValue );
+    }
+
+    protected override void ValidateValue( DateTime? value )
+    {
+      //TODO: implement min/max
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Event Hanlders
+
+    void TextBox_SelectionChanged( object sender, RoutedEventArgs e )
+    {
+      if( _fireSelectionChangedEvent )
+        PerformMouseSelection();
+      else
+        _fireSelectionChangedEvent = true;
+    }
+
+    #endregion //Event Hanlders
+
+    #region Methods
+
+    private void InitializeDateTimeInfoListAndParseValue()
+    {
+      InitializeDateTimeInfoList();
+      if( Value != null )
+        ParseValueIntoDateTimeInfo();
+    }
+
+    private void InitializeDateTimeInfoList()
+    {
+      _dateTimeInfoList.Clear();
+
+      string format = GetFormatString( Format );
+
+      if( string.IsNullOrEmpty( format ) )
+        return;
+
+      while( format.Length > 0 )
+      {
+        int elementLength = GetElementLengthByFormat( format );
+        DateTimeInfo info = null;
+
+        switch( format[ 0 ] )
+        {
+          case '"':
+          case '\'':
+            {
+              int closingQuotePosition = format.IndexOf( format[ 0 ], 1 );
+              info = new DateTimeInfo
+              {
+                IsReadOnly = true,
+                Type = DateTimePart.Other,
+                Length = 1,
+                Content = format.Substring( 1, Math.Max( 1, closingQuotePosition - 1 ) )
+              };
+              elementLength = Math.Max( 1, closingQuotePosition + 1 );
+              break;
+            }
+          case 'D':
+          case 'd':
+            {
+              string d = format.Substring( 0, elementLength );
+              if( elementLength == 1 )
+                d = "%" + d;
+
+              if( elementLength > 2 )
+                info = new DateTimeInfo
+                {
+                  IsReadOnly = true,
+                  Type = DateTimePart.DayName,
+                  Format = d
+                };
+              else
+                info = new DateTimeInfo
+                {
+                  IsReadOnly = false,
+                  Type = DateTimePart.Day,
+                  Format = d
+                };
+              break;
+            }
+          case 'F':
+          case 'f':
+            {
+              string f = format.Substring( 0, elementLength );
+              if( elementLength == 1 )
+                f = "%" + f;
+
+              info = new DateTimeInfo
+              {
+                IsReadOnly = false,
+                Type = DateTimePart.Millisecond,
+                Format = f
+              };
+              break;
+            }
+          case 'h':
+            {
+              string h = format.Substring( 0, elementLength );
+              if( elementLength == 1 )
+                h = "%" + h;
+
+              info = new DateTimeInfo
+              {
+                IsReadOnly = false,
+                Type = DateTimePart.Hour12,
+                Format = h
+              };
+              break;
+            }
+          case 'H':
+            {
+              string H = format.Substring( 0, elementLength );
+              if( elementLength == 1 )
+                H = "%" + H;
+
+              info = new DateTimeInfo
+              {
+                IsReadOnly = false,
+                Type = DateTimePart.Hour24,
+                Format = H
+              };
+              break;
+            }
+          case 'M':
+            {
+              string M = format.Substring( 0, elementLength );
+              if( elementLength == 1 )
+                M = "%" + M;
+
+              if( elementLength >= 3 )
+                info = new DateTimeInfo
+                {
+                  IsReadOnly = false,
+                  Type = DateTimePart.MonthName,
+                  Format = M
+                };
+              else
+                info = new DateTimeInfo
+                {
+                  IsReadOnly = false,
+                  Type = DateTimePart.Month,
+                  Format = M
+                };
+              break;
+            }
+          case 'S':
+          case 's':
+            {
+              string s = format.Substring( 0, elementLength );
+              if( elementLength == 1 )
+                s = "%" + s;
+
+              info = new DateTimeInfo
+              {
+                IsReadOnly = false,
+                Type = DateTimePart.Second,
+                Format = s
+              };
+              break;
+            }
+          case 'T':
+          case 't':
+            {
+              string t = format.Substring( 0, elementLength );
+              if( elementLength == 1 )
+                t = "%" + t;
+
+              info = new DateTimeInfo
+              {
+                IsReadOnly = false,
+                Type = DateTimePart.AmPmDesignator,
+                Format = t
+              };
+              break;
+            }
+          case 'Y':
+          case 'y':
+            {
+              string y = format.Substring( 0, elementLength );
+              if( elementLength == 1 )
+                y = "%" + y;
+
+              info = new DateTimeInfo
+              {
+                IsReadOnly = false,
+                Type = DateTimePart.Year,
+                Format = y
+              };
+              break;
+            }
+          case '\\':
+            {
+              if( format.Length >= 2 )
+              {
+                info = new DateTimeInfo
+                {
+                  IsReadOnly = true,
+                  Content = format.Substring( 1, 1 ),
+                  Length = 1,
+                  Type = DateTimePart.Other
+                };
+                elementLength = 2;
+              }
+              break;
+            }
+          case 'g':
+            {
+              string g = format.Substring( 0, elementLength );
+              if( elementLength == 1 )
+                g = "%" + g;
+
+              info = new DateTimeInfo
+              {
+                IsReadOnly = true,
+                Type = DateTimePart.Period,
+                Format = format.Substring( 0, elementLength )
+              };
+              break;
+            }
+          case 'm':
+            {
+              string m = format.Substring( 0, elementLength );
+              if( elementLength == 1 )
+                m = "%" + m;
+
+              info = new DateTimeInfo
+              {
+                IsReadOnly = false,
+                Type = DateTimePart.Minute,
+                Format = m
+              };
+              break;
+            }
+          case 'z':
+            {
+              string z = format.Substring( 0, elementLength );
+              if( elementLength == 1 )
+                z = "%" + z;
+
+              info = new DateTimeInfo
+              {
+                IsReadOnly = true,
+                Type = DateTimePart.TimeZone,
+                Format = z
+              };
+              break;
+            }
+          default:
+            {
+              elementLength = 1;
+              info = new DateTimeInfo
+              {
+                IsReadOnly = true,
+                Length = 1,
+                Content = format[ 0 ].ToString(),
+                Type = DateTimePart.Other
+              };
+              break;
+            }
+        }
+
+        _dateTimeInfoList.Add( info );
+        format = format.Substring( elementLength );
+      }
+    }
+
+    private static int GetElementLengthByFormat( string format )
+    {
+      for( int i = 1; i < format.Length; i++ )
+      {
+        if( String.Compare( format[ i ].ToString(), format[ 0 ].ToString(), false ) != 0 )
+        {
+          return i;
+        }
+      }
+      return format.Length;
+    }
+
+    private void ParseValueIntoDateTimeInfo()
+    {
+      string text = string.Empty;
+
+      _dateTimeInfoList.ForEach( info =>
+      {
+        if( info.Format == null )
+        {
+          info.StartPosition = text.Length;
+          info.Length = info.Content.Length;
+          text += info.Content;
+        }
+        else
+        {
+          DateTime date = DateTime.Parse( Value.ToString() );
+          info.StartPosition = text.Length;
+          info.Content = date.ToString( info.Format, CultureInfo.DateTimeFormat );
+          info.Length = info.Content.Length;
+          text += info.Content;
+        }
+      } );
+    }
+
+    private void PerformMouseSelection()
+    {
+      _dateTimeInfoList.ForEach( info =>
+      {
+        if( ( info.StartPosition <= TextBox.SelectionStart ) && ( TextBox.SelectionStart < ( info.StartPosition + info.Length ) ) )
+        {
+          Select( info );
+          return;
+        }
+      } );
+    }
+
+    private void Select( DateTimeInfo info )
+    {
+      _fireSelectionChangedEvent = false;
+      TextBox.Select( info.StartPosition, info.Length );
+      _fireSelectionChangedEvent = true;
+      _selectedDateTimeInfo = info;
+    }
+
+    private string GetFormatString( DateTimeFormat dateTimeFormat )
+    {
+      switch( dateTimeFormat )
+      {
+        case DateTimeFormat.ShortDate:
+          return CultureInfo.DateTimeFormat.ShortDatePattern;
+        case DateTimeFormat.LongDate:
+          return CultureInfo.DateTimeFormat.LongDatePattern;
+        case DateTimeFormat.ShortTime:
+          return CultureInfo.DateTimeFormat.ShortTimePattern;
+        case DateTimeFormat.LongTime:
+          return CultureInfo.DateTimeFormat.LongTimePattern;
+        case DateTimeFormat.FullDateTime:
+          return CultureInfo.DateTimeFormat.FullDateTimePattern;
+        case DateTimeFormat.MonthDay:
+          return CultureInfo.DateTimeFormat.MonthDayPattern;
+        case DateTimeFormat.RFC1123:
+          return CultureInfo.DateTimeFormat.RFC1123Pattern;
+        case DateTimeFormat.SortableDateTime:
+          return CultureInfo.DateTimeFormat.SortableDateTimePattern;
+        case DateTimeFormat.UniversalSortableDateTime:
+          return CultureInfo.DateTimeFormat.UniversalSortableDateTimePattern;
+        case DateTimeFormat.YearMonth:
+          return CultureInfo.DateTimeFormat.YearMonthPattern;
+        case DateTimeFormat.Custom:
+          return FormatString;
+        default:
+          throw new ArgumentException( "Not a supported format" );
+      }
+    }
+
+    private void UpdateDateTime( int value )
+    {
+      _fireSelectionChangedEvent = false;
+      DateTimeInfo info = _selectedDateTimeInfo;
+
+      //this only occurs when the user manually type in a value for the Value Property
+      if( info == null )
+        info = _dateTimeInfoList[ 0 ];
+
+      try
+      {
+        switch( info.Type )
+        {
+          case DateTimePart.Year:
+            {
+              Value = ( ( DateTime )Value ).AddYears( value );
+              break;
+            }
+          case DateTimePart.Month:
+          case DateTimePart.MonthName:
+            {
+              Value = ( ( DateTime )Value ).AddMonths( value );
+              break;
+            }
+          case DateTimePart.Day:
+          case DateTimePart.DayName:
+            {
+              Value = ( ( DateTime )Value ).AddDays( value );
+              break;
+            }
+          case DateTimePart.Hour12:
+          case DateTimePart.Hour24:
+            {
+              Value = ( ( DateTime )Value ).AddHours( value );
+              break;
+            }
+          case DateTimePart.Minute:
+            {
+              Value = ( ( DateTime )Value ).AddMinutes( value );
+              break;
+            }
+          case DateTimePart.Second:
+            {
+              Value = ( ( DateTime )Value ).AddSeconds( value );
+              break;
+            }
+          case DateTimePart.Millisecond:
+            {
+              Value = ( ( DateTime )Value ).AddMilliseconds( value );
+              break;
+            }
+          case DateTimePart.AmPmDesignator:
+            {
+              Value = ( ( DateTime )Value ).AddHours( value * 12 );
+              break;
+            }
+          default:
+            {
+              break;
+            }
+        }
+      }
+      catch
+      {
+        //this can occur if the date/time = 1/1/0001 12:00:00 AM which is the smallest date allowed.
+        //I could write code that would validate the date each and everytime but I think that it would be more
+        //efficient if I just handle the edge case and allow an exeption to occur and swallow it instead.
+      }
+
+      //we loose our selection when the Value is set so we need to reselect it without firing the selection changed event
+      TextBox.Select( info.StartPosition, info.Length );
+      _fireSelectionChangedEvent = true;
+    }
+
+    private void UpdateTextFormatting()
+    {
+      _processTextChanged = false;
+
+      if( Value.HasValue )
+        Text = ConvertValueToText();
+
+      _processTextChanged = true;
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimeUpDown/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimeUpDown/Themes/Generic.xaml
new file mode 100644
index 00000000..0b4fd315
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimeUpDown/Themes/Generic.xaml
@@ -0,0 +1,76 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
+
+   <DataTemplate x:Key="DefaultWatermarkTemplate">
+      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
+   </DataTemplate>
+
+   <!-- =============================================================================== -->
+   <!-- DateTimeUpDown                                                                  -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type local:DateTimeUpDown}">
+      <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+      <Setter Property="HorizontalContentAlignment" Value="Right" />
+      <Setter Property="TextAlignment" Value="Right" />
+      <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:DateTimeUpDown}">
+               <local:ButtonSpinner x:Name="PART_Spinner"
+                                    IsTabStop="False"
+                                    Background="{TemplateBinding Background}"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                    AllowSpin="{TemplateBinding AllowSpin}"
+                                    ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
+                  <local:WatermarkTextBox x:Name="PART_TextBox"
+                                          BorderThickness="0" 
+                                          Background="Transparent"
+                                          ContextMenu="{TemplateBinding ContextMenu}"
+                                          FontFamily="{TemplateBinding FontFamily}" 
+                                          FontSize="{TemplateBinding FontSize}" 
+                                          FontStretch="{TemplateBinding FontStretch}"
+                                          FontStyle="{TemplateBinding FontStyle}" 
+                                          FontWeight="{TemplateBinding FontWeight}" 
+                                          Foreground="{TemplateBinding Foreground}" 
+                                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
+                                          MinWidth="20"
+                                          AcceptsReturn="False"
+                                          Padding="0"
+                                          TextAlignment="{TemplateBinding TextAlignment}"
+                                          TextWrapping="NoWrap" 
+                                          TabIndex="{TemplateBinding TabIndex}"
+                                          Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
+                                          Watermark="{TemplateBinding Watermark}"
+                                          WatermarkTemplate="{TemplateBinding WatermarkTemplate}" />
+               </local:ButtonSpinner>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DropDownButton/Implementation/DropDownButton.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DropDownButton/Implementation/DropDownButton.cs
new file mode 100644
index 00000000..9fa8ba67
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DropDownButton/Implementation/DropDownButton.cs
@@ -0,0 +1,370 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Input;
+
+namespace Xceed.Wpf.Toolkit
+{
+  [TemplatePart( Name = PART_DropDownButton, Type = typeof( ToggleButton ) )]
+  public class DropDownButton : ContentControl, ICommandSource
+  {
+    private const string PART_DropDownButton = "PART_DropDownButton";
+
+    #region Constructors
+
+    static DropDownButton()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( DropDownButton ), new FrameworkPropertyMetadata( typeof( DropDownButton ) ) );
+    }
+
+    public DropDownButton()
+    {
+      Keyboard.AddKeyDownHandler( this, OnKeyDown );
+      Mouse.AddPreviewMouseDownOutsideCapturedElementHandler( this, OnMouseDownOutsideCapturedElement );
+    }
+
+    #endregion //Constructors
+
+    #region Properties
+
+    private System.Windows.Controls.Primitives.ButtonBase _button;
+    protected System.Windows.Controls.Primitives.ButtonBase Button
+    {
+      get
+      {
+        return _button;
+      }
+      set
+      {
+        if( _button != null )
+          _button.Click -= DropDownButton_Click;
+
+        _button = value;
+
+        if( _button != null )
+          _button.Click += DropDownButton_Click;
+      }
+    }
+
+    #region DropDownContent
+
+    public static readonly DependencyProperty DropDownContentProperty = DependencyProperty.Register( "DropDownContent", typeof( object ), typeof( DropDownButton ), new UIPropertyMetadata( null, OnDropDownContentChanged ) );
+    public object DropDownContent
+    {
+      get
+      {
+        return ( object )GetValue( DropDownContentProperty );
+      }
+      set
+      {
+        SetValue( DropDownContentProperty, value );
+      }
+    }
+
+    private static void OnDropDownContentChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      DropDownButton dropDownButton = o as DropDownButton;
+      if( dropDownButton != null )
+        dropDownButton.OnDropDownContentChanged( ( object )e.OldValue, ( object )e.NewValue );
+    }
+
+    protected virtual void OnDropDownContentChanged( object oldValue, object newValue )
+    {
+      // TODO: Add your property changed side-effects. Descendants can override as well.
+    }
+
+    #endregion //DropDownContent
+
+    #region IsOpen
+
+    public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register( "IsOpen", typeof( bool ), typeof( DropDownButton ), new UIPropertyMetadata( false, OnIsOpenChanged ) );
+    public bool IsOpen
+    {
+      get
+      {
+        return ( bool )GetValue( IsOpenProperty );
+      }
+      set
+      {
+        SetValue( IsOpenProperty, value );
+      }
+    }
+
+    private static void OnIsOpenChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      DropDownButton dropDownButton = o as DropDownButton;
+      if( dropDownButton != null )
+        dropDownButton.OnIsOpenChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnIsOpenChanged( bool oldValue, bool newValue )
+    {
+      if( newValue )
+        RaiseRoutedEvent( DropDownButton.OpenedEvent );
+      else
+        RaiseRoutedEvent( DropDownButton.ClosedEvent );
+    }
+
+    #endregion //IsOpen
+
+    #endregion //Properties
+
+    #region Base Class Overrides
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+      Button = GetTemplateChild( PART_DropDownButton ) as ToggleButton;
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Events
+
+    public static readonly RoutedEvent ClickEvent = EventManager.RegisterRoutedEvent( "Click", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( DropDownButton ) );
+    public event RoutedEventHandler Click
+    {
+      add
+      {
+        AddHandler( ClickEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( ClickEvent, value );
+      }
+    }
+
+    public static readonly RoutedEvent OpenedEvent = EventManager.RegisterRoutedEvent( "Opened", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( DropDownButton ) );
+    public event RoutedEventHandler Opened
+    {
+      add
+      {
+        AddHandler( OpenedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( OpenedEvent, value );
+      }
+    }
+
+    public static readonly RoutedEvent ClosedEvent = EventManager.RegisterRoutedEvent( "Closed", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( DropDownButton ) );
+    public event RoutedEventHandler Closed
+    {
+      add
+      {
+        AddHandler( ClosedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( ClosedEvent, value );
+      }
+    }
+
+    #endregion //Events
+
+    #region Event Handlers
+
+    private void OnKeyDown( object sender, KeyEventArgs e )
+    {
+      switch( e.Key )
+      {
+        case Key.Escape:
+          {
+            CloseDropDown();
+            break;
+          }
+      }
+    }
+
+    private void OnMouseDownOutsideCapturedElement( object sender, MouseButtonEventArgs e )
+    {
+      CloseDropDown();
+    }
+
+    private void DropDownButton_Click( object sender, RoutedEventArgs e )
+    {
+      OnClick();
+    }
+
+    void CanExecuteChanged( object sender, EventArgs e )
+    {
+      CanExecuteChanged();
+    }
+
+    #endregion //Event Handlers
+
+    #region Methods
+
+    private void CanExecuteChanged()
+    {
+      if( Command != null )
+      {
+        RoutedCommand command = Command as RoutedCommand;
+
+        // If a RoutedCommand.
+        if( command != null )
+          IsEnabled = command.CanExecute( CommandParameter, CommandTarget ) ? true : false;
+        // If a not RoutedCommand.
+        else
+          IsEnabled = Command.CanExecute( CommandParameter ) ? true : false;
+      }
+    }
+
+    /// <summary>
+    /// Closes the drop down.
+    /// </summary>
+    private void CloseDropDown()
+    {
+      if( IsOpen )
+        IsOpen = false;
+      ReleaseMouseCapture();
+    }
+
+    protected virtual void OnClick()
+    {
+      RaiseRoutedEvent( DropDownButton.ClickEvent );
+      RaiseCommand();
+    }
+
+    /// <summary>
+    /// Raises routed events.
+    /// </summary>
+    private void RaiseRoutedEvent( RoutedEvent routedEvent )
+    {
+      RoutedEventArgs args = new RoutedEventArgs( routedEvent, this );
+      RaiseEvent( args );
+    }
+
+    /// <summary>
+    /// Raises the command's Execute event.
+    /// </summary>
+    private void RaiseCommand()
+    {
+      if( Command != null )
+      {
+        RoutedCommand routedCommand = Command as RoutedCommand;
+
+        if( routedCommand == null )
+          ( ( ICommand )Command ).Execute( CommandParameter );
+        else
+          routedCommand.Execute( CommandParameter, CommandTarget );
+      }
+    }
+
+    /// <summary>
+    /// Unhooks a command from the Command property.
+    /// </summary>
+    /// <param name="oldCommand">The old command.</param>
+    /// <param name="newCommand">The new command.</param>
+    private void UnhookCommand( ICommand oldCommand, ICommand newCommand )
+    {
+      EventHandler handler = CanExecuteChanged;
+      oldCommand.CanExecuteChanged -= handler;
+    }
+
+    /// <summary>
+    /// Hooks up a command to the CanExecuteChnaged event handler.
+    /// </summary>
+    /// <param name="oldCommand">The old command.</param>
+    /// <param name="newCommand">The new command.</param>
+    private void HookUpCommand( ICommand oldCommand, ICommand newCommand )
+    {
+      EventHandler handler = new EventHandler( CanExecuteChanged );
+      canExecuteChangedHandler = handler;
+      if( newCommand != null )
+        newCommand.CanExecuteChanged += canExecuteChangedHandler;
+    }
+
+    #endregion //Methods
+
+    #region ICommandSource Members
+
+    // Keeps a copy of the CanExecuteChnaged handler so it doesn't get garbage collected.
+    private EventHandler canExecuteChangedHandler;
+
+    #region Command
+
+    public static readonly DependencyProperty CommandProperty = DependencyProperty.Register( "Command", typeof( ICommand ), typeof( DropDownButton ), new PropertyMetadata( ( ICommand )null, OnCommandChanged ) );
+    [TypeConverter( typeof( CommandConverter ) )]
+    public ICommand Command
+    {
+      get
+      {
+        return ( ICommand )GetValue( CommandProperty );
+      }
+      set
+      {
+        SetValue( CommandProperty, value );
+      }
+    }
+
+    private static void OnCommandChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      DropDownButton dropDownButton = d as DropDownButton;
+      if( dropDownButton != null )
+        dropDownButton.OnCommandChanged( ( ICommand )e.OldValue, ( ICommand )e.NewValue );
+    }
+
+    protected virtual void OnCommandChanged( ICommand oldValue, ICommand newValue )
+    {
+      // If old command is not null, then we need to remove the handlers.
+      if( oldValue != null )
+        UnhookCommand( oldValue, newValue );
+
+      HookUpCommand( oldValue, newValue );
+
+      CanExecuteChanged(); //may need to call this when changing the command parameter or target.
+    }
+
+    #endregion //Command
+
+    public static readonly DependencyProperty CommandParameterProperty = DependencyProperty.Register( "CommandParameter", typeof( object ), typeof( DropDownButton ), new PropertyMetadata( null ) );
+    public object CommandParameter
+    {
+      get
+      {
+        return GetValue( CommandParameterProperty );
+      }
+      set
+      {
+        SetValue( CommandParameterProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CommandTargetProperty = DependencyProperty.Register( "CommandTarget", typeof( IInputElement ), typeof( DropDownButton ), new PropertyMetadata( null ) );
+    public IInputElement CommandTarget
+    {
+      get
+      {
+        return ( IInputElement )GetValue( CommandTargetProperty );
+      }
+      set
+      {
+        SetValue( CommandTargetProperty, value );
+      }
+    }
+
+    #endregion //ICommandSource Members
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DropDownButton/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DropDownButton/Themes/Generic.xaml
new file mode 100644
index 00000000..c751a687
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DropDownButton/Themes/Generic.xaml
@@ -0,0 +1,108 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
+
+   <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+
+   <LinearGradientBrush x:Key="PopupDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="1" Color="#FFE8EBED" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <Style TargetType="{x:Type local:DropDownButton}">
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="IsTabStop" Value="False" />
+      <Setter Property="HorizontalContentAlignment" Value="Center" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Padding" Value="3" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:DropDownButton}">
+               <Grid x:Name="MainGrid" SnapsToDevicePixels="True">
+                  <ToggleButton x:Name="PART_DropDownButton"
+                                Grid.Column="1"
+                                IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}">
+                     <ToggleButton.Template>
+                        <ControlTemplate TargetType="ToggleButton">
+                           <ContentPresenter />
+                        </ControlTemplate>
+                     </ToggleButton.Template>
+                     <Grid>
+                        <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                             CornerRadius="2.75"
+                                             RenderChecked="{TemplateBinding IsOpen}"
+                                             RenderEnabled="{TemplateBinding IsEnabled}"
+											            RenderMouseOver="{Binding IsMouseOver, ElementName=PART_DropDownButton}"
+											            RenderPressed="{Binding IsPressed, ElementName=PART_DropDownButton}">
+                           <Grid>
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="*" />
+                                 <ColumnDefinition Width="Auto" />
+                              </Grid.ColumnDefinitions>
+                              <ContentPresenter Margin="{TemplateBinding Padding}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" RecognizesAccessKey="true" />
+                              <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Margin="4,3,4,3" Grid.Column="1">
+                                 <Path x:Name="Arrow"  Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000" />
+                              </Grid>
+                           </Grid>
+                        </chrome:ButtonChrome>
+                     </Grid>
+                  </ToggleButton>
+
+                  <Popup x:Name="PART_Popup" 
+                         HorizontalOffset="1"
+                         VerticalOffset="1"
+                         AllowsTransparency="True"
+                         StaysOpen="False"
+                         Placement="Bottom"
+                         Focusable="False"
+                         IsOpen="{Binding IsChecked, ElementName=PART_DropDownButton}">
+                     <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}">
+                        <ContentPresenter Content="{TemplateBinding DropDownContent}" />
+                     </Border>
+                  </Popup>
+
+               </Grid>
+                <ControlTemplate.Triggers>
+                    <Trigger Property="IsEnabled" Value="False">
+                        <Setter Property="Fill" TargetName="Arrow" Value="#AFAFAF" />
+                    </Trigger>
+                </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Implementation/Converters/BorderThicknessToStrokeThicknessConverter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Implementation/Converters/BorderThicknessToStrokeThicknessConverter.cs
new file mode 100644
index 00000000..a726a9c0
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Implementation/Converters/BorderThicknessToStrokeThicknessConverter.cs
@@ -0,0 +1,43 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.Mag.Converters
+{
+  internal class BorderThicknessToStrokeThicknessConverter : IValueConverter
+  {
+    #region IValueConverter Members
+
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      Thickness thickness = ( Thickness )value;
+      return ( thickness.Bottom + thickness.Left + thickness.Right + thickness.Top ) / 4;
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Implementation/Converters/RadiusConverter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Implementation/Converters/RadiusConverter.cs
new file mode 100644
index 00000000..3f661c06
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Implementation/Converters/RadiusConverter.cs
@@ -0,0 +1,41 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.Mag.Converters
+{
+  internal class RadiusConverter : IValueConverter
+  {
+    #region IValueConverter Members
+
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      return ( double )value * 2;
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Implementation/FrameType.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Implementation/FrameType.cs
new file mode 100644
index 00000000..e839573d
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Implementation/FrameType.cs
@@ -0,0 +1,27 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit
+{
+  public enum FrameType
+  {
+    Circle,
+    Rectangle
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Implementation/Magnifier.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Implementation/Magnifier.cs
new file mode 100644
index 00000000..e2c6f1ce
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Implementation/Magnifier.cs
@@ -0,0 +1,255 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+
+namespace Xceed.Wpf.Toolkit
+{
+  [TemplatePart( Name = PART_VisualBrush, Type = typeof( VisualBrush ) )]
+  public class Magnifier : Control
+  {
+    private const double DEFAULT_SIZE = 100d;
+    private const string PART_VisualBrush = "PART_VisualBrush";
+
+    #region Private Members
+
+    private VisualBrush _visualBrush = new VisualBrush();
+
+    #endregion //Private Members
+
+    #region Properties
+
+    #region FrameType
+
+    public static readonly DependencyProperty FrameTypeProperty = DependencyProperty.Register( "FrameType", typeof( FrameType ), typeof( Magnifier ), new UIPropertyMetadata( FrameType.Circle, OnFrameTypeChanged ) );
+    public FrameType FrameType
+    {
+      get
+      {
+        return ( FrameType )GetValue( FrameTypeProperty );
+      }
+      set
+      {
+        SetValue( FrameTypeProperty, value );
+      }
+    }
+
+    private static void OnFrameTypeChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      Magnifier m = ( Magnifier )d;
+      m.OnFrameTypeChanged( ( FrameType )e.OldValue, ( FrameType )e.NewValue );
+    }
+
+    protected virtual void OnFrameTypeChanged( FrameType oldValue, FrameType newValue )
+    {
+      this.UpdateSizeFromRadius();
+    }
+
+    #endregion //FrameType
+
+    #region Radius
+
+    public static readonly DependencyProperty RadiusProperty = DependencyProperty.Register( "Radius", typeof( double ), typeof( Magnifier ), new FrameworkPropertyMetadata( ( Magnifier.DEFAULT_SIZE / 2 ), new PropertyChangedCallback( OnRadiusPropertyChanged ) ) );
+    public double Radius
+    {
+      get
+      {
+        return ( double )GetValue( RadiusProperty );
+      }
+      set
+      {
+        SetValue( RadiusProperty, value );
+      }
+    }
+
+    private static void OnRadiusPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      Magnifier m = ( Magnifier )d;
+      m.OnRadiusChanged( e );
+    }
+
+    protected virtual void OnRadiusChanged( DependencyPropertyChangedEventArgs e )
+    {
+      this.UpdateSizeFromRadius();
+    }
+
+    #endregion
+
+    #region Target
+
+    public static readonly DependencyProperty TargetProperty = DependencyProperty.Register( "Target", typeof( UIElement ), typeof( Magnifier ) );
+    public UIElement Target
+    {
+      get
+      {
+        return ( UIElement )GetValue( TargetProperty );
+      }
+      set
+      {
+        SetValue( TargetProperty, value );
+      }
+    }
+
+    #endregion //Target
+
+    #region ViewBox
+
+    internal Rect ViewBox
+    {
+      get
+      {
+        return _visualBrush.Viewbox;
+      }
+      set
+      {
+        _visualBrush.Viewbox = value;
+      }
+    }
+
+    #endregion
+
+    #region ZoomFactor
+
+    public static readonly DependencyProperty ZoomFactorProperty = DependencyProperty.Register( "ZoomFactor", typeof( double ), typeof( Magnifier ), new FrameworkPropertyMetadata( 0.5, OnZoomFactorPropertyChanged, OnCoerceZoomFactorProperty ) );
+    public double ZoomFactor
+    {
+      get
+      {
+        return ( double )GetValue( ZoomFactorProperty );
+      }
+      set
+      {
+        SetValue( ZoomFactorProperty, value );
+      }
+    }
+
+    private static void OnZoomFactorPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      Magnifier m = ( Magnifier )d;
+      m.OnZoomFactorChanged( e );
+    }
+
+    protected virtual void OnZoomFactorChanged( DependencyPropertyChangedEventArgs e )
+    {
+      ResolveViewBox();
+    }
+
+    private static object OnCoerceZoomFactorProperty( DependencyObject d, object value )
+    {
+      Magnifier m = ( Magnifier )d;
+      return m.OnCoerceZoomFactor( value );
+    }
+
+    protected virtual object OnCoerceZoomFactor( object value )
+    {
+      double zoomFactor = ( double )value;
+
+      if( zoomFactor > 1 )
+        zoomFactor = 1;
+      else if( zoomFactor < 0 )
+        zoomFactor = 0;
+
+      return zoomFactor;
+    }
+
+    #endregion //ZoomFactor
+
+    #endregion //Properties
+
+    #region Constructors
+
+    /// <summary>
+    /// Initializes static members of the <see cref="Magnifier"/> class.
+    /// </summary>
+    static Magnifier()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( Magnifier ), new FrameworkPropertyMetadata( typeof( Magnifier ) ) );
+      HeightProperty.OverrideMetadata( typeof( Magnifier ), new FrameworkPropertyMetadata( Magnifier.DEFAULT_SIZE ) );
+      WidthProperty.OverrideMetadata( typeof( Magnifier ), new FrameworkPropertyMetadata( Magnifier.DEFAULT_SIZE ) );
+    }
+
+    public Magnifier()
+    {
+      this.SizeChanged += new SizeChangedEventHandler( OnSizeChangedEvent );
+    }
+
+    private void OnSizeChangedEvent( object sender, SizeChangedEventArgs e )
+    {
+      ResolveViewBox();
+    }
+
+    private void UpdateSizeFromRadius()
+    {
+      if( this.FrameType == Toolkit.FrameType.Circle )
+      {
+        double newSize = Radius * 2;
+        if(!DoubleHelper.AreVirtuallyEqual( Width, newSize ))
+        {
+          Width = newSize;
+        }
+
+        if(!DoubleHelper.AreVirtuallyEqual( Height, newSize ))
+        {
+          Height = newSize;
+        }
+      }
+    }
+
+    #endregion
+
+    #region Base Class Overrides
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+
+      VisualBrush newBrush = GetTemplateChild( PART_VisualBrush ) as VisualBrush;
+
+      // Just create a brush as placeholder even if there is no such brush
+      // this avoid having to "if" each access to the _visualBrush member.
+      // Do not keep the current _visualBrush whatsoever to avoid memory leaks.
+      if( newBrush == null )
+      {
+        newBrush = new VisualBrush();
+      }
+
+      newBrush.Viewbox = _visualBrush.Viewbox;
+      _visualBrush = newBrush;
+    }
+
+    #endregion // Base Class Overrides
+
+    #region Methods
+
+    private void ResolveViewBox()
+    {
+      if( !IsInitialized )
+        return;
+
+      ViewBox = new Rect( 
+        ViewBox.Location, 
+        new Size( ActualWidth * ZoomFactor , ActualHeight * ZoomFactor ) );
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Implementation/MagnifierAdorner.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Implementation/MagnifierAdorner.cs
new file mode 100644
index 00000000..e6e56bb5
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Implementation/MagnifierAdorner.cs
@@ -0,0 +1,119 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class MagnifierAdorner : Adorner
+  {
+    #region Members
+
+    private Magnifier _magnifier;
+    private Point _currentMousePosition;
+
+    #endregion
+
+    #region Constructors
+
+    public MagnifierAdorner( UIElement element, Magnifier magnifier )
+      : base( element )
+    {
+      _magnifier = magnifier;
+      UpdateViewBox();
+      AddVisualChild( _magnifier );
+
+      Loaded += ( s, e ) => InputManager.Current.PostProcessInput += OnProcessInput;
+      Unloaded += ( s, e ) => InputManager.Current.PostProcessInput -= OnProcessInput;
+    }
+
+    #endregion
+
+    #region Private/Internal methods
+
+    private void OnProcessInput( object sender, ProcessInputEventArgs e )
+    {
+      Point pt = Mouse.GetPosition( this );
+
+      if( _currentMousePosition == pt )
+        return;
+
+      _currentMousePosition = pt;
+      UpdateViewBox();
+      InvalidateArrange();
+    }
+
+    internal void UpdateViewBox()
+    {
+      var viewBoxLocation = CalculateViewBoxLocation();
+      _magnifier.ViewBox = new Rect( viewBoxLocation, _magnifier.ViewBox.Size );
+    }
+
+    private Point CalculateViewBoxLocation()
+    {
+      double offsetX = 0, offsetY = 0;
+
+      Point adorner = Mouse.GetPosition( this );
+      Point element = Mouse.GetPosition( AdornedElement );
+
+      offsetX = element.X - adorner.X;
+      offsetY = element.Y - adorner.Y;
+
+      double left = _currentMousePosition.X - ( ( _magnifier.ViewBox.Width / 2 ) + offsetX );
+      double top = _currentMousePosition.Y - ( ( _magnifier.ViewBox.Height / 2 ) + offsetY );
+      return new Point( left, top );
+    }
+
+    #endregion
+
+    #region Overrides
+
+    protected override Visual GetVisualChild( int index )
+    {
+      return _magnifier;
+    }
+
+    protected override int VisualChildrenCount
+    {
+      get
+      {
+        return 1;
+      }
+    }
+
+    protected override Size MeasureOverride( Size constraint )
+    {
+      _magnifier.Measure( constraint );
+      return base.MeasureOverride( constraint );
+    }
+
+    protected override Size ArrangeOverride( Size finalSize )
+    {
+      double x = _currentMousePosition.X - ( _magnifier.Width / 2 );
+      double y = _currentMousePosition.Y - ( _magnifier.Height / 2 );
+      _magnifier.Arrange( new Rect( x, y, _magnifier.Width, _magnifier.Height ) );
+      return base.ArrangeOverride( finalSize );
+    }
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Implementation/MagnifierManager.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Implementation/MagnifierManager.cs
new file mode 100644
index 00000000..ac8d0c9d
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Implementation/MagnifierManager.cs
@@ -0,0 +1,117 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Documents;
+using System.Windows.Input;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class MagnifierManager : DependencyObject
+  {
+    #region Members
+
+    private MagnifierAdorner _adorner;
+    private UIElement _element;
+
+    #endregion //Members
+
+    #region Properties
+
+    public static readonly DependencyProperty CurrentProperty = DependencyProperty.RegisterAttached( "Magnifier", typeof( Magnifier ), typeof( UIElement ), new FrameworkPropertyMetadata( null, OnMagnifierChanged ) );
+    public static void SetMagnifier( UIElement element, Magnifier value )
+    {
+      element.SetValue( CurrentProperty, value );
+    }
+    public static Magnifier GetMagnifier( UIElement element )
+    {
+      return ( Magnifier )element.GetValue( CurrentProperty );
+    }
+
+    private static void OnMagnifierChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      UIElement target = d as UIElement;
+
+      if( target == null )
+        throw new ArgumentException( "Magnifier can only be attached to a UIElement." );
+
+      MagnifierManager manager = new MagnifierManager();
+      manager.AttachToMagnifier( target, e.NewValue as Magnifier );
+    }
+
+    #endregion //Properties
+
+    #region Event Handlers
+
+    void Element_MouseLeave( object sender, MouseEventArgs e )
+    {
+      HideAdorner();
+    }
+
+    void Element_MouseEnter( object sender, MouseEventArgs e )
+    {
+      ShowAdorner();
+    }
+
+    #endregion //Event Handlers
+
+    #region Methods
+
+    private void AttachToMagnifier( UIElement element, Magnifier magnifier )
+    {
+      _element = element;
+      _element.MouseEnter += Element_MouseEnter;
+      _element.MouseLeave += Element_MouseLeave;
+
+      magnifier.Target = _element;
+
+      _adorner = new MagnifierAdorner( _element, magnifier );
+    }
+
+    void ShowAdorner()
+    {
+      VerifyAdornerLayer();
+      _adorner.Visibility = Visibility.Visible;
+    }
+
+    bool VerifyAdornerLayer()
+    {
+      if( _adorner.Parent != null )
+        return true;
+
+      AdornerLayer layer = AdornerLayer.GetAdornerLayer( _element );
+      if( layer == null )
+        return false;
+
+      layer.Add( _adorner );
+      return true;
+    }
+
+    void HideAdorner()
+    {
+      if( _adorner.Visibility == Visibility.Visible )
+      {
+        _adorner.Visibility = Visibility.Collapsed;
+      }
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Themes/Generic.xaml
new file mode 100644
index 00000000..62ab1775
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Themes/Generic.xaml
@@ -0,0 +1,71 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Mag.Converters">
+
+   <!-- =============================================================================== -->
+   <!-- Magnifier                                                                       -->
+   <!-- =============================================================================== -->
+
+   <conv:RadiusConverter x:Key="RadiusConverter" />
+   <conv:BorderThicknessToStrokeThicknessConverter x:Key="BorderThicknessToStrokeThicknessConverter" />
+
+   <ControlTemplate x:Key="CircleTemplate" TargetType="{x:Type local:Magnifier}">
+      <Grid>
+         <Ellipse Fill="{TemplateBinding Background}" />
+         <Ellipse Stroke="{Binding Path=BorderBrush, RelativeSource={RelativeSource TemplatedParent}}" 
+                  StrokeThickness="{Binding Path=BorderThickness, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BorderThicknessToStrokeThicknessConverter}}">
+            <Ellipse.Fill>
+               <VisualBrush x:Name="PART_VisualBrush"
+                            ViewboxUnits="Absolute"
+                            Visual="{Binding Path=Target, RelativeSource={RelativeSource TemplatedParent}}" />
+            </Ellipse.Fill>
+         </Ellipse>
+      </Grid>
+   </ControlTemplate>
+
+   <ControlTemplate x:Key="RectangleTemplate" TargetType="{x:Type local:Magnifier}">
+      <Grid Background="{TemplateBinding Background}" >
+         <Rectangle Stroke="{Binding Path=BorderBrush, RelativeSource={RelativeSource TemplatedParent}}"
+                    StrokeThickness="{Binding Path=BorderThickness, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BorderThicknessToStrokeThicknessConverter}}">
+            <Rectangle.Fill>
+               <VisualBrush x:Name="PART_VisualBrush"
+                            ViewboxUnits="Absolute"
+                            Visual="{Binding Path=Target, RelativeSource={RelativeSource TemplatedParent}}" />
+            </Rectangle.Fill>
+         </Rectangle>
+      </Grid>
+   </ControlTemplate>
+
+   <Style TargetType="{x:Type local:Magnifier}">
+      <Setter Property="IsHitTestVisible" Value="False" />
+      <Style.Triggers>
+         <Trigger Property="FrameType" Value="Circle">
+            <Setter Property="Template" Value="{StaticResource CircleTemplate}" />
+         </Trigger>
+         <Trigger Property="FrameType" Value="Rectangle">
+            <Setter Property="Template" Value="{StaticResource RectangleTemplate}" />
+         </Trigger>
+      </Style.Triggers>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MaskedTextBox/Implementation/MaskedTextBox.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MaskedTextBox/Implementation/MaskedTextBox.cs
new file mode 100644
index 00000000..734a8209
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MaskedTextBox/Implementation/MaskedTextBox.cs
@@ -0,0 +1,725 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class MaskedTextBox : TextBox
+  {
+    #region Members
+
+    /// <summary>
+    /// Flags if the Text and Value properties are in the process of being sync'd
+    /// </summary>
+    private bool _isSyncingTextAndValueProperties;
+    private bool _isInitialized;
+    private bool _convertExceptionOccurred = false;
+
+    #endregion //Members
+
+    #region Properties
+
+    protected MaskedTextProvider MaskProvider
+    {
+      get;
+      set;
+    }
+
+    #region IncludePrompt
+
+    public static readonly DependencyProperty IncludePromptProperty = DependencyProperty.Register( "IncludePrompt", typeof( bool ), typeof( MaskedTextBox ), new UIPropertyMetadata( false, OnIncludePromptPropertyChanged ) );
+    public bool IncludePrompt
+    {
+      get
+      {
+        return ( bool )GetValue( IncludePromptProperty );
+      }
+      set
+      {
+        SetValue( IncludePromptProperty, value );
+      }
+    }
+
+    private static void OnIncludePromptPropertyChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      MaskedTextBox maskedTextBox = o as MaskedTextBox;
+      if( maskedTextBox != null )
+        maskedTextBox.OnIncludePromptChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnIncludePromptChanged( bool oldValue, bool newValue )
+    {
+      ResolveMaskProvider( Mask );
+    }
+
+    #endregion //IncludePrompt
+
+    #region IncludeLiterals
+
+    public static readonly DependencyProperty IncludeLiteralsProperty = DependencyProperty.Register( "IncludeLiterals", typeof( bool ), typeof( MaskedTextBox ), new UIPropertyMetadata( true, OnIncludeLiteralsPropertyChanged ) );
+    public bool IncludeLiterals
+    {
+      get
+      {
+        return ( bool )GetValue( IncludeLiteralsProperty );
+      }
+      set
+      {
+        SetValue( IncludeLiteralsProperty, value );
+      }
+    }
+
+    private static void OnIncludeLiteralsPropertyChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      MaskedTextBox maskedTextBox = o as MaskedTextBox;
+      if( maskedTextBox != null )
+        maskedTextBox.OnIncludeLiteralsChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnIncludeLiteralsChanged( bool oldValue, bool newValue )
+    {
+      ResolveMaskProvider( Mask );
+    }
+
+    #endregion //IncludeLiterals
+
+    #region Mask
+
+    public static readonly DependencyProperty MaskProperty = DependencyProperty.Register( "Mask", typeof( string ), typeof( MaskedTextBox ), new UIPropertyMetadata( "<>", OnMaskPropertyChanged ) );
+    public string Mask
+    {
+      get
+      {
+        return ( string )GetValue( MaskProperty );
+      }
+      set
+      {
+        SetValue( MaskProperty, value );
+      }
+    }
+
+    private static void OnMaskPropertyChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      MaskedTextBox maskedTextBox = o as MaskedTextBox;
+      if( maskedTextBox != null )
+        maskedTextBox.OnMaskChanged( ( string )e.OldValue, ( string )e.NewValue );
+    }
+
+    protected virtual void OnMaskChanged( string oldValue, string newValue )
+    {
+      ResolveMaskProvider( newValue );
+      UpdateText( 0 );
+    }
+
+    #endregion //Mask
+
+    #region PromptChar
+
+    public static readonly DependencyProperty PromptCharProperty = DependencyProperty.Register( "PromptChar", typeof( char ), typeof( MaskedTextBox ), new UIPropertyMetadata( '_', OnPromptCharChanged ) );
+    public char PromptChar
+    {
+      get
+      {
+        return ( char )GetValue( PromptCharProperty );
+      }
+      set
+      {
+        SetValue( PromptCharProperty, value );
+      }
+    }
+
+    private static void OnPromptCharChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      MaskedTextBox maskedTextBox = o as MaskedTextBox;
+      if( maskedTextBox != null )
+        maskedTextBox.OnPromptCharChanged( ( char )e.OldValue, ( char )e.NewValue );
+    }
+
+    protected virtual void OnPromptCharChanged( char oldValue, char newValue )
+    {
+      ResolveMaskProvider( Mask );
+    }
+
+    #endregion //PromptChar
+
+    #region SelectAllOnGotFocus
+
+    public static readonly DependencyProperty SelectAllOnGotFocusProperty = DependencyProperty.Register( "SelectAllOnGotFocus", typeof( bool ), typeof( MaskedTextBox ), new PropertyMetadata( false ) );
+    public bool SelectAllOnGotFocus
+    {
+      get
+      {
+        return ( bool )GetValue( SelectAllOnGotFocusProperty );
+      }
+      set
+      {
+        SetValue( SelectAllOnGotFocusProperty, value );
+      }
+    }
+
+    #endregion //SelectAllOnGotFocus
+
+    #region Text
+
+    private static void OnTextChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      MaskedTextBox inputBase = o as MaskedTextBox;
+      if( inputBase != null )
+        inputBase.OnTextChanged( ( string )e.OldValue, ( string )e.NewValue );
+    }
+
+    protected virtual void OnTextChanged( string oldValue, string newValue )
+    {
+      if( _isInitialized )
+        SyncTextAndValueProperties( MaskedTextBox.TextProperty, newValue );
+    }
+
+    #endregion //Text
+
+    #region Value
+
+    public static readonly DependencyProperty ValueProperty = DependencyProperty.Register( "Value", typeof( object ), typeof( MaskedTextBox ), new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnValueChanged ) );
+    public object Value
+    {
+      get
+      {
+        return ( object )GetValue( ValueProperty );
+      }
+      set
+      {
+        SetValue( ValueProperty, value );
+      }
+    }
+
+    private static void OnValueChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      MaskedTextBox maskedTextBox = o as MaskedTextBox;
+      if( maskedTextBox != null )
+        maskedTextBox.OnValueChanged( ( object )e.OldValue, ( object )e.NewValue );
+    }
+
+    protected virtual void OnValueChanged( object oldValue, object newValue )
+    {
+      if( _isInitialized )
+        SyncTextAndValueProperties( MaskedTextBox.ValueProperty, newValue );
+
+      RoutedPropertyChangedEventArgs<object> args = new RoutedPropertyChangedEventArgs<object>( oldValue, newValue );
+      args.RoutedEvent = MaskedTextBox.ValueChangedEvent;
+      RaiseEvent( args );
+    }
+
+    #endregion //Value
+
+    #region ValueType
+
+    public static readonly DependencyProperty ValueTypeProperty = DependencyProperty.Register( "ValueType", typeof( Type ), typeof( MaskedTextBox ), new UIPropertyMetadata( typeof( String ), OnValueTypeChanged ) );
+    public Type ValueType
+    {
+      get
+      {
+        return ( Type )GetValue( ValueTypeProperty );
+      }
+      set
+      {
+        SetValue( ValueTypeProperty, value );
+      }
+    }
+
+    private static void OnValueTypeChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      MaskedTextBox maskedTextBox = o as MaskedTextBox;
+      if( maskedTextBox != null )
+        maskedTextBox.OnValueTypeChanged( ( Type )e.OldValue, ( Type )e.NewValue );
+    }
+
+    protected virtual void OnValueTypeChanged( Type oldValue, Type newValue )
+    {
+      if( _isInitialized )
+        SyncTextAndValueProperties( MaskedTextBox.TextProperty, Text );
+    }
+
+    #endregion //ValueType
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static MaskedTextBox()
+    {
+      TextProperty.OverrideMetadata( typeof( MaskedTextBox ), new FrameworkPropertyMetadata( OnTextChanged ) );
+    }
+
+    public MaskedTextBox()
+    {
+      CommandBindings.Add( new CommandBinding( ApplicationCommands.Paste, Paste ) ); //handle paste
+      CommandBindings.Add( new CommandBinding( ApplicationCommands.Cut, null, CanCut ) ); //surpress cut
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+
+      ResolveMaskProvider( Mask );
+      UpdateText( 0 );
+    }
+
+    protected override void OnInitialized( EventArgs e )
+    {
+      base.OnInitialized( e );
+
+      if( !_isInitialized )
+      {
+        _isInitialized = true;
+        SyncTextAndValueProperties( ValueProperty, Value );
+      }
+    }
+
+    protected override void OnGotKeyboardFocus( KeyboardFocusChangedEventArgs e )
+    {
+      if( SelectAllOnGotFocus )
+      {
+        SelectAll();
+      }
+
+      base.OnGotKeyboardFocus( e );
+    }
+
+    protected override void OnPreviewKeyDown( KeyEventArgs e )
+    {
+      if( !e.Handled )
+      {
+        HandlePreviewKeyDown( e );
+      }
+
+      base.OnPreviewKeyDown( e );
+    }
+
+    protected override void OnPreviewTextInput( TextCompositionEventArgs e )
+    {
+      if( !e.Handled )
+      {
+        HandlePreviewTextInput( e );
+      }
+
+      base.OnPreviewTextInput( e );
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Events
+
+    public static readonly RoutedEvent ValueChangedEvent = EventManager.RegisterRoutedEvent( "ValueChanged", RoutingStrategy.Bubble, typeof( RoutedPropertyChangedEventHandler<object> ), typeof( MaskedTextBox ) );
+    public event RoutedPropertyChangedEventHandler<object> ValueChanged
+    {
+      add
+      {
+        AddHandler( ValueChangedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( ValueChangedEvent, value );
+      }
+    }
+
+    #endregion //Events
+
+    #region Methods
+
+    #region Private
+
+    private void UpdateText()
+    {
+      UpdateText( SelectionStart );
+    }
+
+    private void UpdateText( int position )
+    {
+      MaskedTextProvider provider = MaskProvider;
+      if( provider == null )
+        throw new InvalidOperationException();
+
+      Text = provider.ToDisplayString();
+      SelectionLength = 0;
+      SelectionStart = position;
+    }
+
+    private int GetNextCharacterPosition( int startPosition )
+    {
+      int position = MaskProvider.FindEditPositionFrom( startPosition, true );
+      return position == -1 ? startPosition : position;
+    }
+
+    private void ResolveMaskProvider( string mask )
+    {
+      //do not create a mask provider if the Mask is empty, which can occur if the IncludePrompt and IncludeLiterals properties
+      //are set prior to the Mask.
+      if( String.IsNullOrEmpty( mask ) )
+        return;
+
+      MaskProvider = new MaskedTextProvider( mask )
+      {
+        IncludePrompt = this.IncludePrompt,
+        IncludeLiterals = this.IncludeLiterals,
+        PromptChar = this.PromptChar,
+        ResetOnSpace = false //should make this a property
+      };
+    }
+
+    private object ConvertTextToValue( string text )
+    {
+      object convertedValue = null;
+
+      Type dataType = ValueType;
+
+      string valueToConvert = MaskProvider.ToString().Trim();
+
+      try
+      {
+        if( valueToConvert.GetType() == dataType || dataType.IsInstanceOfType( valueToConvert ) )
+        {
+          convertedValue = valueToConvert;
+        }
+#if !VS2008
+        else if( String.IsNullOrWhiteSpace( valueToConvert ) )
+        {
+          convertedValue = Activator.CreateInstance( dataType );
+        }
+#else
+        else if ( String.IsNullOrEmpty( valueToConvert ) )
+        {
+          convertedValue = Activator.CreateInstance( dataType );
+        }
+#endif
+        else if( null == convertedValue && valueToConvert is IConvertible )
+        {
+          convertedValue = Convert.ChangeType( valueToConvert, dataType );
+        }
+      }
+      catch
+      {
+        //if an excpetion occurs revert back to original value
+        _convertExceptionOccurred = true;
+        return Value;
+      }
+
+      return convertedValue;
+    }
+
+    private string ConvertValueToText( object value )
+    {
+      if( value == null )
+        value = string.Empty;
+
+      if( _convertExceptionOccurred )
+      {
+        value = Value;
+        _convertExceptionOccurred = false;
+      }
+
+      //I have only seen this occur while in Blend, but we need it here so the Blend designer doesn't crash.
+      if( MaskProvider == null )
+        return value.ToString();
+
+      MaskProvider.Set( value.ToString() );
+      return MaskProvider.ToDisplayString();
+    }
+
+    private void SyncTextAndValueProperties( DependencyProperty p, object newValue )
+    {
+      //prevents recursive syncing properties
+      if( _isSyncingTextAndValueProperties )
+        return;
+
+      _isSyncingTextAndValueProperties = true;
+
+      //this only occures when the user typed in the value
+      if( MaskedTextBox.TextProperty == p )
+      {
+        if( newValue != null )
+          SetValue( MaskedTextBox.ValueProperty, ConvertTextToValue( newValue.ToString() ) );
+      }
+
+      SetValue( MaskedTextBox.TextProperty, ConvertValueToText( newValue ) );
+
+      _isSyncingTextAndValueProperties = false;
+    }
+
+    private void HandlePreviewTextInput( TextCompositionEventArgs e )
+    {
+      if( !IsReadOnly )
+      {
+        this.InsertText( e.Text );
+      }
+
+      e.Handled = true;
+    }
+
+    private void HandlePreviewKeyDown( KeyEventArgs e )
+    {
+      if( e.Key == Key.Delete )
+      {
+        e.Handled = IsReadOnly
+                 || HandleKeyDownDelete();
+      }
+      else if( e.Key == Key.Back )
+      {
+        e.Handled = IsReadOnly
+                 || HandleKeyDownBack();
+      }
+      else if( e.Key == Key.Space )
+      {
+        if( !IsReadOnly )
+        {
+          InsertText( " " );
+        }
+
+        e.Handled = true;
+      }
+      else if( e.Key == Key.Return || e.Key == Key.Enter )
+      {
+        if( !IsReadOnly && AcceptsReturn )
+        {
+          this.InsertText( "\r" );
+        }
+
+        // We don't want the OnPreviewTextInput to be triggered for the Return/Enter key
+        // when it is not accepted.
+        e.Handled = true;
+      }
+      else if( e.Key == Key.Escape )
+      {
+        // We don't want the OnPreviewTextInput to be triggered at all for the Escape key.
+        e.Handled = true;
+      }
+      else if( e.Key == Key.Tab )
+      {
+        if( AcceptsTab )
+        {
+          if( !IsReadOnly )
+          {
+            this.InsertText( "\t" );
+          }
+
+          e.Handled = true;
+        }
+      }
+    }
+
+    private bool HandleKeyDownDelete()
+    {
+      ModifierKeys modifiers = Keyboard.Modifiers;
+      bool handled = true;
+
+      if( modifiers == ModifierKeys.None )
+      {
+        if( !RemoveSelectedText() )
+        {
+          int position = SelectionStart;
+
+          if( position < Text.Length )
+          {
+            RemoveText( position, 1 );
+            UpdateText( position );
+          }
+        }
+        else
+        {
+          UpdateText();
+        }
+      }
+      else if( modifiers == ModifierKeys.Control )
+      {
+        if( !RemoveSelectedText() )
+        {
+          int position = SelectionStart;
+
+          RemoveTextToEnd( position );
+          UpdateText( position );
+        }
+        else
+        {
+          UpdateText();
+        }
+      }
+      else if( modifiers == ModifierKeys.Shift )
+      {
+        if( RemoveSelectedText() )
+        {
+          UpdateText();
+        }
+        else
+        {
+          handled = false;
+        }
+      }
+      else
+      {
+        handled = false;
+      }
+
+      return handled;
+    }
+
+    private bool HandleKeyDownBack()
+    {
+      ModifierKeys modifiers = Keyboard.Modifiers;
+      bool handled = true;
+
+      if( modifiers == ModifierKeys.None || modifiers == ModifierKeys.Shift )
+      {
+        if( !RemoveSelectedText() )
+        {
+          int position = SelectionStart;
+
+          if( position > 0 )
+          {
+            int newPosition = position - 1;
+
+            RemoveText( newPosition, 1 );
+            UpdateText( newPosition );
+          }
+        }
+        else
+        {
+          UpdateText();
+        }
+      }
+      else if( modifiers == ModifierKeys.Control )
+      {
+        if( !RemoveSelectedText() )
+        {
+          RemoveTextFromStart( SelectionStart );
+          UpdateText( 0 );
+        }
+        else
+        {
+          UpdateText();
+        }
+      }
+      else
+      {
+        handled = false;
+      }
+
+      return handled;
+    }
+
+    private void InsertText( string text )
+    {
+      int position = SelectionStart;
+      MaskedTextProvider provider = MaskProvider;
+
+      bool textRemoved = this.RemoveSelectedText();
+
+      position = GetNextCharacterPosition( position );
+
+      if( !textRemoved && Keyboard.IsKeyToggled( Key.Insert ) )
+      {
+        if( provider.Replace( text, position ) )
+        {
+          position += text.Length;
+        }
+      }
+      else
+      {
+        if( provider.InsertAt( text, position ) )
+        {
+          position += text.Length;
+        }
+      }
+
+      position = GetNextCharacterPosition( position );
+
+      this.UpdateText( position );
+    }
+
+    private void RemoveTextFromStart( int endPosition )
+    {
+      RemoveText( 0, endPosition );
+    }
+
+    private void RemoveTextToEnd( int startPosition )
+    {
+      RemoveText( startPosition, Text.Length - startPosition );
+    }
+
+    private void RemoveText( int position, int length )
+    {
+      if( length == 0 )
+        return;
+
+      MaskProvider.RemoveAt( position, position + length - 1 );
+    }
+
+    private bool RemoveSelectedText()
+    {
+      int length = SelectionLength;
+
+      if( length == 0 )
+        return false;
+
+      int position = SelectionStart;
+
+      return MaskProvider.RemoveAt( position, position + length - 1 );
+    }
+
+    #endregion //Private
+
+    #endregion //Methods
+
+    #region Commands
+
+    private void Paste( object sender, RoutedEventArgs e )
+    {
+      if( IsReadOnly )
+        return;
+
+      object data = Clipboard.GetData( DataFormats.Text );
+      if( data != null )
+      {
+        string text = data.ToString().Trim();
+        if( text.Length > 0 )
+        {
+          int position = SelectionStart;
+
+          MaskProvider.Set( text );
+
+          UpdateText( position );
+        }
+      }
+    }
+
+    private void CanCut( object sender, CanExecuteRoutedEventArgs e )
+    {
+      e.CanExecute = false;
+      e.Handled = true;
+    }
+
+    #endregion //Commands
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Icons/Error48.png b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Icons/Error48.png
new file mode 100644
index 00000000..4304d43b
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Icons/Error48.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Icons/Information48.png b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Icons/Information48.png
new file mode 100644
index 00000000..35075187
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Icons/Information48.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Icons/Question48.png b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Icons/Question48.png
new file mode 100644
index 00000000..dad7dd09
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Icons/Question48.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Icons/Warning48.png b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Icons/Warning48.png
new file mode 100644
index 00000000..ecb7fe86
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Icons/Warning48.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Implementation/MessageBox.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Implementation/MessageBox.cs
new file mode 100644
index 00000000..bd3b58e4
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Implementation/MessageBox.cs
@@ -0,0 +1,720 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Media;
+
+namespace Xceed.Wpf.Toolkit
+{
+  [TemplateVisualState( Name = VisualStates.OK, GroupName = VisualStates.MessageBoxButtonsGroup )]
+  [TemplateVisualState( Name = VisualStates.OKCancel, GroupName = VisualStates.MessageBoxButtonsGroup )]
+  [TemplateVisualState( Name = VisualStates.YesNo, GroupName = VisualStates.MessageBoxButtonsGroup )]
+  [TemplateVisualState( Name = VisualStates.YesNoCancel, GroupName = VisualStates.MessageBoxButtonsGroup )]
+  [TemplatePart( Name = PART_DragWidget, Type = typeof( Thumb ) )]
+  [TemplatePart( Name = PART_CancelButton, Type = typeof( Button ) )]
+  [TemplatePart( Name = PART_NoButton, Type = typeof( Button ) )]
+  [TemplatePart( Name = PART_OkButton, Type = typeof( Button ) )]
+  [TemplatePart( Name = PART_YesButton, Type = typeof( Button ) )]
+  public class MessageBox : Control
+  {
+    private const string PART_DragWidget = "PART_DragWidget";
+    private const string PART_CancelButton = "PART_CancelButton";
+    private const string PART_NoButton = "PART_NoButton";
+    private const string PART_OkButton = "PART_OkButton";
+    private const string PART_YesButton = "PART_YesButton";
+    private const string PART_CloseButton = "PART_CloseButton";
+
+    #region Private Members
+
+    /// <summary>
+    /// Tracks the MessageBoxButon value passed into the InitializeContainer method
+    /// </summary>
+    private MessageBoxButton _button = MessageBoxButton.OK;
+
+    /// <summary>
+    /// Tracks the MessageBoxResult to set as the default and focused button
+    /// </summary>
+    private MessageBoxResult _defaultResult = MessageBoxResult.None;
+
+    /// <summary>
+    /// Tracks the owner of the MessageBox
+    /// </summary>
+    private Window _owner;
+
+    #endregion //Private Members
+
+    #region Constructors
+
+    static MessageBox()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( MessageBox ), new FrameworkPropertyMetadata( typeof( MessageBox ) ) );
+    }
+
+    internal MessageBox()
+    {
+      /*user cannot create instance */
+      AddHandler( ButtonBase.ClickEvent, new RoutedEventHandler( Button_Click ) );
+    }
+
+    #endregion //Constructors
+
+    #region Properties
+
+    #region Protected Properties
+
+    /// <summary>
+    /// A System.Windows.MessageBoxResult value that specifies which message box button was clicked by the user.
+    /// </summary>
+    protected MessageBoxResult MessageBoxResult = MessageBoxResult.None;
+
+    protected Window Container
+    {
+      get;
+      private set;
+    }
+    protected Thumb DragWidget
+    {
+      get;
+      private set;
+    }
+
+    #endregion //Protected Properties
+
+    #region Dependency Properties
+
+    public static readonly DependencyProperty CaptionProperty = DependencyProperty.Register( "Caption", typeof( string ), typeof( MessageBox ), new UIPropertyMetadata( String.Empty ) );
+    public string Caption
+    {
+      get
+      {
+        return ( string )GetValue( CaptionProperty );
+      }
+      set
+      {
+        SetValue( CaptionProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CaptionForegroundProperty = DependencyProperty.Register( "CaptionForeground", typeof( Brush ), typeof( MessageBox ), new UIPropertyMetadata( null ) );
+    public Brush CaptionForeground
+    {
+      get
+      {
+        return ( Brush )GetValue( CaptionForegroundProperty );
+      }
+      set
+      {
+        SetValue( CaptionForegroundProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CancelButtonContentProperty = DependencyProperty.Register( "CancelButtonContent", typeof( object ), typeof( MessageBox ), new UIPropertyMetadata( "Cancel" ) );
+    public object CancelButtonContent
+    {
+      get
+      {
+        return ( object )GetValue( CancelButtonContentProperty );
+      }
+      set
+      {
+        SetValue( CancelButtonContentProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CloseButtonStyleProperty = DependencyProperty.Register( "CloseButtonStyle", typeof( Style ), typeof( MessageBox ), new PropertyMetadata( null ) );
+    public Style CloseButtonStyle
+    {
+      get
+      {
+        return ( Style )GetValue( CloseButtonStyleProperty );
+      }
+      set
+      {
+        SetValue( CloseButtonStyleProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty ImageSourceProperty = DependencyProperty.Register( "ImageSource", typeof( ImageSource ), typeof( MessageBox ), new UIPropertyMetadata( default( ImageSource ) ) );
+    public ImageSource ImageSource
+    {
+      get
+      {
+        return ( ImageSource )GetValue( ImageSourceProperty );
+      }
+      set
+      {
+        SetValue( ImageSourceProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty NoButtonContentProperty = DependencyProperty.Register( "NoButtonContent", typeof( object ), typeof( MessageBox ), new UIPropertyMetadata( "No" ) );
+    public object NoButtonContent
+    {
+      get
+      {
+        return ( object )GetValue( NoButtonContentProperty );
+      }
+      set
+      {
+        SetValue( NoButtonContentProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty OkButtonContentProperty = DependencyProperty.Register( "OkButtonContent", typeof( object ), typeof( MessageBox ), new UIPropertyMetadata( "OK" ) );
+    public object OkButtonContent
+    {
+      get
+      {
+        return ( object )GetValue( OkButtonContentProperty );
+      }
+      set
+      {
+        SetValue( OkButtonContentProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty TextProperty = DependencyProperty.Register( "Text", typeof( string ), typeof( MessageBox ), new UIPropertyMetadata( String.Empty ) );
+    public string Text
+    {
+      get
+      {
+        return ( string )GetValue( TextProperty );
+      }
+      set
+      {
+        SetValue( TextProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty WindowBackgroundProperty = DependencyProperty.Register( "WindowBackground", typeof( Brush ), typeof( MessageBox ), new PropertyMetadata( null ) );
+    public Brush WindowBackground
+    {
+      get
+      {
+        return ( Brush )GetValue( WindowBackgroundProperty );
+      }
+      set
+      {
+        SetValue( WindowBackgroundProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty WindowBorderBrushProperty = DependencyProperty.Register( "WindowBorderBrush", typeof( Brush ), typeof( MessageBox ), new PropertyMetadata( null ) );
+    public Brush WindowBorderBrush
+    {
+      get
+      {
+        return ( Brush )GetValue( WindowBorderBrushProperty );
+      }
+      set
+      {
+        SetValue( WindowBorderBrushProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty WindowOpacityProperty = DependencyProperty.Register( "WindowOpacity", typeof( double ), typeof( MessageBox ), new PropertyMetadata( null ) );
+    public double WindowOpacity
+    {
+      get
+      {
+        return ( double )GetValue( WindowOpacityProperty );
+      }
+      set
+      {
+        SetValue( WindowOpacityProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty YesButtonContentProperty = DependencyProperty.Register( "YesButtonContent", typeof( object ), typeof( MessageBox ), new UIPropertyMetadata( "Yes" ) );
+    public object YesButtonContent
+    {
+      get
+      {
+        return ( object )GetValue( YesButtonContentProperty );
+      }
+      set
+      {
+        SetValue( YesButtonContentProperty, value );
+      }
+    }
+
+    #endregion //Dependency Properties
+
+    #endregion //Properties
+
+    #region Base Class Overrides
+
+    /// <summary>
+    /// Overrides the OnApplyTemplate method.
+    /// </summary>
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+
+      if( DragWidget != null )
+        DragWidget.DragDelta -= ( o, e ) => ProcessMove( e );
+
+      DragWidget = GetTemplateChild( PART_DragWidget ) as Thumb;
+
+      if( DragWidget != null )
+        DragWidget.DragDelta += ( o, e ) => ProcessMove( e );
+
+      ChangeVisualState( _button.ToString(), true );
+
+      SetDefaultResult();
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Methods
+
+    #region Public Static
+
+
+    /// <summary>
+    /// Displays a message box that has a message and that returns a result.
+    /// </summary>
+    /// <param name="messageText">A System.String that specifies the text to display.</param>
+    /// <param name="messageBoxStyle">A Style that will be applied to the MessageBox instance.</param>
+    /// <returns>A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user.</returns>
+    public static MessageBoxResult Show( string messageText )
+    {
+      return Show( messageText, string.Empty, MessageBoxButton.OK, (Style)null );
+    }
+
+    /// <summary>
+    /// Displays a message box that has a message and that returns a result.
+    /// </summary>
+    /// <param name="owner">A System.Windows.Window that represents the owner of the MessageBox</param>
+    /// <param name="messageText">A System.String that specifies the text to display.</param>
+    /// <param name="messageBoxStyle">A Style that will be applied to the MessageBox instance.</param>
+    /// <returns>A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user.</returns>
+    public static MessageBoxResult Show( Window owner, string messageText )
+    {
+      return Show( owner, messageText, string.Empty, MessageBoxButton.OK, (Style) null );
+    }
+
+    /// <summary>
+    /// Displays a message box that has a message and title bar caption; and that returns a result.
+    /// </summary>
+    /// <param name="messageText">A System.String that specifies the text to display.</param>
+    /// <param name="caption">A System.String that specifies the title bar caption to display.</param>
+    /// <param name="messageBoxStyle">A Style that will be applied to the MessageBox instance.</param>
+    /// <returns>A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user.</returns>
+    public static MessageBoxResult Show( string messageText, string caption )
+    {
+        return Show(messageText, caption, MessageBoxButton.OK, (Style)null);
+    }
+
+    public static MessageBoxResult Show( Window owner, string messageText, string caption )
+    {
+        return Show(owner, messageText, caption, (Style)null);
+    }
+
+    public static MessageBoxResult Show( Window owner, string messageText, string caption, Style messageBoxStyle )
+    {
+      return Show( owner, messageText, caption, MessageBoxButton.OK, messageBoxStyle );
+    }
+
+    public static MessageBoxResult Show( string messageText, string caption, MessageBoxButton button )
+    {
+        return Show(messageText, caption, button, (Style)null);
+    }
+
+    /// <summary>
+    /// Displays a message box that has a message and that returns a result.
+    /// </summary>
+    /// <param name="messageText">A System.String that specifies the text to display.</param>
+    /// <param name="caption">A System.String that specifies the title bar caption to display.</param>
+    /// <param name="button">A System.Windows.MessageBoxButton value that specifies which button or buttons to display.</param>
+    /// <param name="messageBoxStyle">A Style that will be applied to the MessageBox instance.</param>
+    /// <returns>A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user.</returns>
+    public static MessageBoxResult Show( string messageText, string caption, MessageBoxButton button, Style messageBoxStyle )
+    {
+      return ShowCore( null, messageText, caption, button, MessageBoxImage.None, MessageBoxResult.None, messageBoxStyle );
+    }
+
+
+    public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button )
+    {
+        return Show(owner, messageText, caption, button, (Style)null);
+    }
+
+    public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button, Style messageBoxStyle )
+    {
+      return ShowCore( owner, messageText, caption, button, MessageBoxImage.None, MessageBoxResult.None, messageBoxStyle );
+    }
+
+
+    public static MessageBoxResult Show( string messageText, string caption, MessageBoxButton button, MessageBoxImage icon )
+    {
+        return Show(messageText, caption, button, icon, (Style)null);
+    }
+
+    /// <summary>
+    /// Displays a message box that has a message and that returns a result.
+    /// </summary>
+    /// <param name="messageText">A System.String that specifies the text to display.</param>
+    /// <param name="caption">A System.String that specifies the title bar caption to display.</param>
+    /// <param name="button">A System.Windows.MessageBoxButton value that specifies which button or buttons to display.</param>
+    /// <param name="image"> A System.Windows.MessageBoxImage value that specifies the icon to display.</param>
+    /// <param name="messageBoxStyle">A Style that will be applied to the MessageBox instance.</param>
+    /// <returns>A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user.</returns>
+    public static MessageBoxResult Show( string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, Style messageBoxStyle )
+    {
+      return ShowCore( null, messageText, caption, button, icon, MessageBoxResult.None, messageBoxStyle );
+    }
+
+    public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon )
+    {
+        return Show(owner, messageText, caption, button, icon, (Style)null);
+    }
+
+    public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, Style messageBoxStyle )
+    {
+      return ShowCore( owner, messageText, caption, button, icon, MessageBoxResult.None, messageBoxStyle );
+    }
+
+
+    public static MessageBoxResult Show( string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult )
+    {
+        return Show(messageText, caption, button, icon, defaultResult, (Style)null);
+    }
+    /// <summary>
+    /// Displays a message box that has a message and that returns a result.
+    /// </summary>
+    /// <param name="messageText">A System.String that specifies the text to display.</param>
+    /// <param name="caption">A System.String that specifies the title bar caption to display.</param>
+    /// <param name="button">A System.Windows.MessageBoxButton value that specifies which button or buttons to display.</param>
+    /// <param name="image"> A System.Windows.MessageBoxImage value that specifies the icon to display.</param>
+    /// <param name="defaultResult">A System.Windows.MessageBoxResult value that specifies the default result of the MessageBox.</param>
+    /// <param name="messageBoxStyle">A Style that will be applied to the MessageBox instance.</param>
+    /// <returns>A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user.</returns>
+    public static MessageBoxResult Show( string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult, Style messageBoxStyle )
+    {
+      return ShowCore( null, messageText, caption, button, icon, defaultResult, messageBoxStyle );
+    }
+
+    public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult )
+    {
+        return Show(owner, messageText, caption, button, icon, defaultResult, (Style) null);
+    }
+
+
+    public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult, Style messageBoxStyle )
+    {
+      return ShowCore( owner, messageText, caption, button, icon, defaultResult, messageBoxStyle );
+    }
+
+    #endregion //Public Static
+
+    #region Protected
+
+    /// <summary>
+    /// Shows the container which contains the MessageBox.
+    /// </summary>
+    protected void Show()
+    {
+      Container.ShowDialog();
+    }
+
+    /// <summary>
+    /// Initializes the MessageBox.
+    /// </summary>
+    /// <param name="text">The text.</param>
+    /// <param name="caption">The caption.</param>
+    /// <param name="button">The button.</param>
+    /// <param name="image">The image.</param>
+    protected void InitializeMessageBox( Window owner, string text, string caption, MessageBoxButton button, MessageBoxImage image, MessageBoxResult defaultResult )
+    {
+      Text = text;
+      Caption = caption;
+      _button = button;
+      _defaultResult = defaultResult;
+      _owner = owner;
+      SetImageSource( image );
+      Container = CreateContainer();
+    }
+
+    /// <summary>
+    /// Changes the control's visual state(s).
+    /// </summary>
+    /// <param name="name">name of the state</param>
+    /// <param name="useTransitions">True if state transitions should be used.</param>
+    protected void ChangeVisualState( string name, bool useTransitions )
+    {
+      VisualStateManager.GoToState( this, name, useTransitions );
+    }
+
+    #endregion //Protected
+
+    #region Private
+
+    /// <summary>
+    /// Sets the button that represents the _defaultResult to the default button and gives it focus.
+    /// </summary>
+    private void SetDefaultResult()
+    {
+      var defaultButton = GetDefaultButtonFromDefaultResult();
+      if( defaultButton != null )
+      {
+        defaultButton.IsDefault = true;
+        defaultButton.Focus();
+      }
+    }
+
+    /// <summary>
+    /// Gets the default button from the _defaultResult.
+    /// </summary>
+    /// <returns>The default button that represents the defaultResult</returns>
+    private Button GetDefaultButtonFromDefaultResult()
+    {
+      Button defaultButton = null;
+      switch( _defaultResult )
+      {
+        case MessageBoxResult.Cancel:
+          defaultButton = GetMessageBoxButton( PART_CancelButton );
+          break;
+        case MessageBoxResult.No:
+          defaultButton = GetMessageBoxButton( PART_NoButton );
+          break;
+        case MessageBoxResult.OK:
+          defaultButton = GetMessageBoxButton( PART_OkButton );
+          break;
+        case MessageBoxResult.Yes:
+          defaultButton = GetMessageBoxButton( PART_YesButton );
+          break;
+        case MessageBoxResult.None:
+          defaultButton = GetDefaultButton();
+          break;
+      }
+      return defaultButton;
+    }
+
+    /// <summary>
+    /// Gets the default button.
+    /// </summary>
+    /// <remarks>Used when the _defaultResult is set to None</remarks>
+    /// <returns>The button to use as the default</returns>
+    private Button GetDefaultButton()
+    {
+      Button defaultButton = null;
+      switch( _button )
+      {
+        case MessageBoxButton.OK:
+        case MessageBoxButton.OKCancel:
+          defaultButton = GetMessageBoxButton( PART_OkButton );
+          break;
+        case MessageBoxButton.YesNo:
+        case MessageBoxButton.YesNoCancel:
+          defaultButton = GetMessageBoxButton( PART_YesButton );
+          break;
+      }
+      return defaultButton;
+    }
+
+    /// <summary>
+    /// Gets a message box button.
+    /// </summary>
+    /// <param name="name">The name of the button to get.</param>
+    /// <returns>The button</returns>
+    private Button GetMessageBoxButton( string name )
+    {
+      Button button = GetTemplateChild( name ) as Button;
+      return button;
+    }
+
+    /// <summary>
+    /// Shows the MessageBox.
+    /// </summary>
+    /// <param name="messageText">The message text.</param>
+    /// <param name="caption">The caption.</param>
+    /// <param name="button">The button.</param>
+    /// <param name="icon">The icon.</param>
+    /// <param name="defaultResult">The default result.</param>
+    /// <returns></returns>
+    private static MessageBoxResult ShowCore( Window owner, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult, Style messageBoxStyle )
+    {
+      MessageBox msgBox = new MessageBox();
+      msgBox.InitializeMessageBox( owner, messageText, caption, button, icon, defaultResult );
+
+      // Setting the style to null will inhibit any implicit styles      
+      if( messageBoxStyle != null )
+      {
+        msgBox.Style = messageBoxStyle;
+      }
+
+      msgBox.Show();
+      return msgBox.MessageBoxResult;
+    }
+
+    /// <summary>
+    /// Resolves the owner Window of the MessageBox.
+    /// </summary>
+    /// <returns>the owner Window</returns>
+    private static Window ResolveOwnerWindow()
+    {
+      Window owner = null;
+      if( Application.Current != null )
+      {
+        foreach( Window w in Application.Current.Windows )
+        {
+          if( w.IsActive )
+          {
+            owner = w;
+            break;
+          }
+        }
+      }
+      return owner;
+    }
+
+    /// <summary>
+    /// Sets the message image source.
+    /// </summary>
+    /// <param name="image">The image to show.</param>
+    private void SetImageSource( MessageBoxImage image )
+    {
+      String iconName = String.Empty;
+
+      switch( image )
+      {
+        case MessageBoxImage.Error:
+          {
+            iconName = "Error48.png";
+            break;
+          }
+        case MessageBoxImage.Information:
+          {
+            iconName = "Information48.png";
+            break;
+          }
+        case MessageBoxImage.Question:
+          {
+            iconName = "Question48.png";
+            break;
+          }
+        case MessageBoxImage.Warning:
+          {
+            iconName = "Warning48.png";
+            break;
+          }
+        case MessageBoxImage.None:
+        default:
+          {
+            return;
+          }
+      }
+
+      ImageSource = ( ImageSource )new ImageSourceConverter().ConvertFromString( String.Format( "pack://application:,,,/WPFToolkit.Extended;component/MessageBox/Icons/{0}", iconName ) );
+    }
+
+    /// <summary>
+    /// Creates the container which will host the MessageBox control.
+    /// </summary>
+    /// <returns></returns>
+    private Window CreateContainer()
+    {
+      var newWindow = new Window();
+      newWindow.AllowsTransparency = true;
+      newWindow.Background = Brushes.Transparent;
+      newWindow.Content = this;
+      newWindow.Owner = _owner ?? ResolveOwnerWindow();
+
+      if( newWindow.Owner != null )
+        newWindow.WindowStartupLocation = System.Windows.WindowStartupLocation.CenterOwner;
+      else
+        newWindow.WindowStartupLocation = System.Windows.WindowStartupLocation.CenterScreen;
+
+      newWindow.ShowInTaskbar = false;
+      newWindow.SizeToContent = System.Windows.SizeToContent.WidthAndHeight;
+      newWindow.ResizeMode = System.Windows.ResizeMode.NoResize;
+      newWindow.WindowStyle = System.Windows.WindowStyle.None;
+      return newWindow;
+    }
+
+    #endregion //Private
+
+    #endregion //Methods
+
+    #region Event Handlers
+
+    /// <summary>
+    /// Processes the move of a drag operation on the header.
+    /// </summary>
+    /// <param name="e">The <see cref="System.Windows.Controls.Primitives.DragDeltaEventArgs"/> instance containing the event data.</param>
+    private void ProcessMove( DragDeltaEventArgs e )
+    {
+      double left = 0.0;
+
+      if( FlowDirection == System.Windows.FlowDirection.RightToLeft )
+        left = Container.Left - e.HorizontalChange;
+      else
+        left = Container.Left + e.HorizontalChange;
+
+      Container.Left = left;
+      Container.Top = Container.Top + e.VerticalChange;
+    }
+
+    /// <summary>
+    /// Sets the MessageBoxResult according to the button pressed and then closes the MessageBox.
+    /// </summary>
+    /// <param name="sender">The source of the event.</param>
+    /// <param name="e">The <see cref="System.Windows.RoutedEventArgs"/> instance containing the event data.</param>
+    private void Button_Click( object sender, RoutedEventArgs e )
+    {
+      Button button = e.OriginalSource as Button;
+
+      if( button == null )
+        return;
+
+      switch( button.Name )
+      {
+        case PART_NoButton:
+          MessageBoxResult = MessageBoxResult.No;
+          break;
+        case PART_YesButton:
+          MessageBoxResult = MessageBoxResult.Yes;
+          break;
+        case PART_CloseButton:
+        case PART_CancelButton:
+          MessageBoxResult = MessageBoxResult.Cancel;
+          break;
+        case PART_OkButton:
+          MessageBoxResult = MessageBoxResult.OK;
+          break;
+      }
+
+      Close();
+    }
+
+    /// <summary>
+    /// Closes the MessageBox.
+    /// </summary>
+    private void Close()
+    {
+      Container.Close();
+    }
+
+    #endregion //Event Handlers
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Implementation/VisualStates.MessageBox.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Implementation/VisualStates.MessageBox.cs
new file mode 100644
index 00000000..f7ff3f15
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Implementation/VisualStates.MessageBox.cs
@@ -0,0 +1,30 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit
+{
+  internal static partial class VisualStates
+  {
+    public const string MessageBoxButtonsGroup = "MessageBoxButtonsGroup";
+    public const string OK = "OK";
+    public const string OKCancel = "OKCancel";
+    public const string YesNo = "YesNo";
+    public const string YesNoCancel = "YesNoCancel";
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Themes/Generic.xaml
new file mode 100644
index 00000000..9f38df83
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Themes/Generic.xaml
@@ -0,0 +1,330 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
+
+   <LinearGradientBrush x:Key="WindowDarkBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="WindowBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="0.479" Color="#FFf4f5f6" />
+            <GradientStop Offset="1" Color="#FFd0d6db" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="WindowButtonHoverBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFb5bdc8" />
+            <GradientStop Offset="0.370" Color="#FF8399a9" />
+            <GradientStop Offset="0.370" Color="#FF718597" />
+            <GradientStop Offset="0.906" Color="#FFb9c1ca" />
+            <GradientStop Offset="1" Color="#FFb9c1ca" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="WindowButtonPressedBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FF6b7c8d" />
+            <GradientStop Offset="0.370" Color="#FF4d606f" />
+            <GradientStop Offset="0.370" Color="#FF465460" />
+            <GradientStop Offset="0.906" Color="#FF262d33" />
+            <GradientStop Offset="1" Color="#FF262d33" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <Style x:Key="WindowCloseButtonStyle" TargetType="Button">
+      <Setter Property="Foreground" Value="#FF000000" />
+      <Setter Property="Padding" Value="3" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="Button">
+               <Grid>
+                  <VisualStateManager.VisualStateGroups>
+                     <VisualStateGroup x:Name="CommonStates">
+                        <VisualState x:Name="Normal" />
+                        <VisualState x:Name="MouseOver">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonHoverBrush}" />
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Pressed">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonPressedBrush}" />
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                     </VisualStateGroup>
+                  </VisualStateManager.VisualStateGroups>
+                  <Border x:Name="Background" CornerRadius="0,0,2,0" Background="{StaticResource WindowDarkBrush}">
+                     <Border Margin="1,0,1,1" BorderBrush="#59FFFFFF" BorderThickness="1" CornerRadius="0,0,1,0" />
+                  </Border>
+                  <ContentPresenter x:Name="contentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
+                  <Path x:Name="path"
+								Height="6"
+								Width="7"
+								Stretch="Fill"
+								Opacity="1"
+								Data="M 2,6 C2,6 3,6 3,6 3,6 3,5 3,5 3,5 4,5 4,5 4,5 4,6 4,6 4,6 5,6 5,6 5,6 7,6 7,6 7,6 7,5 7,5 7,5 6,5 6,5 6,5 6,4 6,4 6,4 5,4 5,4 5,4 5,2 5,2 5,2 6,2 6,2 6,2 6,1 6,1 6,1 7,1 7,1 7,1 7,0 7,0 7,0 5,0 5,0 5,0 4,0 4,0 4,0 4,1 4,1 4,1 3,1 3,1 3,1 3,0 3,0 3,0 2,0 2,0 2,0 0,0 0,0 0,0 0,1 0,1 0,1 1,1 1,1 1,1 1,2 1,2 1,2 2,2 2,2 2,2 2,4 2,4 2,4 1,4 1,4 1,4 1,5 1,5 1,5 0,5 0,5 0,5 0,6 0,6 0,6 2,6 2,6 z"
+								Fill="White"
+                        Margin="0,0,0,1"
+                        Visibility="Collapsed" />
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <!-- =============================================================================== -->
+   <!-- MessageBox                                                                      -->
+   <!-- =============================================================================== -->
+
+   <ControlTemplate x:Key="MessageBoxDragWidgetTemplate" TargetType="{x:Type Thumb}">
+      <Border Background="Transparent" />
+   </ControlTemplate>
+
+   <Style TargetType="{x:Type local:MessageBox}">
+      <Setter Property="Background" Value="#FFFFFFFF" />
+      <Setter Property="BorderBrush" Value="{StaticResource WindowDarkBrush}" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="CaptionForeground" Value="#FF000000" />
+      <Setter Property="CloseButtonStyle" Value="{StaticResource WindowCloseButtonStyle}" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="HorizontalAlignment" Value="Left" />
+      <Setter Property="HorizontalContentAlignment" Value="Left" />
+      <Setter Property="IsEnabled" Value="true" />
+      <Setter Property="MinWidth" Value="350" />
+      <Setter Property="MinHeight" Value="50" />
+      <Setter Property="MaxHeight" Value="250" />
+      <Setter Property="VerticalAlignment" Value="Top" />
+      <Setter Property="VerticalContentAlignment" Value="Top" />
+      <Setter Property="WindowBorderBrush" Value="{StaticResource WindowDarkBrush}" />
+      <Setter Property="WindowBackground" Value="{StaticResource WindowBackgroundBrush}" />
+      <Setter Property="WindowOpacity" Value="1.0" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:MessageBox}">
+               <Grid x:Name="Root">
+                  <VisualStateManager.VisualStateGroups>
+                     <VisualStateGroup x:Name="group1">
+                        <VisualState x:Name="OK">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_OkButton" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="OKCancel">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_OkButton" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_CancelButton" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="YesNo">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_YesButton" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_NoButton" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+
+                        <VisualState x:Name="YesNoCancel">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_YesButton" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_NoButton" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_CancelButton" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                     </VisualStateGroup>
+                  </VisualStateManager.VisualStateGroups>
+
+                  <!-- Borders -->
+                  <Grid  x:Name="MessageBoxWindowGrid">
+                     <Border BorderBrush="{TemplateBinding WindowBorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="5,5,0,0" Opacity="{TemplateBinding WindowOpacity}" />
+                     <Grid Margin="0" Background="{x:Null}">
+                        <Border x:Name="MessageBoxWindow" Margin="1,1,1,1" Background="{TemplateBinding WindowBackground}" CornerRadius="4,4,0,0" Opacity="{TemplateBinding WindowOpacity}" />
+                        <Border BorderBrush="White" BorderThickness="1" CornerRadius="4,4,0,0" Margin="1" Opacity="0.7" />
+                     </Grid>
+                  </Grid>
+
+                  <Grid>
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" MinHeight="26" />
+                        <RowDefinition />
+                     </Grid.RowDefinitions>
+
+                     <!-- Content Border -->
+                     <Grid Margin="6,0,6,6" x:Name="ContentGrid" Grid.Row="1">
+                        <Grid.RowDefinitions>
+                           <RowDefinition />
+                           <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <Border BorderBrush="#FFFFFFFF" BorderThickness="1" CornerRadius="1" />
+                        <Border Margin="1"  BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="0.1" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}">
+
+                           <Grid MinWidth="350">
+                              <Grid.RowDefinitions>
+                                 <RowDefinition />
+                                 <RowDefinition Height="Auto" />
+                              </Grid.RowDefinitions>
+
+                              <Grid Margin="24,16,24,22">
+                                 <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="*" />
+                                 </Grid.ColumnDefinitions>
+
+                                 <!-- Message Image -->
+                                 <Image x:Name="MessageBoxImage" VerticalAlignment="Top" SnapsToDevicePixels="True" Stretch="None"  Margin="-6,-1,10,-4" Source="{TemplateBinding ImageSource}" />
+
+                                 <!-- Message Text -->
+                                 <ScrollViewer Grid.Column="1" VerticalScrollBarVisibility="Auto">
+                                    <TextBlock x:Name="MessageText"
+                                               TextWrapping="Wrap"
+                                               VerticalAlignment="Center"
+                                               MaxWidth="450"
+                                               Text="{TemplateBinding Text}" 
+                                               FontFamily="{TemplateBinding FontFamily}"
+                                               FontSize="{TemplateBinding FontSize}"
+                                               FontStyle="{TemplateBinding FontStyle}"
+                                               FontWeight="{TemplateBinding FontWeight}"
+                                               Foreground="{TemplateBinding Foreground}" />
+                                 </ScrollViewer>
+
+                              </Grid>
+
+                              <!-- Buttons -->
+                              <Grid Grid.Row="1" HorizontalAlignment="Right" Margin="12,0,12,12">
+                                 <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
+                                 </Grid.ColumnDefinitions>
+                                 <Button Grid.Column="0" x:Name="PART_YesButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding YesButtonContent}" />
+                                 <Button Grid.Column="1" x:Name="PART_NoButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding NoButtonContent}" />
+                                 <Button Grid.Column="2" x:Name="PART_OkButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding OkButtonContent}" />
+                                 <Button Grid.Column="3" x:Name="PART_CancelButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding CancelButtonContent}" IsCancel="True" />
+                              </Grid>
+                           </Grid>
+                        </Border>
+                     </Grid>
+
+                     <!-- Header -->
+                     <Border x:Name="HeaderArea" Background="Transparent" Grid.Column="1" CornerRadius="5,5,0,0" Margin="1,1,1,0">
+                        <Grid>
+                           <Grid x:Name="CaptionHeader"  Margin="1,1,105,0" VerticalAlignment="Center">
+                              <!-- Caption -->
+                              <ContentControl x:Name="Caption"
+                                              Margin="5,0,0,0"
+                                              IsTabStop="False"
+                                              HorizontalAlignment="Stretch"
+                                              Content="{TemplateBinding Caption}"
+                                              Foreground="{TemplateBinding CaptionForeground}" />
+                           </Grid>
+                           <Thumb x:Name="PART_DragWidget" Template="{StaticResource MessageBoxDragWidgetTemplate}" IsTabStop="False" />
+                        </Grid>
+                     </Border>
+
+                  </Grid>
+
+                  <Border x:Name="Resize" BorderThickness="7" BorderBrush="Transparent" />
+
+                  <!-- Close Button -->
+                  <Border BorderBrush="#A5FFFFFF" BorderThickness="1,0,1,1" CornerRadius="0,0,3,3" VerticalAlignment="Top" Margin="0,1,7,0" HorizontalAlignment="Right">
+                     <Button x:Name="PART_CloseButton" Style="{TemplateBinding CloseButtonStyle}" Height="17" Width="43" IsTabStop="False" IsCancel="True">
+                        <Path Height="10"
+                              HorizontalAlignment="Center"
+                              VerticalAlignment="Center"
+                              Width="12"
+                              Fill="#E4FFFFFF"
+                              Stretch="Fill"
+                              Stroke="#FF535666" 
+                              Data="M0.5,0.5 L4.5178828,0.5 L6.0620003,3.125 L7.4936447,0.5 L11.5,0.5 L11.5,1.5476431 L8.7425003,6.1201854 L11.5,10.359666 L11.5,11.5 L7.4941902,11.5 L6.0620003,8.8740005 L4.5172949,11.5 L0.5,11.5 L0.5,10.43379 L3.3059995,6.1201582 L0.5,1.4676378 L0.5,0.5 z" />
+                     </Button>
+                  </Border>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MultiLineTextEditor/Images/Notes16.png b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MultiLineTextEditor/Images/Notes16.png
new file mode 100644
index 00000000..ebfaee36
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MultiLineTextEditor/Images/Notes16.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs
new file mode 100644
index 00000000..3e99f507
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs
@@ -0,0 +1,245 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Input;
+
+namespace Xceed.Wpf.Toolkit
+{
+  [TemplatePart( Name = PART_ResizeThumb, Type = typeof( Thumb ) )]
+  public class MultiLineTextEditor : ContentControl
+  {
+    private const string PART_ResizeThumb = "PART_ResizeThumb";
+
+    #region Members
+
+    Thumb _resizeThumb;
+
+    #endregion //Members
+
+    #region Properties
+
+    public static readonly DependencyProperty DropDownHeightProperty = DependencyProperty.Register( "DropDownHeight", typeof( double ), typeof( MultiLineTextEditor ), new UIPropertyMetadata( 150.0 ) );
+    public double DropDownHeight
+    {
+      get
+      {
+        return ( double )GetValue( DropDownHeightProperty );
+      }
+      set
+      {
+        SetValue( DropDownHeightProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty DropDownWidthProperty = DependencyProperty.Register( "DropDownWidth", typeof( double ), typeof( MultiLineTextEditor ), new UIPropertyMetadata( 200.0 ) );
+    public double DropDownWidth
+    {
+      get
+      {
+        return ( double )GetValue( DropDownWidthProperty );
+      }
+      set
+      {
+        SetValue( DropDownWidthProperty, value );
+      }
+    }
+
+    #region IsOpen
+
+    public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register( "IsOpen", typeof( bool ), typeof( MultiLineTextEditor ), new UIPropertyMetadata( false, OnIsOpenChanged ) );
+    public bool IsOpen
+    {
+      get
+      {
+        return ( bool )GetValue( IsOpenProperty );
+      }
+      set
+      {
+        SetValue( IsOpenProperty, value );
+      }
+    }
+
+    private static void OnIsOpenChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      MultiLineTextEditor multiLineTextEditor = o as MultiLineTextEditor;
+      if( multiLineTextEditor != null )
+        multiLineTextEditor.OnIsOpenChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnIsOpenChanged( bool oldValue, bool newValue )
+    {
+
+    }
+
+    #endregion //IsOpen
+
+    public static readonly DependencyProperty IsSpellCheckEnabledProperty = DependencyProperty.Register( "IsSpellCheckEnabled", typeof( bool ), typeof( MultiLineTextEditor ), new UIPropertyMetadata( false ) );
+    public bool IsSpellCheckEnabled
+    {
+      get
+      {
+        return ( bool )GetValue( IsSpellCheckEnabledProperty );
+      }
+      set
+      {
+        SetValue( IsSpellCheckEnabledProperty, value );
+      }
+    }
+
+
+    #region Text
+
+    public static readonly DependencyProperty TextProperty = DependencyProperty.Register( "Text", typeof( string ), typeof( MultiLineTextEditor ), new FrameworkPropertyMetadata( String.Empty, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnTextChanged ) );
+    public string Text
+    {
+      get
+      {
+        return ( string )GetValue( TextProperty );
+      }
+      set
+      {
+        SetValue( TextProperty, value );
+      }
+    }
+
+    private static void OnTextChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      MultiLineTextEditor textEditor = o as MultiLineTextEditor;
+      if( textEditor != null )
+        textEditor.OnTextChanged( ( string )e.OldValue, ( string )e.NewValue );
+    }
+
+    protected virtual void OnTextChanged( string oldValue, string newValue )
+    {
+
+    }
+
+    #endregion //Text
+
+    public static readonly DependencyProperty TextAlignmentProperty = DependencyProperty.Register( "TextAlignment", typeof( TextAlignment ), typeof( MultiLineTextEditor ), new UIPropertyMetadata( TextAlignment.Left ) );
+    public TextAlignment TextAlignment
+    {
+      get
+      {
+        return ( TextAlignment )GetValue( TextAlignmentProperty );
+      }
+      set
+      {
+        SetValue( TextAlignmentProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty TextWrappingProperty = DependencyProperty.Register( "TextWrapping", typeof( TextWrapping ), typeof( MultiLineTextEditor ), new UIPropertyMetadata( TextWrapping.NoWrap ) );
+    public TextWrapping TextWrapping
+    {
+      get
+      {
+        return ( TextWrapping )GetValue( TextWrappingProperty );
+      }
+      set
+      {
+        SetValue( TextWrappingProperty, value );
+      }
+    }
+
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static MultiLineTextEditor()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( MultiLineTextEditor ), new FrameworkPropertyMetadata( typeof( MultiLineTextEditor ) ) );
+    }
+
+    public MultiLineTextEditor()
+    {
+      Keyboard.AddKeyDownHandler( this, OnKeyDown );
+      Mouse.AddPreviewMouseDownOutsideCapturedElementHandler( this, OnMouseDownOutsideCapturedElement );
+    }
+
+    #endregion //Constructors
+
+    #region Bass Class Overrides
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+
+      if( _resizeThumb != null )
+        _resizeThumb.DragDelta -= ResizeThumb_DragDelta;
+
+      _resizeThumb = GetTemplateChild( PART_ResizeThumb ) as Thumb;
+
+      if( _resizeThumb != null )
+        _resizeThumb.DragDelta += ResizeThumb_DragDelta;
+    }
+
+    #endregion //Bass Class Overrides
+
+    #region Event Handlers
+
+    private void OnKeyDown( object sender, KeyEventArgs e )
+    {
+      switch( e.Key )
+      {
+        case Key.Escape:
+        case Key.Tab:
+          {
+            CloseEditor();
+            break;
+          }
+      }
+    }
+
+    private void OnMouseDownOutsideCapturedElement( object sender, MouseButtonEventArgs e )
+    {
+      CloseEditor();
+    }
+
+    void ResizeThumb_DragDelta( object sender, DragDeltaEventArgs e )
+    {
+      double yadjust = DropDownHeight + e.VerticalChange;
+      double xadjust = DropDownWidth + e.HorizontalChange;
+
+      if( ( xadjust >= 0 ) && ( yadjust >= 0 ) )
+      {
+        DropDownWidth = xadjust;
+        DropDownHeight = yadjust;
+      }
+    }
+
+    #endregion //Event Handlers
+
+    #region Methods
+
+    private void CloseEditor()
+    {
+      if( IsOpen )
+        IsOpen = false;
+      ReleaseMouseCapture();
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MultiLineTextEditor/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MultiLineTextEditor/Themes/Generic.xaml
new file mode 100644
index 00000000..65d80b8d
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MultiLineTextEditor/Themes/Generic.xaml
@@ -0,0 +1,169 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
+
+   <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+
+   <Image x:Key="DefaultContent" x:Shared="False" Height="16" Width="18" Source="/WPFToolkit.Extended;component/MultiLineTextEditor/Images/Notes16.png" />
+
+   <LinearGradientBrush x:Key="PopupDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="1" Color="#FFE8EBED" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <Style x:Key="ToggleButtonStyle" TargetType="ToggleButton">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="ToggleButton">
+               <Grid SnapsToDevicePixels="True">
+
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                     </Grid.ColumnDefinitions>
+
+                     <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
+                        <ContentPresenter Content="{TemplateBinding Content}"
+                                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                                          ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                     </Border>
+
+                     <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                          Grid.Column="1"
+                                          CornerRadius="0,2.75,2.75,0"
+                                          RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:MultiLineTextEditor}}"
+                                          RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:MultiLineTextEditor}}"
+											         RenderMouseOver="{TemplateBinding IsMouseOver}"
+											         RenderPressed="{TemplateBinding IsPressed}">
+                        <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
+                           <Path x:Name="Arrow"  Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000" />
+                        </Grid>
+                     </chrome:ButtonChrome>
+                  </Grid>
+
+               </Grid>
+                <ControlTemplate.Triggers>
+                    <Trigger Property="IsEnabled" Value="False">
+                        <Setter Property="Fill" TargetName="Arrow" Value="#AFAFAF" />
+                        <Setter Property="Foreground" Value="Gray" />
+                    </Trigger>
+                </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style TargetType="{x:Type local:MultiLineTextEditor}">
+      <Setter Property="Background" Value="White"/>
+      <Setter Property="BorderBrush">
+         <Setter.Value>
+            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+               <GradientStop Color="#FFA3AEB9" Offset="0" />
+               <GradientStop Color="#FF8399A9" Offset="0.375" />
+               <GradientStop Color="#FF718597" Offset="0.375" />
+               <GradientStop Color="#FF617584" Offset="1" />
+            </LinearGradientBrush>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="BorderThickness" Value="1,1,0,1" />
+      <Setter Property="Content" Value="{StaticResource DefaultContent}" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Padding" Value="2,0,0,0" />
+      <Setter Property="HorizontalContentAlignment" Value="Center" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:MultiLineTextEditor}">
+               <Grid x:Name="Root">
+                  <ToggleButton x:Name="PART_DropDownButton"
+                                Grid.Column="1"
+                                IsTabStop="True"
+                                MinHeight="22"
+                                SnapsToDevicePixels="True"
+                                Background="{TemplateBinding Background}" 
+                                BorderBrush="{TemplateBinding BorderBrush}" 
+                                BorderThickness="{TemplateBinding BorderThickness}" 
+                                Padding="{TemplateBinding Padding}"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                                Style="{StaticResource ToggleButtonStyle}"
+                                IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                  <Popup IsOpen="{Binding IsChecked, ElementName=PART_DropDownButton}"
+                         StaysOpen="False"
+                         Placement="Bottom"
+                         SnapsToDevicePixels="True"
+                         AllowsTransparency="True"
+                         Focusable="False"
+                         PopupAnimation="Slide"
+                         Width="{TemplateBinding DropDownWidth}"
+                         Height="{TemplateBinding DropDownHeight}">
+                     <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}">
+                        <Grid>
+                           <TextBox x:Name="PART_TextBox"
+                                    AcceptsReturn="true"
+                                    TextWrapping="{TemplateBinding TextWrapping}"
+                                    Padding="{TemplateBinding Padding}"
+                                    VerticalScrollBarVisibility="Auto"
+                                    HorizontalScrollBarVisibility="Auto"
+                                    SpellCheck.IsEnabled="{TemplateBinding IsSpellCheckEnabled}"
+                                    Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
+                                    TextAlignment="{TemplateBinding TextAlignment}"
+                                    Margin="3" />
+                           <Thumb x:Name="PART_ResizeThumb" HorizontalAlignment="Right" VerticalAlignment="Bottom" Cursor="SizeNWSE">
+                              <Thumb.Template>
+                                 <ControlTemplate TargetType="{x:Type Thumb}">
+                                    <Grid Background="Transparent">
+                                       <Path Data="M0.5,6.5 L6.5,0.5 M6.5,3.5 L3.5,6.5" Stroke="Black" StrokeThickness="1" />
+                                    </Grid>
+                                 </ControlTemplate>
+                              </Thumb.Template>
+                           </Thumb>
+                        </Grid>
+                     </Border>
+                  </Popup>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Implementation/DecimalUpDown.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Implementation/DecimalUpDown.cs
new file mode 100644
index 00000000..75f7317f
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Implementation/DecimalUpDown.cs
@@ -0,0 +1,121 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class DecimalUpDown : NumericUpDown<decimal?>
+  {
+    #region Constructors
+
+    static DecimalUpDown()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( DecimalUpDown ), new FrameworkPropertyMetadata( typeof( DecimalUpDown ) ) );
+      DefaultValueProperty.OverrideMetadata( typeof( DecimalUpDown ), new FrameworkPropertyMetadata( default( decimal ) ) );
+      IncrementProperty.OverrideMetadata( typeof( DecimalUpDown ), new FrameworkPropertyMetadata( 1m ) );
+      MaximumProperty.OverrideMetadata( typeof( DecimalUpDown ), new FrameworkPropertyMetadata( decimal.MaxValue ) );
+      MinimumProperty.OverrideMetadata( typeof( DecimalUpDown ), new FrameworkPropertyMetadata( decimal.MinValue ) );
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    protected override decimal? CoerceValue( decimal? value )
+    {
+      if( value < Minimum )
+        return Minimum;
+      else if( value > Maximum )
+        return Maximum;
+      else
+        return value;
+    }
+
+    protected override void OnIncrement()
+    {
+      if( Value.HasValue )
+        Value += Increment;
+      else
+        Value = DefaultValue;
+    }
+
+    protected override void OnDecrement()
+    {
+      if( Value.HasValue )
+        Value -= Increment;
+      else
+        Value = DefaultValue;
+    }
+
+    protected override decimal? ConvertTextToValue( string text )
+    {
+      decimal? result = null;
+
+      if( String.IsNullOrEmpty( text ) )
+        return result;
+
+      try
+      {
+        result = FormatString.Contains( "P" ) ? ParsePercent( text, CultureInfo ) : ParseDecimal( text, CultureInfo );
+        result = CoerceValue( result );
+      }
+      catch
+      {
+        Text = ConvertValueToText();
+        return Value;
+      }
+
+      return result;
+    }
+
+    protected override string ConvertValueToText()
+    {
+      if( Value == null )
+        return string.Empty;
+
+      return Value.Value.ToString( FormatString, CultureInfo );
+    }
+
+    protected override void SetValidSpinDirection()
+    {
+      ValidSpinDirections validDirections = ValidSpinDirections.None;
+
+      if( Value < Maximum || !Value.HasValue )
+        validDirections = validDirections | ValidSpinDirections.Increase;
+
+      if( Value > Minimum || !Value.HasValue )
+        validDirections = validDirections | ValidSpinDirections.Decrease;
+
+      if( Spinner != null )
+        Spinner.ValidSpinDirection = validDirections;
+    }
+
+    protected override void ValidateValue( decimal? value )
+    {
+      if( value < Minimum )
+        Value = Minimum;
+      else if( value > Maximum )
+        Value = Maximum;
+    }
+
+    #endregion //Base Class Overrides
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Implementation/DoubleUpDown.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Implementation/DoubleUpDown.cs
new file mode 100644
index 00000000..228ed2e6
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Implementation/DoubleUpDown.cs
@@ -0,0 +1,121 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class DoubleUpDown : NumericUpDown<double?>
+  {
+    #region Constructors
+
+    static DoubleUpDown()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( DoubleUpDown ), new FrameworkPropertyMetadata( typeof( DoubleUpDown ) ) );
+      DefaultValueProperty.OverrideMetadata( typeof( DoubleUpDown ), new FrameworkPropertyMetadata( default( double ) ) );
+      IncrementProperty.OverrideMetadata( typeof( DoubleUpDown ), new FrameworkPropertyMetadata( 1d ) );
+      MaximumProperty.OverrideMetadata( typeof( DoubleUpDown ), new FrameworkPropertyMetadata( double.MaxValue ) );
+      MinimumProperty.OverrideMetadata( typeof( DoubleUpDown ), new FrameworkPropertyMetadata( double.MinValue ) );
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    protected override double? CoerceValue( double? value )
+    {
+      if( value < Minimum )
+        return Minimum;
+      else if( value > Maximum )
+        return Maximum;
+      else
+        return value;
+    }
+
+    protected override void OnIncrement()
+    {
+      if( Value.HasValue )
+        Value += Increment;
+      else
+        Value = DefaultValue;
+    }
+
+    protected override void OnDecrement()
+    {
+      if( Value.HasValue )
+        Value -= Increment;
+      else
+        Value = DefaultValue;
+    }
+
+    protected override double? ConvertTextToValue( string text )
+    {
+      double? result = null;
+
+      if( String.IsNullOrEmpty( text ) )
+        return result;
+
+      try
+      {
+        result = FormatString.Contains( "P" ) ? Decimal.ToDouble( ParsePercent( text, CultureInfo ) ) : ParseDouble( text, CultureInfo );
+        result = CoerceValue( result );
+      }
+      catch
+      {
+        Text = ConvertValueToText();
+        return Value;
+      }
+
+      return result;
+    }
+
+    protected override string ConvertValueToText()
+    {
+      if( Value == null )
+        return string.Empty;
+
+      return Value.Value.ToString( FormatString, CultureInfo );
+    }
+
+    protected override void SetValidSpinDirection()
+    {
+      ValidSpinDirections validDirections = ValidSpinDirections.None;
+
+      if( Value < Maximum || !Value.HasValue )
+        validDirections = validDirections | ValidSpinDirections.Increase;
+
+      if( Value > Minimum || !Value.HasValue )
+        validDirections = validDirections | ValidSpinDirections.Decrease;
+
+      if( Spinner != null )
+        Spinner.ValidSpinDirection = validDirections;
+    }
+
+    protected override void ValidateValue( double? value )
+    {
+      if( value < Minimum )
+        Value = Minimum;
+      else if( value > Maximum )
+        Value = Maximum;
+    }
+
+    #endregion //Base Class Overrides
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Implementation/IntegerUpDown.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Implementation/IntegerUpDown.cs
new file mode 100644
index 00000000..cc14d3fb
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Implementation/IntegerUpDown.cs
@@ -0,0 +1,122 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class IntegerUpDown : NumericUpDown<int?>
+  {
+    #region Constructors
+
+    static IntegerUpDown()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( IntegerUpDown ), new FrameworkPropertyMetadata( typeof( IntegerUpDown ) ) );
+      DefaultValueProperty.OverrideMetadata( typeof( IntegerUpDown ), new FrameworkPropertyMetadata( 0 ) );
+      IncrementProperty.OverrideMetadata( typeof( IntegerUpDown ), new FrameworkPropertyMetadata( 1 ) );
+      MaximumProperty.OverrideMetadata( typeof( IntegerUpDown ), new FrameworkPropertyMetadata( int.MaxValue ) );
+      MinimumProperty.OverrideMetadata( typeof( IntegerUpDown ), new FrameworkPropertyMetadata( int.MinValue ) );
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    protected override int? CoerceValue( int? value )
+    {
+      if( value < Minimum )
+        return Minimum;
+      else if( value > Maximum )
+        return Maximum;
+      else
+        return value;
+    }
+
+    protected override void OnIncrement()
+    {
+      if( Value.HasValue )
+        Value += Increment;
+      else
+        Value = DefaultValue;
+    }
+
+    protected override void OnDecrement()
+    {
+      if( Value.HasValue )
+        Value -= Increment;
+      else
+        Value = DefaultValue;
+    }
+
+    protected override int? ConvertTextToValue( string text )
+    {
+      int? result = null;
+
+      if( String.IsNullOrEmpty( text ) )
+        return result;
+
+      try
+      {
+        //don't know why someone would format an integer as %, but just in case they do.
+        result = FormatString.Contains( "P" ) ? Decimal.ToInt32( ParsePercent( text, CultureInfo ) ) : ParseInt( text, CultureInfo );
+        result = CoerceValue( result );
+      }
+      catch
+      {
+        Text = ConvertValueToText();
+        return Value;
+      }
+
+      return result;
+    }
+
+    protected override string ConvertValueToText()
+    {
+      if( Value == null )
+        return string.Empty;
+
+      return Value.Value.ToString( FormatString, CultureInfo );
+    }
+
+    protected override void SetValidSpinDirection()
+    {
+      ValidSpinDirections validDirections = ValidSpinDirections.None;
+
+      if( Value < Maximum || !Value.HasValue )
+        validDirections = validDirections | ValidSpinDirections.Increase;
+
+      if( Value > Minimum || !Value.HasValue )
+        validDirections = validDirections | ValidSpinDirections.Decrease;
+
+      if( Spinner != null )
+        Spinner.ValidSpinDirection = validDirections;
+    }
+
+    protected override void ValidateValue( int? value )
+    {
+      if( value < Minimum )
+        Value = Minimum;
+      else if( value > Maximum )
+        Value = Maximum;
+    }
+
+    #endregion //Base Class Overrides
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Implementation/NumericUpDown.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Implementation/NumericUpDown.cs
new file mode 100644
index 00000000..7a1d2506
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Implementation/NumericUpDown.cs
@@ -0,0 +1,203 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Globalization;
+using System.Windows;
+using Xceed.Wpf.Toolkit.Primitives;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public abstract class NumericUpDown<T> : UpDownBase<T>
+  {
+    #region Properties
+
+    #region DefaultValue
+
+    public static readonly DependencyProperty DefaultValueProperty = DependencyProperty.Register( "DefaultValue", typeof( T ), typeof( NumericUpDown<T> ), new UIPropertyMetadata( default( T ) ) );
+    public T DefaultValue
+    {
+      get
+      {
+        return ( T )GetValue( DefaultValueProperty );
+      }
+      set
+      {
+        SetValue( DefaultValueProperty, value );
+      }
+    }
+
+    #endregion //DefaultValue
+
+    #region FormatString
+
+    public static readonly DependencyProperty FormatStringProperty = DependencyProperty.Register( "FormatString", typeof( string ), typeof( NumericUpDown<T> ), new UIPropertyMetadata( String.Empty, OnFormatStringChanged ) );
+    public string FormatString
+    {
+      get
+      {
+        return ( string )GetValue( FormatStringProperty );
+      }
+      set
+      {
+        SetValue( FormatStringProperty, value );
+      }
+    }
+
+    private static void OnFormatStringChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      NumericUpDown<T> numericUpDown = o as NumericUpDown<T>;
+      if( numericUpDown != null )
+        numericUpDown.OnFormatStringChanged( ( string )e.OldValue, ( string )e.NewValue );
+    }
+
+    protected virtual void OnFormatStringChanged( string oldValue, string newValue )
+    {
+      if( IsInitialized )
+        Text = ConvertValueToText();
+    }
+
+    #endregion //FormatString
+
+    #region Increment
+
+    public static readonly DependencyProperty IncrementProperty = DependencyProperty.Register( "Increment", typeof( T ), typeof( NumericUpDown<T> ), new PropertyMetadata( default( T ) ) );
+    public T Increment
+    {
+      get
+      {
+        return ( T )GetValue( IncrementProperty );
+      }
+      set
+      {
+        SetValue( IncrementProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region Maximum
+
+    public static readonly DependencyProperty MaximumProperty = DependencyProperty.Register( "Maximum", typeof( T ), typeof( NumericUpDown<T> ), new UIPropertyMetadata( default( T ), OnMaximumChanged ) );
+    public T Maximum
+    {
+      get
+      {
+        return ( T )GetValue( MaximumProperty );
+      }
+      set
+      {
+        SetValue( MaximumProperty, value );
+      }
+    }
+
+    private static void OnMaximumChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      NumericUpDown<T> numericUpDown = o as NumericUpDown<T>;
+      if( numericUpDown != null )
+        numericUpDown.OnMaximumChanged( ( T )e.OldValue, ( T )e.NewValue );
+    }
+
+    protected virtual void OnMaximumChanged( T oldValue, T newValue )
+    {
+      SetValidSpinDirection();
+    }
+
+    #endregion //Maximum
+
+    #region Minimum
+
+    public static readonly DependencyProperty MinimumProperty = DependencyProperty.Register( "Minimum", typeof( T ), typeof( NumericUpDown<T> ), new UIPropertyMetadata( default( T ), OnMinimumChanged ) );
+    public T Minimum
+    {
+      get
+      {
+        return ( T )GetValue( MinimumProperty );
+      }
+      set
+      {
+        SetValue( MinimumProperty, value );
+      }
+    }
+
+    private static void OnMinimumChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      NumericUpDown<T> numericUpDown = o as NumericUpDown<T>;
+      if( numericUpDown != null )
+        numericUpDown.OnMinimumChanged( ( T )e.OldValue, ( T )e.NewValue );
+    }
+
+    protected virtual void OnMinimumChanged( T oldValue, T newValue )
+    {
+      SetValidSpinDirection();
+    }
+
+    #endregion //Minimum
+
+    #region SelectAllOnGotFocus
+
+    public static readonly DependencyProperty SelectAllOnGotFocusProperty = DependencyProperty.Register( "SelectAllOnGotFocus", typeof( bool ), typeof( NumericUpDown<T> ), new PropertyMetadata( false ) );
+    public bool SelectAllOnGotFocus
+    {
+      get
+      {
+        return ( bool )GetValue( SelectAllOnGotFocusProperty );
+      }
+      set
+      {
+        SetValue( SelectAllOnGotFocusProperty, value );
+      }
+    }
+
+    #endregion //SelectAllOnGotFocus
+
+    #endregion //Properties
+
+    #region Methods
+
+    protected static decimal ParseDecimal( string text, IFormatProvider cultureInfo )
+    {
+      return Decimal.Parse( text, NumberStyles.Any, cultureInfo );
+    }
+
+    protected static double ParseDouble( string text, IFormatProvider cultureInfo )
+    {
+      return Double.Parse( text, NumberStyles.Any, cultureInfo );
+    }
+
+    protected static int ParseInt( string text, IFormatProvider cultureInfo )
+    {
+      return Int32.Parse( text, NumberStyles.Any, cultureInfo );
+    }
+
+    protected static decimal ParsePercent( string text, IFormatProvider cultureInfo )
+    {
+      NumberFormatInfo info = NumberFormatInfo.GetInstance( cultureInfo );
+
+      text = text.Replace( info.PercentSymbol, null );
+
+      decimal result = Decimal.Parse( text, NumberStyles.Any, info );
+      result = result / 100;
+
+      return result;
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Themes/Generic.xaml
new file mode 100644
index 00000000..a267d4a7
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Themes/Generic.xaml
@@ -0,0 +1,108 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
+
+   <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+
+   <DataTemplate x:Key="DefaultWatermarkTemplate">
+      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
+   </DataTemplate>
+
+   <Style x:Key="NumericUpDown" TargetType="Control">
+      <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+      <Setter Property="HorizontalContentAlignment" Value="Right" />
+      <Setter Property="IsTabStop" Value="False" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="Control">
+               <local:ButtonSpinner x:Name="PART_Spinner"
+                                    IsTabStop="False"
+                                    Background="{TemplateBinding Background}"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                    AllowSpin="{Binding AllowSpin, RelativeSource={RelativeSource TemplatedParent}}"
+                                    ShowButtonSpinner="{Binding ShowButtonSpinner, RelativeSource={RelativeSource TemplatedParent}}">
+                  <local:WatermarkTextBox x:Name="PART_TextBox"
+                                          BorderThickness="0"
+                                          Background="{TemplateBinding Background}"
+                                          ContextMenu="{TemplateBinding ContextMenu}"
+                                          FontFamily="{TemplateBinding FontFamily}" 
+                                          FontSize="{TemplateBinding FontSize}" 
+                                          FontStretch="{TemplateBinding FontStretch}"
+                                          FontStyle="{TemplateBinding FontStyle}" 
+                                          FontWeight="{TemplateBinding FontWeight}" 
+                                          Foreground="{TemplateBinding Foreground}" 
+                                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
+                                          MinWidth="20"
+                                          AcceptsReturn="False"
+                                          Padding="0"
+                                          SelectAllOnGotFocus="{Binding SelectAllOnGotFocus, RelativeSource={RelativeSource TemplatedParent}}"
+                                          TextAlignment="{Binding TextAlignment, RelativeSource={RelativeSource TemplatedParent}}"
+                                          TextWrapping="NoWrap" 
+                                          TabIndex="{TemplateBinding TabIndex}"
+                                          Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}, UpdateSourceTrigger=PropertyChanged}"
+                                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          Watermark="{Binding Watermark, RelativeSource={RelativeSource TemplatedParent}}"
+                                          WatermarkTemplate="{Binding WatermarkTemplate, RelativeSource={RelativeSource TemplatedParent}}" />
+               </local:ButtonSpinner>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsEnabled" Value="False">
+                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <!-- =============================================================================== -->
+   <!-- DecimalUpDown                                                                   -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type local:DecimalUpDown}" BasedOn="{StaticResource NumericUpDown}">
+      <Setter Property="TextAlignment" Value="Right" />
+      <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+   </Style>
+
+   <!-- =============================================================================== -->
+   <!-- DoubleUpDown                                                                    -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type local:DoubleUpDown}" BasedOn="{StaticResource NumericUpDown}">
+      <Setter Property="TextAlignment" Value="Right" />
+      <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+   </Style>
+
+   <!-- =============================================================================== -->
+   <!-- IntegerUpDown                                                                   -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type local:IntegerUpDown}" BasedOn="{StaticResource NumericUpDown}">
+      <Setter Property="TextAlignment" Value="Right" />
+      <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Pie/Implementation/Pie.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Pie/Implementation/Pie.cs
new file mode 100644
index 00000000..7325395f
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Pie/Implementation/Pie.cs
@@ -0,0 +1,630 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections.Specialized;
+using System.Windows;
+using System.Windows.Media;
+using Xceed.Wpf.Toolkit.Primitives;
+using Xceed.Wpf.Toolkit.Core;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public sealed class Pie : ShapeBase
+  {
+    #region Constructors
+
+    static Pie()
+    {
+      // The default stretch mode of Pie is Fill
+      Pie.StretchProperty.OverrideMetadata( typeof( Pie ), new FrameworkPropertyMetadata( Stretch.Fill ) );
+      Pie.StrokeLineJoinProperty.OverrideMetadata( typeof( Pie ), new FrameworkPropertyMetadata( PenLineJoin.Round ) );
+    }
+
+    public Pie()
+      : base()
+    {
+    }
+
+    #endregion
+
+    #region EndAngle Property
+
+    public static readonly DependencyProperty EndAngleProperty =
+      DependencyProperty.Register( "EndAngle", typeof( double ), typeof( Pie ),
+        new FrameworkPropertyMetadata( 360d, FrameworkPropertyMetadataOptions.AffectsRender | FrameworkPropertyMetadataOptions.BindsTwoWayByDefault,
+          new PropertyChangedCallback( Pie.OnEndAngleChanged ), new CoerceValueCallback( Pie.CoerceEndAngleValue ) ) );
+
+    public double EndAngle
+    {
+      get
+      {
+        return ( double )this.GetValue( Pie.EndAngleProperty );
+      }
+      set
+      {
+        this.SetValue( Pie.EndAngleProperty, value );
+      }
+    }
+
+    private static void OnEndAngleChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( Pie )d ).OnEndAngleChanged( e );
+    }
+
+    private void OnEndAngleChanged( DependencyPropertyChangedEventArgs e )
+    {
+      // avoid re-entrancy
+      if( this.IsUpdatingEndAngle )
+        return;
+
+      if( !( this.IsUpdatingStartAngle || this.IsUpdatingSlice || this.IsUpdatingSweepDirection ) )
+      {
+        switch( this.Mode )
+        {
+          case PieMode.Slice:
+            throw new InvalidOperationException( ErrorMessages.GetMessage( "EndAngleCannotBeSetDirectlyInSlice" ) );
+        }
+      }
+
+      // EndAngle, Slice, and SweepDirection are interrelated and must be kept in sync
+      this.IsUpdatingEndAngle = true;
+      try
+      {
+        if( this.Mode == PieMode.EndAngle )
+        {
+          this.CoerceValue( Pie.SweepDirectionProperty );
+        }
+        this.CoerceValue( Pie.SliceProperty );
+      }
+      finally
+      {
+        this.IsUpdatingEndAngle = false;
+      }
+    }
+
+    private static object CoerceEndAngleValue( DependencyObject d, object value )
+    {
+      // keep EndAngle in sync with Slice and SweepDirection
+      Pie pie = ( Pie )d;
+      if( pie.IsUpdatingSlice || pie.IsUpdatingSweepDirection
+          || ( pie.IsUpdatingStartAngle && pie.Mode == PieMode.Slice ) )
+      {
+        double newValue = pie.StartAngle + ( ( pie.SweepDirection == SweepDirection.Clockwise ) ? 1.0 : -1.0 ) * pie.Slice * 360;
+        if( !DoubleHelper.AreVirtuallyEqual( ( double )value, newValue ) )
+        {
+          value = newValue;
+        }
+      }
+      return value;
+    }
+
+    #endregion
+
+    #region Mode Property
+
+    public static readonly DependencyProperty ModeProperty =
+      DependencyProperty.Register( "Mode", typeof( PieMode ), typeof( Pie ),
+        new FrameworkPropertyMetadata( PieMode.Manual, new PropertyChangedCallback( Pie.OnModeChanged ) ) );
+
+    public PieMode Mode
+    {
+      get
+      {
+        return ( PieMode )this.GetValue( Pie.ModeProperty );
+      }
+      set
+      {
+        this.SetValue( Pie.ModeProperty, value );
+      }
+    }
+
+    private static void OnModeChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( Pie )d ).OnModeChanged( e );
+    }
+
+    private void OnModeChanged( DependencyPropertyChangedEventArgs e )
+    {
+      // disallow reentrancy
+      if( this.IsUpdatingMode )
+        return;
+
+      this.IsUpdatingMode = true;
+      try
+      {
+        if( this.Mode == PieMode.EndAngle )
+        {
+          this.CoerceValue( Pie.SweepDirectionProperty );
+        }
+      }
+      finally
+      {
+        this.IsUpdatingMode = false;
+      }
+    }
+
+    #endregion
+
+    #region Slice Property
+
+    public static readonly DependencyProperty SliceProperty =
+      DependencyProperty.Register( "Slice", typeof( double ), typeof( Pie ),
+        new FrameworkPropertyMetadata( 1d, FrameworkPropertyMetadataOptions.AffectsRender | FrameworkPropertyMetadataOptions.BindsTwoWayByDefault,
+          new PropertyChangedCallback( Pie.OnSliceChanged ), new CoerceValueCallback( Pie.CoerceSliceValue ) ), new ValidateValueCallback( Pie.ValidateSlice ) );
+
+    public double Slice
+    {
+      get
+      {
+        return ( double )this.GetValue( Pie.SliceProperty );
+      }
+      set
+      {
+        this.SetValue( Pie.SliceProperty, value );
+      }
+    }
+
+    private static void OnSliceChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( Pie )d ).OnSliceChanged( e );
+    }
+
+    private void OnSliceChanged( DependencyPropertyChangedEventArgs e )
+    {
+      // avoid re-entrancy
+      if( this.IsUpdatingSlice )
+        return;
+
+      if( !( this.IsUpdatingStartAngle || this.IsUpdatingEndAngle || this.IsUpdatingSweepDirection ) )
+      {
+        if( this.Mode == PieMode.EndAngle )
+          throw new InvalidOperationException( ErrorMessages.GetMessage( "SliceCannotBeSetDirectlyInEndAngle" ) );
+      }
+
+      // EndAngle and Slice are interrelated and must be kept in sync
+      this.IsUpdatingSlice = true;
+      try
+      {
+        if( !( this.IsUpdatingStartAngle || this.IsUpdatingEndAngle || ( this.Mode == PieMode.Manual && this.IsUpdatingSweepDirection ) ) )
+        {
+          this.CoerceValue( Pie.EndAngleProperty );
+        }
+      }
+      finally
+      {
+        this.IsUpdatingSlice = false;
+      }
+    }
+
+    private static object CoerceSliceValue( DependencyObject d, object value )
+    {
+      // keep Slice in sync with EndAngle, StartAngle, and SweepDirection
+      Pie pie = ( Pie )d;
+      if( pie.IsUpdatingEndAngle || pie.IsUpdatingStartAngle || pie.IsUpdatingSweepDirection )
+      {
+
+        double slice = Math.Max( -360.0, Math.Min( 360.0, ( pie.EndAngle - pie.StartAngle ) ) ) / ( ( pie.SweepDirection == SweepDirection.Clockwise ) ? 360.0 : -360.0 );
+        double newValue = DoubleHelper.AreVirtuallyEqual( slice, 0 ) ? 0 : ( slice < 0 ) ? slice + 1 : slice;
+        if( !DoubleHelper.AreVirtuallyEqual( ( double )value, newValue ) )
+        {
+          value = newValue;
+        }
+      }
+      return value;
+    }
+
+    private static bool ValidateSlice( object value )
+    {
+      double newValue = ( double )value;
+      if( newValue < 0 || newValue > 1 || DoubleHelper.IsNaN( newValue ) )
+        throw new ArgumentException( ErrorMessages.GetMessage( "SliceOOR" ) );
+
+      return true;
+    }
+
+    #endregion
+
+    #region StartAngle Property
+
+    public static readonly DependencyProperty StartAngleProperty =
+      DependencyProperty.Register( "StartAngle", typeof( double ), typeof( Pie ),
+        new FrameworkPropertyMetadata( 360d, FrameworkPropertyMetadataOptions.AffectsRender | FrameworkPropertyMetadataOptions.BindsTwoWayByDefault,
+          new PropertyChangedCallback( Pie.OnStartAngleChanged ) ) );
+
+    public double StartAngle
+    {
+      get
+      {
+        return ( double )this.GetValue( Pie.StartAngleProperty );
+      }
+      set
+      {
+        this.SetValue( Pie.StartAngleProperty, value );
+      }
+    }
+
+    private static void OnStartAngleChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( Pie )d ).OnStartAngleChanged( e );
+    }
+
+    private void OnStartAngleChanged( DependencyPropertyChangedEventArgs e )
+    {
+      // avoid re-entrancy
+      if( this.IsUpdatingStartAngle )
+        return;
+
+      // StartAngle, Slice, and SweepDirection are interrelated and must be kept in sync
+      this.IsUpdatingStartAngle = true;
+      try
+      {
+        switch( Mode )
+        {
+          case PieMode.Manual:
+            this.CoerceValue( Pie.SliceProperty );
+            break;
+
+          case PieMode.EndAngle:
+            this.CoerceValue( Pie.SweepDirectionProperty );
+            this.CoerceValue( Pie.SliceProperty );
+            break;
+
+          case PieMode.Slice:
+            this.CoerceValue( Pie.EndAngleProperty );
+            break;
+        }
+      }
+      finally
+      {
+        this.IsUpdatingStartAngle = false;
+      }
+    }
+
+    #endregion
+
+    #region SweepDirection Property
+
+    public static readonly DependencyProperty SweepDirectionProperty =
+      DependencyProperty.Register( "SweepDirection", typeof( SweepDirection ), typeof( Pie ),
+        new FrameworkPropertyMetadata( ( SweepDirection )SweepDirection.Clockwise, FrameworkPropertyMetadataOptions.AffectsRender,
+          new PropertyChangedCallback( Pie.OnSweepDirectionChanged ), new CoerceValueCallback( Pie.CoerceSweepDirectionValue ) ) );
+
+    public SweepDirection SweepDirection
+    {
+      get
+      {
+        return ( SweepDirection )this.GetValue( Pie.SweepDirectionProperty );
+      }
+      set
+      {
+        this.SetValue( Pie.SweepDirectionProperty, value );
+      }
+    }
+
+    private static void OnSweepDirectionChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( Pie )d ).OnSweepDirectionChanged( e );
+    }
+
+    private void OnSweepDirectionChanged( DependencyPropertyChangedEventArgs e )
+    {
+      // avoid re-entrancy
+      if( this.IsUpdatingSweepDirection )
+        return;
+
+      // EndAngle, Slice, and SweepDirection are interrelated and must be kept in sync
+      this.IsUpdatingSweepDirection = true;
+      try
+      {
+        switch( Mode )
+        {
+          case PieMode.Slice:
+            this.CoerceValue( Pie.EndAngleProperty );
+            break;
+
+          default:
+            this.CoerceValue( Pie.SliceProperty );
+            break;
+        }
+      }
+      finally
+      {
+        this.IsUpdatingSweepDirection = false;
+      }
+    }
+
+    private static object CoerceSweepDirectionValue( DependencyObject d, object value )
+    {
+      // keep SweepDirection in sync with EndAngle and StartAngle
+      Pie pie = ( Pie )d;
+      if( pie.IsUpdatingEndAngle || pie.IsUpdatingStartAngle || pie.IsUpdatingMode )
+      {
+        if( DoubleHelper.AreVirtuallyEqual( pie.StartAngle, pie.EndAngle ) )
+        {
+          // if the values are equal, use previously coerced value
+          value = pie.SweepDirection;
+        }
+        else
+        {
+          value = ( pie.EndAngle < pie.StartAngle ) ? SweepDirection.Counterclockwise : SweepDirection.Clockwise;
+        }
+      }
+      return value;
+    }
+
+    #endregion
+
+    #region GeometryTransform Property
+
+    public override Transform GeometryTransform
+    {
+      get
+      {
+        return Transform.Identity;
+      }
+    }
+
+    #endregion
+
+    #region RenderedGeometry Property
+
+    public override Geometry RenderedGeometry
+    {
+      get
+      {
+        // for a Pie, the RenderedGeometry is the same as the DefiningGeometry
+        return this.DefiningGeometry;
+      }
+    }
+
+    #endregion
+
+    #region DefiningGeometry Protected Property
+
+    protected override Geometry DefiningGeometry
+    {
+      get
+      {
+        double slice = Slice;
+        if( _rect.IsEmpty || slice <= 0 )
+          return Geometry.Empty;
+
+        if( slice >= 1 )
+          return new EllipseGeometry( _rect );
+
+        // direction of flow is determined by the SweepDirection property
+        double directionalFactor = ( this.SweepDirection == SweepDirection.Clockwise ) ? 1.0 : -1.0;
+        double startAngle = StartAngle;
+
+        Point pointA = EllipseHelper.PointOfRadialIntersection( _rect, startAngle );
+        Point pointB = EllipseHelper.PointOfRadialIntersection( _rect, startAngle + directionalFactor * slice * 360 );
+        PathSegmentCollection segments = new PathSegmentCollection();
+        segments.Add( new LineSegment( pointA, true ) );
+        ArcSegment arc = new ArcSegment();
+        arc.Point = pointB;
+        arc.Size = new Size( _rect.Width / 2, _rect.Height / 2 );
+        arc.IsLargeArc = slice > 0.5;
+        arc.SweepDirection = SweepDirection;
+        segments.Add( arc );
+        PathFigureCollection figures = new PathFigureCollection();
+        figures.Add( new PathFigure( RectHelper.Center( _rect ), segments, true ) );
+        return new PathGeometry( figures );
+      }
+    }
+
+    #endregion
+
+    #region IsUpdatingEndAngle Private Property
+
+    private bool IsUpdatingEndAngle
+    {
+      get
+      {
+        return _cacheBits[ ( int )CacheBits.IsUpdatingEndAngle ];
+      }
+      set
+      {
+        _cacheBits[ ( int )CacheBits.IsUpdatingEndAngle ] = value;
+      }
+    }
+
+    #endregion
+
+    #region IsUpdatingMode Private Property
+
+    private bool IsUpdatingMode
+    {
+      get
+      {
+        return _cacheBits[ ( int )CacheBits.IsUpdatingMode ];
+      }
+      set
+      {
+        _cacheBits[ ( int )CacheBits.IsUpdatingMode ] = value;
+      }
+    }
+
+    #endregion
+
+    #region IsUpdatingSlice Private Property
+
+    private bool IsUpdatingSlice
+    {
+      get
+      {
+        return _cacheBits[ ( int )CacheBits.IsUpdatingSlice ];
+      }
+      set
+      {
+        _cacheBits[ ( int )CacheBits.IsUpdatingSlice ] = value;
+      }
+    }
+
+    #endregion
+
+    #region IsUpdatingStartAngle Private Property
+
+    private bool IsUpdatingStartAngle
+    {
+      get
+      {
+        return _cacheBits[ ( int )CacheBits.IsUpdatingStartAngle ];
+      }
+      set
+      {
+        _cacheBits[ ( int )CacheBits.IsUpdatingStartAngle ] = value;
+      }
+    }
+
+    #endregion
+
+    #region IsUpdatingSweepDirection Private Property
+
+    private bool IsUpdatingSweepDirection
+    {
+      get
+      {
+        return _cacheBits[ ( int )CacheBits.IsUpdatingSweepDirection ];
+      }
+      set
+      {
+        _cacheBits[ ( int )CacheBits.IsUpdatingSweepDirection ] = value;
+      }
+    }
+
+    #endregion
+
+    internal override Size GetNaturalSize()
+    {
+      double strokeThickness = this.GetStrokeThickness();
+      return new Size( strokeThickness, strokeThickness );
+    }
+
+    internal override Rect GetDefiningGeometryBounds()
+    {
+      return _rect;
+    }
+
+    protected override Size ArrangeOverride( Size finalSize )
+    {
+      double penThickness = this.GetStrokeThickness();
+      double margin = penThickness / 2;
+
+      _rect = new Rect( margin, margin,
+          Math.Max( 0, finalSize.Width - penThickness ),
+          Math.Max( 0, finalSize.Height - penThickness ) );
+
+      switch( Stretch )
+      {
+        case Stretch.None:
+          // empty rectangle
+          _rect.Width = _rect.Height = 0;
+          break;
+
+        case Stretch.Fill:
+          // already initialized for Fill
+          break;
+
+        case Stretch.Uniform:
+          // largest square that fits in the final size
+          if( _rect.Width > _rect.Height )
+          {
+            _rect.Width = _rect.Height;
+          }
+          else
+          {
+            _rect.Height = _rect.Width;
+          }
+          break;
+
+        case Stretch.UniformToFill:
+
+          // smallest square that fills the final size
+          if( _rect.Width < _rect.Height )
+          {
+            _rect.Width = _rect.Height;
+          }
+          else
+          {
+            _rect.Height = _rect.Width;
+          }
+          break;
+      }
+
+      return finalSize;
+    }
+
+    protected override Size MeasureOverride( Size constraint )
+    {
+      if( this.Stretch == Stretch.UniformToFill )
+      {
+        double width = constraint.Width;
+        double height = constraint.Height;
+
+        if( Double.IsInfinity( width ) && Double.IsInfinity( height ) )
+        {
+          return this.GetNaturalSize();
+        }
+        else if( Double.IsInfinity( width ) || Double.IsInfinity( height ) )
+        {
+          width = Math.Min( width, height );
+        }
+        else
+        {
+          width = Math.Max( width, height );
+        }
+
+        return new Size( width, width );
+      }
+
+      return this.GetNaturalSize();
+    }
+
+    protected override void OnRender( DrawingContext drawingContext )
+    {
+      if( !_rect.IsEmpty )
+      {
+        Pen pen = this.GetPen();
+        drawingContext.DrawGeometry( this.Fill, pen, this.RenderedGeometry );
+      }
+    }
+
+    #region Private Fields
+
+    private Rect _rect = Rect.Empty;
+    private BitVector32 _cacheBits = new BitVector32( 0 );
+
+    #endregion
+
+    #region CacheBits Nested Type
+
+    private enum CacheBits
+    {
+      IsUpdatingEndAngle = 0x00000001,
+      IsUpdatingMode = 0x00000002,
+      IsUpdatingSlice = 0x00000004,
+      IsUpdatingStartAngle = 0x00000008,
+      IsUpdatingSweepDirection = 0x00000010,
+    }
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Pie/Implementation/PieModeEnum.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Pie/Implementation/PieModeEnum.cs
new file mode 100644
index 00000000..5f4a973a
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Pie/Implementation/PieModeEnum.cs
@@ -0,0 +1,28 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit
+{
+  public enum PieMode
+  {
+    Manual,
+    EndAngle,
+    Slice,
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Properties/AssemblyInfo.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..ad13a5f6
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Properties/AssemblyInfo.cs
@@ -0,0 +1,93 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+#region Using directives
+
+using System;
+using System.Globalization;
+using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Security;
+using System.Windows;
+using System.Windows.Markup;
+
+#endregion
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle( "Xceed Extended WPF Toolkit" )]
+[assembly: AssemblyDescription("This assembly implements various Windows Presentation Framework controls.")]
+
+[assembly: AssemblyCompany("Xceed Software Inc.")]
+[assembly: AssemblyProduct( "Xceed Extended WPF Toolkit" )]
+[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
+[assembly: AssemblyCulture( "" )]
+
+
+// Needed to enable xbap scenarios
+[assembly: AllowPartiallyTrustedCallers]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+[assembly: CLSCompliant(true)]
+
+//In order to begin building localizable applications, set 
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.SourceAssembly, //where theme specific resource dictionaries are located
+    //(used if a resource is not found in the page, 
+    // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+    //(used if a resource is not found in the page, 
+    // app, or any theme specific resource dictionaries)
+)]
+
+[assembly: XmlnsPrefix("http://schemas.xceed.com/wpf/xaml/toolkit", "xctk")]
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit")]
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Core.Converters" )]
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Core.Input" )]
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Primitives")]
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.PropertyGrid")]
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.PropertyGrid.Attributes")]
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.PropertyGrid.Commands")]
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.PropertyGrid.Converters")]
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.PropertyGrid.Editors")]
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Zoombox" )]
+
+
+#pragma warning disable 1699
+[assembly: AssemblyDelaySign( false )]
+[assembly: AssemblyKeyFile( @"sn.snk" )]
+[assembly: AssemblyKeyName( "" )]
+#pragma warning restore 1699
+
+
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/AdvancedProperties11.png b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/AdvancedProperties11.png
new file mode 100644
index 00000000..0146e932
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/AdvancedProperties11.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Categorize16.png b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Categorize16.png
new file mode 100644
index 00000000..51510df8
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Categorize16.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/ClearFilter16.png b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/ClearFilter16.png
new file mode 100644
index 00000000..aeaeab8d
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/ClearFilter16.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Database11.png b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Database11.png
new file mode 100644
index 00000000..0f523fbd
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Database11.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Inheritance11.png b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Inheritance11.png
new file mode 100644
index 00000000..7dd3b491
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Inheritance11.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Local11.png b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Local11.png
new file mode 100644
index 00000000..ec521dd4
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Local11.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Resource11.png b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Resource11.png
new file mode 100644
index 00000000..7275c981
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Resource11.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/SortAscending16.png b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/SortAscending16.png
new file mode 100644
index 00000000..b3138ba3
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/SortAscending16.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Style11.png b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Style11.png
new file mode 100644
index 00000000..7a6005d6
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Images/Style11.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs
new file mode 100644
index 00000000..f036c681
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs
@@ -0,0 +1,30 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Attributes
+{
+  public class ExpandableObjectAttribute : Attribute
+  {
+    public ExpandableObjectAttribute()
+    {
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/IItemsSource.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/IItemsSource.cs
new file mode 100644
index 00000000..5b60f073
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/IItemsSource.cs
@@ -0,0 +1,61 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Collections.Generic;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Attributes
+{
+  public interface IItemsSource
+  {
+    ItemCollection GetValues();
+  }
+
+  public class Item
+  {
+    public string DisplayName
+    {
+      get;
+      set;
+    }
+    public object Value
+    {
+      get;
+      set;
+    }
+  }
+
+  public class ItemCollection : List<Item>
+  {
+    public void Add( object value )
+    {
+      Item item = new Item();
+      item.DisplayName = value.ToString();
+      item.Value = value;
+      base.Add( item );
+    }
+
+    public void Add( object value, string displayName )
+    {
+      Item newItem = new Item();
+      newItem.DisplayName = displayName;
+      newItem.Value = value;
+      base.Add( newItem );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs
new file mode 100644
index 00000000..305bcc57
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs
@@ -0,0 +1,41 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Attributes
+{
+  public class ItemsSourceAttribute : Attribute
+  {
+    public Type Type
+    {
+      get;
+      set;
+    }
+
+    public ItemsSourceAttribute( Type type )
+    {
+      var valueSourceInterface = type.GetInterface( typeof( IItemsSource ).FullName );
+      if( valueSourceInterface == null )
+        throw new ArgumentException( "Type must implement the IItemsSource interface.", "type" );
+
+      Type = type;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs
new file mode 100644
index 00000000..9cebc17f
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs
@@ -0,0 +1,38 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Attributes
+{
+  [AttributeUsage( AttributeTargets.Property, AllowMultiple = false, Inherited = true )]
+  public class PropertyOrderAttribute : Attribute
+  {
+    public int Order
+    {
+      get;
+      set;
+    }
+
+    public PropertyOrderAttribute( int order )
+    {
+      Order = order;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs
new file mode 100644
index 00000000..8679b57b
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs
@@ -0,0 +1,35 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows.Input;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Commands
+{
+  public class PropertyGridCommands
+  {
+    private static RoutedCommand _clearFilterCommand = new RoutedCommand();
+    public static RoutedCommand ClearFilter
+    {
+      get
+      {
+        return _clearFilterCommand;
+      }
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs
new file mode 100644
index 00000000..c2245b48
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs
@@ -0,0 +1,35 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows.Input;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Commands
+{
+  public static class PropertyItemCommands
+  {
+    private static RoutedCommand _resetValueCommand = new RoutedCommand();
+    public static RoutedCommand ResetValue
+    {
+      get
+      {
+        return _resetValueCommand;
+      }
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs
new file mode 100644
index 00000000..f2b1377e
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs
@@ -0,0 +1,39 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Converters
+{
+  public class ExpandableObjectMarginConverter : IValueConverter
+  {
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      int childLevel = ( int )value;
+      return new Thickness( childLevel * 15, 0, 0, 0 );
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/ValueSourceToImagePathConverter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/ValueSourceToImagePathConverter.cs
new file mode 100644
index 00000000..14dd8f34
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/ValueSourceToImagePathConverter.cs
@@ -0,0 +1,67 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Data;
+using System.Windows.Media.Imaging;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Converters
+{
+  public class ValueSourceToImagePathConverter : IValueConverter
+  {
+    #region IValueConverter Members
+
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      BaseValueSource bvs = ( BaseValueSource )value;
+
+      string uriPrefix = "/WPFToolkit.Extended;component/PropertyGrid/Images/";
+      string imageName = "AdvancedProperties11";
+
+      switch( bvs )
+      {
+        case BaseValueSource.Inherited:
+        case BaseValueSource.DefaultStyle:
+        case BaseValueSource.ImplicitStyleReference:
+          imageName = "Inheritance11";
+          break;
+        case BaseValueSource.DefaultStyleTrigger:
+          break;
+        case BaseValueSource.Style:
+          imageName = "Style11";
+          break;
+
+        case BaseValueSource.Local:
+          imageName = "Local11";
+          break;
+      }
+
+
+      return new BitmapImage( new Uri( String.Format( "{0}{1}.png", uriPrefix, imageName ), UriKind.RelativeOrAbsolute ) );
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/ValueSourceToToolTipConverter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/ValueSourceToToolTipConverter.cs
new file mode 100644
index 00000000..07b6bf0f
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/ValueSourceToToolTipConverter.cs
@@ -0,0 +1,61 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Converters
+{
+  public class ValueSourceToToolTipConverter : IValueConverter
+  {
+    #region IValueConverter Members
+
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      BaseValueSource bvs = ( BaseValueSource )value;
+      string toolTip = "Advanced Properties";
+
+      switch( bvs )
+      {
+        case BaseValueSource.Inherited:
+        case BaseValueSource.DefaultStyle:
+        case BaseValueSource.ImplicitStyleReference:
+          toolTip = "Inheritance";
+          break;
+        case BaseValueSource.Style:
+          toolTip = "Style Setter";
+          break;
+
+        case BaseValueSource.Local:
+          toolTip = "Local";
+          break;
+      }
+
+      return toolTip;
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorDefinition.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorDefinition.cs
new file mode 100644
index 00000000..bf5bc3fc
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorDefinition.cs
@@ -0,0 +1,52 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  public class EditorDefinition
+  {
+    public DataTemplate EditorTemplate
+    {
+      get;
+      set;
+    }
+
+    private PropertyDefinitionCollection _properties = new PropertyDefinitionCollection();
+    public PropertyDefinitionCollection PropertiesDefinitions
+    {
+      get
+      {
+        return _properties;
+      }
+      set
+      {
+        _properties = value;
+      }
+    }
+
+    public Type TargetType
+    {
+      get;
+      set;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorDefinitionCollection.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorDefinitionCollection.cs
new file mode 100644
index 00000000..94459d7f
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorDefinitionCollection.cs
@@ -0,0 +1,56 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  public class EditorDefinitionCollection : ObservableCollection<EditorDefinition>
+  {
+    public EditorDefinition this[ string propertyName ]
+    {
+      get
+      {
+        foreach( var item in Items )
+        {
+          if( item.PropertiesDefinitions.Where( x => x.Name == propertyName ).Any() )
+            return item;
+        }
+
+        return null;
+      }
+    }
+
+    public EditorDefinition this[ Type targetType ]
+    {
+      get
+      {
+        foreach( var item in Items )
+        {
+          if( item.TargetType == targetType )
+            return item;
+        }
+
+        return null;
+      }
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs
new file mode 100644
index 00000000..4db6ecc7
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs
@@ -0,0 +1,37 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
+{
+  public class CheckBoxEditor : TypeEditor<CheckBox>
+  {
+    protected override void SetControlProperties()
+    {
+      Editor.Margin = new Thickness( 5, 0, 0, 0 );
+    }
+
+    protected override void SetValueDependencyProperty()
+    {
+      ValueProperty = CheckBox.IsCheckedProperty;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/CollectionEditor.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/CollectionEditor.xaml
new file mode 100644
index 00000000..388fdb52
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/CollectionEditor.xaml
@@ -0,0 +1,82 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<UserControl x:Class="Xceed.Wpf.Toolkit.PropertyGrid.Editors.CollectionEditor"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes">
+
+   <UserControl.Resources>
+      <Style x:Key="ButtonStyle" TargetType="Button">
+         <Setter Property="Background" Value="White" />
+         <Setter Property="BorderThickness" Value="0" />
+         <Setter Property="Padding" Value="2,0,0,0" />
+         <Setter Property="HorizontalContentAlignment" Value="Left" />
+         <Setter Property="VerticalContentAlignment" Value="Center" />
+         <Setter Property="Template">
+            <Setter.Value>
+               <ControlTemplate TargetType="Button">
+                  <Grid SnapsToDevicePixels="True">
+
+                     <Grid>
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="*" />
+                           <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+
+                        <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
+                           <ContentPresenter Content="{TemplateBinding Content}"
+                                             ContentTemplate="{TemplateBinding ContentTemplate}"
+                                             ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                        </Border>
+
+                        <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                             Grid.Column="1"
+                                             CornerRadius="0,2.75,2.75,0"
+                                             RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}"
+											            RenderMouseOver="{TemplateBinding IsMouseOver}">
+                           <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
+                              <Path x:Name="Arrow" Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000" />
+                           </Grid>
+                        </chrome:ButtonChrome>
+                     </Grid>
+
+                  </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Fill" TargetName="Arrow" Value="#AFAFAF" />
+                            <Setter Property="Foreground" Value="Gray" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+         </Setter>
+      </Style>
+   </UserControl.Resources>
+
+   <Button Grid.Column="1"
+           IsTabStop="True"
+           MinHeight="22"
+           SnapsToDevicePixels="True"
+           Content="(Collection)"
+           Style="{StaticResource ButtonStyle}"
+           Click="Button_Click" />
+</UserControl>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/CollectionEditor.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/CollectionEditor.xaml.cs
new file mode 100644
index 00000000..79026ad2
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/CollectionEditor.xaml.cs
@@ -0,0 +1,54 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
+{
+  /// <summary>
+  /// Interaction logic for CollectionEditor.xaml
+  /// </summary>
+  public partial class CollectionEditor : UserControl, ITypeEditor
+  {
+    PropertyItem _item;
+
+    public CollectionEditor()
+    {
+      InitializeComponent();
+    }
+
+    private void Button_Click( object sender, RoutedEventArgs e )
+    {
+      CollectionEditorDialog editor = new CollectionEditorDialog( _item.PropertyType );
+      Binding binding = new Binding( "Value" );
+      binding.Source = _item;
+      binding.Mode = _item.IsReadOnly ? BindingMode.OneWay : BindingMode.TwoWay;
+      BindingOperations.SetBinding( editor, CollectionEditorDialog.ItemsSourceProperty, binding );
+      editor.ShowDialog();
+    }
+
+    public FrameworkElement ResolveEditor( PropertyItem propertyItem )
+    {
+      _item = propertyItem;
+      return this;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ColorEditor.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ColorEditor.cs
new file mode 100644
index 00000000..ed1e829f
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ColorEditor.cs
@@ -0,0 +1,34 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
+{
+  public class ColorEditor : TypeEditor<ColorPicker>
+  {
+    protected override void SetControlProperties()
+    {
+      Editor.BorderThickness = new System.Windows.Thickness( 0 );
+      Editor.DisplayColorAndName = true;
+    }
+    protected override void SetValueDependencyProperty()
+    {
+      ValueProperty = ColorPicker.SelectedColorProperty;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs
new file mode 100644
index 00000000..91081037
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs
@@ -0,0 +1,44 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Collections.Generic;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
+{
+  public abstract class ComboBoxEditor : TypeEditor<System.Windows.Controls.ComboBox>
+  {
+    protected override void SetValueDependencyProperty()
+    {
+      ValueProperty = System.Windows.Controls.ComboBox.SelectedItemProperty;
+    }
+
+    protected override void ResolveValueBinding( PropertyItem propertyItem )
+    {
+      SetItemsSource( propertyItem );
+      base.ResolveValueBinding( propertyItem );
+    }
+
+    protected abstract IList<object> CreateItemsSource( PropertyItem propertyItem );
+
+    private void SetItemsSource( PropertyItem propertyItem )
+    {
+      Editor.ItemsSource = CreateItemsSource( propertyItem );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DateTimeUpDownEditor.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DateTimeUpDownEditor.cs
new file mode 100644
index 00000000..1aafa787
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DateTimeUpDownEditor.cs
@@ -0,0 +1,33 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
+{
+  public class DateTimeUpDownEditor : TypeEditor<DateTimeUpDown>
+  {
+    protected override void SetControlProperties()
+    {
+      Editor.BorderThickness = new System.Windows.Thickness( 0 );
+    }
+    protected override void SetValueDependencyProperty()
+    {
+      ValueProperty = DateTimeUpDown.ValueProperty;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DecimalUpDownEditor.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DecimalUpDownEditor.cs
new file mode 100644
index 00000000..b778bcfc
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DecimalUpDownEditor.cs
@@ -0,0 +1,34 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
+{
+  public class DecimalUpDownEditor : TypeEditor<DecimalUpDown>
+  {
+    protected override void SetControlProperties()
+    {
+      Editor.BorderThickness = new System.Windows.Thickness( 0 );
+    }
+
+    protected override void SetValueDependencyProperty()
+    {
+      ValueProperty = DecimalUpDown.ValueProperty;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DoubleUpDownEditor.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DoubleUpDownEditor.cs
new file mode 100644
index 00000000..ce2b6ded
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DoubleUpDownEditor.cs
@@ -0,0 +1,34 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
+{
+  public class DoubleUpDownEditor : TypeEditor<DoubleUpDown>
+  {
+    protected override void SetControlProperties()
+    {
+      Editor.BorderThickness = new System.Windows.Thickness( 0 );
+    }
+
+    protected override void SetValueDependencyProperty()
+    {
+      ValueProperty = DoubleUpDown.ValueProperty;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs
new file mode 100644
index 00000000..cdd39006
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs
@@ -0,0 +1,58 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Reflection;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
+{
+  public class EnumComboBoxEditor : ComboBoxEditor
+  {
+    protected override IList<object> CreateItemsSource( PropertyItem propertyItem )
+    {
+      return GetValues( propertyItem.PropertyType );
+    }
+
+    private static object[] GetValues( Type enumType )
+    {
+      List<object> values = new List<object>();
+
+      var fields = enumType.GetFields().Where( x => x.IsLiteral );
+      foreach( FieldInfo field in fields )
+      {
+        // Get array of BrowsableAttribute attributes
+        object[] attrs = field.GetCustomAttributes( typeof( BrowsableAttribute ), false );
+        if( attrs.Length == 1 )
+        {
+          // If attribute exists and its value is false continue to the next field...
+          BrowsableAttribute brAttr = ( BrowsableAttribute )attrs[ 0 ];
+          if( brAttr.Browsable == false )
+            continue;
+        }
+
+        values.Add( field.GetValue( enumType ) );
+      }
+
+      return values.ToArray();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs
new file mode 100644
index 00000000..aaa22de5
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs
@@ -0,0 +1,94 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows;
+using System.Windows.Media;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
+{
+  public class FontComboBoxEditor : ComboBoxEditor
+  {
+    protected override IList<object> CreateItemsSource( PropertyItem propertyItem )
+    {
+      if( propertyItem.PropertyType == typeof( FontFamily ) )
+        return GetFontFamilies();
+      else if( propertyItem.PropertyType == typeof( FontWeight ) )
+        return GetFontWeights();
+      else if( propertyItem.PropertyType == typeof( FontStyle ) )
+        return GetFontStyles();
+      else if( propertyItem.PropertyType == typeof( FontStretch ) )
+        return GetFontStretches();
+
+      return null;
+    }
+
+    private static IList<object> GetFontFamilies()
+    {
+#if !VS2008
+      return Fonts.SystemFontFamilies.ToList<object>();
+#else
+      return Fonts.SystemFontFamilies.Cast<object>().ToList();
+#endif
+    }
+
+    private static IList<object> GetFontWeights()
+    {
+      return new List<object>()
+            {
+                FontWeights.Black, 
+                FontWeights.Bold, 
+                FontWeights.ExtraBlack, 
+                FontWeights.ExtraBold,
+                FontWeights.ExtraLight, 
+                FontWeights.Light, 
+                FontWeights.Medium, 
+                FontWeights.Normal, 
+                FontWeights.SemiBold,
+                FontWeights.Thin
+            };
+    }
+
+    private static IList<object> GetFontStyles()
+    {
+      return new List<object>()
+            {
+                FontStyles.Italic,
+                FontStyles.Normal
+            };
+    }
+
+    private static IList<object> GetFontStretches()
+    {
+      return new List<object>()
+            {
+                FontStretches.Condensed,
+                FontStretches.Expanded,
+                FontStretches.ExtraCondensed,
+                FontStretches.ExtraExpanded,
+                FontStretches.Normal,
+                FontStretches.SemiCondensed,
+                FontStretches.SemiExpanded,
+                FontStretches.UltraCondensed,
+                FontStretches.UltraExpanded
+            };
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ITypeEditor.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ITypeEditor.cs
new file mode 100644
index 00000000..0970fb15
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ITypeEditor.cs
@@ -0,0 +1,28 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
+{
+  public interface ITypeEditor
+  {
+    FrameworkElement ResolveEditor( PropertyItem propertyItem );
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/IntegerUpDownEditor.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/IntegerUpDownEditor.cs
new file mode 100644
index 00000000..6d4c6491
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/IntegerUpDownEditor.cs
@@ -0,0 +1,33 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
+{
+  public class IntegerUpDownEditor : TypeEditor<IntegerUpDown>
+  {
+    protected override void SetControlProperties()
+    {
+      Editor.BorderThickness = new System.Windows.Thickness( 0 );
+    }
+    protected override void SetValueDependencyProperty()
+    {
+      ValueProperty = IntegerUpDown.ValueProperty;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs
new file mode 100644
index 00000000..f3ab9dd6
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs
@@ -0,0 +1,62 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
+{
+  public class ItemsSourceAttributeEditor : TypeEditor<System.Windows.Controls.ComboBox>
+  {
+    private readonly ItemsSourceAttribute _attribute;
+
+    public ItemsSourceAttributeEditor( ItemsSourceAttribute attribute )
+    {
+      _attribute = attribute;
+    }
+
+    protected override void SetValueDependencyProperty()
+    {
+      ValueProperty = System.Windows.Controls.ComboBox.SelectedValueProperty;
+    }
+
+    protected override void ResolveValueBinding( PropertyItem propertyItem )
+    {
+      SetItemsSource();
+      base.ResolveValueBinding( propertyItem );
+    }
+
+    protected override void SetControlProperties()
+    {
+      Editor.DisplayMemberPath = "DisplayName";
+      Editor.SelectedValuePath = "Value";
+    }
+
+    private void SetItemsSource()
+    {
+      Editor.ItemsSource = CreateItemsSource();
+    }
+
+    private System.Collections.IEnumerable CreateItemsSource()
+    {
+      var instance = Activator.CreateInstance( _attribute.Type );
+      return ( instance as IItemsSource ).GetValues();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs
new file mode 100644
index 00000000..bfdf013d
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs
@@ -0,0 +1,42 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
+{
+  public class PrimitiveTypeCollectionEditor : TypeEditor<Xceed.Wpf.Toolkit.PrimitiveTypeCollectionEditor>
+  {
+    protected override void SetControlProperties()
+    {
+      Editor.BorderThickness = new System.Windows.Thickness( 0 );
+      Editor.Content = "(Collection)";
+    }
+
+    protected override void SetValueDependencyProperty()
+    {
+      ValueProperty = Xceed.Wpf.Toolkit.PrimitiveTypeCollectionEditor.ItemsSourceProperty;
+    }
+
+    protected override void ResolveValueBinding( PropertyItem propertyItem )
+    {
+      Editor.ItemsSourceType = propertyItem.PropertyType;
+      Editor.ItemType = propertyItem.PropertyType.GetGenericArguments()[ 0 ];
+      base.ResolveValueBinding( propertyItem );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TextBlockEditor.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TextBlockEditor.cs
new file mode 100644
index 00000000..13479320
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TextBlockEditor.cs
@@ -0,0 +1,36 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows.Controls;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
+{
+  public class TextBlockEditor : TypeEditor<TextBlock>
+  {
+    protected override void SetValueDependencyProperty()
+    {
+      ValueProperty = TextBlock.TextProperty;
+    }
+
+    protected override void SetControlProperties()
+    {
+      Editor.Margin = new System.Windows.Thickness( 5, 0, 0, 0 );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TextBoxEditor.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TextBoxEditor.cs
new file mode 100644
index 00000000..8c87df41
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TextBoxEditor.cs
@@ -0,0 +1,36 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows.Controls;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
+{
+  public class TextBoxEditor : TypeEditor<WatermarkTextBox>
+  {
+    protected override void SetControlProperties()
+    {
+      Editor.BorderThickness = new System.Windows.Thickness( 0 );
+    }
+
+    protected override void SetValueDependencyProperty()
+    {
+      ValueProperty = TextBox.TextProperty;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TimeSpanEditor.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TimeSpanEditor.cs
new file mode 100644
index 00000000..1f7d1aec
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TimeSpanEditor.cs
@@ -0,0 +1,51 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Globalization;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
+{
+  public class TimeSpanEditor : DateTimeUpDownEditor
+  {
+    private sealed class TimeSpanConverter : IValueConverter
+    {
+      object IValueConverter.Convert( object value, Type targetType, object parameter, CultureInfo culture )
+      {
+        return DateTime.Today + ( TimeSpan )value;
+      }
+
+      object IValueConverter.ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
+      {
+        return ( ( DateTime )value ).TimeOfDay;
+      }
+    }
+
+    protected override void SetControlProperties()
+    {
+      Editor.Format = DateTimeFormat.LongTime;
+    }
+
+    protected override IValueConverter CreateValueConverter()
+    {
+      return new TimeSpanConverter();
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TypeEditor.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TypeEditor.cs
new file mode 100644
index 00000000..791b5b29
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TypeEditor.cs
@@ -0,0 +1,82 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
+{
+  public abstract class TypeEditor<T> : ITypeEditor where T : FrameworkElement, new()
+  {
+    #region Properties
+
+    protected T Editor
+    {
+      get;
+      set;
+    }
+    protected DependencyProperty ValueProperty
+    {
+      get;
+      set;
+    }
+
+    #endregion //Properties
+
+    #region ITypeEditor Members
+
+    public virtual FrameworkElement ResolveEditor( PropertyItem propertyItem )
+    {
+      Editor = new T();
+      SetValueDependencyProperty();
+      SetControlProperties();
+      ResolveValueBinding( propertyItem );
+      return Editor;
+    }
+
+    #endregion //ITypeEditor Members
+
+    #region Methods
+
+    protected virtual IValueConverter CreateValueConverter()
+    {
+      return null;
+    }
+
+    protected virtual void ResolveValueBinding( PropertyItem propertyItem )
+    {
+      var _binding = new Binding( "Value" );
+      _binding.Source = propertyItem;
+      _binding.ValidatesOnExceptions = true;
+      _binding.ValidatesOnDataErrors = true;
+      _binding.Mode = propertyItem.IsReadOnly ? BindingMode.OneWay : BindingMode.TwoWay;
+      _binding.Converter = CreateValueConverter();
+      BindingOperations.SetBinding( Editor, ValueProperty, _binding );
+    }
+
+    protected virtual void SetControlProperties()
+    {
+      //TODO: implement in derived class
+    }
+
+    protected abstract void SetValueDependencyProperty();
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyDefinition.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyDefinition.cs
new file mode 100644
index 00000000..fb299b11
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyDefinition.cs
@@ -0,0 +1,30 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  public class PropertyDefinition
+  {
+    public string Name
+    {
+      get;
+      set;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyDefinitionCollection.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyDefinitionCollection.cs
new file mode 100644
index 00000000..e4c44c5b
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyDefinitionCollection.cs
@@ -0,0 +1,40 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Collections.ObjectModel;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  public class PropertyDefinitionCollection : ObservableCollection<PropertyDefinition>
+  {
+    public PropertyDefinition this[ string propertyName ]
+    {
+      get
+      {
+        foreach( var item in Items )
+        {
+          if( item.Name == propertyName )
+            return item;
+        }
+
+        return null;
+      }
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGrid.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGrid.cs
new file mode 100644
index 00000000..5c0d65c3
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGrid.cs
@@ -0,0 +1,819 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Input;
+using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
+using System.Collections.Specialized;
+using System.Windows.Media;
+using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  [TemplatePart( Name = PART_DragThumb, Type = typeof( Thumb ) )]
+  public class PropertyGrid : Control, ISupportInitialize
+  {
+    private const string PART_DragThumb = "PART_DragThumb";
+
+    #region Members
+
+    private Thumb _dragThumb;
+    private List<PropertyItem> _propertyItemsCache;
+    private bool _hasPendingSelectedObjectChanged;
+    private int _initializationCount;
+
+    #endregion //Members
+
+    #region Properties
+
+    #region AdvancedOptionsMenu
+
+    public static readonly DependencyProperty AdvancedOptionsMenuProperty = DependencyProperty.Register( "AdvancedOptionsMenu", typeof( ContextMenu ), typeof( PropertyGrid ), new UIPropertyMetadata( null ) );
+    public ContextMenu AdvancedOptionsMenu
+    {
+      get
+      {
+        return ( ContextMenu )GetValue( AdvancedOptionsMenuProperty );
+      }
+      set
+      {
+        SetValue( AdvancedOptionsMenuProperty, value );
+      }
+    }
+
+    #endregion //AdvancedOptionsMenu
+
+    #region AutoGenerateProperties
+
+    public static readonly DependencyProperty AutoGeneratePropertiesProperty = DependencyProperty.Register( "AutoGenerateProperties", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( true ) );
+    public bool AutoGenerateProperties
+    {
+      get
+      {
+        return ( bool )GetValue( AutoGeneratePropertiesProperty );
+      }
+      set
+      {
+        SetValue( AutoGeneratePropertiesProperty, value );
+      }
+    }
+
+    #endregion //AutoGenerateProperties
+
+    #region ShowSummary
+
+    public static readonly DependencyProperty ShowSummaryProperty = DependencyProperty.Register( "ShowSummary", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( true ) );
+    public bool ShowSummary
+    {
+      get
+      {
+        return ( bool )GetValue( ShowSummaryProperty );
+      }
+      set
+      {
+        SetValue( ShowSummaryProperty, value );
+      }
+    }
+
+    #endregion //ShowSummary
+
+    #region EditorDefinitions
+
+    public static readonly DependencyProperty EditorDefinitionsProperty = DependencyProperty.Register( "EditorDefinitions", typeof( EditorDefinitionCollection ), typeof( PropertyGrid ), new UIPropertyMetadata( null, OnEditorDefinitionsChanged) );
+    public EditorDefinitionCollection EditorDefinitions
+    {
+      get
+      {
+        return ( EditorDefinitionCollection )GetValue( EditorDefinitionsProperty );
+      }
+      set
+      {
+        SetValue( EditorDefinitionsProperty, value );
+      }
+    }
+
+    private static void OnEditorDefinitionsChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PropertyGrid propertyGrid = o as PropertyGrid;
+      if( propertyGrid != null )
+        propertyGrid.OnEditorDefinitionsChanged( ( EditorDefinitionCollection )e.OldValue, ( EditorDefinitionCollection )e.NewValue );
+    }
+
+    protected virtual void OnEditorDefinitionsChanged( EditorDefinitionCollection oldValue, EditorDefinitionCollection newValue )
+    {
+      if( oldValue != null )
+        oldValue.CollectionChanged -= new NotifyCollectionChangedEventHandler( OnEditorDefinitionsCollectionChanged );
+
+      if( newValue != null )
+        newValue.CollectionChanged += new NotifyCollectionChangedEventHandler( OnEditorDefinitionsCollectionChanged );
+
+      RefreshPropertyGrid();
+    }
+
+    #endregion //EditorDefinitions
+
+    #region Filter
+
+    public static readonly DependencyProperty FilterProperty = DependencyProperty.Register( "Filter", typeof( string ), typeof( PropertyGrid ), new UIPropertyMetadata( null, OnFilterChanged ) );
+    public string Filter
+    {
+      get
+      {
+        return ( string )GetValue( FilterProperty );
+      }
+      set
+      {
+        SetValue( FilterProperty, value );
+      }
+    }
+
+    private static void OnFilterChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PropertyGrid propertyGrid = o as PropertyGrid;
+      if( propertyGrid != null )
+        propertyGrid.OnFilterChanged( ( string )e.OldValue, ( string )e.NewValue );
+    }
+
+    protected virtual void OnFilterChanged( string oldValue, string newValue )
+    {
+      if( Properties != null )
+        Properties.Filter( newValue );
+    }
+
+    #endregion //Filter
+
+    #region FilterWatermark
+
+    public static readonly DependencyProperty FilterWatermarkProperty = DependencyProperty.Register( "FilterWatermark", typeof( string ), typeof( PropertyGrid ), new UIPropertyMetadata( "Search" ) );
+    public string FilterWatermark
+    {
+      get
+      {
+        return ( string )GetValue( FilterWatermarkProperty );
+      }
+      set
+      {
+        SetValue( FilterWatermarkProperty, value );
+      }
+    }
+
+    #endregion //FilterWatermark
+
+    #region IsCategorized
+
+    public static readonly DependencyProperty IsCategorizedProperty = DependencyProperty.Register( "IsCategorized", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( true, OnIsCategorizedChanged ) );
+    public bool IsCategorized
+    {
+      get
+      {
+        return ( bool )GetValue( IsCategorizedProperty );
+      }
+      set
+      {
+        SetValue( IsCategorizedProperty, value );
+      }
+    }
+
+    private static void OnIsCategorizedChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PropertyGrid propertyGrid = o as PropertyGrid;
+      if( propertyGrid != null )
+        propertyGrid.OnIsCategorizedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnIsCategorizedChanged( bool oldValue, bool newValue )
+    {
+      InitializePropertyGrid( newValue );
+    }
+
+    #endregion //IsCategorized
+
+    #region NameColumnWidth
+
+    public static readonly DependencyProperty NameColumnWidthProperty = DependencyProperty.Register( "NameColumnWidth", typeof( double ), typeof( PropertyGrid ), new UIPropertyMetadata( 150.0, OnNameColumnWidthChanged ) );
+    public double NameColumnWidth
+    {
+      get
+      {
+        return ( double )GetValue( NameColumnWidthProperty );
+      }
+      set
+      {
+        SetValue( NameColumnWidthProperty, value );
+      }
+    }
+
+    private static void OnNameColumnWidthChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PropertyGrid propertyGrid = o as PropertyGrid;
+      if( propertyGrid != null )
+        propertyGrid.OnNameColumnWidthChanged( ( double )e.OldValue, ( double )e.NewValue );
+    }
+
+    protected virtual void OnNameColumnWidthChanged( double oldValue, double newValue )
+    {
+      ( ( TranslateTransform )_dragThumb.RenderTransform ).X = newValue;
+    }
+
+    #endregion //NameColumnWidth
+
+    #region Properties
+
+    private static readonly DependencyPropertyKey PropertiesPropertyKey = DependencyProperty.RegisterReadOnly( "Properties", typeof( PropertyItemCollection ), typeof( PropertyGrid ), new UIPropertyMetadata( null ) );
+    public PropertyItemCollection Properties
+    {
+      get
+      {
+        return ( PropertyItemCollection )GetValue( PropertiesPropertyKey.DependencyProperty );
+      }
+      private set
+      {
+        SetValue( PropertiesPropertyKey, value );
+      }
+    }
+
+    #endregion //Properties
+
+    #region PropertyDefinitions
+
+    public static readonly DependencyProperty PropertyDefinitionsProperty = DependencyProperty.Register( "PropertyDefinitions", typeof( PropertyDefinitionCollection ), typeof( PropertyGrid ), new UIPropertyMetadata( null, OnPropertyDefinitionsChanged ) );
+    public PropertyDefinitionCollection PropertyDefinitions
+    {
+      get
+      {
+        return ( PropertyDefinitionCollection )GetValue( PropertyDefinitionsProperty );
+      }
+      set
+      {
+        SetValue( PropertyDefinitionsProperty, value );
+      }
+    }
+
+    private static void OnPropertyDefinitionsChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PropertyGrid propertyGrid = o as PropertyGrid;
+      if( propertyGrid != null )
+        propertyGrid.OnPropertyDefinitionsChanged( ( PropertyDefinitionCollection )e.OldValue, ( PropertyDefinitionCollection )e.NewValue );
+    }
+
+    protected virtual void OnPropertyDefinitionsChanged( PropertyDefinitionCollection oldValue, PropertyDefinitionCollection newValue )
+    {
+      if( oldValue != null )
+        oldValue.CollectionChanged -= new NotifyCollectionChangedEventHandler( OnPropertyDefinitionsCollectionChanged );
+
+      if( newValue != null )
+        newValue.CollectionChanged += new NotifyCollectionChangedEventHandler( OnPropertyDefinitionsCollectionChanged );
+
+      RefreshPropertyGrid();
+    }
+
+    #endregion //PropertyDefinitions
+
+    #region SelectedObject
+
+    public static readonly DependencyProperty SelectedObjectProperty = DependencyProperty.Register( "SelectedObject", typeof( object ), typeof( PropertyGrid ), new UIPropertyMetadata( null, OnSelectedObjectChanged ) );
+    public object SelectedObject
+    {
+      get
+      {
+        return ( object )GetValue( SelectedObjectProperty );
+      }
+      set
+      {
+        SetValue( SelectedObjectProperty, value );
+      }
+    }
+
+    private static void OnSelectedObjectChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PropertyGrid propertyInspector = o as PropertyGrid;
+      if( propertyInspector != null )
+        propertyInspector.OnSelectedObjectChanged( ( object )e.OldValue, ( object )e.NewValue );
+    }
+
+    protected virtual void OnSelectedObjectChanged( object oldValue, object newValue )
+    {
+      // We do not want to process the change now if the grid is initializing (ie. BeginInit/EndInit).
+      _hasPendingSelectedObjectChanged = IsInitializing();
+
+      if( IsInitializing() )
+        return;
+
+      if( newValue == null )
+        ResetPropertyGrid();
+      else
+      {
+        SetSelectedObjectNameBinding( newValue );
+        SelectedObjectType = newValue.GetType();
+        _propertyItemsCache = GetObjectProperties( newValue );
+        InitializePropertyGrid( IsCategorized );
+      }
+    }
+
+    #endregion //SelectedObject
+
+    #region SelectedObjectType
+
+    public static readonly DependencyProperty SelectedObjectTypeProperty = DependencyProperty.Register( "SelectedObjectType", typeof( Type ), typeof( PropertyGrid ), new UIPropertyMetadata( null, OnSelectedObjectTypeChanged ) );
+    public Type SelectedObjectType
+    {
+      get
+      {
+        return ( Type )GetValue( SelectedObjectTypeProperty );
+      }
+      private set
+      {
+        SetValue( SelectedObjectTypeProperty, value );
+      }
+    }
+
+    private static void OnSelectedObjectTypeChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PropertyGrid propertyGrid = o as PropertyGrid;
+      if( propertyGrid != null )
+        propertyGrid.OnSelectedObjectTypeChanged( ( Type )e.OldValue, ( Type )e.NewValue );
+    }
+
+    protected virtual void OnSelectedObjectTypeChanged( Type oldValue, Type newValue )
+    {
+      if( newValue == null )
+        SelectedObjectTypeName = string.Empty;
+      else
+      {
+        DisplayNameAttribute displayNameAttribute = newValue.GetCustomAttributes( false ).OfType<DisplayNameAttribute>().FirstOrDefault();
+        SelectedObjectTypeName = displayNameAttribute == null ? newValue.Name : displayNameAttribute.DisplayName;
+      }
+    }
+
+    #endregion //SelectedObjectType
+
+    #region SelectedObjectTypeName
+
+    public static readonly DependencyProperty SelectedObjectTypeNameProperty = DependencyProperty.Register( "SelectedObjectTypeName", typeof( string ), typeof( PropertyGrid ), new UIPropertyMetadata( string.Empty ) );
+    public string SelectedObjectTypeName
+    {
+      get
+      {
+        return ( string )GetValue( SelectedObjectTypeNameProperty );
+      }
+      private set
+      {
+        SetValue( SelectedObjectTypeNameProperty, value );
+      }
+    }
+
+    #endregion //SelectedObjectTypeName
+
+    #region SelectedObjectName
+
+    public static readonly DependencyProperty SelectedObjectNameProperty = DependencyProperty.Register( "SelectedObjectName", typeof( string ), typeof( PropertyGrid ), new UIPropertyMetadata( string.Empty, OnSelectedObjectNameChanged ) );
+    public string SelectedObjectName
+    {
+      get
+      {
+        return ( string )GetValue( SelectedObjectNameProperty );
+      }
+      private set
+      {
+        SetValue( SelectedObjectNameProperty, value );
+      }
+    }
+
+    private static void OnSelectedObjectNameChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PropertyGrid propertyGrid = o as PropertyGrid;
+      if( propertyGrid != null )
+        propertyGrid.SelectedObjectNameChanged( ( string )e.OldValue, ( string )e.NewValue );
+    }
+
+    protected virtual void SelectedObjectNameChanged( string oldValue, string newValue )
+    {
+
+    }
+
+    #endregion //SelectedObjectName
+
+    #region SelectedPropertyItem
+
+    public static readonly DependencyProperty SelectedPropertyItemProperty = DependencyProperty.Register( "SelectedPropertyItem", typeof( PropertyItem ), typeof( PropertyGrid ), new UIPropertyMetadata( null, OnSelectedPropertyItemChanged ) );
+    public PropertyItem SelectedPropertyItem
+    {
+      get
+      {
+        return ( PropertyItem )GetValue( SelectedPropertyItemProperty );
+      }
+      internal set
+      {
+        SetValue( SelectedPropertyItemProperty, value );
+      }
+    }
+
+    private static void OnSelectedPropertyItemChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PropertyGrid propertyGrid = o as PropertyGrid;
+      if( propertyGrid != null )
+        propertyGrid.OnSelectedPropertyItemChanged( ( PropertyItem )e.OldValue, ( PropertyItem )e.NewValue );
+    }
+
+    protected virtual void OnSelectedPropertyItemChanged( PropertyItem oldValue, PropertyItem newValue )
+    {
+      if( oldValue != null )
+        oldValue.IsSelected = false;
+
+      //if (newValue != null)
+      //    newValue.IsSelected = true;
+
+      RaiseEvent( new RoutedEventArgs( PropertyGrid.SelectedPropertyItemChangedEvent, newValue ) );
+    }
+
+    #endregion //SelectedPropertyItem
+
+    #region ShowAdvancedOptions
+
+    public static readonly DependencyProperty ShowAdvancedOptionsProperty = DependencyProperty.Register( "ShowAdvancedOptions", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( false ) );
+    public bool ShowAdvancedOptions
+    {
+      get
+      {
+        return ( bool )GetValue( ShowAdvancedOptionsProperty );
+      }
+      set
+      {
+        SetValue( ShowAdvancedOptionsProperty, value );
+      }
+    }
+
+    #endregion //ShowAdvancedOptions
+
+    #region ShowSearchBox
+
+    public static readonly DependencyProperty ShowSearchBoxProperty = DependencyProperty.Register( "ShowSearchBox", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( true ) );
+    public bool ShowSearchBox
+    {
+      get
+      {
+        return ( bool )GetValue( ShowSearchBoxProperty );
+      }
+      set
+      {
+        SetValue( ShowSearchBoxProperty, value );
+      }
+    }
+
+    #endregion //ShowSearchBox
+
+    #region ShowSortOptions
+
+    public static readonly DependencyProperty ShowSortOptionsProperty = DependencyProperty.Register( "ShowSortOptions", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( true ) );
+    public bool ShowSortOptions
+    {
+      get
+      {
+        return ( bool )GetValue( ShowSortOptionsProperty );
+      }
+      set
+      {
+        SetValue( ShowSortOptionsProperty, value );
+      }
+    }
+
+    #endregion //ShowSortOptions
+
+    #region ShowTitle
+
+    public static readonly DependencyProperty ShowTitleProperty = DependencyProperty.Register( "ShowTitle", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( true ) );
+    public bool ShowTitle
+    {
+      get
+      {
+        return ( bool )GetValue( ShowTitleProperty );
+      }
+      set
+      {
+        SetValue( ShowTitleProperty, value );
+      }
+    }
+
+    #endregion //ShowTitle
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static PropertyGrid()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGrid ), new FrameworkPropertyMetadata( typeof( PropertyGrid ) ) );
+    }
+
+    public PropertyGrid()
+    {
+      EditorDefinitions = new EditorDefinitionCollection();
+      PropertyDefinitions = new PropertyDefinitionCollection();
+      CommandBindings.Add( new CommandBinding( PropertyGridCommands.ClearFilter, ClearFilter, CanClearFilter ) );
+    }
+
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+
+      if( _dragThumb != null )
+        _dragThumb.DragDelta -= DragThumb_DragDelta;
+      _dragThumb = GetTemplateChild( PART_DragThumb ) as Thumb;
+      if( _dragThumb != null )
+        _dragThumb.DragDelta += DragThumb_DragDelta;
+
+      //Update TranslateTransform in code-behind instead of XAML to remove the
+      //output window error.
+      //When we use FindAncesstor in custom control template for binding internal elements property 
+      //into its ancestor element, Visual Studio displays data warning messages in output window when 
+      //binding engine meets unmatched target type during visual tree traversal though it does the proper 
+      //binding when it receives expected target type during visual tree traversal
+      //ref : http://www.codeproject.com/Tips/124556/How-to-suppress-the-System-Windows-Data-Error-warn
+      TranslateTransform _moveTransform = new TranslateTransform();
+      _moveTransform.X = NameColumnWidth;
+      _dragThumb.RenderTransform = _moveTransform;
+    }
+
+    protected override void OnPreviewKeyDown( KeyEventArgs e )
+    {
+      //hitting enter on textbox will update value of underlying source
+      if( this.SelectedPropertyItem != null && e.Key == Key.Enter && e.OriginalSource is TextBox )
+      {
+        if( !( e.OriginalSource as TextBox ).AcceptsReturn )
+        {
+          BindingExpression be = ( ( TextBox )e.OriginalSource ).GetBindingExpression( TextBox.TextProperty );
+          be.UpdateSource();
+        }
+      }
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Event Handlers
+
+    void DragThumb_DragDelta( object sender, DragDeltaEventArgs e )
+    {
+      NameColumnWidth = Math.Max( 0, NameColumnWidth + e.HorizontalChange );
+    }
+
+    #endregion //Event Handlers
+
+    #region Commands
+
+    private void ClearFilter( object sender, ExecutedRoutedEventArgs e )
+    {
+      Filter = String.Empty;
+    }
+
+    private void CanClearFilter( object sender, CanExecuteRoutedEventArgs e )
+    {
+      e.CanExecute = !String.IsNullOrEmpty( Filter );
+    }
+
+    #endregion //Commands
+
+    #region Methods
+
+    private void InitializePropertyGrid( bool isCategorized )
+    {
+      LoadProperties( isCategorized );
+      SetDragThumbMargin( isCategorized );
+    }
+
+    private void LoadProperties( bool isCategorized )
+    {
+      if( _propertyItemsCache == null )
+        return;
+
+      //clear any filters first
+      Filter = String.Empty;
+
+      if( isCategorized )
+        Properties = PropertyGridUtilities.GetCategorizedProperties( _propertyItemsCache );
+      else
+        Properties = PropertyGridUtilities.GetAlphabetizedProperties( _propertyItemsCache );
+    }
+
+    private List<PropertyItem> GetObjectProperties( object instance )
+    {
+      var propertyItems = new List<PropertyItem>();
+      if( instance == null )
+        return propertyItems;
+
+      try
+      {
+        PropertyDescriptorCollection descriptors = PropertyGridUtilities.GetPropertyDescriptors( instance );
+
+        if( !AutoGenerateProperties )
+        {
+          List<PropertyDescriptor> specificProperties = new List<PropertyDescriptor>();
+          if( PropertyDefinitions != null )
+          {
+            foreach( PropertyDefinition pd in PropertyDefinitions )
+            {
+              foreach( PropertyDescriptor descriptor in descriptors )
+              {
+                if( descriptor.Name == pd.Name )
+                {
+                  specificProperties.Add( descriptor );
+                  break;
+                }
+              }
+            }
+          }
+
+          descriptors = new PropertyDescriptorCollection( specificProperties.ToArray() );
+        }
+
+        foreach( PropertyDescriptor descriptor in descriptors )
+        {
+          if( descriptor.IsBrowsable )
+            propertyItems.Add( PropertyGridUtilities.CreatePropertyItem( descriptor, instance, this, descriptor.Name ) );
+        }
+      }
+      catch( Exception )
+      {
+        //TODO: handle this some how
+      }
+
+      return propertyItems;
+    }
+
+    private void SetSelectedObjectNameBinding( object selectedObject )
+    {
+      if( selectedObject is FrameworkElement )
+      {
+        var binding = new Binding( "Name" );
+        binding.Source = selectedObject;
+        binding.Mode = BindingMode.OneWay;
+        BindingOperations.SetBinding( this, PropertyGrid.SelectedObjectNameProperty, binding );
+      }
+    }
+
+    private void SetDragThumbMargin( bool isCategorized )
+    {
+      if( _dragThumb == null )
+        return;
+
+      if( isCategorized )
+        _dragThumb.Margin = new Thickness( 6, 0, 0, 0 );
+      else
+        _dragThumb.Margin = new Thickness( -1, 0, 0, 0 );
+    }
+
+    private void ResetPropertyGrid()
+    {
+      SelectedObjectName = String.Empty;
+      SelectedObjectType = null;
+      _propertyItemsCache = null;
+      SelectedPropertyItem = null;
+      Properties = null;
+    }
+
+    private void OnEditorDefinitionsCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
+    {
+      RefreshPropertyGrid();
+    }
+
+    private void OnPropertyDefinitionsCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
+    {
+      RefreshPropertyGrid();
+    }
+
+    private void RefreshPropertyGrid()
+    {
+      _propertyItemsCache = GetObjectProperties( SelectedObject );
+      InitializePropertyGrid( IsCategorized );
+    }
+
+    private bool IsInitializing()
+    {
+      return _initializationCount != 0;
+    }
+
+    /// <summary>
+    /// Updates all property values in the PropertyGrid with the data from the SelectedObject
+    /// </summary>
+    public void Update()
+    {
+      foreach( var item in Properties )
+      {
+        BindingOperations.GetBindingExpressionBase( item, PropertyItem.ValueProperty ).UpdateTarget();
+      }
+    }
+
+    #endregion //Methods
+
+    #region Events
+
+    public static readonly RoutedEvent PropertyValueChangedEvent = EventManager.RegisterRoutedEvent( "PropertyValueChanged", RoutingStrategy.Bubble, typeof( PropertyValueChangedEventHandler ), typeof( PropertyGrid ) );
+    public event PropertyValueChangedEventHandler PropertyValueChanged
+    {
+      add
+      {
+        AddHandler( PropertyValueChangedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( PropertyValueChangedEvent, value );
+      }
+    }
+
+    public static readonly RoutedEvent SelectedPropertyItemChangedEvent = EventManager.RegisterRoutedEvent( "SelectedPropertyItemChanged", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( PropertyGrid ) );
+    public event RoutedEventHandler SelectedPropertyItemChanged
+    {
+      add
+      {
+        AddHandler( SelectedPropertyItemChangedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( SelectedPropertyItemChangedEvent, value );
+      }
+    }
+
+    #endregion //Events
+
+    #region Interfaces
+
+    #region ISupportInitialize Members
+
+    public override void BeginInit()
+    {
+      base.BeginInit();
+      _initializationCount++;
+    }
+
+    public override void EndInit()
+    {
+      base.EndInit();
+      if( --_initializationCount == 0 )
+      {
+        ProcessInitializationParameters();
+      }
+    }
+
+    private void ProcessInitializationParameters()
+    {
+      if( _hasPendingSelectedObjectChanged )
+      {
+        //This will update SelectedObject, Type, Name based on the actual config.
+        OnSelectedObjectChanged( SelectedObject, SelectedObject );
+      }
+    }
+
+    #endregion
+
+    #endregion
+  }
+
+  public delegate void PropertyValueChangedEventHandler( object sender, PropertyValueChangedEventArgs e );
+  public class PropertyValueChangedEventArgs : RoutedEventArgs
+  {
+    public object NewValue
+    {
+      get;
+      set;
+    }
+    public object OldValue
+    {
+      get;
+      set;
+    }
+
+    public PropertyValueChangedEventArgs( RoutedEvent routedEvent, object source, object oldValue, object newValue )
+      : base( routedEvent, source )
+    {
+      NewValue = newValue;
+      OldValue = oldValue;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGridUtilities.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGridUtilities.cs
new file mode 100644
index 00000000..b8ffc753
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGridUtilities.cs
@@ -0,0 +1,219 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Windows;
+using System.Windows.Data;
+using System.Windows.Media;
+using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
+using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  internal class PropertyGridUtilities
+  {
+    internal static T GetAttribute<T>( PropertyDescriptor property ) where T : Attribute
+    {
+      foreach( Attribute att in property.Attributes )
+      {
+        var tAtt = att as T;
+        if( tAtt != null )
+          return tAtt;
+      }
+      return null;
+    }
+
+    internal static PropertyItemCollection GetAlphabetizedProperties( List<PropertyItem> propertyItems )
+    {
+      PropertyItemCollection propertyCollection = new PropertyItemCollection( propertyItems );
+      propertyCollection.SortBy( "DisplayName", ListSortDirection.Ascending );
+      return propertyCollection;
+    }
+
+    internal static PropertyItemCollection GetCategorizedProperties( List<PropertyItem> propertyItems )
+    {
+      PropertyItemCollection propertyCollection = new PropertyItemCollection( propertyItems );
+      propertyCollection.GroupBy( "Category" );
+      propertyCollection.SortBy( "Category", ListSortDirection.Ascending );
+
+      propertyCollection.SortBy( "PropertyOrder", ListSortDirection.Ascending );
+      propertyCollection.SortBy( "DisplayName", ListSortDirection.Ascending );
+      return propertyCollection;
+    }
+
+
+    internal static PropertyDescriptorCollection GetPropertyDescriptors( object instance )
+    {
+      PropertyDescriptorCollection descriptors;
+
+      TypeConverter tc = TypeDescriptor.GetConverter( instance );
+      if( tc == null || !tc.GetPropertiesSupported() )
+      {
+
+        if( instance is ICustomTypeDescriptor )
+          descriptors = ( ( ICustomTypeDescriptor )instance ).GetProperties();
+        else
+          descriptors = TypeDescriptor.GetProperties( instance.GetType() );
+      }
+      else
+      {
+        descriptors = tc.GetProperties( instance );
+      }
+
+      return descriptors;
+    }
+
+    internal static PropertyItem CreatePropertyItem( PropertyDescriptor property, object instance, PropertyGrid grid, string bindingPath )
+    {
+        return CreatePropertyItem(property, instance, grid, bindingPath, 0);
+    }
+
+    internal static PropertyItem CreatePropertyItem( PropertyDescriptor property, object instance, PropertyGrid grid, string bindingPath, int level )
+    {
+      PropertyItem propertyItem = new PropertyItem( instance, property, grid, bindingPath, level );
+
+      var binding = new Binding( bindingPath )
+      {
+        Source = instance,
+        ValidatesOnExceptions = true,
+        ValidatesOnDataErrors = true,
+        Mode = propertyItem.IsReadOnly ? BindingMode.OneWay : BindingMode.TwoWay
+      };
+      propertyItem.SetBinding( PropertyItem.ValueProperty, binding );
+
+      propertyItem.Editor = PropertyGridUtilities.GetTypeEditor( propertyItem
+                                                                , grid.EditorDefinitions
+                                                                );
+      return propertyItem;
+    }
+
+    internal static FrameworkElement GetTypeEditor( PropertyItem propertyItem
+                                                    , EditorDefinitionCollection editorDefinitions
+                                                    )
+    {
+      FrameworkElement editor = null;
+
+      //first check for an attribute editor
+      if( editor == null )
+        editor = PropertyGridUtilities.GetAttibuteEditor( propertyItem );
+
+      //now look for a custom editor based on editor definitions
+      if( editor == null )
+        editor = PropertyGridUtilities.GetCustomEditor( propertyItem, editorDefinitions );
+
+      //guess we have to use the default editor
+      if( editor == null )
+        editor = PropertyGridUtilities.CreateDefaultEditor( propertyItem );
+
+      return editor;
+    }
+
+    internal static FrameworkElement GetAttibuteEditor( PropertyItem propertyItem )
+    {
+      FrameworkElement editor = null;
+
+      var itemsSourceAttribute = GetAttribute<ItemsSourceAttribute>( propertyItem.PropertyDescriptor );
+      if( itemsSourceAttribute != null )
+        editor = new ItemsSourceAttributeEditor( itemsSourceAttribute ).ResolveEditor( propertyItem );
+
+      var editorAttribute = GetAttribute<EditorAttribute>( propertyItem.PropertyDescriptor );
+      if( editorAttribute != null )
+      {
+        Type type = Type.GetType( editorAttribute.EditorTypeName );
+        var instance = Activator.CreateInstance( type );
+        if( instance is ITypeEditor )
+          editor = ( instance as ITypeEditor ).ResolveEditor( propertyItem );
+      }
+
+      return editor;
+    }
+
+    internal static FrameworkElement GetCustomEditor( PropertyItem propertyItem, EditorDefinitionCollection customTypeEditors )
+    {
+      FrameworkElement editor = null;
+
+      //check for custom editor
+      if( (customTypeEditors != null) && (customTypeEditors.Count > 0) )
+      {
+        //first check if the custom editor is type based
+        EditorDefinition customEditor = customTypeEditors[ propertyItem.PropertyType ];
+        if( customEditor == null )
+        {
+          //must be property based
+          customEditor = customTypeEditors[ propertyItem.Name ];
+        }
+
+        if( customEditor != null )
+        {
+          if( customEditor.EditorTemplate != null )
+            editor = customEditor.EditorTemplate.LoadContent() as FrameworkElement;
+        }
+      }
+
+      return editor;
+    }
+
+    internal static FrameworkElement CreateDefaultEditor( PropertyItem propertyItem )
+    {
+      ITypeEditor editor = null;
+
+
+      if( propertyItem.IsReadOnly )
+        editor = new TextBlockEditor();
+      else if( propertyItem.PropertyType == typeof( bool ) || propertyItem.PropertyType == typeof( bool? ) )
+        editor = new CheckBoxEditor();
+      else if( propertyItem.PropertyType == typeof( decimal ) || propertyItem.PropertyType == typeof( decimal? ) )
+        editor = new DecimalUpDownEditor();
+      else if( propertyItem.PropertyType == typeof( double ) || propertyItem.PropertyType == typeof( double? ) )
+        editor = new DoubleUpDownEditor();
+      else if( propertyItem.PropertyType == typeof( int ) || propertyItem.PropertyType == typeof( int? ) )
+        editor = new IntegerUpDownEditor();
+      else if( propertyItem.PropertyType == typeof( DateTime ) || propertyItem.PropertyType == typeof( DateTime? ) )
+        editor = new DateTimeUpDownEditor();
+      else if( ( propertyItem.PropertyType == typeof( Color ) ) )
+        editor = new ColorEditor();
+      else if( propertyItem.PropertyType.IsEnum )
+        editor = new EnumComboBoxEditor();
+      else if( propertyItem.PropertyType == typeof( TimeSpan ) )
+        editor = new TimeSpanEditor();
+      else if( propertyItem.PropertyType == typeof( FontFamily ) || propertyItem.PropertyType == typeof( FontWeight ) || propertyItem.PropertyType == typeof( FontStyle ) || propertyItem.PropertyType == typeof( FontStretch ) )
+        editor = new FontComboBoxEditor();
+      else
+      {
+        Type listType = CollectionEditor.GetListItemType(propertyItem.PropertyType);
+
+        if(listType != null)
+        {
+          if( !listType.IsPrimitive && !listType.Equals( typeof( String ) ) )
+            editor = new Xceed.Wpf.Toolkit.PropertyGrid.Editors.CollectionEditor();
+          else
+            editor = new Xceed.Wpf.Toolkit.PropertyGrid.Editors.PrimitiveTypeCollectionEditor();
+        }
+        else
+          editor = new TextBoxEditor();
+      }
+
+      return editor.ResolveEditor( propertyItem );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItem.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItem.cs
new file mode 100644
index 00000000..1684b3e4
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItem.cs
@@ -0,0 +1,548 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Input;
+using System.Windows.Markup.Primitives;
+using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
+using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  public class PropertyItem : Control
+  {
+    #region Members
+
+    private DependencyPropertyDescriptor _dpDescriptor;
+    private MarkupObject _markupObject;
+
+    #endregion //Members
+
+    #region Properties
+
+    public string BindingPath
+    {
+      get;
+      private set;
+    }
+
+    #region Category
+
+    public static readonly DependencyProperty CategoryProperty = DependencyProperty.Register( "Category", typeof( string ), typeof( PropertyItem ), new UIPropertyMetadata( string.Empty ) );
+    public string Category
+    {
+      get
+      {
+        return ( string )GetValue( CategoryProperty );
+      }
+      set
+      {
+        SetValue( CategoryProperty, value );
+      }
+    }
+
+    #endregion //Category
+
+    #region Description
+
+    public string Description
+    {
+      get
+      {
+        return PropertyDescriptor.Description;
+      }
+    }
+
+    #endregion //Description
+
+    #region DisplayName
+
+    public static readonly DependencyProperty DisplayNameProperty = DependencyProperty.Register( "DisplayName", typeof( string ), typeof( PropertyItem ), new UIPropertyMetadata( null ) );
+    public string DisplayName
+    {
+      get
+      {
+        return ( string )GetValue( DisplayNameProperty );
+      }
+      set
+      {
+        SetValue( DisplayNameProperty, value );
+      }
+    }
+
+    #endregion //DisplayName
+
+    #region Editor
+
+    public static readonly DependencyProperty EditorProperty = DependencyProperty.Register( "Editor", typeof( FrameworkElement ), typeof( PropertyItem ), new UIPropertyMetadata( null, OnEditorChanged ) );
+    public FrameworkElement Editor
+    {
+      get
+      {
+        return ( FrameworkElement )GetValue( EditorProperty );
+      }
+      set
+      {
+        SetValue( EditorProperty, value );
+      }
+    }
+
+    private static void OnEditorChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PropertyItem propertyItem = o as PropertyItem;
+      if( propertyItem != null )
+        propertyItem.OnEditorChanged( ( FrameworkElement )e.OldValue, ( FrameworkElement )e.NewValue );
+    }
+
+    protected virtual void OnEditorChanged( FrameworkElement oldValue, FrameworkElement newValue )
+    {
+      if( oldValue != null )
+        oldValue.DataContext = null;
+
+      if( newValue != null )
+        newValue.DataContext = this;
+    }
+
+    #endregion //Editor
+
+    #region Instance
+
+    private object _instance;
+    public object Instance
+    {
+      get
+      {
+        return _instance;
+      }
+      private set
+      {
+        _instance = value;
+        _markupObject = MarkupWriter.GetMarkupObjectFor( _instance );
+      }
+    }
+
+    #endregion //Instance
+
+    #region IsDataBound
+
+    /// <summary>
+    /// Gets if the property is data bound
+    /// </summary>
+    public bool IsDataBound
+    {
+      get
+      {
+        var dependencyObject = Instance as DependencyObject;
+        if( dependencyObject != null && _dpDescriptor != null )
+          return BindingOperations.GetBindingExpressionBase( dependencyObject, _dpDescriptor.DependencyProperty ) != null;
+
+        return false;
+      }
+    }
+
+    #endregion //IsDataBound
+
+    #region IsDynamicResource
+
+    public bool IsDynamicResource
+    {
+      get
+      {
+        var markupProperty = _markupObject.Properties.Where( p => p.Name == PropertyDescriptor.Name ).FirstOrDefault();
+        if( markupProperty != null )
+          return markupProperty.Value is DynamicResourceExtension;
+        return false;
+      }
+    }
+
+    #endregion //IsDynamicResource
+
+    #region IsExpanded
+
+    public static readonly DependencyProperty IsExpandedProperty = DependencyProperty.Register( "IsExpanded", typeof( bool ), typeof( PropertyItem ), new UIPropertyMetadata( false, OnIsExpandedChanged ) );
+    public bool IsExpanded
+    {
+      get
+      {
+        return ( bool )GetValue( IsExpandedProperty );
+      }
+      set
+      {
+        SetValue( IsExpandedProperty, value );
+      }
+    }
+
+    private static void OnIsExpandedChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PropertyItem propertyItem = o as PropertyItem;
+      if( propertyItem != null )
+        propertyItem.OnIsExpandedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnIsExpandedChanged( bool oldValue, bool newValue )
+    {
+      if( newValue && ( Properties == null || Properties.Count == 0 ) )
+      {
+        GetChildProperties();
+      }
+    }
+
+    #endregion IsExpanded
+
+    #region HasChildProperties
+
+    public static readonly DependencyProperty HasChildPropertiesProperty = DependencyProperty.Register( "HasChildProperties", typeof( bool ), typeof( PropertyItem ), new UIPropertyMetadata( false ) );
+    public bool HasChildProperties
+    {
+      get
+      {
+        return ( bool )GetValue( HasChildPropertiesProperty );
+      }
+      set
+      {
+        SetValue( HasChildPropertiesProperty, value );
+      }
+    }
+
+    #endregion HasChildProperties
+
+    #region HasResourceApplied
+
+    public bool HasResourceApplied
+    {
+      //TODO: need to find a better way to determine if a StaticResource has been applied to any property not just a style
+      get
+      {
+        var markupProperty = _markupObject.Properties.Where( p => p.Name == PropertyDescriptor.Name ).FirstOrDefault();
+        if( markupProperty != null )
+          return markupProperty.Value is Style;
+
+        return false;
+      }
+    }
+
+    #endregion //HasResourceApplied
+
+    public bool IsReadOnly
+    {
+      get;
+      private set;
+    }
+
+    #region IsSelected
+
+    public static readonly DependencyProperty IsSelectedProperty = DependencyProperty.Register( "IsSelected", typeof( bool ), typeof( PropertyItem ), new UIPropertyMetadata( false, OnIsSelectedChanged ) );
+    public bool IsSelected
+    {
+      get
+      {
+        return ( bool )GetValue( IsSelectedProperty );
+      }
+      set
+      {
+        SetValue( IsSelectedProperty, value );
+      }
+    }
+
+    private static void OnIsSelectedChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PropertyItem propertyItem = o as PropertyItem;
+      if( propertyItem != null )
+        propertyItem.OnIsSelectedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnIsSelectedChanged( bool oldValue, bool newValue )
+    {
+      if( newValue )
+        PropertyGrid.SelectedPropertyItem = this;
+    }
+
+    #endregion //IsSelected
+
+    #region Level
+
+    public static readonly DependencyProperty LevelProperty = DependencyProperty.Register( "Level", typeof( int ), typeof( PropertyItem ), new UIPropertyMetadata( 0 ) );
+    public int Level
+    {
+      get
+      {
+        return ( int )GetValue( LevelProperty );
+      }
+      set
+      {
+        SetValue( LevelProperty, value );
+      }
+    }
+
+    #endregion //Level
+
+    #region Properties
+
+    public static readonly DependencyProperty PropertiesProperty = DependencyProperty.Register( "Properties", typeof( PropertyItemCollection ), typeof( PropertyItem ), new UIPropertyMetadata( null ) );
+    public PropertyItemCollection Properties
+    {
+      get
+      {
+        return ( PropertyItemCollection )GetValue( PropertiesProperty );
+      }
+      set
+      {
+        SetValue( PropertiesProperty, value );
+      }
+    }
+
+    #endregion //Properties
+
+    #region PropertyDescriptor
+
+    private PropertyDescriptor _propertyDescriptor;
+    public PropertyDescriptor PropertyDescriptor
+    {
+      get
+      {
+        return _propertyDescriptor;
+      }
+      private set
+      {
+        _propertyDescriptor = value;
+        _dpDescriptor = DependencyPropertyDescriptor.FromProperty( _propertyDescriptor );
+      }
+    }
+
+    #endregion //PropertyDescriptor
+
+    public PropertyGrid PropertyGrid
+    {
+      get;
+      private set;
+    }
+
+    public int PropertyOrder
+    {
+      get;
+      set;
+    } //maybe make a DP
+
+    #region PropertyType
+
+    public Type PropertyType
+    {
+      get
+      {
+        return PropertyDescriptor.PropertyType;
+      }
+    }
+
+    #endregion //PropertyType
+
+    public ICommand ResetValueCommand
+    {
+      get;
+      private set;
+    }
+
+    #region Value
+
+    public static readonly DependencyProperty ValueProperty = DependencyProperty.Register( "Value", typeof( object ), typeof( PropertyItem ), new UIPropertyMetadata( null, OnValueChanged ) );
+    public object Value
+    {
+      get
+      {
+        return ( object )GetValue( ValueProperty );
+      }
+      set
+      {
+        SetValue( ValueProperty, value );
+      }
+    }
+
+    private static void OnValueChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PropertyItem propertyItem = o as PropertyItem;
+      if( propertyItem != null )
+      {
+        propertyItem.OnValueChanged( ( object )e.OldValue, ( object )e.NewValue );
+      }
+    }
+
+    protected virtual void OnValueChanged( object oldValue, object newValue )
+    {
+      if( IsInitialized )
+      {
+        PropertyGrid.RaiseEvent( new PropertyValueChangedEventArgs( PropertyGrid.PropertyValueChangedEvent, this, oldValue, newValue ) );
+      }
+    }
+
+    #endregion //Value
+
+    #region ValueSource
+
+    /// <summary>
+    /// Gets the value source.
+    /// </summary>
+    public BaseValueSource ValueSource
+    {
+      get
+      {
+        var dependencyObject = Instance as DependencyObject;
+        if( _dpDescriptor != null && dependencyObject != null )
+          return DependencyPropertyHelper.GetValueSource( dependencyObject, _dpDescriptor.DependencyProperty ).BaseValueSource;
+
+        return BaseValueSource.Unknown;
+      }
+    }
+
+    #endregion //ValueSource
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static PropertyItem()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyItem ), new FrameworkPropertyMetadata( typeof( PropertyItem ) ) );
+    }
+
+    public PropertyItem( object instance, PropertyDescriptor property, PropertyGrid propertyGrid, string bindingPath, int level )
+    {
+      PropertyDescriptor = property;
+      PropertyGrid = propertyGrid;
+      Instance = instance;
+      BindingPath = bindingPath;
+      Level = level;
+
+      SetPropertyDescriptorProperties();
+      ResolveParenthesisPropertyName();
+      ResolveExpandableObject();
+      ResolvePropertyOrder();
+
+      CommandBindings.Add( new CommandBinding( PropertyItemCommands.ResetValue, ExecuteResetValueCommand, CanExecuteResetValueCommand ) );
+      AddHandler( Mouse.PreviewMouseDownEvent, new MouseButtonEventHandler( PropertyItem_PreviewMouseDown ), true );
+    }
+
+    #endregion //Constructors
+
+    #region Event Handlers
+
+    void PropertyItem_PreviewMouseDown( object sender, MouseButtonEventArgs e )
+    {
+      IsSelected = true;
+    }
+
+    #endregion  //Event Handlers
+
+    #region Commands
+
+    private void ExecuteResetValueCommand( object sender, ExecutedRoutedEventArgs e )
+    {
+      if( PropertyDescriptor.CanResetValue( Instance ) )
+        PropertyDescriptor.ResetValue( Instance );
+
+      //TODO: notify UI that the ValueSource may have changed to update the icon
+    }
+
+    private void CanExecuteResetValueCommand( object sender, CanExecuteRoutedEventArgs e )
+    {
+      bool canExecute = false;
+
+      if( PropertyDescriptor.CanResetValue( Instance ) && !PropertyDescriptor.IsReadOnly )
+      {
+        canExecute = true;
+      }
+
+      e.CanExecute = canExecute;
+    }
+
+    #endregion //Commands
+
+    #region Methods
+
+    private void GetChildProperties()
+    {
+      if( Value == null )
+        return;
+
+      var propertyItems = new List<PropertyItem>();
+
+      try
+      {
+        PropertyDescriptorCollection descriptors = PropertyGridUtilities.GetPropertyDescriptors( Value );
+
+        foreach( PropertyDescriptor descriptor in descriptors )
+        {
+          if( descriptor.IsBrowsable )
+          {
+            PropertyItem childPropertyItem = PropertyGridUtilities.CreatePropertyItem( descriptor, Instance, PropertyGrid, String.Format( "{0}.{1}", BindingPath, descriptor.Name ), Level + 1 );
+            propertyItems.Add( childPropertyItem );
+          }
+        }
+      }
+      catch( Exception )
+      {
+        //TODO: handle this some how
+      }
+
+      Properties = PropertyGridUtilities.GetAlphabetizedProperties( propertyItems );
+    }
+
+    private void ResolveParenthesisPropertyName()
+    {
+      var attribute = PropertyGridUtilities.GetAttribute<ParenthesizePropertyNameAttribute>( PropertyDescriptor );
+      if( (attribute != null) && attribute.NeedParenthesis )
+      {
+        DisplayName = "(" + DisplayName + ")";
+      }
+    }
+
+    private void ResolveExpandableObject()
+    {
+      var attribute = PropertyGridUtilities.GetAttribute<ExpandableObjectAttribute>( PropertyDescriptor );
+      if( attribute != null )
+      {
+        HasChildProperties = true;
+        IsReadOnly = true;
+      }
+    }
+
+    private void ResolvePropertyOrder()
+    {
+      var attrs = PropertyDescriptor.Attributes.OfType<PropertyOrderAttribute>();
+      if( attrs.Any() )
+        PropertyOrder = attrs.First().Order;
+      else
+        PropertyOrder = 0;
+    }
+
+    private void SetPropertyDescriptorProperties()
+    {
+      Name = PropertyDescriptor.Name;
+      DisplayName = PropertyDescriptor.DisplayName;
+      Category = PropertyDescriptor.Category;
+      IsReadOnly = PropertyDescriptor.IsReadOnly;
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItemCollection.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItemCollection.cs
new file mode 100644
index 00000000..53961ee1
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItemCollection.cs
@@ -0,0 +1,72 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  public class PropertyItemCollection : ObservableCollection<PropertyItem>
+  {
+    public PropertyItemCollection()
+    {
+
+    }
+
+    public PropertyItemCollection( List<PropertyItem> list )
+      : base( list )
+    {
+
+    }
+    public PropertyItemCollection( IEnumerable<PropertyItem> collection )
+      : base( collection )
+    {
+
+    }
+
+    private ICollectionView GetDefaultView()
+    {
+      return CollectionViewSource.GetDefaultView( this );
+    }
+
+    public void GroupBy( string name )
+    {
+      GetDefaultView().GroupDescriptions.Add( new PropertyGroupDescription( name ) );
+    }
+
+    public void SortBy( string name, ListSortDirection sortDirection )
+    {
+      GetDefaultView().SortDescriptions.Add( new SortDescription( name, sortDirection ) );
+    }
+
+    public void Filter( string text )
+    {
+      if( text == null )
+        return;
+
+      GetDefaultView().Filter = ( item ) =>
+      {
+        var property = item as PropertyItem;
+        return property.DisplayName.ToLower().StartsWith( text.ToLower() );
+      };
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Themes/Generic.xaml
new file mode 100644
index 00000000..2f8c6e0c
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Themes/Generic.xaml
@@ -0,0 +1,535 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:pg="clr-namespace:Xceed.Wpf.Toolkit.PropertyGrid"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
+                    xmlns:pgconv="clr-namespace:Xceed.Wpf.Toolkit.PropertyGrid.Converters"
+                    xmlns:utilities="clr-namespace:Xceed.Wpf.Toolkit.Core.Utilities"
+                    xmlns:commands="clr-namespace:Xceed.Wpf.Toolkit.PropertyGrid.Commands">
+
+   <!-- =============================================================================== -->
+   <!-- PropertyGrid                                                                    -->
+   <!-- =============================================================================== -->
+
+   <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+   <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+   <pgconv:ExpandableObjectMarginConverter x:Key="ExpandableObjectMarginConverter" />
+   <pgconv:ValueSourceToImagePathConverter x:Key="ValueSourceToImagePathConverter" />
+   <pgconv:ValueSourceToToolTipConverter x:Key="ValueSourceToToolTipConverter" />
+
+   <SolidColorBrush x:Key="MouseOverBorderBrush" Color="#FFFFB700" />
+   <LinearGradientBrush x:Key="MouseOverBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <GradientStop Offset="0" Color="#FFFEFBF4" />
+      <GradientStop Offset="0.19" Color="#FFFDE7CE" />
+      <GradientStop Offset="0.39" Color="#FFFDDEB8" />
+      <GradientStop Offset="0.39" Color="#FFFFCE6B" />
+      <GradientStop Offset="0.79" Color="#FFFFDE9A" />
+      <GradientStop Offset="1" Color="#FFFFEBAA" />
+   </LinearGradientBrush>
+
+   <SolidColorBrush x:Key="CheckedBorderBrush" Color="#FFC29B29" />
+   <LinearGradientBrush x:Key="CheckedBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <GradientStop Offset="0" Color="#FFFFDCA0" />
+      <GradientStop Offset="0.18" Color="#FFFFD692" />
+      <GradientStop Offset="0.39" Color="#FFFFC45D" />
+      <GradientStop Offset="1" Color="#FFFFD178" />
+   </LinearGradientBrush>
+
+   <SolidColorBrush x:Key="PressedBorderBrush" Color="#FFC29B29" />
+   <LinearGradientBrush x:Key="PressedBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <GradientStop Offset="0" Color="#FFE3C085" />
+      <GradientStop Offset="0.19" Color="#FFF4CC89" />
+      <GradientStop Offset="0.36" Color="#FFF5C777" />
+      <GradientStop Offset="0.36" Color="#FFF5BB56" />
+      <GradientStop Offset="0.79" Color="#FFF4CE9A" />
+      <GradientStop Offset="1" Color="#FFF3E28D" />
+   </LinearGradientBrush>
+
+   <Style x:Key="OptionsToggleButtonStyle" TargetType="{x:Type RadioButton}">
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="BorderBrush" Value="Transparent" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+      <Setter Property="Height" Value="22" />
+      <Setter Property="HorizontalContentAlignment" Value="Center" />
+      <Setter Property="ToolTipService.InitialShowDelay" Value="900" />
+      <Setter Property="ToolTipService.ShowDuration" Value="20000" />
+      <Setter Property="ToolTipService.BetweenShowDelay" Value="0" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type RadioButton}">
+               <Grid SnapsToDevicePixels="True">
+                  <Border x:Name="OuterBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="2" />
+                  <Border x:Name="MiddleBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2">
+                     <Border x:Name="InnerBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2" Padding="{TemplateBinding Padding}">
+                        <StackPanel x:Name="StackPanel" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
+                           <ContentPresenter x:Name="Content"
+                                             Content="{TemplateBinding Content}"
+                                             Margin="1"
+                                             RenderOptions.BitmapScalingMode="NearestNeighbor"
+                                             VerticalAlignment="Center"
+                                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                        </StackPanel>
+                     </Border>
+                  </Border>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsMouseOver" Value="True">
+                     <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource MouseOverBackgroundBrush}" />
+                     <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource MouseOverBorderBrush}" />
+                     <Setter Property="BorderBrush" TargetName="InnerBorder" Value="#80FFFFFF" />
+                  </Trigger>
+
+                  <Trigger Property="IsEnabled" Value="False">
+                     <Setter Property="Opacity" TargetName="Content" Value="0.5" />
+                     <Setter Property="TextElement.Foreground" TargetName="OuterBorder" Value="#FF9E9E9E" />
+                  </Trigger>
+
+                  <Trigger Property="IsChecked" Value="True">
+                     <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource CheckedBackgroundBrush}" />
+                     <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource CheckedBorderBrush}" />
+                     <Setter Property="BorderBrush" TargetName="InnerBorder">
+                        <Setter.Value>
+                           <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
+                              <GradientStop Color="#FFE7CBAD" Offset="0" />
+                              <GradientStop Color="#FFF7D7B5" Offset="0.1" />
+                              <GradientStop Color="#FFFFD38C" Offset="0.36" />
+                              <GradientStop Color="#FFFFC75A" Offset="0.36" />
+                              <GradientStop Color="#FFFFEFA5" Offset="1" />
+                           </LinearGradientBrush>
+                        </Setter.Value>
+                     </Setter>
+                  </Trigger>
+
+                  <Trigger Property="IsPressed" Value="True">
+                     <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource PressedBackgroundBrush}" />
+                     <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource PressedBorderBrush}" />
+                     <Setter Property="BorderBrush" TargetName="InnerBorder" Value="Transparent" />
+                  </Trigger>
+
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="IsChecked" Value="True" />
+                        <Condition Property="IsMouseOver" Value="True" />
+                     </MultiTrigger.Conditions>
+                     <Setter Property="Background" TargetName="MiddleBorder">
+                        <Setter.Value>
+                           <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
+                              <GradientStop Color="#40FFFEFE" Offset="0" />
+                              <GradientStop Color="#40FFFEFE" Offset="0.39" />
+                              <GradientStop Color="#20FFCE68" Offset="0.39" />
+                              <GradientStop Color="#20FFCE68" Offset="0.69" />
+                              <GradientStop Color="#10FFFFFF" Offset="1" />
+                           </LinearGradientBrush>
+                        </Setter.Value>
+                     </Setter>
+                  </MultiTrigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="ClearFilterButtonStyle" TargetType="{x:Type Button}">
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="BorderBrush" Value="Transparent" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Height" Value="22" />
+      <Setter Property="HorizontalContentAlignment" Value="Center" />
+      <Setter Property="ToolTipService.InitialShowDelay" Value="900" />
+      <Setter Property="ToolTipService.ShowDuration" Value="20000" />
+      <Setter Property="ToolTipService.BetweenShowDelay" Value="0" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Button}">
+               <Grid SnapsToDevicePixels="True">
+                  <Border x:Name="OuterBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="2" />
+                  <Border x:Name="MiddleBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2">
+                     <Border x:Name="InnerBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2" Padding="{TemplateBinding Padding}">
+                        <StackPanel x:Name="StackPanel" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
+                           <ContentPresenter x:Name="Content"
+                                             Content="{TemplateBinding Content}"
+                                             Margin="1"
+                                             RenderOptions.BitmapScalingMode="NearestNeighbor"
+                                             VerticalAlignment="Center"
+                                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                        </StackPanel>
+                     </Border>
+                  </Border>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsMouseOver" Value="True">
+                     <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource MouseOverBackgroundBrush}" />
+                     <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource MouseOverBorderBrush}" />
+                     <Setter Property="BorderBrush" TargetName="InnerBorder" Value="#80FFFFFF" />
+                  </Trigger>
+
+                  <Trigger Property="IsEnabled" Value="False">
+                     <Setter Property="Opacity" TargetName="Content" Value="0.5" />
+                     <Setter Property="TextElement.Foreground" TargetName="OuterBorder" Value="#FF9E9E9E" />
+                  </Trigger>
+
+                  <Trigger Property="IsPressed" Value="True">
+                     <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource PressedBackgroundBrush}" />
+                     <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource PressedBorderBrush}" />
+                     <Setter Property="BorderBrush" TargetName="InnerBorder" Value="Transparent" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <SolidColorBrush x:Key="GlyphBrush" Color="#FF31347C" />
+
+   <ControlTemplate x:Key="ExpanderToggleButton" TargetType="{x:Type ToggleButton}">
+      <Grid>
+         <Rectangle Margin="0,0,0,0" x:Name="Rectangle" Fill="Transparent" />
+         <Path HorizontalAlignment="Center" x:Name="Up_Arrow" VerticalAlignment="Center" Fill="{StaticResource GlyphBrush}" Data="M 0 0 L 4 4 L 8 0 Z" RenderTransformOrigin="0.5,0.5">
+            <Path.RenderTransform>
+               <TransformGroup>
+                  <ScaleTransform ScaleX="1" ScaleY="1" />
+                  <SkewTransform AngleX="0" AngleY="0" />
+                  <RotateTransform Angle="-90" />
+                  <TranslateTransform X="0" Y="0" />
+               </TransformGroup>
+            </Path.RenderTransform>
+         </Path>
+         <Path Visibility="Collapsed" HorizontalAlignment="Center" x:Name="Down_Arrow" VerticalAlignment="Center" Fill="{StaticResource GlyphBrush}" Data="M 0 4 L 4 0 L 8 4 Z" RenderTransformOrigin="0.5,0.5">
+            <Path.RenderTransform>
+               <TransformGroup>
+                  <ScaleTransform ScaleX="1" ScaleY="1" />
+                  <SkewTransform AngleX="0" AngleY="0" />
+                  <RotateTransform Angle="135" />
+                  <TranslateTransform X="0" Y="0" />
+               </TransformGroup>
+            </Path.RenderTransform>
+         </Path>
+      </Grid>
+      <ControlTemplate.Triggers>
+         <Trigger Property="IsChecked" Value="true">
+            <Setter Property="Visibility" Value="Visible" TargetName="Down_Arrow" />
+            <Setter Property="Visibility" Value="Collapsed" TargetName="Up_Arrow" />
+            <Setter Property="OpacityMask" TargetName="Down_Arrow" Value="#FF000000" />
+         </Trigger>
+      </ControlTemplate.Triggers>
+   </ControlTemplate>
+
+   <Style x:Key="ExpanderStyle" TargetType="{x:Type Expander}">
+      <Setter Property="Padding" Value="0" />
+      <Setter Property="Background" Value="#FFF0F0F0" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Expander}">
+               <Grid>
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="Auto" />
+                     <RowDefinition Height="*" x:Name="ContentRow" />
+                  </Grid.RowDefinitions>
+                  <Border x:Name="Border" Background="{TemplateBinding Background}" BorderBrush="#FFF0F0F0">
+                     <Grid>
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="20" />
+                           <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <ToggleButton Template="{StaticResource ExpanderToggleButton}" IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" OverridesDefaultStyle="True" />
+                        <ContentPresenter Grid.Column="1" Margin="1" RecognizesAccessKey="True" ContentSource="Header" TextElement.FontWeight="Bold" />
+                     </Grid>
+                  </Border>
+                  <Border Visibility="Collapsed" Grid.Row="1" x:Name="ExpandSite" Background="#FFF0F0F0" Padding="10 0 0 0">
+                     <Border Background="#FFFFFF" BorderThickness="0" Margin="0" Padding="0" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Focusable="false" />
+                     </Border>
+                  </Border>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsExpanded" Value="True">
+                     <Setter Property="Visibility" Value="Visible" TargetName="ExpandSite" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="PropertyExpanderStyle" TargetType="{x:Type Expander}">
+      <Setter Property="Padding" Value="10 0 0 0" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Expander}">
+               <Grid>
+                  <Border Visibility="Collapsed" Grid.Row="1" x:Name="ExpandSite" Padding="0 0 0 0">
+                     <Border BorderThickness="0" Margin="0" Padding="0" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+												      VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+												      Focusable="false" />
+                     </Border>
+                  </Border>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsExpanded" Value="True">
+                     <Setter Property="Visibility" Value="Visible" TargetName="ExpandSite" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <ContextMenu x:Key="DefaultAdvancedOptionsMenu">
+      <MenuItem Header="Reset Value" Command="commands:PropertyItemCommands.ResetValue" />
+   </ContextMenu>
+
+   <Style TargetType="{x:Type pg:PropertyItem}">
+      <Setter Property="BorderBrush" Value="#FFF0F0F0" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Focusable" Value="True" />
+      <Setter Property="IsTabStop" Value="False" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type pg:PropertyItem}">
+               <Border Background="White" ContextMenu="{Binding AdvancedOptionsMenu, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}}" ContextMenuService.Placement="Bottom">
+                  <Grid VerticalAlignment="Center" HorizontalAlignment="Stretch">
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="{Binding NameColumnWidth, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type pg:PropertyGrid}}}" />
+                        <ColumnDefinition Width="*" />
+                     </Grid.ColumnDefinitions>
+                     <Grid.RowDefinitions>
+                        <RowDefinition />
+                        <RowDefinition />
+                     </Grid.RowDefinitions>
+
+                     <Border BorderThickness="0.5" BorderBrush="#FFF0F0F0" x:Name="PART_Name">
+                        <Grid Margin="2,2,2,2">
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="*" />
+                              <ColumnDefinition Width="Auto" />
+                           </Grid.ColumnDefinitions>
+
+                           <Grid Margin="{Binding Level, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ExpandableObjectMarginConverter}}">
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="15" />
+                                 <ColumnDefinition Width="*" />
+                              </Grid.ColumnDefinitions>
+
+                              <Border Grid.Column="0">
+                                 <ToggleButton Template="{StaticResource ExpanderToggleButton}"
+                                               OverridesDefaultStyle="True"
+                                               IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}"
+                                               Visibility="{Binding HasChildProperties, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                              </Border>
+
+                              <TextBlock Grid.Column="1" Text="{Binding DisplayName, RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" TextTrimming="CharacterEllipsis" />
+                           </Grid>
+
+                           <Grid Grid.Column="1"
+                                 HorizontalAlignment="Right"
+                                 Margin="5,0,5,0"
+                                 Visibility="{Binding ShowAdvancedOptions, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}, Converter={StaticResource BooleanToVisibilityConverter}}"
+                                 utilities:ContextMenuUtilities.OpenOnMouseLeftButtonClick="True"
+                                 ContextMenu="{Binding AdvancedOptionsMenu, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}}">
+
+                              <Image x:Name="_optionsImage"
+                                     Width="11"
+                                     Height="11"
+                                     Source="{Binding ValueSource, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ValueSourceToImagePathConverter}}"
+                                     ToolTip="{Binding ValueSource, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ValueSourceToToolTipConverter}}" />
+                           </Grid>
+                        </Grid>
+                     </Border>
+
+                     <Border BorderThickness="0.5" BorderBrush="#FFF0F0F0" x:Name="PART_Editor" Grid.Column="1" Background="Transparent">
+                        <ContentControl Content="{TemplateBinding Editor}" VerticalAlignment="Center" Focusable="False" IsTabStop="False" />
+                     </Border>
+
+                     <Expander x:Name="_propertyExpander" Grid.ColumnSpan="2" Grid.Row="1" IsExpanded="{TemplateBinding IsExpanded}" Style="{StaticResource PropertyExpanderStyle}" IsEnabled="True">
+                        <ItemsControl ItemsSource="{Binding Properties, RelativeSource={RelativeSource TemplatedParent}}" IsTabStop="False" Focusable="False">
+                           <ItemsControl.ItemsPanel>
+                              <ItemsPanelTemplate>
+                                 <VirtualizingStackPanel />
+                              </ItemsPanelTemplate>
+                           </ItemsControl.ItemsPanel>
+                        </ItemsControl>
+                     </Expander>
+                  </Grid>
+               </Border>
+               <ControlTemplate.Triggers>
+                  <DataTrigger Binding="{Binding IsDataBound, RelativeSource={RelativeSource Self}}" Value="True">
+                     <Setter TargetName="_optionsImage" Property="Source" Value="/WPFToolkit.Extended;component/PropertyGrid/Images/Database11.png" />
+                     <Setter TargetName="_optionsImage" Property="ToolTip" Value="Databinding" />
+                  </DataTrigger>
+                  <DataTrigger Binding="{Binding IsDynamicResource, RelativeSource={RelativeSource Self}}" Value="True">
+                     <Setter TargetName="_optionsImage" Property="Source" Value="/WPFToolkit.Extended;component/PropertyGrid/Images/Resource11.png" />
+                     <Setter TargetName="_optionsImage" Property="ToolTip" Value="Resource" />
+                  </DataTrigger>
+                  <DataTrigger Binding="{Binding HasResourceApplied, RelativeSource={RelativeSource Self}}" Value="True">
+                     <Setter TargetName="_optionsImage" Property="Source" Value="/WPFToolkit.Extended;component/PropertyGrid/Images/Resource11.png" />
+                     <Setter TargetName="_optionsImage" Property="ToolTip" Value="Resource" />
+                  </DataTrigger>
+                  <Trigger Property="IsMouseOver" Value="True">
+                     <Setter TargetName="PART_Name" Property="Background" Value="#CED4DF" />
+                  </Trigger>
+                  <Trigger Property="IsSelected" Value="True">
+                     <Setter TargetName="PART_Name" Property="Background" Value="#43577B" />
+                     <Setter TargetName="PART_Name" Property="TextElement.Foreground" Value="White" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style TargetType="{x:Type pg:PropertyGrid}">
+      <Setter Property="AdvancedOptionsMenu" Value="{StaticResource DefaultAdvancedOptionsMenu}" />
+      <Setter Property="Background" Value="#CED4DF" />
+      <Setter Property="BorderBrush" Value="#43577B" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type pg:PropertyGrid}">
+               <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+                  <Grid>
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition />
+                        <RowDefinition Height="5" />
+                        <RowDefinition Height="Auto"/>
+                     </Grid.RowDefinitions>
+
+                     <StackPanel Orientation="Horizontal" Margin="6,2,0,4">
+                        <TextBlock Text="{TemplateBinding SelectedObjectTypeName}" FontWeight="Bold" Visibility="{Binding ShowTitle, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}"/>
+                        <TextBlock Text="{TemplateBinding SelectedObjectName}" Margin="5,0,0,0" Visibility="{Binding ShowTitle, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                     </StackPanel>
+
+                     <Grid Grid.Row="1" Margin="4,0,4,4">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="Auto" />
+                           <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <Grid Background="#BCC7D8" Margin="4" Visibility="{Binding ShowSortOptions, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
+                           <StackPanel Orientation="Horizontal" Margin="1" >
+                              <RadioButton IsChecked="{Binding IsCategorized, RelativeSource={RelativeSource TemplatedParent}}"
+                                           VerticalAlignment="Center"
+                                           Style="{StaticResource OptionsToggleButtonStyle}"
+                                           ToolTip="Categorized">
+                                 <Image Source="/WPFToolkit.Extended;component/PropertyGrid/Images/Categorize16.png" Width="16" Height="16" />
+                              </RadioButton>
+                              <RadioButton IsChecked="{Binding IsCategorized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}, Mode=OneWay}"
+                                           VerticalAlignment="Center"
+                                           Style="{StaticResource OptionsToggleButtonStyle}"
+                                           ToolTip="Alphabetical">
+                                 <Image Source="/WPFToolkit.Extended;component/PropertyGrid/Images/SortAscending16.png" Width="16" Height="16" />
+                              </RadioButton>
+                           </StackPanel>
+                        </Grid>
+
+                        <Border Grid.Column="1" Margin="4,4,0,4" Background="White" BorderBrush="Gray" BorderThickness="1" Visibility="{Binding ShowSearchBox, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
+                           <Grid>
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="*" />
+                                 <ColumnDefinition Width="Auto" />
+                              </Grid.ColumnDefinitions>
+                              <local:WatermarkTextBox x:Name="_txtFilter"
+                                                      Background="Transparent" 
+                                                      Text="{Binding Filter, RelativeSource={RelativeSource TemplatedParent}, UpdateSourceTrigger=PropertyChanged}"
+                                                      Watermark="{TemplateBinding FilterWatermark}">
+                                 <local:WatermarkTextBox.Style>
+                                    <Style TargetType="Control">
+                                       <Setter Property="BorderThickness" Value="0" />
+                                       <Style.Triggers>
+                                          <Trigger Property="IsMouseOver" Value="True">
+                                             <Setter Property="BorderThickness" Value="1" />
+                                          </Trigger>
+                                       </Style.Triggers>
+                                    </Style>
+                                 </local:WatermarkTextBox.Style>
+
+                              </local:WatermarkTextBox>
+
+                              <Button Grid.Column="1"
+                                      Command="commands:PropertyGridCommands.ClearFilter"
+                                      Style="{StaticResource ClearFilterButtonStyle}"
+                                      HorizontalAlignment="Left">
+                                 <Image Source="/WPFToolkit.Extended;component/PropertyGrid/Images/ClearFilter16.png" Width="16" Height="16" />
+                              </Button>
+                           </Grid>
+                        </Border>
+                     </Grid>
+
+                     <Grid Grid.Row="2" Background="White">
+                        <ScrollViewer VerticalScrollBarVisibility="Auto">
+                           <ItemsControl ItemsSource="{Binding Properties, RelativeSource={RelativeSource TemplatedParent}}" IsTabStop="False" Focusable="False">
+                              <ItemsControl.ItemsPanel>
+                                 <ItemsPanelTemplate>
+                                    <VirtualizingStackPanel />
+                                 </ItemsPanelTemplate>
+                              </ItemsControl.ItemsPanel>
+
+                              <ItemsControl.GroupStyle>
+                                 <GroupStyle>
+                                    <GroupStyle.ContainerStyle>
+                                       <Style TargetType="{x:Type GroupItem}">
+                                          <Setter Property="Template">
+                                             <Setter.Value>
+                                                <ControlTemplate>
+                                                   <Border Background="{TemplateBinding Background}"
+                                                           BorderBrush="{TemplateBinding BorderBrush}"
+                                                           BorderThickness="{TemplateBinding BorderThickness}">
+                                                      <Expander Header="{Binding Name}" Style="{StaticResource ExpanderStyle}" IsExpanded="True">
+                                                         <ItemsPresenter />
+                                                      </Expander>
+                                                   </Border>
+                                                </ControlTemplate>
+                                             </Setter.Value>
+                                          </Setter>
+                                       </Style>
+                                    </GroupStyle.ContainerStyle>
+                                 </GroupStyle>
+                              </ItemsControl.GroupStyle>
+
+                           </ItemsControl>
+                        </ScrollViewer>
+
+                         <Thumb x:Name="PART_DragThumb" HorizontalAlignment="Left" Width="5" Margin="6,0,0,0" Cursor="SizeWE">
+                           <Thumb.Template>
+                              <ControlTemplate>
+                                 <Border Background="Transparent" />
+                              </ControlTemplate>
+                           </Thumb.Template>
+                        </Thumb>
+
+                     </Grid>
+
+                     <GridSplitter Height="3" Grid.Row="3" HorizontalAlignment="Stretch" Visibility="{Binding ShowSummary, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                     <StackPanel Grid.Row="4" Margin="0,0,0,5" Visibility="{Binding ShowSummary, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
+                        <TextBlock Padding="2 2 2 0" FontWeight="Bold" Text="{Binding SelectedPropertyItem.DisplayName, RelativeSource={RelativeSource TemplatedParent}}" />
+                        <TextBlock Padding="5 2 2 0" TextWrapping="WrapWithOverflow" Text="{Binding SelectedPropertyItem.Description, RelativeSource={RelativeSource TemplatedParent}}" />
+                     </StackPanel>
+                  </Grid>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBox/Formatters/ITextFormatter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBox/Formatters/ITextFormatter.cs
new file mode 100644
index 00000000..85d07765
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBox/Formatters/ITextFormatter.cs
@@ -0,0 +1,29 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows.Documents;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public interface ITextFormatter
+  {
+    string GetText( FlowDocument document );
+    void SetText( FlowDocument document, string text );
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBox/Formatters/PlainTextFormatter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBox/Formatters/PlainTextFormatter.cs
new file mode 100644
index 00000000..2431b185
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBox/Formatters/PlainTextFormatter.cs
@@ -0,0 +1,39 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows.Documents;
+
+namespace Xceed.Wpf.Toolkit
+{
+  /// <summary>
+  /// Formats the RichTextBox text as plain text
+  /// </summary>
+  public class PlainTextFormatter : ITextFormatter
+  {
+    public string GetText( FlowDocument document )
+    {
+      return new TextRange( document.ContentStart, document.ContentEnd ).Text;
+    }
+
+    public void SetText( FlowDocument document, string text )
+    {
+      new TextRange( document.ContentStart, document.ContentEnd ).Text = text;
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBox/Formatters/RtfFormatter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBox/Formatters/RtfFormatter.cs
new file mode 100644
index 00000000..733a82f7
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBox/Formatters/RtfFormatter.cs
@@ -0,0 +1,68 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.IO;
+using System.Text;
+using System.Windows;
+using System.Windows.Documents;
+
+namespace Xceed.Wpf.Toolkit
+{
+  /// <summary>
+  /// Formats the RichTextBox text as RTF
+  /// </summary>
+  public class RtfFormatter : ITextFormatter
+  {
+    public string GetText( FlowDocument document )
+    {
+      TextRange tr = new TextRange( document.ContentStart, document.ContentEnd );
+      using( MemoryStream ms = new MemoryStream() )
+      {
+        tr.Save( ms, DataFormats.Rtf );
+        return ASCIIEncoding.Default.GetString( ms.ToArray() );
+      }
+    }
+
+    public void SetText( FlowDocument document, string text )
+    {
+      try
+      {
+        //if the text is null/empty clear the contents of the RTB. If you were to pass a null/empty string
+        //to the TextRange.Load method an exception would occur.
+        if( String.IsNullOrEmpty( text ) )
+        {
+          document.Blocks.Clear();
+        }
+        else
+        {
+          TextRange tr = new TextRange( document.ContentStart, document.ContentEnd );
+          using( MemoryStream ms = new MemoryStream( Encoding.ASCII.GetBytes( text ) ) )
+          {
+            tr.Load( ms, DataFormats.Rtf );
+          }
+        }
+      }
+      catch
+      {
+        throw new InvalidDataException( "Data provided is not in the correct RTF format." );
+      }
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBox/Formatters/XamlFormatter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBox/Formatters/XamlFormatter.cs
new file mode 100644
index 00000000..769d5b0c
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBox/Formatters/XamlFormatter.cs
@@ -0,0 +1,68 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.IO;
+using System.Text;
+using System.Windows;
+using System.Windows.Documents;
+
+namespace Xceed.Wpf.Toolkit
+{
+  /// <summary>
+  /// Formats the RichTextBox text as Xaml
+  /// </summary>
+  public class XamlFormatter : ITextFormatter
+  {
+    public string GetText( System.Windows.Documents.FlowDocument document )
+    {
+      TextRange tr = new TextRange( document.ContentStart, document.ContentEnd );
+      using( MemoryStream ms = new MemoryStream() )
+      {
+        tr.Save( ms, DataFormats.Xaml );
+        return ASCIIEncoding.Default.GetString( ms.ToArray() );
+      }
+    }
+
+    public void SetText( System.Windows.Documents.FlowDocument document, string text )
+    {
+      try
+      {
+        //if the text is null/empty clear the contents of the RTB. If you were to pass a null/empty string
+        //to the TextRange.Load method an exception would occur.
+        if( String.IsNullOrEmpty( text ) )
+        {
+          document.Blocks.Clear();
+        }
+        else
+        {
+          TextRange tr = new TextRange( document.ContentStart, document.ContentEnd );
+          using( MemoryStream ms = new MemoryStream( Encoding.ASCII.GetBytes( text ) ) )
+          {
+            tr.Load( ms, DataFormats.Xaml );
+          }
+        }
+      }
+      catch
+      {
+        throw new InvalidDataException( "Data provided is not in the correct Xaml format." );
+      }
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBox/RichTextBox.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBox/RichTextBox.cs
new file mode 100644
index 00000000..8a100fe1
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBox/RichTextBox.cs
@@ -0,0 +1,170 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Data;
+using System.Windows.Threading;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class RichTextBox : System.Windows.Controls.RichTextBox
+  {
+    #region Private Members
+
+    private bool _textSetInternally;
+    bool _surpressGetText;
+
+    #endregion //Private Members
+
+    #region Constructors
+
+    public RichTextBox()
+    {
+      Loaded += RichTextBox_Loaded;
+    }
+
+    public RichTextBox( System.Windows.Documents.FlowDocument document )
+      : base( document )
+    {
+
+    }
+
+    #endregion //Constructors
+
+    #region Properties
+
+    #region Text
+
+    public static readonly DependencyProperty TextProperty = DependencyProperty.Register( "Text", typeof( string ), typeof( RichTextBox ), new FrameworkPropertyMetadata( String.Empty, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnTextPropertyChanged, CoerceTextProperty, true, UpdateSourceTrigger.LostFocus ) );
+    public string Text
+    {
+      get
+      {
+        return ( string )GetValue( TextProperty );
+      }
+      set
+      {
+        SetValue( TextProperty, value );
+      }
+    }
+
+    private static void OnTextPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      RichTextBox rtb = ( RichTextBox )d;
+
+      // if the text is not being set internally then load the text into the RichTextBox
+      if( !rtb._textSetInternally )
+      {
+        //to help with performance this is placed on the dispatcher for processing. For some reason when this is done the TextChanged event is fired multiple times
+        //forcing the UpdateText method to be called multiple times and the setter of the source property to be set multiple times. To fix this, we simply set the _surpressGetText
+        //member to true before the operation and set it to false when the operation completes. This will prevent the Text property from being set multiple times.
+        rtb._surpressGetText = true;
+        DispatcherOperation dop = Dispatcher.CurrentDispatcher.BeginInvoke( new Action( delegate()
+            {
+              rtb.TextFormatter.SetText( rtb.Document, ( string )e.NewValue );
+            } ), DispatcherPriority.Background );
+        dop.Completed += ( sender, ea ) =>
+            {
+              rtb._surpressGetText = false;
+            };
+      }
+    }
+
+    private static object CoerceTextProperty( DependencyObject d, object value )
+    {
+      return value ?? "";
+    }
+
+    #endregion //Text
+
+    #region TextFormatter
+
+    private ITextFormatter _textFormatter;
+    /// <summary>
+    /// The ITextFormatter the is used to format the text of the RichTextBox.
+    /// Deafult formatter is the RtfFormatter
+    /// </summary>
+    public ITextFormatter TextFormatter
+    {
+      get
+      {
+        if( _textFormatter == null )
+          _textFormatter = new RtfFormatter(); //default is rtf
+
+        return _textFormatter;
+      }
+      set
+      {
+        if( _textFormatter != value )
+        {
+          _textFormatter = value;
+          _textFormatter.SetText( Document, Text );
+        }
+      }
+    }
+
+    #endregion //TextFormatter
+
+    #endregion //Properties
+
+    #region Methods
+
+    private void UpdateText()
+    {
+      _textSetInternally = true;
+
+      if( !_surpressGetText )
+        Text = TextFormatter.GetText( Document );
+
+      _textSetInternally = false;
+    }
+
+    /// <summary>
+    /// Clears the content of the RichTextBox.
+    /// </summary>
+    public void Clear()
+    {
+      Document.Blocks.Clear();
+    }
+
+    #endregion //Methods
+
+    #region Event Hanlders
+
+    private void RichTextBox_Loaded( object sender, RoutedEventArgs e )
+    {
+      Binding binding = BindingOperations.GetBinding( this, TextProperty );
+
+      if( binding != null )
+      {
+        if( binding.UpdateSourceTrigger == UpdateSourceTrigger.Default || binding.UpdateSourceTrigger == UpdateSourceTrigger.LostFocus )
+        {
+          PreviewLostKeyboardFocus += ( o, ea ) => UpdateText();
+        }
+        else
+        {
+          TextChanged += ( o, ea ) => UpdateText();
+        }
+      }
+    }
+
+    #endregion //Event Hanlders
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs
new file mode 100644
index 00000000..2deeb9a4
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs
@@ -0,0 +1,38 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit
+{
+  public interface IRichTextBoxFormatBar
+  {
+    /// <summary>
+    /// Represents the RichTextBox that will be the target for all text manipulations in the format bar.
+    /// </summary>
+    System.Windows.Controls.RichTextBox Target
+    {
+      get;
+      set;
+    }
+
+    /// <summary>
+    /// Represents the Method that will be used to update the format bar values based on the Selection.
+    /// </summary>
+    void Update();
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Bold16.png b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Bold16.png
new file mode 100644
index 00000000..8fb36a1a
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Bold16.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Bullets16.png b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Bullets16.png
new file mode 100644
index 00000000..73e7c15e
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Bullets16.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/CenterAlign16.png b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/CenterAlign16.png
new file mode 100644
index 00000000..1030a021
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/CenterAlign16.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/FontColorPicker16.png b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/FontColorPicker16.png
new file mode 100644
index 00000000..d9207308
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/FontColorPicker16.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Italic16.png b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Italic16.png
new file mode 100644
index 00000000..8259a9e1
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Italic16.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/JustifyAlign16.png b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/JustifyAlign16.png
new file mode 100644
index 00000000..c5499bce
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/JustifyAlign16.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/LeftAlign16.png b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/LeftAlign16.png
new file mode 100644
index 00000000..51dffb73
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/LeftAlign16.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Numbering16.png b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Numbering16.png
new file mode 100644
index 00000000..03f6fde2
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Numbering16.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/RightAlign16.png b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/RightAlign16.png
new file mode 100644
index 00000000..cb8e400a
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/RightAlign16.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/TextHighlightColorPicker16.png b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/TextHighlightColorPicker16.png
new file mode 100644
index 00000000..4a3783f2
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/TextHighlightColorPicker16.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Underline16.png b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Underline16.png
new file mode 100644
index 00000000..72689482
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/Images/Underline16.png differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml
new file mode 100644
index 00000000..f9dbb581
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml
@@ -0,0 +1,478 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<UserControl x:Class="Xceed.Wpf.Toolkit.RichTextBoxFormatBar"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+             xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
+             Background="Transparent"
+             IsTabStop="False"
+             x:Name="_window">
+   <UserControl.Effect>
+      <DropShadowEffect BlurRadius="5" Opacity=".25" />
+   </UserControl.Effect>
+
+   <UserControl.Resources>
+
+      <conv:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
+
+      <Style TargetType="{x:Type Separator}" BasedOn="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}" />
+
+      <ControlTemplate x:Key="ThumbControlTemplate" TargetType="{x:Type Thumb}">
+         <Border Background="Transparent" Cursor="Hand" ToolTip="Click to Drag">
+            <StackPanel VerticalAlignment="Center" Width="75">
+               <Line SnapsToDevicePixels="True" Stretch="Fill" StrokeDashArray="1,2" StrokeThickness="1" X1="0" X2="1" Margin=".5">
+                  <Line.Stroke>
+                     <SolidColorBrush Color="Gray" />
+                  </Line.Stroke>
+               </Line>
+               <Line SnapsToDevicePixels="True" Stretch="Fill" StrokeDashArray="1,2" StrokeThickness="1" X1="0" X2="1" Margin=".5">
+                  <Line.Stroke>
+                     <SolidColorBrush Color="Gray" />
+                  </Line.Stroke>
+               </Line>
+               <Line SnapsToDevicePixels="True" Stretch="Fill" StrokeDashArray="1,2" StrokeThickness="1" X1="0" X2="1" Margin=".5">
+                  <Line.Stroke>
+                     <SolidColorBrush Color="Gray" />
+                  </Line.Stroke>
+               </Line>
+            </StackPanel>
+         </Border>
+      </ControlTemplate>
+
+      <SolidColorBrush x:Key="MouseOverBorderBrush" Color="#FFFFB700" />
+      <LinearGradientBrush x:Key="MouseOverBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+         <GradientStop Offset="0" Color="#FFFEFBF4" />
+         <GradientStop Offset="0.19" Color="#FFFDE7CE" />
+         <GradientStop Offset="0.39" Color="#FFFDDEB8" />
+         <GradientStop Offset="0.39" Color="#FFFFCE6B" />
+         <GradientStop Offset="0.79" Color="#FFFFDE9A" />
+         <GradientStop Offset="1" Color="#FFFFEBAA" />
+      </LinearGradientBrush>
+
+      <SolidColorBrush x:Key="CheckedBorderBrush" Color="#FFC29B29" />
+      <LinearGradientBrush x:Key="CheckedBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+         <GradientStop Offset="0" Color="#FFFFDCA0" />
+         <GradientStop Offset="0.18" Color="#FFFFD692" />
+         <GradientStop Offset="0.39" Color="#FFFFC45D" />
+         <GradientStop Offset="1" Color="#FFFFD178" />
+      </LinearGradientBrush>
+
+      <SolidColorBrush x:Key="PressedBorderBrush" Color="#FFC29B29" />
+      <LinearGradientBrush x:Key="PressedBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+         <GradientStop Offset="0" Color="#FFE3C085" />
+         <GradientStop Offset="0.19" Color="#FFF4CC89" />
+         <GradientStop Offset="0.36" Color="#FFF5C777" />
+         <GradientStop Offset="0.36" Color="#FFF5BB56" />
+         <GradientStop Offset="0.79" Color="#FFF4CE9A" />
+         <GradientStop Offset="1" Color="#FFF3E28D" />
+      </LinearGradientBrush>
+
+      <Style x:Key="FormatBarToggleButtonStyle" TargetType="{x:Type ToggleButton}">
+         <Setter Property="Background" Value="Transparent" />
+         <Setter Property="BorderBrush" Value="Transparent" />
+         <Setter Property="BorderThickness" Value="1" />
+         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+         <Setter Property="Height" Value="22" />
+         <Setter Property="HorizontalContentAlignment" Value="Center" />
+         <Setter Property="ToolTipService.InitialShowDelay" Value="900" />
+         <Setter Property="ToolTipService.ShowDuration" Value="20000" />
+         <Setter Property="ToolTipService.BetweenShowDelay" Value="0" />
+         <Setter Property="Template">
+            <Setter.Value>
+               <ControlTemplate TargetType="{x:Type ToggleButton}">
+                  <Grid SnapsToDevicePixels="True">
+                     <Border x:Name="OuterBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="2" />
+                     <Border x:Name="MiddleBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2">
+                        <Border x:Name="InnerBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2" Padding="{TemplateBinding Padding}">
+                           <StackPanel x:Name="StackPanel" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
+                              <ContentPresenter x:Name="Content"
+                                                Content="{TemplateBinding Content}"
+                                                Margin="1"
+                                                RenderOptions.BitmapScalingMode="NearestNeighbor"
+                                                VerticalAlignment="Center"
+                                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                           </StackPanel>
+                        </Border>
+                     </Border>
+                  </Grid>
+                  <ControlTemplate.Triggers>
+                     <Trigger Property="IsMouseOver" Value="True">
+                        <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource MouseOverBackgroundBrush}" />
+                        <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource MouseOverBorderBrush}" />
+                        <Setter Property="BorderBrush" TargetName="InnerBorder" Value="#80FFFFFF" />
+                     </Trigger>
+
+                     <Trigger Property="IsEnabled" Value="False">
+                        <Setter Property="Opacity" TargetName="Content" Value="0.5" />
+                        <Setter Property="TextElement.Foreground" TargetName="OuterBorder" Value="#FF9E9E9E" />
+                     </Trigger>
+
+                     <Trigger Property="IsChecked" Value="True">
+                        <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource CheckedBackgroundBrush}" />
+                        <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource CheckedBorderBrush}" />
+                        <Setter Property="BorderBrush" TargetName="InnerBorder">
+                           <Setter.Value>
+                              <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
+                                 <GradientStop Color="#FFE7CBAD" Offset="0" />
+                                 <GradientStop Color="#FFF7D7B5" Offset="0.1" />
+                                 <GradientStop Color="#FFFFD38C" Offset="0.36" />
+                                 <GradientStop Color="#FFFFC75A" Offset="0.36" />
+                                 <GradientStop Color="#FFFFEFA5" Offset="1" />
+                              </LinearGradientBrush>
+                           </Setter.Value>
+                        </Setter>
+                     </Trigger>
+
+                     <Trigger Property="IsPressed" Value="True">
+                        <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource PressedBackgroundBrush}" />
+                        <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource PressedBorderBrush}" />
+                        <Setter Property="BorderBrush" TargetName="InnerBorder" Value="Transparent" />
+                     </Trigger>
+
+                     <MultiTrigger>
+                        <MultiTrigger.Conditions>
+                           <Condition Property="IsChecked" Value="True" />
+                           <Condition Property="IsMouseOver" Value="True" />
+                        </MultiTrigger.Conditions>
+                        <Setter Property="Background" TargetName="MiddleBorder">
+                           <Setter.Value>
+                              <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
+                                 <GradientStop Color="#40FFFEFE" Offset="0" />
+                                 <GradientStop Color="#40FFFEFE" Offset="0.39" />
+                                 <GradientStop Color="#20FFCE68" Offset="0.39" />
+                                 <GradientStop Color="#20FFCE68" Offset="0.69" />
+                                 <GradientStop Color="#10FFFFFF" Offset="1" />
+                              </LinearGradientBrush>
+                           </Setter.Value>
+                        </Setter>
+                     </MultiTrigger>
+                  </ControlTemplate.Triggers>
+               </ControlTemplate>
+            </Setter.Value>
+         </Setter>
+      </Style>
+
+      <Style x:Key="FontColorButtonStyle" TargetType="{x:Type ToggleButton}">
+         <Setter Property="Background" Value="Transparent" />
+         <Setter Property="BorderBrush" Value="Transparent" />
+         <Setter Property="BorderThickness" Value="1" />
+         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+         <Setter Property="Height" Value="22" />
+         <Setter Property="HorizontalContentAlignment" Value="Center" />
+         <Setter Property="ToolTipService.InitialShowDelay" Value="900" />
+         <Setter Property="ToolTipService.ShowDuration" Value="20000" />
+         <Setter Property="ToolTipService.BetweenShowDelay" Value="0" />
+         <Setter Property="Template">
+            <Setter.Value>
+               <ControlTemplate TargetType="{x:Type ToggleButton}">
+                  <Grid SnapsToDevicePixels="True">
+                     <Border x:Name="OuterBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="2" />
+                     <Border x:Name="MiddleBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2">
+                        <Border x:Name="InnerBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2" Padding="{TemplateBinding Padding}">
+                           <Grid>
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="*" />
+                                 <ColumnDefinition />
+                              </Grid.ColumnDefinitions>
+
+                              <Grid>
+                                 <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/FontColorPicker16.png" Width="16" Height="16" />
+                                 <Rectangle Grid.Row="1"
+                                            Height="4"
+                                            Margin="0,12,0,0"
+                                            Fill="{Binding SelectedColor, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
+                              </Grid>
+
+                              <Path Grid.Column="1"
+                                    Width="7"
+                                    Height="4" 
+                                    Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000" />
+                           </Grid>
+                        </Border>
+                     </Border>
+                  </Grid>
+                  <ControlTemplate.Triggers>
+                     <Trigger Property="IsMouseOver" Value="True">
+                        <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource MouseOverBackgroundBrush}" />
+                        <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource MouseOverBorderBrush}" />
+                        <Setter Property="BorderBrush" TargetName="InnerBorder" Value="#80FFFFFF" />
+                     </Trigger>
+
+                     <Trigger Property="IsEnabled" Value="False">
+                        <Setter Property="TextElement.Foreground" TargetName="OuterBorder" Value="#FF9E9E9E" />
+                     </Trigger>
+
+                     <Trigger Property="IsChecked" Value="True">
+                        <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource CheckedBackgroundBrush}" />
+                        <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource CheckedBorderBrush}" />
+                        <Setter Property="BorderBrush" TargetName="InnerBorder">
+                           <Setter.Value>
+                              <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
+                                 <GradientStop Color="#FFE7CBAD" Offset="0" />
+                                 <GradientStop Color="#FFF7D7B5" Offset="0.1" />
+                                 <GradientStop Color="#FFFFD38C" Offset="0.36" />
+                                 <GradientStop Color="#FFFFC75A" Offset="0.36" />
+                                 <GradientStop Color="#FFFFEFA5" Offset="1" />
+                              </LinearGradientBrush>
+                           </Setter.Value>
+                        </Setter>
+                     </Trigger>
+
+                     <Trigger Property="IsPressed" Value="True">
+                        <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource PressedBackgroundBrush}" />
+                        <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource PressedBorderBrush}" />
+                        <Setter Property="BorderBrush" TargetName="InnerBorder" Value="Transparent" />
+                     </Trigger>
+
+                     <MultiTrigger>
+                        <MultiTrigger.Conditions>
+                           <Condition Property="IsChecked" Value="True" />
+                           <Condition Property="IsMouseOver" Value="True" />
+                        </MultiTrigger.Conditions>
+                        <Setter Property="Background" TargetName="MiddleBorder">
+                           <Setter.Value>
+                              <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
+                                 <GradientStop Color="#40FFFEFE" Offset="0" />
+                                 <GradientStop Color="#40FFFEFE" Offset="0.39" />
+                                 <GradientStop Color="#20FFCE68" Offset="0.39" />
+                                 <GradientStop Color="#20FFCE68" Offset="0.69" />
+                                 <GradientStop Color="#10FFFFFF" Offset="1" />
+                              </LinearGradientBrush>
+                           </Setter.Value>
+                        </Setter>
+                     </MultiTrigger>
+                  </ControlTemplate.Triggers>
+               </ControlTemplate>
+            </Setter.Value>
+         </Setter>
+      </Style>
+
+      <Style x:Key="FontBackgrounColorButtonStyle" TargetType="{x:Type ToggleButton}">
+         <Setter Property="Background" Value="White" />
+         <Setter Property="BorderBrush" Value="Transparent" />
+         <Setter Property="BorderThickness" Value="1" />
+         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+         <Setter Property="Height" Value="22" />
+         <Setter Property="HorizontalContentAlignment" Value="Center" />
+         <Setter Property="ToolTipService.InitialShowDelay" Value="900" />
+         <Setter Property="ToolTipService.ShowDuration" Value="20000" />
+         <Setter Property="ToolTipService.BetweenShowDelay" Value="0" />
+         <Setter Property="Template">
+            <Setter.Value>
+               <ControlTemplate TargetType="{x:Type ToggleButton}">
+                  <Grid SnapsToDevicePixels="True">
+                     <Border x:Name="OuterBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="2" />
+                     <Border x:Name="MiddleBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2">
+                        <Border x:Name="InnerBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2" Padding="{TemplateBinding Padding}">
+                           <Grid>
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="*" />
+                                 <ColumnDefinition />
+                              </Grid.ColumnDefinitions>
+
+                              <Grid>
+                                 <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/TextHighlightColorPicker16.png" Width="16" Height="16" />
+                                 <Rectangle Grid.Row="1"
+                                            Height="4"
+                                            Margin="0,12,0,0"
+                                            Fill="{Binding SelectedColor, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
+                              </Grid>
+
+                              <Path Grid.Column="1"
+                                    Width="7"
+                                    Height="4" 
+                                    Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000" />
+                           </Grid>
+                        </Border>
+                     </Border>
+                  </Grid>
+                  <ControlTemplate.Triggers>
+                     <Trigger Property="IsMouseOver" Value="True">
+                        <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource MouseOverBackgroundBrush}" />
+                        <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource MouseOverBorderBrush}" />
+                        <Setter Property="BorderBrush" TargetName="InnerBorder" Value="#80FFFFFF" />
+                     </Trigger>
+
+                     <Trigger Property="IsEnabled" Value="False">
+                        <Setter Property="TextElement.Foreground" TargetName="OuterBorder" Value="#FF9E9E9E" />
+                     </Trigger>
+
+                     <Trigger Property="IsChecked" Value="True">
+                        <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource CheckedBackgroundBrush}" />
+                        <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource CheckedBorderBrush}" />
+                        <Setter Property="BorderBrush" TargetName="InnerBorder">
+                           <Setter.Value>
+                              <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
+                                 <GradientStop Color="#FFE7CBAD" Offset="0" />
+                                 <GradientStop Color="#FFF7D7B5" Offset="0.1" />
+                                 <GradientStop Color="#FFFFD38C" Offset="0.36" />
+                                 <GradientStop Color="#FFFFC75A" Offset="0.36" />
+                                 <GradientStop Color="#FFFFEFA5" Offset="1" />
+                              </LinearGradientBrush>
+                           </Setter.Value>
+                        </Setter>
+                     </Trigger>
+
+                     <Trigger Property="IsPressed" Value="True">
+                        <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource PressedBackgroundBrush}" />
+                        <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource PressedBorderBrush}" />
+                        <Setter Property="BorderBrush" TargetName="InnerBorder" Value="Transparent" />
+                     </Trigger>
+
+                     <MultiTrigger>
+                        <MultiTrigger.Conditions>
+                           <Condition Property="IsChecked" Value="True" />
+                           <Condition Property="IsMouseOver" Value="True" />
+                        </MultiTrigger.Conditions>
+                        <Setter Property="Background" TargetName="MiddleBorder">
+                           <Setter.Value>
+                              <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
+                                 <GradientStop Color="#40FFFEFE" Offset="0" />
+                                 <GradientStop Color="#40FFFEFE" Offset="0.39" />
+                                 <GradientStop Color="#20FFCE68" Offset="0.39" />
+                                 <GradientStop Color="#20FFCE68" Offset="0.69" />
+                                 <GradientStop Color="#10FFFFFF" Offset="1" />
+                              </LinearGradientBrush>
+                           </Setter.Value>
+                        </Setter>
+                     </MultiTrigger>
+                  </ControlTemplate.Triggers>
+               </ControlTemplate>
+            </Setter.Value>
+         </Setter>
+      </Style>
+
+   </UserControl.Resources>
+
+   <Border CornerRadius="3" BorderThickness="1" BorderBrush="Gray" Background="WhiteSmoke">
+      <Grid Margin="5,0,5,5">
+         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+         </Grid.RowDefinitions>
+
+         <Thumb x:Name="_dragWidget" Height="10" 
+                   Template="{StaticResource ThumbControlTemplate}"
+                   DragDelta="DragWidget_DragDelta" />
+
+         <StackPanel Grid.Row="1">
+            <StackPanel Orientation="Horizontal">
+               <ComboBox x:Name="_cmbFontFamilies"
+                         IsEditable="True"
+                         Width="100"
+                         SelectionChanged="FontFamily_SelectionChanged"
+                         ToolTip="Font Family" />
+
+               <ComboBox x:Name="_cmbFontSizes"
+                         IsEditable="True"
+                         Width="43"
+                         SelectionChanged="FontSize_SelectionChanged"
+                         ToolTip="Font Size"/>
+
+               <Separator />
+
+               <ToggleButton x:Name="_btnBullets"
+                             Style="{StaticResource FormatBarToggleButtonStyle}"
+                             Command="EditingCommands.ToggleBullets"
+                             CommandTarget="{Binding ElementName=_window, Path=Target}"
+                             Click="Bullets_Clicked"
+                             ToolTip="Bullets">
+                  <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/Bullets16.png" />
+               </ToggleButton>
+
+               <ToggleButton x:Name="_btnNumbers"
+                             Style="{StaticResource FormatBarToggleButtonStyle}"
+                             Command="EditingCommands.ToggleNumbering"
+                             CommandTarget="{Binding ElementName=_window, Path=Target}"
+                             Click="Numbers_Clicked"
+                             ToolTip="Numbering">
+                  <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/Numbering16.png" />
+               </ToggleButton>
+
+            </StackPanel>
+
+            <StackPanel Orientation="Horizontal" Margin="0,3,0,0">
+               <ToggleButton x:Name="_btnBold"
+                             Style="{StaticResource FormatBarToggleButtonStyle}"
+                             Command="EditingCommands.ToggleBold"
+                             CommandTarget="{Binding ElementName=_window, Path=Target}"
+                             ToolTip="Bold">
+                  <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/Bold16.png" />
+               </ToggleButton>
+               <ToggleButton x:Name="_btnItalic"
+                             Style="{StaticResource FormatBarToggleButtonStyle}"
+                             Command="{x:Static EditingCommands.ToggleItalic}"
+                             CommandTarget="{Binding ElementName=_window, Path=Target}"
+                             ToolTip="Italic">
+                  <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/Italic16.png" />
+               </ToggleButton>
+               <ToggleButton x:Name="_btnUnderline"
+                             Style="{StaticResource FormatBarToggleButtonStyle}"
+                             Command="{x:Static EditingCommands.ToggleUnderline}"
+                             CommandTarget="{Binding ElementName=_window, Path=Target}"
+                             ToolTip="Underline">
+                  <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/Underline16.png" />
+               </ToggleButton>
+
+               <Separator />
+
+               <RadioButton x:Name="_btnAlignLeft"
+                            Style="{StaticResource FormatBarToggleButtonStyle}"
+                            Command="{x:Static EditingCommands.AlignLeft}"
+                            CommandTarget="{Binding ElementName=_window, Path=Target}"
+                            ToolTip="Align Left">
+                  <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/LeftAlign16.png" />
+               </RadioButton>
+               <RadioButton x:Name="_btnAlignCenter"
+                            Style="{StaticResource FormatBarToggleButtonStyle}"
+                            Command="{x:Static EditingCommands.AlignCenter}"
+                            CommandTarget="{Binding ElementName=_window, Path=Target}"
+                            ToolTip="Align Center">
+                  <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/CenterAlign16.png" />
+               </RadioButton>
+               <RadioButton x:Name="_btnAlignRight"
+                            Style="{StaticResource FormatBarToggleButtonStyle}"
+                            Command="{x:Static EditingCommands.AlignRight}"
+                            CommandTarget="{Binding ElementName=_window, Path=Target}"
+                            ToolTip="Align Right">
+                  <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/RightAlign16.png" />
+               </RadioButton>
+
+               <Separator />
+
+               <local:ColorPicker x:Name="_cmbFontBackgroundColor"
+                                  BorderThickness="0" 
+                                  ButtonStyle="{StaticResource FontBackgrounColorButtonStyle}"
+                                  SelectedColorChanged="FontBackgroundColor_SelectedColorChanged"
+                                  ToolTip="Text Highlight Color" />
+
+               <local:ColorPicker x:Name="_cmbFontColor"
+                                  BorderThickness="0" 
+                                  ButtonStyle="{StaticResource FontColorButtonStyle}"
+                                  SelectedColorChanged="FontColor_SelectedColorChanged"
+                                  ToolTip="Font Color" />
+
+            </StackPanel>
+
+         </StackPanel>
+      </Grid>
+   </Border>
+</UserControl>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml.cs
new file mode 100644
index 00000000..3cb1b06e
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml.cs
@@ -0,0 +1,257 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Documents;
+using System.Windows.Media;
+using Xceed.Wpf.Toolkit.Core;
+using System.Linq;
+
+namespace Xceed.Wpf.Toolkit
+{
+  /// <summary>
+  /// Interaction logic for RichTextBoxFormatBar.xaml
+  /// </summary>
+  public partial class RichTextBoxFormatBar : UserControl, IRichTextBoxFormatBar
+  {
+    #region Properties
+
+    #region RichTextBox
+
+    public static readonly DependencyProperty TargetProperty = DependencyProperty.Register( "Target", typeof( global::System.Windows.Controls.RichTextBox ), typeof( RichTextBoxFormatBar ), new PropertyMetadata( null, OnRichTextBoxPropertyChanged ) );
+    public global::System.Windows.Controls.RichTextBox Target
+    {
+      get
+      {
+        return ( global::System.Windows.Controls.RichTextBox )GetValue( TargetProperty );
+      }
+      set
+      {
+        SetValue( TargetProperty, value );
+      }
+    }
+
+    private static void OnRichTextBoxPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      RichTextBoxFormatBar formatBar = d as RichTextBoxFormatBar;
+    }
+
+    #endregion //RichTextBox
+
+    public static double[] FontSizes
+    {
+      get
+      {
+        return new double[] { 
+		            3.0, 4.0, 5.0, 6.0, 6.5, 7.0, 7.5, 8.0, 8.5, 9.0, 9.5, 
+		            10.0, 10.5, 11.0, 11.5, 12.0, 12.5, 13.0, 13.5, 14.0, 15.0,
+		            16.0, 17.0, 18.0, 19.0, 20.0, 22.0, 24.0, 26.0, 28.0, 30.0,
+		            32.0, 34.0, 36.0, 38.0, 40.0, 44.0, 48.0, 52.0, 56.0, 60.0, 64.0, 68.0, 72.0, 76.0,
+		            80.0, 88.0, 96.0, 104.0, 112.0, 120.0, 128.0, 136.0, 144.0
+		            };
+      }
+    }
+
+    #endregion
+
+    #region Constructors
+
+    public RichTextBoxFormatBar()
+    {
+      InitializeComponent();
+      Loaded += FormatToolbar_Loaded;
+
+      _cmbFontFamilies.ItemsSource = Fonts.SystemFontFamilies.OrderBy( fontFamily => fontFamily.Source );
+      _cmbFontSizes.ItemsSource = FontSizes;
+    }
+
+    #endregion //Constructors
+
+    #region Event Hanlders
+
+    void FormatToolbar_Loaded( object sender, RoutedEventArgs e )
+    {
+      Update();
+    }
+
+    private void FontFamily_SelectionChanged( object sender, SelectionChangedEventArgs e )
+    {
+      if( e.AddedItems.Count == 0 )
+        return;
+
+      FontFamily editValue = ( FontFamily )e.AddedItems[ 0 ];
+      ApplyPropertyValueToSelectedText( TextElement.FontFamilyProperty, editValue );
+    }
+
+    private void FontSize_SelectionChanged( object sender, SelectionChangedEventArgs e )
+    {
+      if( e.AddedItems.Count == 0 )
+        return;
+
+      ApplyPropertyValueToSelectedText( TextElement.FontSizeProperty, e.AddedItems[ 0 ] );
+    }
+
+    void FontColor_SelectedColorChanged( object sender, RoutedPropertyChangedEventArgs<Color> e )
+    {
+      Color selectedColor = ( Color )e.NewValue;
+      ApplyPropertyValueToSelectedText( TextElement.ForegroundProperty, new SolidColorBrush( selectedColor ) );
+    }
+
+    private void FontBackgroundColor_SelectedColorChanged( object sender, RoutedPropertyChangedEventArgs<Color> e )
+    {
+      Color selectedColor = ( Color )e.NewValue;
+      ApplyPropertyValueToSelectedText( TextElement.BackgroundProperty, new SolidColorBrush( selectedColor ) );
+    }
+
+    private void Bullets_Clicked( object sender, RoutedEventArgs e )
+    {
+      if( BothSelectionListsAreChecked() )
+      {
+        _btnNumbers.IsChecked = false;
+      }
+    }
+
+    private void Numbers_Clicked( object sender, RoutedEventArgs e )
+    {
+      if( BothSelectionListsAreChecked() )
+      {
+        _btnBullets.IsChecked = false;
+      }
+    }
+
+    private void DragWidget_DragDelta( object sender, DragDeltaEventArgs e )
+    {
+      ProcessMove( e );
+    }
+
+    #endregion //Event Hanlders
+
+    #region Methods
+
+    public void Update()
+    {
+      UpdateToggleButtonState();
+      UpdateSelectedFontFamily();
+      UpdateSelectedFontSize();
+      UpdateFontColor();
+      UpdateFontBackgroundColor();
+      UpdateSelectionListType();
+    }
+
+    private void UpdateToggleButtonState()
+    {
+      UpdateItemCheckedState( _btnBold, TextElement.FontWeightProperty, FontWeights.Bold );
+      UpdateItemCheckedState( _btnItalic, TextElement.FontStyleProperty, FontStyles.Italic );
+      UpdateItemCheckedState( _btnUnderline, Inline.TextDecorationsProperty, TextDecorations.Underline );
+
+      UpdateItemCheckedState( _btnAlignLeft, Paragraph.TextAlignmentProperty, TextAlignment.Left );
+      UpdateItemCheckedState( _btnAlignCenter, Paragraph.TextAlignmentProperty, TextAlignment.Center );
+      UpdateItemCheckedState( _btnAlignRight, Paragraph.TextAlignmentProperty, TextAlignment.Right );
+    }
+
+    void UpdateItemCheckedState( ToggleButton button, DependencyProperty formattingProperty, object expectedValue )
+    {
+      object currentValue = Target.Selection.GetPropertyValue( formattingProperty );
+      button.IsChecked = ( currentValue == DependencyProperty.UnsetValue ) ? false : currentValue != null && currentValue.Equals( expectedValue );
+    }
+
+    private void UpdateSelectedFontFamily()
+    {
+      object value = Target.Selection.GetPropertyValue( TextElement.FontFamilyProperty );
+      FontFamily currentFontFamily = ( FontFamily )( ( value == DependencyProperty.UnsetValue ) ? null : value );
+      if( currentFontFamily != null )
+      {
+        _cmbFontFamilies.SelectedItem = currentFontFamily;
+      }
+    }
+
+    private void UpdateSelectedFontSize()
+    {
+      object value = Target.Selection.GetPropertyValue( TextElement.FontSizeProperty );
+      _cmbFontSizes.SelectedValue = ( value == DependencyProperty.UnsetValue ) ? null : value;
+    }
+
+    private void UpdateFontColor()
+    {
+      object value = Target.Selection.GetPropertyValue( TextElement.ForegroundProperty );
+      Color currentColor = ( Color )( ( value == DependencyProperty.UnsetValue ) ? Colors.Black : ( ( SolidColorBrush )value ).Color );
+      _cmbFontColor.SelectedColor = currentColor;
+    }
+
+    private void UpdateFontBackgroundColor()
+    {
+      object value = Target.Selection.GetPropertyValue( TextElement.BackgroundProperty );
+      Color currentColor = ( Color )( ( value == null || value == DependencyProperty.UnsetValue ) ? Colors.Transparent : ( ( SolidColorBrush )value ).Color );
+      _cmbFontBackgroundColor.SelectedColor = currentColor;
+    }
+
+    /// <summary>
+    /// Updates the visual state of the List styles, such as Numbers and Bullets.
+    /// </summary>
+    private void UpdateSelectionListType()
+    {
+      //uncheck both
+      _btnBullets.IsChecked = false;
+      _btnNumbers.IsChecked = false;
+
+      Paragraph startParagraph = Target.Selection.Start.Paragraph;
+      Paragraph endParagraph = Target.Selection.End.Paragraph;
+      if( startParagraph != null && endParagraph != null && ( startParagraph.Parent is ListItem ) && ( endParagraph.Parent is ListItem ) && object.ReferenceEquals( ( ( ListItem )startParagraph.Parent ).List, ( ( ListItem )endParagraph.Parent ).List ) )
+      {
+        TextMarkerStyle markerStyle = ( ( ListItem )startParagraph.Parent ).List.MarkerStyle;
+        if( markerStyle == TextMarkerStyle.Disc ) //bullets
+        {
+          _btnBullets.IsChecked = true;
+        }
+        else if( markerStyle == TextMarkerStyle.Decimal ) //numbers
+        {
+          _btnNumbers.IsChecked = true;
+        }
+      }
+    }
+
+    /// <summary>
+    /// Checks to see if both selection lists are checked. (Bullets and Numbers)
+    /// </summary>
+    /// <returns></returns>
+    private bool BothSelectionListsAreChecked()
+    {
+      return _btnBullets.IsChecked == true && _btnNumbers.IsChecked == true;
+    }
+
+    void ApplyPropertyValueToSelectedText( DependencyProperty formattingProperty, object value )
+    {
+      if( value == null )
+        return;
+
+      Target.Selection.ApplyPropertyValue( formattingProperty, value );
+    }
+
+    private void ProcessMove( DragDeltaEventArgs e )
+    {
+      AdornerLayer layer = AdornerLayer.GetAdornerLayer( Target );
+      UIElementAdorner<Control> adorner = layer.GetAdorners( Target )[ 0 ] as UIElementAdorner<Control>;
+      adorner.SetOffsets( adorner.OffsetLeft + e.HorizontalChange, adorner.OffsetTop + e.VerticalChange );
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs
new file mode 100644
index 00000000..b1d4b687
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs
@@ -0,0 +1,220 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+using System.Windows.Input;
+using Xceed.Wpf.Toolkit.Core;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class RichTextBoxFormatBarManager : DependencyObject
+  {
+    #region Members
+
+    private global::System.Windows.Controls.RichTextBox _richTextBox;
+    private UIElementAdorner<Control> _adorner;
+    private IRichTextBoxFormatBar _toolbar;
+
+    #endregion //Members
+
+    #region Properties
+
+    #region FormatBar
+
+    public static readonly DependencyProperty FormatBarProperty = DependencyProperty.RegisterAttached( "FormatBar", typeof( IRichTextBoxFormatBar ), typeof( RichTextBox ), new PropertyMetadata( null, OnFormatBarPropertyChanged ) );
+    public static void SetFormatBar( UIElement element, IRichTextBoxFormatBar value )
+    {
+      element.SetValue( FormatBarProperty, value );
+    }
+    public static IRichTextBoxFormatBar GetFormatBar( UIElement element )
+    {
+      return ( IRichTextBoxFormatBar )element.GetValue( FormatBarProperty );
+    }
+
+    private static void OnFormatBarPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      global::System.Windows.Controls.RichTextBox rtb = d as global::System.Windows.Controls.RichTextBox;
+      if( rtb == null )
+        throw new Exception( "A FormatBar can only be applied to a RichTextBox." );
+
+      RichTextBoxFormatBarManager manager = new RichTextBoxFormatBarManager();
+      manager.AttachFormatBarToRichtextBox( rtb, e.NewValue as IRichTextBoxFormatBar );
+    }
+
+    #endregion //FormatBar
+
+    public bool IsAdornerVisible
+    {
+      get
+      {
+        return _adorner.Visibility == Visibility.Visible;
+      }
+    }
+
+    #endregion //Properties
+
+    #region Event Handlers
+
+    void RichTextBox_MouseButtonUp( object sender, MouseButtonEventArgs e )
+    {
+      if( e.ChangedButton == MouseButton.Left && e.LeftButton == MouseButtonState.Released )
+      {
+        TextRange selectedText = new TextRange( _richTextBox.Selection.Start, _richTextBox.Selection.End );
+#if !VS2008
+        if( selectedText.Text.Length > 0 && !String.IsNullOrWhiteSpace( selectedText.Text ) )
+          ShowAdorner();
+#else
+        if( selectedText.Text.Length > 0 && !String.IsNullOrEmpty( selectedText.Text ) )
+          ShowAdorner();
+#endif
+        else
+          HideAdorner();
+
+        e.Handled = true;
+      }
+      else
+        HideAdorner();
+    }
+
+    void RichTextBox_PreviewMouseMove( object sender, MouseEventArgs e )
+    {
+      //if the mouse moves outside the richtextbox bounds hide the adorner
+      //though this deosn't always work, especially if the user moves the mouse very quickly.
+      //need to find a better solution, but this will work for now.
+      Point p = e.GetPosition( _richTextBox );
+      if( p.X <= 5.0 || p.X >= _richTextBox.ActualWidth - 5 || p.Y <= 3.0 || p.Y >= _richTextBox.ActualHeight - 3 )
+        HideAdorner();
+    }
+
+    void RichTextBox_TextChanged( object sender, TextChangedEventArgs e )
+    {
+      //this fixes the bug when applying text transformations the text would lose it's highlight.  That was because the RichTextBox was losing focus
+      //so we just give it focus again and it seems to do the trick of re-highlighting it.
+      if( !_richTextBox.IsFocused && !_richTextBox.Selection.IsEmpty )
+        _richTextBox.Focus();
+    }
+
+    #endregion //Event Handlers
+
+    #region Methods
+
+    /// <summary>
+    /// Attaches a FormatBar to a RichtextBox
+    /// </summary>
+    /// <param name="richTextBox">The RichtextBox to attach to.</param>
+    /// <param name="formatBar">The Formatbar to attach.</param>
+    private void AttachFormatBarToRichtextBox( global::System.Windows.Controls.RichTextBox richTextBox, IRichTextBoxFormatBar formatBar )
+    {
+      _richTextBox = richTextBox;
+      _richTextBox.PreviewMouseMove += RichTextBox_PreviewMouseMove;
+      //we cannot use the PreviewMouseLeftButtonUp event because of selection bugs.
+      //we cannot use the MouseLeftButtonUp event because it is handled by the RichTextBox and does not bubble up to here, so we must
+      //add a hander to the MouseUpEvent using the Addhandler syntax, and specify to listen for handled events too.
+      _richTextBox.AddHandler( Mouse.MouseUpEvent, new MouseButtonEventHandler( RichTextBox_MouseButtonUp ), true );
+      _richTextBox.TextChanged += RichTextBox_TextChanged;
+
+      _adorner = new UIElementAdorner<Control>( _richTextBox );
+
+      formatBar.Target = _richTextBox;
+      _toolbar = formatBar;
+    }
+
+    /// <summary>
+    /// Shows the FormatBar
+    /// </summary>
+    void ShowAdorner()
+    {
+      if( _adorner.Visibility == Visibility.Visible )
+        return;
+
+      VerifyAdornerLayer();
+
+      _toolbar.Update();
+
+      Control adorningEditor = _toolbar as Control;
+
+      if( _adorner.Child == null )
+        _adorner.Child = adorningEditor;
+
+      _adorner.Visibility = Visibility.Visible;
+
+      PositionFormatBar( adorningEditor );
+    }
+
+    /// <summary>
+    /// Positions the FormatBar so that is does not go outside the bounds of the RichTextBox or covers the selected text
+    /// </summary>
+    /// <param name="adorningEditor"></param>
+    private void PositionFormatBar( Control adorningEditor )
+    {
+      Point mousePosition = Mouse.GetPosition( _richTextBox );
+
+      double left = mousePosition.X;
+      double top = ( mousePosition.Y - 15 ) - adorningEditor.ActualHeight;
+
+      //top
+      if( top < 0 )
+      {
+        top = mousePosition.Y + 10;
+      }
+
+      //right boundary
+      if( left + adorningEditor.ActualWidth > _richTextBox.ActualWidth - 20 )
+      {
+        left = left - ( adorningEditor.ActualWidth - ( _richTextBox.ActualWidth - left ) );
+      }
+
+      _adorner.SetOffsets( left, top );
+    }
+
+    /// <summary>
+    /// Ensures that the IRichTextFormatBar is in the adorner layer.
+    /// </summary>
+    /// <returns>True if the IRichTextFormatBar is in the adorner layer, else false.</returns>
+    bool VerifyAdornerLayer()
+    {
+      if( _adorner.Parent != null )
+        return true;
+
+      AdornerLayer layer = AdornerLayer.GetAdornerLayer( _richTextBox );
+      if( layer == null )
+        return false;
+
+      layer.Add( _adorner );
+      return true;
+    }
+
+    /// <summary>
+    /// Hides the IRichTextFormatBar that is in the adornor layer.
+    /// </summary>
+    void HideAdorner()
+    {
+      if( IsAdornerVisible )
+      {
+        _adorner.Visibility = Visibility.Collapsed;
+        //_adorner.Child = null;
+      }
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/SplitButton/Implementation/SplitButton.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/SplitButton/Implementation/SplitButton.cs
new file mode 100644
index 00000000..de6e5d03
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/SplitButton/Implementation/SplitButton.cs
@@ -0,0 +1,49 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Xceed.Wpf.Toolkit
+{
+  [TemplatePart( Name = PART_ActionButton, Type = typeof( Button ) )]
+  public class SplitButton : DropDownButton
+  {
+    private const string PART_ActionButton = "PART_ActionButton";
+
+    #region Constructors
+
+    static SplitButton()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( SplitButton ), new FrameworkPropertyMetadata( typeof( SplitButton ) ) );
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+      Button = GetTemplateChild( PART_ActionButton ) as Button;
+    }
+
+    #endregion //Base Class Overrides
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/SplitButton/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/SplitButton/Themes/Generic.xaml
new file mode 100644
index 00000000..abdf633f
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/SplitButton/Themes/Generic.xaml
@@ -0,0 +1,134 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
+
+   <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+
+   <LinearGradientBrush x:Key="ColorPickerDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="1" Color="#FFE8EBED" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <!-- =============================================================================== -->
+   <!-- SplitButton                                                                     -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type local:SplitButton}">
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="IsTabStop" Value="False" />
+      <Setter Property="HorizontalContentAlignment" Value="Center" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
+      <Setter Property="Padding" Value="3" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:SplitButton}">
+               <Grid x:Name="MainGrid" SnapsToDevicePixels="True">
+                  <chrome:ButtonChrome x:Name="ControlChrome" Background="{TemplateBinding Background}" RenderEnabled="{TemplateBinding IsEnabled}" CornerRadius="2.75">
+                     <Grid>
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="*" />
+                           <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <Button x:Name="PART_ActionButton" Margin="0" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Padding="{TemplateBinding Padding}" >
+                           <Button.Template>
+                              <ControlTemplate TargetType="Button">
+                                 <ContentPresenter />
+                              </ControlTemplate>
+                           </Button.Template>
+                           <Grid>
+                              <chrome:ButtonChrome x:Name="ActionButtonChrome"
+                                                   CornerRadius="2.75, 0, 0, 2.75"                                                         
+                                                   RenderNormal="False"
+                                                   RenderEnabled="{TemplateBinding IsEnabled}"
+											                  RenderMouseOver="{Binding IsMouseOver, ElementName=PART_ActionButton}"
+											                  RenderPressed="{Binding IsPressed, ElementName=PART_ActionButton}">
+                                 <ContentPresenter Name="ActionButtonContent" Margin="{TemplateBinding Padding}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" RecognizesAccessKey="true" />
+                              </chrome:ButtonChrome>
+                           </Grid>
+                        </Button>
+                        <ToggleButton x:Name="PART_ToggleButton"
+                                      Grid.Column="1"
+                                      IsTabStop="False"
+                                      IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                      IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}">
+                           <ToggleButton.Template>
+                              <ControlTemplate TargetType="ToggleButton">
+                                 <ContentPresenter />
+                              </ControlTemplate>
+                           </ToggleButton.Template>
+                           <Grid>
+                              <chrome:ButtonChrome x:Name="ToggleButtonChrome"                                                         
+                                                   CornerRadius="0, 2.75, 2.75, 0"
+                                                   RenderNormal="False"
+                                                   RenderChecked="{TemplateBinding IsOpen}"
+                                                   RenderEnabled="{TemplateBinding IsEnabled}"
+											                  RenderMouseOver="{Binding IsMouseOver, ElementName=PART_ToggleButton}"
+											                  RenderPressed="{Binding IsPressed, ElementName=PART_ToggleButton}">
+                                 <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Margin="4,3,4,3">
+                                    <Path x:Name="Arrow" Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000" />
+                                 </Grid>
+                              </chrome:ButtonChrome>
+                           </Grid>
+                        </ToggleButton>
+                     </Grid>
+                  </chrome:ButtonChrome>
+
+                  <Popup x:Name="PART_Popup" 
+                         HorizontalOffset="1"
+                         VerticalOffset="1"
+                         AllowsTransparency="True"
+                         StaysOpen="False"
+                         Placement="Bottom"
+                         Focusable="False"
+                         IsOpen="{Binding IsChecked, ElementName=PART_ToggleButton}">
+                     <!-- TODO: Create Popup Styles that can be reused on all popups in the toolkit-->
+                     <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource ColorPickerDarkBorderBrush}">
+                        <ContentPresenter Content="{TemplateBinding DropDownContent}" />
+                     </Border>
+                  </Popup>
+
+               </Grid>
+                <ControlTemplate.Triggers>
+                    <Trigger Property="IsEnabled" Value="False">
+                        <Setter Property="Fill" TargetName="Arrow" Value="#AFAFAF" />
+                    </Trigger>
+                </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Aero.NormalColor.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Aero.NormalColor.xaml
new file mode 100644
index 00000000..ec435b28
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Aero.NormalColor.xaml
@@ -0,0 +1,28 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+   <ResourceDictionary.MergedDictionaries>
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/Themes/Aero/Brushes_NormalColor.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/Themes/Aero/Buttons_NormalColor.xaml" />
+   </ResourceDictionary.MergedDictionaries>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Aero/Brushes_NormalColor.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Aero/Brushes_NormalColor.xaml
new file mode 100644
index 00000000..e9cfb58f
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Aero/Brushes_NormalColor.xaml
@@ -0,0 +1,136 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:options="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes" >
+
+   <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ControlNormalBackgroundKey}" Color="#FFFFFF" options:Freeze="true" />
+   <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}" Color="#F4F4F4" options:Freeze="true" />
+   <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ControlNormalBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1" options:Freeze="true">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FFabadb3" Offset="0" />
+            <GradientStop Color="#FFdbdfe6" Offset="0.05000000074505806" />
+            <GradientStop Color="#FFdbdfe6" Offset="0.949999988079071" />
+            <GradientStop Color="#FFe3e9ef" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ControlMouseOverBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1" options:Freeze="true">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FF3d7bad" Offset="0" />
+            <GradientStop Color="#FFa4c9e3" Offset="0.05000000074505806" />
+            <GradientStop Color="#FFa4c9e3" Offset="0.949999988079071" />
+            <GradientStop Color="#FFb7d9ed" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ControlFocusedBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1" options:Freeze="true">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FF3d7bad" Offset="0" />
+            <GradientStop Color="#FFa4c9e3" Offset="0.05000000074505806" />
+            <GradientStop Color="#FFa4c9e3" Offset="0.949999988079071" />
+            <GradientStop Color="#FFb7d9ed" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <SolidColorBrush options:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}" Color="#FFABADB3" />
+   <LinearGradientBrush options:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonNormalInnerBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFfcfcfc" />
+            <GradientStop Offset="0.69" Color="#FFf9f9f9" />
+            <GradientStop Offset="0.69" Color="#FFf3f3f3" />
+            <GradientStop Offset="1" Color="#FFf3f3f3" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush options:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}" StartPoint="0.5,0" EndPoint="0.5,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFf2f2f2" />
+            <GradientStop Offset="0.69" Color="#FFe8e8e8" />
+            <GradientStop Offset="0.69" Color="#FFd1d1d1" />
+            <GradientStop Offset="1" Color="#FFd1d1d1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <SolidColorBrush options:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}" Color="#FF3C7FB1" />
+   <LinearGradientBrush options:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverInnerBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FFfafdfe" Offset="0" />
+            <GradientStop Color="#FFf5fbfe" Offset="0.5" />
+            <GradientStop Color="#FFeff9fe" Offset="0.5009999871253967" />
+            <GradientStop Color="#FFe8f5fc" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush options:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}" StartPoint="0.5,0" EndPoint="0.5,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FFeaf6fd" Offset="0" />
+            <GradientStop Color="#FFd9f0fc" Offset="0.5" />
+            <GradientStop Color="#FFbee6fd" Offset="0.5009999871253967" />
+            <GradientStop Color="#FFa7d9f5" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <SolidColorBrush options:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}" Color="#FF2C628B" />
+   <LinearGradientBrush options:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonPressedInnerBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FF9eb0ba" Offset="0" />
+            <GradientStop Color="#FF9abacb" Offset="0.5" />
+            <GradientStop Color="#FF78aac5" Offset="0.5008999705314636" />
+            <GradientStop Color="#FF5a96b8" Offset="0.8999999761581421" />
+            <GradientStop Color="#FF68b2da" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush options:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}" StartPoint="0.5,0" EndPoint="0.5,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FFe5f4fc" Offset="0" />
+            <GradientStop Color="#FFc4e5f6" Offset="0.5" />
+            <GradientStop Color="#FF98d1ef" Offset="0.5009999871253967" />
+            <GradientStop Color="#FF68b3db" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <LinearGradientBrush options:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonFocusedOuterBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FF3d7bad" Offset="0" />
+            <GradientStop Color="#FFa4c9e3" Offset="0.05000000074505806" />
+            <GradientStop Color="#FFa4c9e3" Offset="0.949999988079071" />
+            <GradientStop Color="#FFb7d9ed" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Aero/Buttons_NormalColor.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Aero/Buttons_NormalColor.xaml
new file mode 100644
index 00000000..6287f5d0
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Aero/Buttons_NormalColor.xaml
@@ -0,0 +1,53 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
+                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes">
+
+   <Style x:Key="{x:Static themes:ResourceKeys.SpinnerButtonStyleKey}" TargetType="RepeatButton">
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="BorderBrush" Value="Transparent" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Padding" Value="2,2" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="RepeatButton">
+               <Grid>
+                  <chrome:ButtonChrome x:Name="Chrome"
+                                       BorderBrush="{TemplateBinding BorderBrush}" 
+                                       Background="{TemplateBinding Background}"                                                                  
+                                       CornerRadius="{DynamicResource {x:Static themes:ResourceKeys.SpinButtonCornerRadiusKey}}"
+                                       RenderEnabled="{TemplateBinding IsEnabled}"
+                                       RenderMouseOver="{TemplateBinding IsMouseOver}"
+                                       RenderNormal="False"
+                                       RenderPressed="{TemplateBinding IsPressed}"
+                                       SnapsToDevicePixels="true" />
+
+                  <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    Margin="{TemplateBinding Padding}" />
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic.xaml
new file mode 100644
index 00000000..90588ebe
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic.xaml
@@ -0,0 +1,55 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+   <ResourceDictionary.MergedDictionaries>
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/Themes/Generic/Brushes.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/Themes/Generic/Buttons.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/Themes/Generic/Common.xaml" />
+
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/Chromes/Themes/Generic.xaml" />
+
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/BusyIndicator/Themes/Generic.xaml" />
+
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/ButtonSpinner/Themes/Generic.xaml" />
+
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/Calculator/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/CalculatorUpDown/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/CheckComboBox/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/CheckListBox/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/ChildWindow/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/CollectionEditors/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/ColorCanvas/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/ColorPicker/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/DropDownButton/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/Magnifier/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/MessageBox/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/DateTimeUpDown/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/DateTimePicker/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/MultiLineTextEditor/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/NumericUpDown/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/SplitButton/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/PropertyGrid/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/TimePicker/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/WatermarkTextBox/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/Wizard/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/Zoombox/Themes/Generic.xaml" />
+   </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic/Brushes.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic/Brushes.xaml
new file mode 100644
index 00000000..d5daf541
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic/Brushes.xaml
@@ -0,0 +1,128 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:options="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes">
+
+   <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ControlNormalBackgroundKey}" Color="#FFFFFFFF" options:Freeze="true" />
+   <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}" Color="#F4F4F4" options:Freeze="true" />
+
+
+   <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ControlNormalBorderKey}" EndPoint="0,20" MappingMode="Absolute" StartPoint="0,0" options:Freeze="true">
+      <GradientStop Color="#ABADB3" Offset="0.05" />
+      <GradientStop Color="#E2E3EA" Offset="0.07" />
+      <GradientStop Color="#E3E9EF" Offset="1" />
+   </LinearGradientBrush>
+   <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ControlMouseOverBorderKey}" StartPoint="0,0" EndPoint="0,1" options:Freeze="true">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#5794BF" Offset="0.05" />
+            <GradientStop Color="#B7D5EA" Offset="0.07" />
+            <GradientStop Color="#C7E2F1" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ControlFocusedBorderKey}" StartPoint="0,0" EndPoint="0,1" options:Freeze="true">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#3D7BAD" Offset="0.05" />
+            <GradientStop Color="#A4C9E3" Offset="0.07" />
+            <GradientStop Color="#B7D9ED" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}" Color="#FF707070" options:Freeze="true" />
+   <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ButtonNormalInnerBorderKey}" EndPoint="0,1" StartPoint="0,0" options:Freeze="true">
+      <GradientStop Color="#FAFFFFFF" Offset="0" />
+      <GradientStop Color="#85FFFFFF" Offset="1" />
+   </LinearGradientBrush>
+   <LinearGradientBrush options:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#F3F3F3" Offset="0" />
+            <GradientStop Color="#EBEBEB" Offset="0.5" />
+            <GradientStop Color="#DDDDDD" Offset="0.5" />
+            <GradientStop Color="#CDCDCD" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <SolidColorBrush options:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}" Color="#3C7FB1" />
+   <LinearGradientBrush options:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverInnerBorderKey}" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FAFFFFFF" Offset="0" />
+            <GradientStop Color="#85FFFFFF" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush options:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FFEAF6FD" Offset="0" />
+            <GradientStop Color="#FFD9F0FC" Offset="0.50" />
+            <GradientStop Color="#FFBEE6FD" Offset="0.50" />
+            <GradientStop Color="#FFA7D9F5" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <SolidColorBrush options:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}" Color="#2C628B" />
+   <LinearGradientBrush options:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonPressedInnerBorderKey}" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FAFFFFFF" Offset="0" />
+            <GradientStop Color="#85FFFFFF" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush options:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}" StartPoint="0.5,0" EndPoint="0.5,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#C2E4F6" Offset="0.5" />
+            <GradientStop Color="#ABDAF3" Offset="0.5" />
+            <GradientStop Color="#90CBEB" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ButtonFocusedOuterBorderKey}" Color="#FF707070" options:Freeze="true" />
+   <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ButtonFocusedInnerBorderKey}" Color="#F900CCFF" options:Freeze="true" />
+   <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ButtonFocusedBackgroundKey}" EndPoint="0,1" StartPoint="0,0" options:Freeze="true">
+      <GradientStop Color="#FFEAF6FD" Offset="0" />
+      <GradientStop Color="#FFD9F0FC" Offset="0.50" />
+      <GradientStop Color="#FFBEE6FD" Offset="0.50" />
+      <GradientStop Color="#FFA7D9F5" Offset="1" />
+   </LinearGradientBrush>
+
+   <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ButtonDisabledOuterBorderKey}" Color="#ADB2B5" options:Freeze="true" />
+   <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ButtonInnerBorderDisabledKey}" EndPoint="0,1" StartPoint="0,0" options:Freeze="true">
+      <GradientStop Color="#FAFFFFFF" Offset="0" />
+      <GradientStop Color="#85FFFFFF" Offset="1" />
+   </LinearGradientBrush>
+
+   <SolidColorBrush options:Freeze="true" x:Key="{x:Static themes:ResourceKeys.GlyphNormalForegroundKey}" Color="#FF000000" />
+   <SolidColorBrush options:Freeze="true" x:Key="{x:Static themes:ResourceKeys.GlyphDisabledForegroundKey}" Color="#A9A9A9" />
+
+   <CornerRadius x:Key="{x:Static themes:ResourceKeys.SpinButtonCornerRadiusKey}" TopLeft="0" TopRight="0" BottomRight="0" BottomLeft="0" options:Freeze="true" />
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic/Buttons.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic/Buttons.xaml
new file mode 100644
index 00000000..36157d3f
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic/Buttons.xaml
@@ -0,0 +1,51 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
+                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes">
+
+   <Style x:Key="{x:Static themes:ResourceKeys.SpinnerButtonStyleKey}" TargetType="RepeatButton">
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Padding" Value="2,2" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="RepeatButton">
+               <Grid>
+                  <chrome:ButtonChrome x:Name="Chrome"
+                                       BorderBrush="{TemplateBinding BorderBrush}" 
+                                       Background="{TemplateBinding Background}"                                                                  
+                                       CornerRadius="{DynamicResource {x:Static themes:ResourceKeys.SpinButtonCornerRadiusKey}}"
+                                       RenderEnabled="{TemplateBinding IsEnabled}"
+                                       RenderMouseOver="{TemplateBinding IsMouseOver}"
+                                       RenderNormal="True"
+                                       RenderPressed="{TemplateBinding IsPressed}"
+                                       SnapsToDevicePixels="true" />
+
+                  <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    Margin="{TemplateBinding Padding}" />
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic/Common.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic/Common.xaml
new file mode 100644
index 00000000..552687e9
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic/Common.xaml
@@ -0,0 +1,154 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:primitives="clr-namespace:Xceed.Wpf.Toolkit.Primitives">
+
+   <!-- =============================================================================== -->
+   <!-- Common Styles                                                                   -->
+   <!-- Need to find a way to share these for ChildWIndow and MessageBox                -->
+   <!-- =============================================================================== -->
+
+   <LinearGradientBrush x:Key="WindowDarkBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="WindowBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="0.479" Color="#FFf4f5f6" />
+            <GradientStop Offset="1" Color="#FFd0d6db" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="WindowButtonHoverBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFb5bdc8" />
+            <GradientStop Offset="0.370" Color="#FF8399a9" />
+            <GradientStop Offset="0.370" Color="#FF718597" />
+            <GradientStop Offset="0.906" Color="#FFb9c1ca" />
+            <GradientStop Offset="1" Color="#FFb9c1ca" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="WindowButtonPressedBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FF6b7c8d" />
+            <GradientStop Offset="0.370" Color="#FF4d606f" />
+            <GradientStop Offset="0.370" Color="#FF465460" />
+            <GradientStop Offset="0.906" Color="#FF262d33" />
+            <GradientStop Offset="1" Color="#FF262d33" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <Style x:Key="WindowCloseButtonStyle" TargetType="Button">
+      <Setter Property="Foreground" Value="#FF000000" />
+      <Setter Property="Padding" Value="3" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="Button">
+               <Grid>
+                  <VisualStateManager.VisualStateGroups>
+                     <VisualStateGroup x:Name="CommonStates">
+                        <VisualState x:Name="Normal" />
+                        <VisualState x:Name="MouseOver">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonHoverBrush}" />
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Pressed">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonPressedBrush}" />
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                     </VisualStateGroup>
+                  </VisualStateManager.VisualStateGroups>
+                  <Border x:Name="Background" CornerRadius="0,0,2,0" Background="{StaticResource WindowDarkBrush}">
+                     <Border Margin="1,0,1,1" BorderBrush="#59FFFFFF" BorderThickness="1" CornerRadius="0,0,1,0" />
+                  </Border>
+                  <ContentPresenter x:Name="contentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
+                  <Path x:Name="path"
+                        Height="6"
+                        Width="7"
+                        Stretch="Fill"
+                        Opacity="1"
+                        Data="M 2,6 C2,6 3,6 3,6 3,6 3,5 3,5 3,5 4,5 4,5 4,5 4,6 4,6 4,6 5,6 5,6 5,6 7,6 7,6 7,6 7,5 7,5 7,5 6,5 6,5 6,5 6,4 6,4 6,4 5,4 5,4 5,4 5,2 5,2 5,2 6,2 6,2 6,2 6,1 6,1 6,1 7,1 7,1 7,1 7,0 7,0 7,0 5,0 5,0 5,0 4,0 4,0 4,0 4,1 4,1 4,1 3,1 3,1 3,1 3,0 3,0 3,0 2,0 2,0 2,0 0,0 0,0 0,0 0,1 0,1 0,1 1,1 1,1 1,1 1,2 1,2 1,2 2,2 2,2 2,2 2,4 2,4 2,4 1,4 1,4 1,4 1,5 1,5 1,5 0,5 0,5 0,5 0,6 0,6 0,6 2,6 2,6 z"
+                        Fill="White"
+                        Margin="0,0,0,1"
+                        Visibility="Collapsed" />
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+
+    <!-- =============================================================================== -->
+   <!-- SelectorItem                                                                    -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type primitives:SelectorItem}">
+        <Setter Property="Background"
+           Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+
+        <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type primitives:SelectorItem}">
+               <Border x:Name="_background"
+                       Background="{TemplateBinding Background}"
+                       BorderBrush="{TemplateBinding BorderBrush}"
+                       BorderThickness="{TemplateBinding BorderThickness}">
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                     </Grid.ColumnDefinitions>
+                     <CheckBox Name="PART_CheckBox" IsChecked="{Binding IsSelected, RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="Center" Focusable="False"  Margin="3,1,5,1" />
+                     <Border Grid.Column="1">
+                        <ContentPresenter Margin="2" ContentSource="Content" />
+                     </Border>
+                  </Grid>
+               </Border>
+               <ControlTemplate.Triggers>
+                 <Trigger Property="IsMouseOver" Value="true">
+                    <Setter TargetName="_background" Property="Background" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
+                    <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
+                </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic/Glyphs.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic/Glyphs.xaml
new file mode 100644
index 00000000..8dc22a60
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic/Glyphs.xaml
@@ -0,0 +1,70 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes">
+
+   <Geometry x:Key="UpArrowGeometry">M 0,3 C0,3 0,4 0,4 0,4 3,4 3,4 3,4 3,3 3,3 3,3 4,3 4,3 4,3 4,4 4,4 4,4 7,4 7,4 7,4 7,3 7,3 7,3 6,3 6,3 6,3 6,2 6,2 6,2 5,2 5,2 5,2 5,1 5,1 5,1 4,1 4,1 4,1 4,0 4,0 4,0 3,0 3,0 3,0 3,1 3,1 3,1 2,1 2,1 2,1 2,2 2,2 2,2 1,2 1,2 1,2 1,3 1,3 1,3 0,3 0,3 z</Geometry>
+   <Geometry x:Key="DownArrowGeometry">M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z</Geometry>
+
+   <DataTemplate x:Key="IncreaseGlyphNormalKey">
+      <Path Width="7"
+            Height="4"
+            Data="{StaticResource UpArrowGeometry}"
+            Fill="{DynamicResource {x:Static themes:ResourceKeys.GlyphNormalForegroundKey}}"
+            SnapsToDevicePixels="True"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            Focusable="False" />
+   </DataTemplate>
+   <DataTemplate x:Key="IncreaseGlyphDisabledKey">
+      <Path	Width="7"
+            Height="4"
+            Data="{StaticResource UpArrowGeometry}"
+            Fill="{DynamicResource {x:Static themes:ResourceKeys.GlyphDisabledForegroundKey}}"
+            SnapsToDevicePixels="True"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            Focusable="False" />
+   </DataTemplate>
+
+   <DataTemplate x:Key="DecreaseGlyphNormalKey">
+      <Path Width="7"
+            Height="4"
+            Data="{StaticResource DownArrowGeometry}"
+            Fill="{DynamicResource {x:Static themes:ResourceKeys.GlyphNormalForegroundKey}}"
+            SnapsToDevicePixels="True"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            Focusable="False" />
+   </DataTemplate>
+
+   <DataTemplate x:Key="DecreaseGlyphDisabledKey">
+      <Path	Width="7"
+            Height="4"
+            Data="{StaticResource DownArrowGeometry}"
+            Fill="{DynamicResource {x:Static themes:ResourceKeys.GlyphDisabledForegroundKey}}"
+            SnapsToDevicePixels="True"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            Focusable="False" />
+   </DataTemplate>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimePicker/Implementation/TimeFormat.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimePicker/Implementation/TimeFormat.cs
new file mode 100644
index 00000000..93a77e12
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimePicker/Implementation/TimeFormat.cs
@@ -0,0 +1,28 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit
+{
+  public enum TimeFormat
+  {
+    Custom,
+    ShortTime,
+    LongTime
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimePicker/Implementation/TimeItem.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimePicker/Implementation/TimeItem.cs
new file mode 100644
index 00000000..1fe6d93e
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimePicker/Implementation/TimeItem.cs
@@ -0,0 +1,61 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class TimeItem
+  {
+    public string Display
+    {
+      get;
+      set;
+    }
+    public TimeSpan Time
+    {
+      get;
+      set;
+    }
+
+    public TimeItem( string display, TimeSpan time )
+    {
+      Display = display;
+      Time = time;
+    }
+
+    #region Base Class Overrides
+
+    public override bool Equals( object obj )
+    {
+      var item = obj as TimeItem;
+      if( item != null )
+        return Time == item.Time;
+      else
+        return false;
+    }
+
+    public override int GetHashCode()
+    {
+      return Time.GetHashCode();
+    }
+
+    #endregion //Base Class Overrides
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimePicker/Implementation/TimePicker.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimePicker/Implementation/TimePicker.cs
new file mode 100644
index 00000000..1cd8679c
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimePicker/Implementation/TimePicker.cs
@@ -0,0 +1,510 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace Xceed.Wpf.Toolkit
+{
+  [TemplatePart( Name = PART_TimeListItems, Type = typeof( ListBox ) )]
+  public class TimePicker : Control
+  {
+    private const string PART_TimeListItems = "PART_TimeListItems";
+
+    #region Members
+
+    ListBox _timeListBox;
+    private DateTimeFormatInfo DateTimeFormatInfo
+    {
+      get;
+      set;
+    }
+    internal static readonly TimeSpan EndTimeDefaultValue = new TimeSpan( 23, 59, 0 );
+    internal static readonly TimeSpan StartTimeDefaultValue = new TimeSpan( 0, 0, 0 );
+    internal static readonly TimeSpan TimeIntervalDefaultValue = new TimeSpan( 1, 0, 0 );
+
+    #endregion //Members
+
+    #region Properties
+
+    #region AllowSpin
+
+    public static readonly DependencyProperty AllowSpinProperty = DependencyProperty.Register( "AllowSpin", typeof( bool ), typeof( TimePicker ), new UIPropertyMetadata( true ) );
+    public bool AllowSpin
+    {
+      get
+      {
+        return ( bool )GetValue( AllowSpinProperty );
+      }
+      set
+      {
+        SetValue( AllowSpinProperty, value );
+      }
+    }
+
+    #endregion //AllowSpin
+
+    #region EndTime
+
+    public static readonly DependencyProperty EndTimeProperty = DependencyProperty.Register( "EndTime", typeof( TimeSpan ), typeof( TimePicker ), new UIPropertyMetadata( EndTimeDefaultValue, new PropertyChangedCallback( OnEndTimeChanged ), new CoerceValueCallback( OnCoerceEndTime ) ) );
+
+    private static object OnCoerceEndTime( DependencyObject o, object value )
+    {
+      TimePicker timePicker = o as TimePicker;
+      if( timePicker != null )
+        return timePicker.OnCoerceEndTime( ( TimeSpan )value );
+      else
+        return value;
+    }
+
+    private static void OnEndTimeChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      TimePicker timePicker = o as TimePicker;
+      if( timePicker != null )
+        timePicker.OnEndTimeChanged( ( TimeSpan )e.OldValue, ( TimeSpan )e.NewValue );
+    }
+
+    protected virtual TimeSpan OnCoerceEndTime( TimeSpan value )
+    {
+      // TODO: Keep the proposed value within the desired range.
+      return value;
+    }
+
+    protected virtual void OnEndTimeChanged( TimeSpan oldValue, TimeSpan newValue )
+    {
+      if( _timeListBox != null )
+        _timeListBox.ItemsSource = GenerateTimeListItemsSource();
+    }
+
+    public TimeSpan EndTime
+    {
+      // IMPORTANT: To maintain parity between setting a property in XAML and procedural code, do not touch the getter and setter inside this dependency property!
+      get
+      {
+        return ( TimeSpan )GetValue( EndTimeProperty );
+      }
+      set
+      {
+        SetValue( EndTimeProperty, value );
+      }
+    }
+
+
+    #endregion //EndTime
+
+    #region Format
+
+    public static readonly DependencyProperty FormatProperty = DependencyProperty.Register( "Format", typeof( TimeFormat ), typeof( TimePicker ), new UIPropertyMetadata( TimeFormat.ShortTime, OnFormatChanged ) );
+    public TimeFormat Format
+    {
+      get
+      {
+        return ( TimeFormat )GetValue( FormatProperty );
+      }
+      set
+      {
+        SetValue( FormatProperty, value );
+      }
+    }
+
+    private static void OnFormatChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      TimePicker timePicker = o as TimePicker;
+      if( timePicker != null )
+        timePicker.OnFormatChanged( ( TimeFormat )e.OldValue, ( TimeFormat )e.NewValue );
+    }
+
+    protected virtual void OnFormatChanged( TimeFormat oldValue, TimeFormat newValue )
+    {
+
+    }
+
+    #endregion //Format
+
+    #region FormatString
+
+    public static readonly DependencyProperty FormatStringProperty = DependencyProperty.Register( "FormatString", typeof( string ), typeof( TimePicker ), new UIPropertyMetadata( default( String ), OnFormatStringChanged ) );
+    public string FormatString
+    {
+      get
+      {
+        return ( string )GetValue( FormatStringProperty );
+      }
+      set
+      {
+        SetValue( FormatStringProperty, value );
+      }
+    }
+
+    private static void OnFormatStringChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      TimePicker timePicker = o as TimePicker;
+      if( timePicker != null )
+        timePicker.OnFormatStringChanged( ( string )e.OldValue, ( string )e.NewValue );
+    }
+
+    protected virtual void OnFormatStringChanged( string oldValue, string newValue )
+    {
+      if( string.IsNullOrEmpty( newValue ) )
+        throw new ArgumentException( "CustomFormat should be specified.", FormatString );
+    }
+
+    #endregion //FormatString
+
+    #region IsOpen
+
+    public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register( "IsOpen", typeof( bool ), typeof( TimePicker ), new UIPropertyMetadata( false ) );
+    public bool IsOpen
+    {
+      get
+      {
+        return ( bool )GetValue( IsOpenProperty );
+      }
+      set
+      {
+        SetValue( IsOpenProperty, value );
+      }
+    }
+
+    #endregion //IsOpen
+
+    #region ShowButtonSpinner
+
+    public static readonly DependencyProperty ShowButtonSpinnerProperty = DependencyProperty.Register( "ShowButtonSpinner", typeof( bool ), typeof( TimePicker ), new UIPropertyMetadata( true ) );
+    public bool ShowButtonSpinner
+    {
+      get
+      {
+        return ( bool )GetValue( ShowButtonSpinnerProperty );
+      }
+      set
+      {
+        SetValue( ShowButtonSpinnerProperty, value );
+      }
+    }
+
+    #endregion //ShowButtonSpinner
+
+    #region StartTime
+
+    public static readonly DependencyProperty StartTimeProperty = DependencyProperty.Register( "StartTime", typeof( TimeSpan ), typeof( TimePicker ), new UIPropertyMetadata( StartTimeDefaultValue, new PropertyChangedCallback( OnStartTimeChanged ), new CoerceValueCallback( OnCoerceStartTime ) ) );
+
+    private static object OnCoerceStartTime( DependencyObject o, object value )
+    {
+      TimePicker timePicker = o as TimePicker;
+      if( timePicker != null )
+        return timePicker.OnCoerceStartTime( ( TimeSpan )value );
+      else
+        return value;
+    }
+
+    private static void OnStartTimeChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      TimePicker timePicker = o as TimePicker;
+      if( timePicker != null )
+        timePicker.OnStartTimeChanged( ( TimeSpan )e.OldValue, ( TimeSpan )e.NewValue );
+    }
+
+    protected virtual TimeSpan OnCoerceStartTime( TimeSpan value )
+    {
+      // TODO: Keep the proposed value within the desired range.
+      return value;
+    }
+
+    protected virtual void OnStartTimeChanged( TimeSpan oldValue, TimeSpan newValue )
+    {
+      if( _timeListBox != null )
+        _timeListBox.ItemsSource = GenerateTimeListItemsSource();
+    }
+
+    public TimeSpan StartTime
+    {
+      // IMPORTANT: To maintain parity between setting a property in XAML and procedural code, do not touch the getter and setter inside this dependency property!
+      get
+      {
+        return ( TimeSpan )GetValue( StartTimeProperty );
+      }
+      set
+      {
+        SetValue( StartTimeProperty, value );
+      }
+    }
+
+
+    #endregion //StartTime
+
+    #region TimeInterval
+
+    public static readonly DependencyProperty TimeIntervalProperty = DependencyProperty.Register( "TimeInterval", typeof( TimeSpan ), typeof( TimePicker ), new UIPropertyMetadata( TimeIntervalDefaultValue, OnTimeIntervalChanged ) );
+    public TimeSpan TimeInterval
+    {
+      get
+      {
+        return ( TimeSpan )GetValue( TimeIntervalProperty );
+      }
+      set
+      {
+        SetValue( TimeIntervalProperty, value );
+      }
+    }
+
+    private static void OnTimeIntervalChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      TimePicker timePicker = o as TimePicker;
+      if( timePicker != null )
+        timePicker.OnTimeIntervalChanged( ( TimeSpan )e.OldValue, ( TimeSpan )e.NewValue );
+    }
+
+    protected virtual void OnTimeIntervalChanged( TimeSpan oldValue, TimeSpan newValue )
+    {
+      if( _timeListBox != null )
+        _timeListBox.ItemsSource = GenerateTimeListItemsSource();
+    }
+
+    #endregion //TimeInterval
+
+    #region Value
+
+    public static readonly DependencyProperty ValueProperty = DependencyProperty.Register( "Value", typeof( DateTime? ), typeof( TimePicker ), new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnValueChanged ) );
+    public DateTime? Value
+    {
+      get
+      {
+        return ( DateTime? )GetValue( ValueProperty );
+      }
+      set
+      {
+        SetValue( ValueProperty, value );
+      }
+    }
+
+    private static void OnValueChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      TimePicker timePicker = o as TimePicker;
+      if( timePicker != null )
+        timePicker.OnValueChanged( ( DateTime? )e.OldValue, ( DateTime? )e.NewValue );
+    }
+
+    protected virtual void OnValueChanged( DateTime? oldValue, DateTime? newValue )
+    {
+      //TODO: refactor this
+      if( newValue.HasValue && _timeListBox != null )
+      {
+        var items = _timeListBox.ItemsSource;
+        foreach( TimeItem item in items )
+        {
+          if( item.Time == newValue.Value.TimeOfDay )
+          {
+            int index = _timeListBox.Items.IndexOf( item );
+            if( _timeListBox.SelectedIndex != index )
+              _timeListBox.SelectedIndex = index;
+            break;
+          }
+        }
+      }
+
+      RoutedPropertyChangedEventArgs<object> args = new RoutedPropertyChangedEventArgs<object>( oldValue, newValue );
+      args.RoutedEvent = ValueChangedEvent;
+      RaiseEvent( args );
+    }
+
+    #endregion //Value
+
+    #region Watermark
+
+    public static readonly DependencyProperty WatermarkProperty = DependencyProperty.Register( "Watermark", typeof( object ), typeof( TimePicker ), new UIPropertyMetadata( null ) );
+    public object Watermark
+    {
+      get
+      {
+        return ( object )GetValue( WatermarkProperty );
+      }
+      set
+      {
+        SetValue( WatermarkProperty, value );
+      }
+    }
+
+    #endregion //Watermark
+
+    #region WatermarkTemplate
+
+    public static readonly DependencyProperty WatermarkTemplateProperty = DependencyProperty.Register( "WatermarkTemplate", typeof( DataTemplate ), typeof( TimePicker ), new UIPropertyMetadata( null ) );
+    public DataTemplate WatermarkTemplate
+    {
+      get
+      {
+        return ( DataTemplate )GetValue( WatermarkTemplateProperty );
+      }
+      set
+      {
+        SetValue( WatermarkTemplateProperty, value );
+      }
+    }
+
+    #endregion //WatermarkTemplate
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static TimePicker()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( TimePicker ), new FrameworkPropertyMetadata( typeof( TimePicker ) ) );
+    }
+
+    public TimePicker()
+    {
+      DateTimeFormatInfo = DateTimeFormatInfo.GetInstance( CultureInfo.CurrentCulture );
+      Keyboard.AddKeyDownHandler( this, OnKeyDown );
+      Mouse.AddPreviewMouseDownOutsideCapturedElementHandler( this, OnMouseDownOutsideCapturedElement );
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+
+      if( _timeListBox != null )
+        _timeListBox.SelectionChanged -= TimeListBox_SelectionChanged;
+
+      _timeListBox = GetTemplateChild( PART_TimeListItems ) as ListBox;
+
+      if( _timeListBox != null )
+      {
+        _timeListBox.SelectionChanged += TimeListBox_SelectionChanged;
+        _timeListBox.ItemsSource = GenerateTimeListItemsSource();
+      }
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Event Handlers
+
+    private void OnKeyDown( object sender, KeyEventArgs e )
+    {
+      switch( e.Key )
+      {
+        case Key.Escape:
+        case Key.Tab:
+          {
+            CloseTimePicker();
+            break;
+          }
+      }
+    }
+
+    private void OnMouseDownOutsideCapturedElement( object sender, MouseButtonEventArgs e )
+    {
+      CloseTimePicker();
+    }
+
+    void TimeListBox_SelectionChanged( object sender, SelectionChangedEventArgs e )
+    {
+      if( e.AddedItems.Count > 0 )
+      {
+        TimeItem selectedTimeListItem = ( TimeItem )e.AddedItems[ 0 ];
+        var time = selectedTimeListItem.Time;
+        ;
+        var date = Value ?? DateTime.MinValue;
+
+        Value = new DateTime( date.Year, date.Month, date.Day, time.Hours, time.Minutes, time.Seconds, time.Milliseconds );
+      }
+
+      CloseTimePicker();
+    }
+
+    #endregion //Event Handlers
+
+    #region Events
+
+    //Due to a bug in Visual Studio, you cannot create event handlers for nullable args in XAML, so I have to use object instead.
+    public static readonly RoutedEvent ValueChangedEvent = EventManager.RegisterRoutedEvent( "ValueChanged", RoutingStrategy.Bubble, typeof( RoutedPropertyChangedEventHandler<object> ), typeof( TimePicker ) );
+    public event RoutedPropertyChangedEventHandler<object> ValueChanged
+    {
+      add
+      {
+        AddHandler( ValueChangedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( ValueChangedEvent, value );
+      }
+    }
+
+    #endregion //Events
+
+    #region Methods
+
+    private void CloseTimePicker()
+    {
+      if( IsOpen )
+        IsOpen = false;
+      ReleaseMouseCapture();
+    }
+
+    public IEnumerable GenerateTimeListItemsSource()
+    {
+      TimeSpan time = StartTime;
+      TimeSpan endTime = EndTime;
+
+      if( endTime <= time )
+      {
+        endTime = EndTimeDefaultValue;
+        time = StartTimeDefaultValue;
+      }
+
+      TimeSpan timeInterval = TimeInterval;
+
+      if( time != null && endTime != null && timeInterval != null && timeInterval.Ticks > 0 )
+      {
+        while( time <= endTime )
+        {
+          yield return new TimeItem( DateTime.MinValue.Add( time ).ToString( GetTimeFormat(), CultureInfo.CurrentCulture ), time );
+          time = time.Add( timeInterval );
+        }
+        yield break;
+      }
+    }
+
+    private string GetTimeFormat()
+    {
+      switch( Format )
+      {
+        case TimeFormat.Custom:
+          return FormatString;
+        case TimeFormat.LongTime:
+          return DateTimeFormatInfo.LongTimePattern;
+        case TimeFormat.ShortTime:
+          return DateTimeFormatInfo.ShortTimePattern;
+        default:
+          return DateTimeFormatInfo.ShortTimePattern;
+      }
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimePicker/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimePicker/Themes/Generic.xaml
new file mode 100644
index 00000000..76dc028c
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimePicker/Themes/Generic.xaml
@@ -0,0 +1,166 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
+
+   <!-- =============================================================================== -->
+   <!-- ResourceDictionary for TimePicker and related controls                          -->
+   <!-- =============================================================================== -->
+
+   <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+   <conv:TimeFormatToDateTimeFormatConverter x:Key="TimeFormatToDateTimeFormatConverter" />
+
+   <DataTemplate x:Key="DefaultWatermarkTemplate">
+      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
+   </DataTemplate>
+
+   <LinearGradientBrush x:Key="PopupDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="1" Color="#FFE8EBED" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <Style x:Key="TimePickerToggleButtonStyle" TargetType="ToggleButton">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="ToggleButton">
+               <Grid SnapsToDevicePixels="True">
+                  <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                       CornerRadius="0,2.75,2.75,0"
+                                       RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:TimePicker}}"
+                                       RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:TimePicker}}"
+                                       RenderMouseOver="{TemplateBinding IsMouseOver}"
+                                       RenderPressed="{TemplateBinding IsPressed}">
+
+                     <Grid>
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="*" />
+                           <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+
+                        <ContentPresenter HorizontalAlignment="Stretch" VerticalAlignment="Stretch" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+
+                        <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
+                            <Path x:Name="Arrow" Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000" />
+                        </Grid>
+                     </Grid>
+                  </chrome:ButtonChrome>
+               </Grid>
+                <ControlTemplate.Triggers>
+                    <Trigger Property="IsEnabled" Value="False">
+                        <Setter Property="Fill" TargetName="Arrow" Value="#AFAFAF" />
+                    </Trigger>
+                </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <SolidColorBrush x:Key="ListItemHover" Color="#FFE7F5FD" />
+
+   <Style x:Key="TimeItemStyle" TargetType="ListBoxItem">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="ListBoxItem">
+               <Border Name="Border" SnapsToDevicePixels="true">
+                  <ContentPresenter Margin="4" />
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsMouseOver" Value="True">
+                     <Setter TargetName="Border" Property="Background" Value="{StaticResource ListItemHover}" />
+                  </Trigger>
+                  <Trigger Property="IsSelected" Value="True">
+                     <Setter TargetName="Border" Property="Background" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
+                     <Setter Property="Foreground" Value="White" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <!-- =============================================================================== -->
+   <!-- TimePicker                                                                      -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type local:TimePicker}">
+      <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:TimePicker}">
+               <Border>
+                  <Grid>
+                     <Grid>
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="*" />
+                           <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <local:DateTimeUpDown x:Name="PART_TimeUpDown" 
+                                              BorderThickness="1,1,0,1"
+                                              Background="{TemplateBinding Background}"
+                                              Foreground="{TemplateBinding Foreground}"
+                                              ContextMenu="{TemplateBinding ContextMenu}"
+                                              AllowSpin="{TemplateBinding AllowSpin}"
+                                              Format="{TemplateBinding Format, Converter={StaticResource TimeFormatToDateTimeFormatConverter}}"
+                                              FormatString="{TemplateBinding FormatString}"
+                                              ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}"
+                                              Value="{Binding Value, RelativeSource={RelativeSource TemplatedParent}}"
+                                              Watermark="{TemplateBinding Watermark}"
+                                              WatermarkTemplate="{TemplateBinding WatermarkTemplate}" />
+                        <ToggleButton x:Name="_timePickerToggleButton"
+                                      Grid.Column="1"
+                                      IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                                      Style="{StaticResource TimePickerToggleButtonStyle}"
+                                      IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}" />
+                     </Grid>
+                     <Popup IsOpen="{Binding IsChecked, ElementName=_timePickerToggleButton}"
+                            StaysOpen="False">
+                        <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}">
+                           <Grid>
+                              <ListBox x:Name="PART_TimeListItems"
+                                       BorderThickness="0"
+                                       Width="150"
+                                       Height="130"
+                                       DisplayMemberPath="Display"
+                                       ItemContainerStyle="{StaticResource TimeItemStyle}" />
+                           </Grid>
+                        </Border>
+                     </Popup>
+                  </Grid>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimelinePanel/Implementation/DateElement.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimelinePanel/Implementation/DateElement.cs
new file mode 100644
index 00000000..9422955a
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimelinePanel/Implementation/DateElement.cs
@@ -0,0 +1,94 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit
+{
+  internal sealed class DateElement : IComparable<DateElement>
+  {
+    #region Members
+
+    private readonly int _originalIndex;
+
+    #endregion //Members
+
+    #region Fields
+
+    public readonly UIElement Element;
+    public readonly DateTime Date;
+    public readonly DateTime DateEnd;
+    public Rect PlacementRectangle;
+
+    public int Column = 0;
+    public int ColumnSpan = 1;
+
+    #endregion //Fields
+
+    #region Constructors
+
+    internal DateElement( UIElement element, DateTime date, DateTime dateEnd )
+      : this( element, date, dateEnd, -1 )
+    {
+    }
+
+    internal DateElement( UIElement element, DateTime date, DateTime dateEnd, int originalIndex )
+    {
+      Element = element;
+      Date = date;
+      DateEnd = dateEnd;
+      _originalIndex = originalIndex;
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    public override string ToString()
+    {
+      var fe = Element as FrameworkElement;
+      if( fe == null )
+        return base.ToString();
+
+      if( fe.Tag != null )
+        return fe.Tag.ToString();
+
+      return fe.Name;
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Methods
+
+    public int CompareTo( DateElement d )
+    {
+      int dateCompare = Date.CompareTo( d.Date );
+      if( dateCompare != 0 )
+        return dateCompare;
+
+      if( _originalIndex >= 0 )
+        return ( _originalIndex < d._originalIndex ) ? -1 : 1;
+
+      return -DateEnd.CompareTo( d.DateEnd );
+    }
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimelinePanel/Implementation/OverlapBehavior.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimelinePanel/Implementation/OverlapBehavior.cs
new file mode 100644
index 00000000..e2964089
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimelinePanel/Implementation/OverlapBehavior.cs
@@ -0,0 +1,29 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit
+{
+  public enum OverlapBehavior
+  {
+    Stack,
+    Stretch,
+    Hide,
+    None
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimelinePanel/Implementation/TimelinePanel.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimelinePanel/Implementation/TimelinePanel.cs
new file mode 100644
index 00000000..f7789db4
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimelinePanel/Implementation/TimelinePanel.cs
@@ -0,0 +1,1312 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Media;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class TimelinePanel : Panel, IScrollInfo
+  {
+    #region Members
+
+    private List<DateElement> _visibleElements = null;
+
+    #endregion //Members
+
+    #region Properties
+
+    #region BeginDate Property
+
+    public static readonly DependencyProperty BeginDateProperty = DependencyProperty.Register( "BeginDate", typeof( DateTime ), typeof( TimelinePanel ), new FrameworkPropertyMetadata( DateTime.MinValue, FrameworkPropertyMetadataOptions.AffectsMeasure ) );
+    public DateTime BeginDate
+    {
+      get
+      {
+        return ( DateTime )GetValue( BeginDateProperty );
+      }
+      set
+      {
+        SetValue( BeginDateProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region EndDate Property
+
+    public static readonly DependencyProperty EndDateProperty = DependencyProperty.Register( "EndDate", typeof( DateTime ), typeof( TimelinePanel ), new FrameworkPropertyMetadata( DateTime.MinValue, FrameworkPropertyMetadataOptions.AffectsMeasure ) );
+    public DateTime EndDate
+    {
+      get
+      {
+        return ( DateTime )GetValue( EndDateProperty );
+      }
+      set
+      {
+        SetValue( EndDateProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region OverlapBehavior Property
+
+    public static readonly DependencyProperty OverlapBehaviorProperty = DependencyProperty.Register( "OverlapBehavior", typeof( OverlapBehavior ), typeof( TimelinePanel ), new FrameworkPropertyMetadata( default( OverlapBehavior ), FrameworkPropertyMetadataOptions.AffectsMeasure ) );
+    public OverlapBehavior OverlapBehavior
+    {
+      get
+      {
+        return ( OverlapBehavior )GetValue( OverlapBehaviorProperty );
+      }
+      set
+      {
+        SetValue( OverlapBehaviorProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region KeepOriginalOrderForOverlap Property
+
+    public static readonly DependencyProperty KeepOriginalOrderForOverlapProperty = DependencyProperty.Register( "KeepOriginalOrderForOverlap", typeof( bool ), typeof( TimelinePanel ), new FrameworkPropertyMetadata( false, FrameworkPropertyMetadataOptions.AffectsMeasure ) );
+    public bool KeepOriginalOrderForOverlap
+    {
+      get
+      {
+        return ( bool )GetValue( KeepOriginalOrderForOverlapProperty );
+      }
+      set
+      {
+        SetValue( KeepOriginalOrderForOverlapProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region Orientation Property
+
+    public static readonly DependencyProperty OrientationProperty = StackPanel.OrientationProperty.AddOwner( typeof( TimelinePanel ), new FrameworkPropertyMetadata( Orientation.Horizontal, FrameworkPropertyMetadataOptions.AffectsMeasure ) );
+    public Orientation Orientation
+    {
+      get
+      {
+        return ( Orientation )GetValue( OrientationProperty );
+      }
+      set
+      {
+        SetValue( OrientationProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region UnitTimeSpan Property
+
+    public static readonly DependencyProperty UnitTimeSpanProperty = DependencyProperty.Register( "UnitTimeSpan", typeof( TimeSpan ), typeof( TimelinePanel ), new FrameworkPropertyMetadata( TimeSpan.Zero, FrameworkPropertyMetadataOptions.AffectsMeasure ) );
+    public TimeSpan UnitTimeSpan
+    {
+      get
+      {
+        return ( TimeSpan )GetValue( UnitTimeSpanProperty );
+      }
+      set
+      {
+        SetValue( UnitTimeSpanProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region UnitSize Property
+
+    public static readonly DependencyProperty UnitSizeProperty = DependencyProperty.Register( "UnitSize", typeof( double ), typeof( TimelinePanel ), new FrameworkPropertyMetadata( 0d, FrameworkPropertyMetadataOptions.AffectsMeasure ) );
+    public double UnitSize
+    {
+      get
+      {
+        return ( double )GetValue( UnitSizeProperty );
+      }
+      set
+      {
+        SetValue( UnitSizeProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region Date Attached Property
+
+    public static readonly DependencyProperty DateProperty = DependencyProperty.RegisterAttached( "Date", typeof( DateTime ), typeof( TimelinePanel ), new FrameworkPropertyMetadata( DateTime.MinValue, FrameworkPropertyMetadataOptions.AffectsParentMeasure ) );
+
+    public static DateTime GetDate( DependencyObject obj )
+    {
+      return ( DateTime )obj.GetValue( DateProperty );
+    }
+
+    public static void SetDate( DependencyObject obj, DateTime value )
+    {
+      obj.SetValue( DateProperty, value );
+    }
+
+    #endregion
+
+    #region DateEnd Attached Property
+
+    public static readonly DependencyProperty DateEndProperty = DependencyProperty.RegisterAttached( "DateEnd", typeof( DateTime ), typeof( TimelinePanel ), new FrameworkPropertyMetadata( DateTime.MinValue, FrameworkPropertyMetadataOptions.AffectsParentMeasure ) );
+
+    public static DateTime GetDateEnd( DependencyObject obj )
+    {
+      return ( DateTime )obj.GetValue( DateEndProperty );
+    }
+
+    public static void SetDateEnd( DependencyObject obj, DateTime value )
+    {
+      obj.SetValue( DateEndProperty, value );
+    }
+
+    #endregion
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static TimelinePanel()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( TimelinePanel ), new FrameworkPropertyMetadata( typeof( TimelinePanel ) ) );
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    protected override Size MeasureOverride( Size availableSize )
+    {
+      DateTime calcBeginDate = DateTime.MaxValue;
+      DateTime calcEndDate = DateTime.MinValue;
+
+      foreach( UIElement child in InternalChildren )
+      {
+        DateTime date = GetDate( child );
+        DateTime dateEnd = GetDateEnd( child );
+
+        if( date < calcBeginDate )
+        {
+          calcBeginDate = date;
+        }
+
+        if( date > calcEndDate )
+        {
+          calcEndDate = date;
+        }
+
+        if( dateEnd > calcEndDate )
+        {
+          calcEndDate = dateEnd;
+        }
+      }
+
+      if( BeginDate == DateTime.MinValue )
+      {
+        BeginDate = calcBeginDate;
+      }
+
+      if( EndDate == DateTime.MinValue )
+      {
+        EndDate = calcEndDate;
+      }
+
+      foreach( UIElement child in InternalChildren )
+      {
+        DateTime date = GetDate( child );
+        DateTime dateEnd = GetDateEnd( child );
+
+        Size childSize = availableSize;
+
+        if( dateEnd > DateTime.MinValue && dateEnd > date )
+        {
+          if( Orientation == Orientation.Horizontal )
+          {
+            if( UnitTimeSpan != TimeSpan.Zero && UnitSize > 0 )
+            {
+              double size = ( double )( dateEnd.Ticks - date.Ticks ) / ( double )UnitTimeSpan.Ticks;
+
+              childSize.Width = size * UnitSize;
+            }
+            else if( !double.IsPositiveInfinity( availableSize.Width ) )
+            {
+              // width is DateEnd - Date
+              childSize.Width = CalculateTimelineOffset( dateEnd, availableSize.Width ) - CalculateTimelineOffset( date, availableSize.Width );
+            }
+          }
+          else
+          {
+            if( UnitTimeSpan != TimeSpan.Zero && UnitSize > 0 )
+            {
+              double size = ( double )( dateEnd.Ticks - date.Ticks ) / ( double )UnitTimeSpan.Ticks;
+
+              childSize.Height = size * UnitSize;
+            }
+            else if( !double.IsPositiveInfinity( availableSize.Height ) )
+            {
+              // height is DateEnd - Date
+              childSize.Height = CalculateTimelineOffset( dateEnd, availableSize.Height ) - CalculateTimelineOffset( date, availableSize.Height );
+            }
+          }
+        }
+
+        child.Measure( childSize );
+      }
+
+      Size newAvailableSize = new Size( availableSize.Width, availableSize.Height );
+
+      if( UnitTimeSpan != TimeSpan.Zero && UnitSize > 0 )
+      {
+        double size = ( double )( EndDate.Ticks - BeginDate.Ticks ) / ( double )UnitTimeSpan.Ticks;
+
+        if( Orientation == Orientation.Horizontal )
+        {
+          newAvailableSize.Width = size * UnitSize;
+        }
+        else
+        {
+          newAvailableSize.Height = size * UnitSize;
+        }
+      }
+
+      Size desiredSize = new Size();
+
+      if( ( Orientation == Orientation.Vertical && double.IsPositiveInfinity( newAvailableSize.Height ) ) ||
+          ( Orientation == Orientation.Horizontal && double.IsPositiveInfinity( newAvailableSize.Width ) ) )
+      {
+        // Our panel cannot layout items when we have positive infinity in the layout direction
+        // so defer to arrange pass.
+        _visibleElements = null;
+      }
+      else
+      {
+        LayoutItems( InternalChildren, newAvailableSize );
+
+        Rect desiredRect = new Rect();
+
+        foreach( DateElement child in _visibleElements )
+        {
+          desiredRect.Union( child.PlacementRectangle );
+        }
+
+        if( Orientation == Orientation.Horizontal )
+        {
+          desiredSize.Width = newAvailableSize.Width;
+          desiredSize.Height = desiredRect.Size.Height;
+        }
+        else
+        {
+          desiredSize.Width = desiredRect.Size.Width;
+          desiredSize.Height = newAvailableSize.Height;
+        }
+      }
+
+      if( IsScrolling )
+      {
+        Size viewport = new Size( availableSize.Width, availableSize.Height );
+        Size extent = new Size( desiredSize.Width, desiredSize.Height );
+        Vector offset = new Vector( Math.Max( 0, Math.Min( _offset.X, extent.Width - viewport.Width ) ),
+                                    Math.Max( 0, Math.Min( _offset.Y, extent.Height - viewport.Height ) ) );
+
+        SetScrollingData( viewport, extent, offset );
+
+        desiredSize.Width = Math.Min( desiredSize.Width, availableSize.Width );
+        desiredSize.Height = Math.Min( desiredSize.Height, availableSize.Height );
+
+        _physicalViewport = availableSize;
+      }
+
+      return desiredSize;
+    }
+
+    protected override Size ArrangeOverride( Size finalSize )
+    {
+      Rect finalRect = new Rect();
+
+      if( _visibleElements == null )
+      {
+        LayoutItems( InternalChildren, finalSize );
+      }
+
+      foreach( DateElement child in _visibleElements )
+      {
+        if( IsScrolling )
+        {
+          Rect placement = new Rect( child.PlacementRectangle.Location, child.PlacementRectangle.Size );
+          placement.Offset( -_offset );
+
+          child.Element.Arrange( placement );
+        }
+        else
+        {
+          child.Element.Arrange( child.PlacementRectangle );
+        }
+
+        finalRect.Union( child.PlacementRectangle );
+      }
+
+      Size renderSize;
+
+      if( Orientation == Orientation.Horizontal )
+      {
+        renderSize = new Size( finalSize.Width, finalRect.Size.Height );
+      }
+      else
+      {
+        renderSize = new Size( finalRect.Size.Width, finalSize.Height );
+      }
+
+      return renderSize;
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Methods
+
+    private void ResetScrollInfo()
+    {
+      _offset = new Vector();
+      _physicalViewport = _viewport = _extent = new Size( 0, 0 );
+    }
+
+    private void SetScrollingData( Size viewport, Size extent, Vector offset )
+    {
+      _offset = offset;
+
+      if( !AreVirtuallyEqual( viewport, _viewport ) ||
+          !AreVirtuallyEqual( extent, _extent ) ||
+          !AreVirtuallyEqual( offset, _computedOffset ) )
+      {
+        _viewport = viewport;
+        _extent = extent;
+        _offset = offset;
+
+        OnScrollChange();
+      }
+    }
+
+    private double ValidateInputOffset( double offset, string parameterName )
+    {
+      if( double.IsNaN( offset ) )
+        throw new ArgumentOutOfRangeException( parameterName );
+
+      return Math.Max( 0d, offset );
+    }
+
+    private void OnScrollChange()
+    {
+      if( ScrollOwner != null )
+      {
+        ScrollOwner.InvalidateScrollInfo();
+      }
+    }
+
+    private double CalculateTimelineOffset( DateTime d, double finalWidth )
+    {
+      double offset;
+
+      long tickRange = EndDate.Ticks - BeginDate.Ticks;
+      long tickOffset = d.Ticks - BeginDate.Ticks;
+
+      if( UnitTimeSpan != TimeSpan.Zero && UnitSize > 0 )
+      {
+        offset = ( ( double )tickOffset / ( double )UnitTimeSpan.Ticks ) * UnitSize;
+      }
+      else
+      {
+        if( tickRange > 0 )
+        {
+          offset = ( ( double )tickOffset / ( double )tickRange ) * finalWidth;
+        }
+        else
+        {
+          offset = 0;
+        }
+      }
+
+      return offset;
+    }
+
+    private static int CompareElementsByLeft( DateElement a, DateElement b )
+    {
+      return a.PlacementRectangle.Left.CompareTo( b.PlacementRectangle.Left );
+    }
+
+    private static int CompareElementsByTop( DateElement a, DateElement b )
+    {
+      return a.PlacementRectangle.Top.CompareTo( b.PlacementRectangle.Top );
+    }
+
+    private void LayoutItems( UIElementCollection children, Size availableSize )
+    {
+      _visibleElements = new List<DateElement>();
+      List<DateElement> overlappingElements = new List<DateElement>();
+
+      int index = 0;
+      foreach( UIElement child in children )
+      {
+        if( child == null )
+          continue;
+
+        DateTime date = GetDate( child );
+        DateTime dateEnd = GetDateEnd( child );
+
+        if( child.Visibility != Visibility.Collapsed )
+        {
+          if( KeepOriginalOrderForOverlap )
+          {
+            _visibleElements.Add( new DateElement( child, date, dateEnd, index ) );
+          }
+          else
+          {
+            _visibleElements.Add( new DateElement( child, date, dateEnd ) );
+          }
+        }
+
+        index++;
+      }
+
+      _visibleElements.Sort();
+
+      foreach( DateElement child in _visibleElements )
+      {
+        DateTime date = GetDate( child.Element );
+        DateTime dateEnd = GetDateEnd( child.Element );
+
+        if( Orientation == Orientation.Vertical )
+        {
+
+          //---------------------------------------------------------------------
+          // 
+          // Begin Layout Algorithm (Vertical Orientation)
+          //
+          //---------------------------------------------------------------------
+
+          // calculate the values for y (top) and height
+
+          // y
+          child.PlacementRectangle.Y = CalculateTimelineOffset( date, availableSize.Height );
+
+          // height
+          if( dateEnd > DateTime.MinValue && dateEnd > date )
+          {
+            // height is DateEnd - Date
+            child.PlacementRectangle.Height = CalculateTimelineOffset( dateEnd, availableSize.Height ) - CalculateTimelineOffset( date, availableSize.Height );
+          }
+          else
+          {
+            // height is the desired size
+            child.PlacementRectangle.Height = child.Element.DesiredSize.Height;
+          }
+
+          // now calcualte the values for x (left) and width based on the OverlapBehavior
+
+          switch( OverlapBehavior )
+          {
+
+            //---------------------------------------------------------------------
+            //
+            // OverlapBehavior == None (Vertical)
+            //
+            //---------------------------------------------------------------------
+
+            case OverlapBehavior.None:
+
+              #region OverlapBehavior == None (Vertical)
+
+              child.PlacementRectangle.X = 0;
+              child.PlacementRectangle.Width = child.Element.DesiredSize.Width;
+
+              break;
+
+              #endregion
+
+            //---------------------------------------------------------------------
+            //
+            // OverlapBehavior == Hide (Vertical)
+            //
+            //---------------------------------------------------------------------
+
+            case OverlapBehavior.Hide:
+
+              #region OverlapBehavior = Hide
+
+              overlappingElements.Clear();
+
+              foreach( DateElement compare in _visibleElements )
+              {
+                if( child == compare )
+                  break;
+
+                Rect childRect = child.PlacementRectangle;
+                Rect compareRect = compare.PlacementRectangle;
+
+                if( childRect.Top >= compareRect.Top && childRect.Top < compareRect.Bottom )
+                {
+                  overlappingElements.Add( compare );
+                }
+              }
+
+              if( overlappingElements.Count > 0 )
+              {
+                child.PlacementRectangle.X = 0;
+                child.PlacementRectangle.Y = 0;
+                child.PlacementRectangle.Width = 0;
+                child.PlacementRectangle.Height = 0;
+              }
+              else
+              {
+                child.PlacementRectangle.X = 0;
+                child.PlacementRectangle.Width = child.Element.DesiredSize.Width;
+              }
+
+              break;
+
+              #endregion
+
+            //---------------------------------------------------------------------
+            //
+            // OverlapBehavior == Stretch (Vertical)
+            //
+            //---------------------------------------------------------------------
+
+            case OverlapBehavior.Stretch:
+
+              #region OverlapBehavior = Stretch
+
+              // find the first gap at the desired vertical (Y) location (note that in doing this, we 
+              // only need to look for elements that intersect at the "top" of the item that is being
+              // placed because the _VisibleElements collection has been sorted so that the first 
+              // items come first--this means there won't be anything "below" the current item that
+              // isn't also below the current item
+
+              // find all overlapping elements
+
+              overlappingElements.Clear();
+
+              foreach( DateElement compare in _visibleElements )
+              {
+                if( child == compare )
+                  break;
+
+                Rect childRect = child.PlacementRectangle;
+                Rect compareRect = compare.PlacementRectangle;
+
+                if( childRect.Top >= compareRect.Top && childRect.Top < compareRect.Bottom )
+                {
+                  overlappingElements.Add( compare );
+                }
+              }
+
+              // sort the elements according to their "left" value so that as we search through
+              // the list we are able to identiy gaps
+
+              overlappingElements.Sort( CompareElementsByLeft );
+
+              // initialize left and width such that the item will be stretch to fill the available 
+              // space and if there are no overlapping items, skip to the end
+
+              double left = 0;
+              double width = availableSize.Width;
+
+              if( overlappingElements.Count > 0 )
+              {
+
+                bool foundGap = false;
+
+                // now, look for a gap (there is a good chance that there won't be one, but if there is 
+                // then we will place the item in it)
+
+                for( int i = 0; i < overlappingElements.Count; i++ )
+                {
+                  Rect r = overlappingElements[ i ].PlacementRectangle;
+
+                  // if this is the first overlapping element, then look for a gap at the beginning
+                  if( i == 0 )
+                  {
+                    if( r.Left > 0 )
+                    {
+                      left = 0;
+                      width = r.Left;
+                      foundGap = true;
+                      break;
+                    }
+                  }
+
+                  // if this is the last overlapping element
+                  if( i == overlappingElements.Count - 1 )
+                  {
+                    //left = r.Right;
+                    break;
+                  }
+
+                  // if this is an element somewhere in the middle, then 
+                  else
+                  {
+                    Rect n = overlappingElements[ i + 1 ].PlacementRectangle;
+                    if( ( n.Left - r.Right ) > 0 )
+                    {
+                      left = r.Right;
+                      width = n.Left - r.Right;
+                      foundGap = true;
+                      break;
+                    }
+                  }
+
+                }
+
+                // if we didn't find a gap, we need to make one by scooting the overlapping elements 
+                // over and then placing the item at the end
+
+                if( !foundGap )
+                {
+                  width = Math.Min( availableSize.Width / ( overlappingElements.Count + 1 ), overlappingElements[ 0 ].PlacementRectangle.Width );
+                  left = 0;
+
+                  foreach( DateElement e in overlappingElements )
+                  {
+                    e.PlacementRectangle.Width = width;
+                    e.PlacementRectangle.X = left;
+                    left += width;
+                  }
+                }
+              }
+
+              child.PlacementRectangle.X = left;
+
+              if( double.IsPositiveInfinity( width ) )
+              {
+                child.PlacementRectangle.Width = child.Element.DesiredSize.Width;
+              }
+              else
+              {
+                child.PlacementRectangle.Width = width;
+              }
+
+              break;
+
+              #endregion
+
+            //---------------------------------------------------------------------
+            //
+            // OverlapBehavior == Stack (Vertical)
+            //
+            //---------------------------------------------------------------------
+
+            case OverlapBehavior.Stack:
+
+              #region OverlapBehavior = Stack;
+
+              overlappingElements.Clear();
+
+              foreach( DateElement compare in _visibleElements )
+              {
+                if( child == compare )
+                  break;
+
+                Rect childRect = child.PlacementRectangle;
+                Rect compareRect = compare.PlacementRectangle;
+
+                if( childRect.Top >= compareRect.Top && childRect.Top < compareRect.Bottom )
+                {
+                  overlappingElements.Add( compare );
+                }
+              }
+
+              // sort the elements according to their "left" value so that as we search through
+              // the list we are able to identiy gaps
+
+              overlappingElements.Sort( CompareElementsByLeft );
+
+              // initialize left and width values, width will always be it's desired size
+
+              left = 0;
+              child.PlacementRectangle.Width = child.Element.DesiredSize.Width;
+
+              // find the first gap that is big enough to accomodate the current item
+
+              for( int i = 0; i < overlappingElements.Count; i++ )
+              {
+                Rect r = overlappingElements[ i ].PlacementRectangle;
+
+                if( i == 0 )
+                {
+                  if( r.Left >= child.PlacementRectangle.Width )
+                  {
+                    left = 0;
+                    break;
+                  }
+                }
+
+                if( i == overlappingElements.Count - 1 )
+                {
+                  left = r.Right;
+                  break;
+                }
+                else
+                {
+                  Rect n = overlappingElements[ i + 1 ].PlacementRectangle;
+                  if( ( n.Left - r.Right ) >= child.PlacementRectangle.Width )
+                  {
+                    left = r.Right;
+                    break;
+                  }
+                }
+              }
+
+              child.PlacementRectangle.X = left;
+
+              break;
+
+              #endregion
+          }
+        }
+        else
+        {
+          //---------------------------------------------------------------------
+          // 
+          // Begin Layout Algorithm (Horizontal Orientation)
+          //
+          //---------------------------------------------------------------------
+
+          // calculate the values for x (left) and width
+
+          // x
+          child.PlacementRectangle.X = CalculateTimelineOffset( date, availableSize.Width );
+
+          // width
+          if( dateEnd > DateTime.MinValue && dateEnd > date )
+          {
+            // width is DateEnd - Date
+            child.PlacementRectangle.Width = CalculateTimelineOffset( dateEnd, availableSize.Width ) - CalculateTimelineOffset( date, availableSize.Width );
+          }
+          else
+          {
+            // width is the desired size
+            child.PlacementRectangle.Width = child.Element.DesiredSize.Width;
+          }
+
+          // now calcualte the values for y (top) and height based on the OverlapBehavior
+
+          switch( OverlapBehavior )
+          {
+
+            //---------------------------------------------------------------------
+            //
+            // OverlapBehavior == None (Horizontal)
+            //
+            //---------------------------------------------------------------------
+
+            case OverlapBehavior.None:
+
+              #region OverlapBehavior == None (Horizontal)
+
+              child.PlacementRectangle.Y = 0;
+              child.PlacementRectangle.Height = child.Element.DesiredSize.Height;
+
+              break;
+
+              #endregion
+
+            //---------------------------------------------------------------------
+            //
+            // OverlapBehavior == Hide (Horizontal)
+            //
+            //---------------------------------------------------------------------
+
+            case OverlapBehavior.Hide:
+
+              #region OverlapBehavior = Hide (Horizontal)
+
+              overlappingElements.Clear();
+
+              foreach( DateElement compare in _visibleElements )
+              {
+                if( child == compare )
+                  break;
+
+                Rect childRect = child.PlacementRectangle;
+                Rect compareRect = compare.PlacementRectangle;
+
+                if( childRect.Left >= compareRect.Left && childRect.Left < compareRect.Right )
+                {
+                  overlappingElements.Add( compare );
+                }
+              }
+
+              if( overlappingElements.Count > 0 )
+              {
+                child.PlacementRectangle.X = 0;
+                child.PlacementRectangle.Y = 0;
+                child.PlacementRectangle.Width = 0;
+                child.PlacementRectangle.Height = 0;
+              }
+              else
+              {
+                child.PlacementRectangle.Y = 0;
+                child.PlacementRectangle.Height = child.Element.DesiredSize.Height;
+              }
+
+              break;
+
+              #endregion
+
+            //---------------------------------------------------------------------
+            //
+            // OverlapBehavior == Stretch (Horizontal)
+            //
+            //---------------------------------------------------------------------
+
+            case OverlapBehavior.Stretch:
+
+              #region OverlapBehavior = Stretch
+
+              // find the first gap at the desired vertical (Y) location (note that in doing this, we 
+              // only need to look for elements that intersect at the "top" of the item that is being
+              // placed because the _VisibleElements collection has been sorted so that the first 
+              // items come first--this means there won't be anything "below" the current item that
+              // isn't also below the current item
+
+              // find all overlapping elements
+
+              overlappingElements.Clear();
+
+              foreach( DateElement compare in _visibleElements )
+              {
+                if( child == compare )
+                  break;
+
+                Rect childRect = child.PlacementRectangle;
+                Rect compareRect = compare.PlacementRectangle;
+
+                if( childRect.Left >= compareRect.Left && childRect.Left < compareRect.Right )
+                {
+                  overlappingElements.Add( compare );
+                }
+              }
+
+              // sort the elements according to their "left" value so that as we search through
+              // the list we are able to identiy gaps
+
+              overlappingElements.Sort( CompareElementsByTop );
+
+              // initialize left and width such that the item will be stretch to fill the available 
+              // space and if there are no overlapping items, skip to the end
+
+              double top = 0;
+              double height = availableSize.Height;
+
+              if( overlappingElements.Count > 0 )
+              {
+
+                bool foundGap = false;
+
+                // now, look for a gap (there is a good chance that there won't be one, but if there is 
+                // then we will place the item in it)
+
+                for( int i = 0; i < overlappingElements.Count; i++ )
+                {
+                  Rect r = overlappingElements[ i ].PlacementRectangle;
+
+                  // if this is the first overlapping element, then look for a gap at the beginning
+                  if( i == 0 )
+                  {
+                    if( r.Top > 0 )
+                    {
+                      top = 0;
+                      height = r.Top;
+                      foundGap = true;
+                      break;
+                    }
+                  }
+
+                  // if this is the last overlapping element
+                  if( i == overlappingElements.Count - 1 )
+                  {
+                    //left = r.Right;
+                    break;
+                  }
+
+                  // if this is an element somewhere in the middle, then 
+                  else
+                  {
+                    Rect n = overlappingElements[ i + 1 ].PlacementRectangle;
+                    if( ( n.Top - r.Bottom ) > 0 )
+                    {
+                      top = r.Bottom;
+                      height = n.Top - r.Bottom;
+                      foundGap = true;
+                      break;
+                    }
+                  }
+
+                }
+
+                // if we didn't find a gap, we need to make one by scooting the overlapping elements 
+                // over and then placing the item at the end
+
+                if( !foundGap )
+                {
+                  height = Math.Min( availableSize.Height / ( overlappingElements.Count + 1 ), overlappingElements[ 0 ].PlacementRectangle.Height );
+                  top = 0;
+
+                  foreach( DateElement e in overlappingElements )
+                  {
+                    e.PlacementRectangle.Height = height;
+                    e.PlacementRectangle.Y = top;
+                    top += height;
+                  }
+                }
+              }
+
+              child.PlacementRectangle.Y = top;
+
+              if( double.IsPositiveInfinity( height ) )
+              {
+                child.PlacementRectangle.Height = child.Element.DesiredSize.Height;
+              }
+              else
+              {
+                child.PlacementRectangle.Height = height;
+              }
+
+              break;
+
+              #endregion
+
+            //---------------------------------------------------------------------
+            //
+            // OverlapBehavior == Stack (Horizontal)
+            //
+            //---------------------------------------------------------------------
+
+            case OverlapBehavior.Stack:
+
+              #region OverlapBehavior = Stack;
+
+              overlappingElements.Clear();
+
+              foreach( DateElement compare in _visibleElements )
+              {
+                if( child == compare )
+                  break;
+
+                Rect childRect = child.PlacementRectangle;
+                Rect compareRect = compare.PlacementRectangle;
+
+                if( childRect.Left >= compareRect.Left && childRect.Left < compareRect.Right )
+                {
+                  overlappingElements.Add( compare );
+                }
+              }
+
+              // sort the elements according to their "left" value so that as we search through
+              // the list we are able to identiy gaps
+
+              overlappingElements.Sort( CompareElementsByTop );
+
+              // initialize left and width values, width will always be it's desired size
+
+              top = 0;
+              child.PlacementRectangle.Height = child.Element.DesiredSize.Height;
+
+              // find the first gap that is big enough to accomodate the current item
+
+              for( int i = 0; i < overlappingElements.Count; i++ )
+              {
+                Rect r = overlappingElements[ i ].PlacementRectangle;
+
+                if( i == 0 )
+                {
+                  if( r.Top >= child.PlacementRectangle.Height )
+                  {
+                    top = 0;
+                    break;
+                  }
+                }
+
+                if( i == overlappingElements.Count - 1 )
+                {
+                  top = r.Bottom;
+                  break;
+                }
+                else
+                {
+                  Rect n = overlappingElements[ i + 1 ].PlacementRectangle;
+                  if( ( n.Top - r.Bottom ) >= child.PlacementRectangle.Height )
+                  {
+                    top = r.Bottom;
+                    break;
+                  }
+                }
+              }
+
+              child.PlacementRectangle.Y = top;
+
+              break;
+
+              #endregion
+          }
+        }
+      }
+    }
+
+    private static bool AreVirtuallyEqual( double d1, double d2 )
+    {
+      if( double.IsPositiveInfinity( d1 ) )
+        return double.IsPositiveInfinity( d2 );
+
+      if( double.IsNegativeInfinity( d1 ) )
+        return double.IsNegativeInfinity( d2 );
+
+      if( double.IsNaN( d1 ) )
+        return double.IsNaN( d2 );
+
+      double n = d1 - d2;
+      double d = ( Math.Abs( d1 ) + Math.Abs( d2 ) + 10 ) * 1.0e-15;
+      return ( -d < n ) && ( d > n );
+    }
+
+    private static bool AreVirtuallyEqual( Size s1, Size s2 )
+    {
+      return AreVirtuallyEqual( s1.Width, s2.Width )
+          && AreVirtuallyEqual( s1.Height, s2.Height );
+    }
+
+    private static bool AreVirtuallyEqual( Vector v1, Vector v2 )
+    {
+      return AreVirtuallyEqual( v1.X, v2.X )
+          && AreVirtuallyEqual( v1.Y, v2.Y );
+    }
+
+    #endregion //Methods
+
+    #region Interfaces
+
+    #region IScrollInfo
+
+    public bool CanHorizontallyScroll
+    {
+      get
+      {
+        return _allowHorizontal;
+      }
+      set
+      {
+        _allowHorizontal = value;
+      }
+    }
+
+    public bool CanVerticallyScroll
+    {
+      get
+      {
+        return _allowVertical;
+      }
+      set
+      {
+        _allowVertical = value;
+      }
+    }
+
+    public double ExtentHeight
+    {
+      get
+      {
+        return _extent.Height;
+      }
+    }
+
+    public double ExtentWidth
+    {
+      get
+      {
+        return _extent.Width;
+      }
+    }
+
+    public double HorizontalOffset
+    {
+      get
+      {
+        return _offset.X;
+      }
+    }
+
+    public void LineDown()
+    {
+      SetVerticalOffset( VerticalOffset + ( ( Orientation == Orientation.Vertical ) ? 1d : 16d ) );
+    }
+
+    public void LineLeft()
+    {
+      SetHorizontalOffset( HorizontalOffset - ( ( Orientation == Orientation.Horizontal ) ? 1d : 16d ) );
+    }
+
+    public void LineRight()
+    {
+      SetHorizontalOffset( HorizontalOffset + ( ( Orientation == Orientation.Horizontal ) ? 1d : 16d ) );
+    }
+
+    public void LineUp()
+    {
+      SetVerticalOffset( VerticalOffset - ( ( Orientation == Orientation.Vertical ) ? 1d : 16d ) );
+    }
+
+    public Rect MakeVisible( Visual visual, Rect rectangle )
+    {
+      return rectangle;
+    }
+
+    public void MouseWheelDown()
+    {
+      SetVerticalOffset( VerticalOffset + ( SystemParameters.WheelScrollLines * ( ( Orientation == Orientation.Vertical ) ? 1d : 16d ) ) );
+    }
+
+    public void MouseWheelLeft()
+    {
+      SetHorizontalOffset( HorizontalOffset - ( 3d * ( ( Orientation == Orientation.Horizontal ) ? 1d : 16d ) ) );
+    }
+
+    public void MouseWheelRight()
+    {
+      SetHorizontalOffset( HorizontalOffset + ( 3d * ( ( Orientation == Orientation.Horizontal ) ? 1d : 16d ) ) );
+    }
+
+    public void MouseWheelUp()
+    {
+      SetVerticalOffset( VerticalOffset - ( SystemParameters.WheelScrollLines * ( ( Orientation == Orientation.Vertical ) ? 1d : 16d ) ) );
+    }
+
+    public void PageDown()
+    {
+      SetVerticalOffset( VerticalOffset + ViewportHeight );
+    }
+
+    public void PageLeft()
+    {
+      SetHorizontalOffset( HorizontalOffset - ViewportWidth );
+    }
+
+    public void PageRight()
+    {
+      SetHorizontalOffset( HorizontalOffset + ViewportWidth );
+    }
+
+    public void PageUp()
+    {
+      SetVerticalOffset( VerticalOffset - ViewportHeight );
+    }
+
+    public ScrollViewer ScrollOwner
+    {
+      get
+      {
+        return _scrollOwner;
+      }
+      set
+      {
+        if( _scrollOwner != value )
+        {
+          _scrollOwner = value;
+
+          ResetScrollInfo();
+        }
+      }
+    }
+
+    public void SetHorizontalOffset( double offset )
+    {
+      offset = ValidateInputOffset( offset, "HorizontalOffset" );
+
+      if( !AreVirtuallyEqual( offset, _offset.X ) )
+      {
+        _offset.X = offset;
+
+        InvalidateMeasure();
+      }
+    }
+
+    public void SetVerticalOffset( double offset )
+    {
+      offset = ValidateInputOffset( offset, "VerticalOffset" );
+
+      if( !AreVirtuallyEqual( offset, _offset.Y ) )
+      {
+        _offset.Y = offset;
+
+        InvalidateMeasure();
+      }
+    }
+
+    public double VerticalOffset
+    {
+      get
+      {
+        return _offset.Y;
+      }
+    }
+
+    public double ViewportHeight
+    {
+      get
+      {
+        return _viewport.Height;
+      }
+    }
+
+    public double ViewportWidth
+    {
+      get
+      {
+        return _viewport.Width;
+      }
+    }
+
+    private bool IsScrolling
+    {
+      get
+      {
+        return ( _scrollOwner != null );
+      }
+    }
+
+    private bool _allowHorizontal = false;
+    private bool _allowVertical = false;
+    private Vector _computedOffset = new Vector( 0d, 0d );
+    private Size _extent = new Size( 0, 0 );
+    private Vector _offset = new Vector( 0, 0 );
+    private ScrollViewer _scrollOwner = null;
+    private Size _viewport;
+    private Size _physicalViewport;
+
+    #endregion //IScrollInfo
+
+    #endregion //Interfaces
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Utils/Exceptions/ThrowException.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Utils/Exceptions/ThrowException.cs
new file mode 100644
index 00000000..0d8bfeec
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Utils/Exceptions/ThrowException.cs
@@ -0,0 +1,70 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+
+namespace Xceed.Utils.Exceptions
+{
+  internal class ThrowException
+  {
+    private ThrowException()
+    {
+    }
+
+    #region PUBLIC STATIC METHODS
+
+    public static void ThrowArgumentException( string message, string paramName, Exception innerExcept )
+    {
+#if ( XCEEDCF || SILVERLIGHT )
+      throw new ArgumentException( message, innerExcept );
+#else
+      throw new ArgumentException( message, paramName, innerExcept );
+#endif
+    }
+
+    public static void ThrowArgumentOutOfRangeException( string paramName, object value, string message )
+    {
+#if ( XCEEDCF || SILVERLIGHT )
+      throw new ArgumentOutOfRangeException( message );
+#else
+      throw new ArgumentOutOfRangeException( paramName, value, message );
+#endif
+    }
+
+#if !NO_CODE_ANALYSIS
+    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "type" )]
+#endif // !NO_CODE_ANALYSIS
+    public static void ThrowLicenseException( Type type, object instance, string message )
+    {
+#if ( XCEEDCF || SILVERLIGHT )
+      throw new SystemException( message );
+#else
+#if XBAP_FRIENDLY
+      // Under some circumstances, passing a type to a LicenseException will throw a 
+      // FileNotFoundException on the assembly containing the type.
+      throw new System.ComponentModel.LicenseException( null, instance, message );
+#else
+      throw new System.ComponentModel.LicenseException( type, instance, message );
+#endif
+#endif
+    }
+
+    #endregion PUBLIC STATIC METHODS
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/VisualStates.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/VisualStates.cs
new file mode 100644
index 00000000..9d85c8f2
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/VisualStates.cs
@@ -0,0 +1,26 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit
+{
+  internal static partial class VisualStates
+  {
+
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj
new file mode 100644
index 00000000..26bcb16d
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/WPFToolkit.Extended.csproj
@@ -0,0 +1,448 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{2C3149D9-832B-4754-A27B-898A392344B5}</ProjectGuid>
+    <OutputType>library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Xceed.Wpf.Toolkit</RootNamespace>
+    <AssemblyName>WPFToolkit.Extended</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkSubset>Client</TargetFrameworkSubset>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;VS2008</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE;VS2008</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Xml.Linq">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+    <Reference Include="WPFToolkit, Version=3.5.40128.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="BusyIndicator\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="ButtonSpinner\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="CalculatorUpDown\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Calculator\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="CheckListBox\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="ChildWindow\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Chromes\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="CollectionEditors\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="ColorCanvas\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="ColorPicker\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="CheckComboBox\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="DateTimePicker\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="DateTimeUpDown\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="DropDownButton\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Magnifier\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="MessageBox\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="MultiLineTextEditor\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="NumericUpDown\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="PropertyGrid\Implementation\Editors\CollectionEditor.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="CollectionEditors\Implementation\CollectionEditorDialog.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="PropertyGrid\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="RichTextBoxFormatBar\RichTextBoxFormatBar.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="SplitButton\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\Aero.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\Aero\Brushes_NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\Aero\Buttons_NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\Generic.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Themes\Generic\Brushes.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Themes\Generic\Buttons.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Themes\Generic\Common.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\Generic\Glyphs.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="TimePicker\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="WatermarkTextBox\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Wizard\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Zoombox\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyVersionInfo.cs" />
+    <Compile Include="AssemblyVersionInfoCommon.cs" />
+    <Compile Include="BusyIndicator\Implementation\BusyIndicator.cs" />
+    <Compile Include="ButtonSpinner\Implementation\ButtonSpinner.cs" />
+    <Compile Include="CalculatorUpDown\Implementation\CalculatorUpDown.cs" />
+    <Compile Include="Calculator\Implementation\Calculator.cs" />
+    <Compile Include="Calculator\Implementation\CalculatorCommands.cs" />
+    <Compile Include="CheckListBox\Implementation\CheckListBox.cs" />
+    <Compile Include="ChildWindow\Implementation\ChildWindow.cs" />
+    <Compile Include="ChildWindow\Implementation\WindowStartupLocation.cs" />
+    <Compile Include="ChildWindow\Implementation\WindowState.cs" />
+    <Compile Include="ButtonSpinner\Implementation\SpinDirection.cs" />
+    <Compile Include="ButtonSpinner\Implementation\SpinEventArgs.cs" />
+    <Compile Include="ButtonSpinner\Implementation\Spinner.cs" />
+    <Compile Include="ButtonSpinner\Implementation\ValidSpinDirections.cs" />
+    <Compile Include="Chromes\Implementation\ButtonChrome.cs" />
+    <Compile Include="CollectionEditors\Implementation\CollectionEditor.cs" />
+    <Compile Include="CheckComboBox\Implementation\CheckComboBox.cs" />
+    <Compile Include="Core\Converters\ObjectTypeToNameConverter.cs" />
+    <Compile Include="ColorCanvas\Implementation\ColorCanvas.cs" />
+    <Compile Include="Core\Converters\CalculatorMemoryToVisibilityConverter.cs" />
+    <Compile Include="Core\Converters\RoundedValueConverter.cs" />
+    <Compile Include="Core\Converters\TimeFormatToDateTimeFormatConverter.cs" />
+    <Compile Include="Core\Converters\VisibilityToBoolConverter.cs" />
+    <Compile Include="Core\Converters\WizardPageButtonVisibilityConverter.cs" />
+    <Compile Include="Core\ErrorMessages.cs" />
+    <Compile Include="Core\IndexChangedEventArgs.cs" />
+    <Compile Include="Core\IndexChangedEventHandler.cs" />
+    <Compile Include="Core\Input\KeyModifier.cs" />
+    <Compile Include="Core\Input\KeyModifierCollection.cs" />
+    <Compile Include="Core\Input\KeyModifierCollectionConverter.cs" />
+    <Compile Include="Core\InvalidContentException.cs" />
+    <Compile Include="Core\InvalidTemplateException.cs" />
+    <Compile Include="Core\Primitives\HsvColor.cs" />
+    <Compile Include="ColorPicker\Implementation\ColorItem.cs" />
+    <Compile Include="ColorPicker\Implementation\ColorPicker.cs" />
+    <Compile Include="Core\Primitives\Selector.cs" />
+    <Compile Include="Core\Primitives\SelectorItem.cs" />
+    <Compile Include="Core\Primitives\ShapeBase.cs" />
+    <Compile Include="Core\PropertyChangedEventArgs.cs" />
+    <Compile Include="Core\PropertyChangedEventHandler.cs" />
+    <Compile Include="Core\Themes\StaticResourceKey.cs" />
+    <Compile Include="Core\Utilities\CalculatorUtilities.cs" />
+    <Compile Include="Core\Utilities\ColorUtilities.cs" />
+    <Compile Include="ColorCanvas\Implementation\ColorSpectrumSlider.cs" />
+    <Compile Include="Core\Converters\ColorToSolidColorBrushConverter.cs" />
+    <Compile Include="Core\Converters\InverseBoolConverter.cs" />
+    <Compile Include="Core\Converters\SolidColorBrushToColorConverter.cs" />
+    <Compile Include="Core\Utilities\ContextMenuUtilities.cs" />
+    <Compile Include="Core\Utilities\DoubleHelper.cs" />
+    <Compile Include="Core\Utilities\EllipseHelper.cs" />
+    <Compile Include="Core\Utilities\PointHelper.cs" />
+    <Compile Include="Core\Utilities\RectHelper.cs" />
+    <Compile Include="Core\Utilities\ResourceHelper.cs" />
+    <Compile Include="Core\Utilities\Segment.cs" />
+    <Compile Include="Core\Utilities\VisualTreeHelperEx.cs" />
+    <Compile Include="DateTimePicker\Implementation\DateTimePicker.cs" />
+    <Compile Include="DateTimeUpDown\Implementation\DateTimeFormat.cs" />
+    <Compile Include="DateTimeUpDown\Implementation\DateTimeInfo.cs" />
+    <Compile Include="DateTimeUpDown\Implementation\DateTimePart.cs" />
+    <Compile Include="DateTimeUpDown\Implementation\DateTimeUpDown.cs" />
+    <Compile Include="DateTimeUpDown\Implementation\DateTimeParser.cs" />
+    <Compile Include="DropDownButton\Implementation\DropDownButton.cs" />
+    <Compile Include="Magnifier\Implementation\FrameType.cs" />
+    <Compile Include="MultiLineTextEditor\Implementation\MultiLineTextEditor.cs" />
+    <Compile Include="NumericUpDown\Implementation\DecimalUpDown.cs" />
+    <Compile Include="NumericUpDown\Implementation\DoubleUpDown.cs" />
+    <Compile Include="NumericUpDown\Implementation\IntegerUpDown.cs" />
+    <Compile Include="Magnifier\Implementation\Converters\BorderThicknessToStrokeThicknessConverter.cs" />
+    <Compile Include="Magnifier\Implementation\Converters\RadiusConverter.cs" />
+    <Compile Include="Magnifier\Implementation\Magnifier.cs" />
+    <Compile Include="Magnifier\Implementation\MagnifierAdorner.cs" />
+    <Compile Include="Magnifier\Implementation\MagnifierManager.cs" />
+    <Compile Include="Core\Primitives\InputBase.cs" />
+    <Compile Include="MaskedTextBox\Implementation\MaskedTextBox.cs" />
+    <Compile Include="MessageBox\Implementation\MessageBox.cs" />
+    <Compile Include="NumericUpDown\Implementation\NumericUpDown.cs" />
+    <Compile Include="CollectionEditors\Implementation\PrimitiveTypeCollectionEditor.cs" />
+    <Compile Include="Pie\Implementation\Pie.cs" />
+    <Compile Include="Pie\Implementation\PieModeEnum.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="BusyIndicator\Implementation\VisualStates.BusyIndicator.cs" />
+    <Compile Include="PropertyGrid\Implementation\Attributes\ExpandableObjectAttribute.cs" />
+    <Compile Include="PropertyGrid\Implementation\Attributes\IItemsSource.cs" />
+    <Compile Include="PropertyGrid\Implementation\Attributes\ItemsSourceAttribute.cs" />
+    <Compile Include="PropertyGrid\Implementation\Attributes\PropertyOrderAttribute.cs" />
+    <Compile Include="PropertyGrid\Implementation\Commands\PropertyGridCommands.cs" />
+    <Compile Include="PropertyGrid\Implementation\Converters\ValueSourceToImagePathConverter.cs" />
+    <Compile Include="PropertyGrid\Implementation\Converters\ValueSourceToToolTipConverter.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\CheckBoxEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\CollectionEditor.xaml.cs">
+      <DependentUpon>CollectionEditor.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="CollectionEditors\Implementation\CollectionEditorDialog.xaml.cs">
+      <DependentUpon>CollectionEditorDialog.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="PropertyGrid\Implementation\Editors\ColorEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\ComboBoxEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\EditorDefinition.cs" />
+    <Compile Include="PropertyGrid\Implementation\EditorDefinitionCollection.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\DateTimeUpDownEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\DecimalUpDownEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\DoubleUpDownEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\EnumComboBoxEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\FontComboBoxEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\ItemsSourceAttributeEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\TimeSpanEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\IntegerUpDownEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\ITypeEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\PrimitiveTypeCollectionEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\TextBlockEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\TextBoxEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\TypeEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Converters\ExpandableObjectMarginConverter.cs" />
+    <Compile Include="PropertyGrid\Implementation\PropertyDefinition.cs" />
+    <Compile Include="PropertyGrid\Implementation\PropertyDefinitionCollection.cs" />
+    <Compile Include="PropertyGrid\Implementation\PropertyGrid.cs" />
+    <Compile Include="PropertyGrid\Implementation\PropertyItemCollection.cs" />
+    <Compile Include="PropertyGrid\Implementation\PropertyItem.cs" />
+    <Compile Include="PropertyGrid\Implementation\Commands\PropertyItemCommands.cs" />
+    <Compile Include="PropertyGrid\Implementation\PropertyGridUtilities.cs" />
+    <Compile Include="RichTextBoxFormatBar\IRichTextBoxFormatBar.cs" />
+    <Compile Include="RichTextBoxFormatBar\RichTextBoxFormatBar.xaml.cs">
+      <DependentUpon>RichTextBoxFormatBar.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="RichTextBoxFormatBar\RichTextBoxFormatBarManager.cs" />
+    <Compile Include="Core\UIElementAdorner.cs" />
+    <Compile Include="RichTextBox\Formatters\ITextFormatter.cs" />
+    <Compile Include="RichTextBox\Formatters\PlainTextFormatter.cs" />
+    <Compile Include="RichTextBox\Formatters\RtfFormatter.cs" />
+    <Compile Include="RichTextBox\Formatters\XamlFormatter.cs" />
+    <Compile Include="RichTextBox\RichTextBox.cs" />
+    <Compile Include="Core\Primitives\UpDownBase.cs" />
+    <Compile Include="SplitButton\Implementation\SplitButton.cs" />
+    <Compile Include="Core\Themes\ResourceKeys.cs" />
+    <Compile Include="TimelinePanel\Implementation\DateElement.cs" />
+    <Compile Include="TimelinePanel\Implementation\OverlapBehavior.cs" />
+    <Compile Include="TimelinePanel\Implementation\TimelinePanel.cs" />
+    <Compile Include="TimePicker\Implementation\TimeFormat.cs" />
+    <Compile Include="TimePicker\Implementation\TimeItem.cs" />
+    <Compile Include="TimePicker\Implementation\TimePicker.cs" />
+    <Compile Include="Utils\Exceptions\ThrowException.cs" />
+    <Compile Include="VisualStates.cs" />
+    <Compile Include="MessageBox\Implementation\VisualStates.MessageBox.cs" />
+    <Compile Include="WatermarkTextBox\Implementation\WatermarkTextBox.cs" />
+    <Compile Include="Wizard\Implementation\WizardCommands.cs" />
+    <Compile Include="Wizard\Implementation\WizardPage.cs" />
+    <Compile Include="Wizard\Implementation\Wizard.cs" />
+    <Compile Include="Wizard\Implementation\WizardPageButtonVisibility.cs" />
+    <Compile Include="Wizard\Implementation\WizardPageType.cs" />
+    <AppDesigner Include="Properties\" />
+    <Compile Include="Zoombox\Zoombox.cs" />
+    <Compile Include="Zoombox\ZoomboxCursors.cs" />
+    <Compile Include="Zoombox\ZoomboxView.cs" />
+    <Compile Include="Zoombox\ZoomboxViewChangedEventArgs.cs" />
+    <Compile Include="Zoombox\ZoomboxViewChangedEventHandler.cs" />
+    <Compile Include="Zoombox\ZoomboxViewConverter.cs" />
+    <Compile Include="Zoombox\ZoomboxViewException.cs" />
+    <Compile Include="Zoombox\ZoomboxViewFinderDisplay.cs" />
+    <Compile Include="Zoombox\ZoomboxViewKind.cs" />
+    <Compile Include="Zoombox\ZoomboxViewStack.cs" />
+    <Compile Include="Zoombox\ZoomboxViewStackMode.cs" />
+    <Compile Include="Zoombox\ZoomboxZoomOn.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="MessageBox\Icons\Error48.png" />
+    <Resource Include="MessageBox\Icons\Information48.png" />
+    <Resource Include="MessageBox\Icons\Question48.png" />
+    <Resource Include="MessageBox\Icons\Warning48.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\Bold16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\CenterAlign16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\Italic16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\JustifyAlign16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\LeftAlign16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\RightAlign16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\Underline16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\FontColorPicker16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\TextHighlightColorPicker16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\Bullets16.png" />
+    <Resource Include="RichTextBoxFormatBar\Images\Numbering16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="PropertyGrid\Images\SortAscending16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="PropertyGrid\Images\Categorize16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="PropertyGrid\Images\AdvancedProperties11.png" />
+    <Resource Include="PropertyGrid\Images\Inheritance11.png" />
+    <Resource Include="PropertyGrid\Images\Resource11.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="PropertyGrid\Images\Database11.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="PropertyGrid\Images\Local11.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="PropertyGrid\Images\Style11.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="PropertyGrid\Images\ClearFilter16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="CollectionEditors\Images\Delete16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="MultiLineTextEditor\Images\Notes16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Zoombox\Resources\Zoom.cur" />
+    <Resource Include="Zoombox\Resources\ZoomRelative.cur" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Core\ErrorMessages.resx">
+      <DependentUpon>ErrorMessages.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+  </PropertyGroup>
+  <PropertyGroup>
+  </PropertyGroup>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/WatermarkTextBox/Implementation/WatermarkTextBox.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/WatermarkTextBox/Implementation/WatermarkTextBox.cs
new file mode 100644
index 00000000..4514a07e
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/WatermarkTextBox/Implementation/WatermarkTextBox.cs
@@ -0,0 +1,115 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class WatermarkTextBox : TextBox
+  {
+    #region Properties
+
+    #region SelectAllOnGotFocus
+
+    public static readonly DependencyProperty SelectAllOnGotFocusProperty = DependencyProperty.Register( "SelectAllOnGotFocus", typeof( bool ), typeof( WatermarkTextBox ), new PropertyMetadata( false ) );
+    public bool SelectAllOnGotFocus
+    {
+      get
+      {
+        return ( bool )GetValue( SelectAllOnGotFocusProperty );
+      }
+      set
+      {
+        SetValue( SelectAllOnGotFocusProperty, value );
+      }
+    }
+
+    #endregion //SelectAllOnGotFocus
+
+    #region Watermark
+
+    public static readonly DependencyProperty WatermarkProperty = DependencyProperty.Register( "Watermark", typeof( object ), typeof( WatermarkTextBox ), new UIPropertyMetadata( null ) );
+    public object Watermark
+    {
+      get
+      {
+        return ( object )GetValue( WatermarkProperty );
+      }
+      set
+      {
+        SetValue( WatermarkProperty, value );
+      }
+    }
+
+    #endregion //Watermark
+
+    #region WatermarkTemplate
+
+    public static readonly DependencyProperty WatermarkTemplateProperty = DependencyProperty.Register( "WatermarkTemplate", typeof( DataTemplate ), typeof( WatermarkTextBox ), new UIPropertyMetadata( null ) );
+    public DataTemplate WatermarkTemplate
+    {
+      get
+      {
+        return ( DataTemplate )GetValue( WatermarkTemplateProperty );
+      }
+      set
+      {
+        SetValue( WatermarkTemplateProperty, value );
+      }
+    }
+
+    #endregion //WatermarkTemplate
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static WatermarkTextBox()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( WatermarkTextBox ), new FrameworkPropertyMetadata( typeof( WatermarkTextBox ) ) );
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    protected override void OnGotFocus( RoutedEventArgs e )
+    {
+      base.OnGotFocus( e );
+
+       if( SelectAllOnGotFocus )
+        SelectAll();
+    }
+
+    protected override void OnPreviewMouseLeftButtonDown( MouseButtonEventArgs e )
+    {
+      if( !IsKeyboardFocused && SelectAllOnGotFocus )
+      {
+        e.Handled = true;
+        Focus();
+      }
+
+      base.OnPreviewMouseLeftButtonDown( e );
+    }
+
+    #endregion //Base Class Overrides
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/WatermarkTextBox/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/WatermarkTextBox/Themes/Generic.xaml
new file mode 100644
index 00000000..8182ba2b
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/WatermarkTextBox/Themes/Generic.xaml
@@ -0,0 +1,105 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
+
+   <LinearGradientBrush x:Key="TextBoxBorder" EndPoint="0,20" MappingMode="Absolute" StartPoint="0,0">
+      <GradientStop Color="#ABADB3" Offset="0.05" />
+      <GradientStop Color="#E2E3EA" Offset="0.07" />
+      <GradientStop Color="#E3E9EF" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="TextBox_MouseOver" EndPoint="0,1" StartPoint="0,0">
+      <GradientStop Color="#5794BF" Offset="0.05" />
+      <GradientStop Color="#B7D5EA" Offset="0.07" />
+      <GradientStop Color="#C7E2F1" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="TextBox_Focused" EndPoint="0,1" StartPoint="0,0">
+      <GradientStop Color="#3D7BAD" Offset="0.05" />
+      <GradientStop Color="#A4C9E3" Offset="0.07" />
+      <GradientStop Color="#B7D9ED" Offset="1" />
+   </LinearGradientBrush>
+
+   <SolidColorBrush x:Key="TextBox_DisabledBorder" Color="#ADB2B5" />
+   <SolidColorBrush x:Key="TextBox_DisabledBackground" Color="#F4F4F4" />
+
+   <DataTemplate x:Key="DefaultWatermarkTemplate">
+      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
+   </DataTemplate>
+
+   <Style TargetType="{x:Type local:WatermarkTextBox}">
+      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+      <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+      <Setter Property="BorderBrush" Value="{StaticResource TextBoxBorder}" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Padding" Value="3" />
+      <Setter Property="AllowDrop" Value="true" />
+      <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+      <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+      <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:WatermarkTextBox}">
+               <Grid>
+
+                  <Border x:Name="Border" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="1" Background="{TemplateBinding Background}" />
+                  <Border x:Name="MouseOverVisual" Opacity="0" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{StaticResource TextBox_MouseOver}" CornerRadius="1" />
+                  <Border x:Name="FocusVisual" Opacity="0" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{StaticResource TextBox_Focused}" CornerRadius="1" />
+                  <ScrollViewer x:Name="PART_ContentHost" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                  <ContentPresenter x:Name="PART_WatermarkHost"
+                                    Content="{TemplateBinding Watermark}"
+                                    ContentTemplate="{TemplateBinding WatermarkTemplate}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    IsHitTestVisible="False"
+                                    Margin="{TemplateBinding Padding}"
+                                    Visibility="Collapsed" />
+
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="IsFocused" Value="False" />
+                        <Condition Property="Text" Value="" />
+                     </MultiTrigger.Conditions>
+                     <MultiTrigger.Setters>
+                        <Setter Property="Visibility" TargetName="PART_WatermarkHost" Value="Visible" />
+                     </MultiTrigger.Setters>
+                  </MultiTrigger>
+                  <Trigger Property="IsMouseOver" Value="True">
+                     <Setter TargetName="MouseOverVisual" Property="Opacity" Value="1" />
+                  </Trigger>
+                  <Trigger Property="IsFocused" Value="True">
+                     <Setter TargetName="FocusVisual" Property="Opacity" Value="1" />
+                  </Trigger>
+                  <Trigger Property="IsEnabled" Value="false">
+                     <Setter TargetName="Border"  Property="BorderBrush" Value="{StaticResource TextBox_DisabledBorder}" />
+                     <Setter TargetName="Border"  Property="Background" Value="{StaticResource TextBox_DisabledBackground}" />
+                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Wizard/Implementation/Wizard.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Wizard/Implementation/Wizard.cs
new file mode 100644
index 00000000..16436dea
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Wizard/Implementation/Wizard.cs
@@ -0,0 +1,583 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Interop;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class Wizard : ItemsControl
+  {
+    #region Properties
+
+    public static readonly DependencyProperty BackButtonContentProperty = DependencyProperty.Register( "BackButtonContent", typeof( object ), typeof( Wizard ), new UIPropertyMetadata( "< Back" ) );
+    public object BackButtonContent
+    {
+      get
+      {
+        return ( object )GetValue( BackButtonContentProperty );
+      }
+      set
+      {
+        SetValue( BackButtonContentProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty BackButtonVisibilityProperty = DependencyProperty.Register( "BackButtonVisibility", typeof( Visibility ), typeof( Wizard ), new UIPropertyMetadata( Visibility.Visible ) );
+    public Visibility BackButtonVisibility
+    {
+      get
+      {
+        return ( Visibility )GetValue( BackButtonVisibilityProperty );
+      }
+      set
+      {
+        SetValue( BackButtonVisibilityProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CanCancelProperty = DependencyProperty.Register( "CanCancel", typeof( bool ), typeof( Wizard ), new UIPropertyMetadata( true ) );
+    public bool CanCancel
+    {
+      get
+      {
+        return ( bool )GetValue( CanCancelProperty );
+      }
+      set
+      {
+        SetValue( CanCancelProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CancelButtonClosesWindowProperty = DependencyProperty.Register( "CancelButtonClosesWindow", typeof( bool ), typeof( Wizard ), new UIPropertyMetadata( true ) );
+    public bool CancelButtonClosesWindow
+    {
+      get
+      {
+        return ( bool )GetValue( CancelButtonClosesWindowProperty );
+      }
+      set
+      {
+        SetValue( CancelButtonClosesWindowProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CancelButtonContentProperty = DependencyProperty.Register( "CancelButtonContent", typeof( object ), typeof( Wizard ), new UIPropertyMetadata( "Cancel" ) );
+    public object CancelButtonContent
+    {
+      get
+      {
+        return ( object )GetValue( CancelButtonContentProperty );
+      }
+      set
+      {
+        SetValue( CancelButtonContentProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CancelButtonVisibilityProperty = DependencyProperty.Register( "CancelButtonVisibility", typeof( Visibility ), typeof( Wizard ), new UIPropertyMetadata( Visibility.Visible ) );
+    public Visibility CancelButtonVisibility
+    {
+      get
+      {
+        return ( Visibility )GetValue( CancelButtonVisibilityProperty );
+      }
+      set
+      {
+        SetValue( CancelButtonVisibilityProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CanFinishProperty = DependencyProperty.Register( "CanFinish", typeof( bool ), typeof( Wizard ), new UIPropertyMetadata( false ) );
+    public bool CanFinish
+    {
+      get
+      {
+        return ( bool )GetValue( CanFinishProperty );
+      }
+      set
+      {
+        SetValue( CanFinishProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CanHelpProperty = DependencyProperty.Register( "CanHelp", typeof( bool ), typeof( Wizard ), new UIPropertyMetadata( true ) );
+    public bool CanHelp
+    {
+      get
+      {
+        return ( bool )GetValue( CanHelpProperty );
+      }
+      set
+      {
+        SetValue( CanHelpProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CanSelectNextPageProperty = DependencyProperty.Register( "CanSelectNextPage", typeof( bool ), typeof( Wizard ), new UIPropertyMetadata( true ) );
+    public bool CanSelectNextPage
+    {
+      get
+      {
+        return ( bool )GetValue( CanSelectNextPageProperty );
+      }
+      set
+      {
+        SetValue( CanSelectNextPageProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CanSelectPreviousPageProperty = DependencyProperty.Register( "CanSelectPreviousPage", typeof( bool ), typeof( Wizard ), new UIPropertyMetadata( true ) );
+    public bool CanSelectPreviousPage
+    {
+      get
+      {
+        return ( bool )GetValue( CanSelectPreviousPageProperty );
+      }
+      set
+      {
+        SetValue( CanSelectPreviousPageProperty, value );
+      }
+    }
+
+    #region CurrentPage
+
+    public static readonly DependencyProperty CurrentPageProperty = DependencyProperty.Register( "CurrentPage", typeof( WizardPage ), typeof( Wizard ), new UIPropertyMetadata( null, OnCurrentPageChanged ) );
+    public WizardPage CurrentPage
+    {
+      get
+      {
+        return ( WizardPage )GetValue( CurrentPageProperty );
+      }
+      set
+      {
+        SetValue( CurrentPageProperty, value );
+      }
+    }
+
+    private static void OnCurrentPageChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      Wizard wizard = o as Wizard;
+      if( wizard != null )
+        wizard.OnCurrentPageChanged( ( WizardPage )e.OldValue, ( WizardPage )e.NewValue );
+    }
+
+    protected virtual void OnCurrentPageChanged( WizardPage oldValue, WizardPage newValue )
+    {
+      RaiseRoutedEvent( Wizard.PageChangedEvent );
+    }
+
+    #endregion //CurrentPage
+
+    public static readonly DependencyProperty ExteriorPanelMinWidthProperty = DependencyProperty.Register( "ExteriorPanelMinWidth", typeof( double ), typeof( Wizard ), new UIPropertyMetadata( 165.0 ) );
+    public double ExteriorPanelMinWidth
+    {
+      get
+      {
+        return ( double )GetValue( ExteriorPanelMinWidthProperty );
+      }
+      set
+      {
+        SetValue( ExteriorPanelMinWidthProperty, value );
+      }
+    }
+
+
+    public static readonly DependencyProperty FinishButtonClosesWindowProperty = DependencyProperty.Register( "FinishButtonClosesWindow", typeof( bool ), typeof( Wizard ), new UIPropertyMetadata( true ) );
+    public bool FinishButtonClosesWindow
+    {
+      get
+      {
+        return ( bool )GetValue( FinishButtonClosesWindowProperty );
+      }
+      set
+      {
+        SetValue( FinishButtonClosesWindowProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty FinishButtonContentProperty = DependencyProperty.Register( "FinishButtonContent", typeof( object ), typeof( Wizard ), new UIPropertyMetadata( "Finish" ) );
+    public object FinishButtonContent
+    {
+      get
+      {
+        return ( object )GetValue( FinishButtonContentProperty );
+      }
+      set
+      {
+        SetValue( FinishButtonContentProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty FinishButtonVisibilityProperty = DependencyProperty.Register( "FinishButtonVisibility", typeof( Visibility ), typeof( Wizard ), new UIPropertyMetadata( Visibility.Visible ) );
+    public Visibility FinishButtonVisibility
+    {
+      get
+      {
+        return ( Visibility )GetValue( FinishButtonVisibilityProperty );
+      }
+      set
+      {
+        SetValue( FinishButtonVisibilityProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty HelpButtonContentProperty = DependencyProperty.Register( "HelpButtonContent", typeof( object ), typeof( Wizard ), new UIPropertyMetadata( "Help" ) );
+    public object HelpButtonContent
+    {
+      get
+      {
+        return ( object )GetValue( HelpButtonContentProperty );
+      }
+      set
+      {
+        SetValue( HelpButtonContentProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty HelpButtonVisibilityProperty = DependencyProperty.Register( "HelpButtonVisibility", typeof( Visibility ), typeof( Wizard ), new UIPropertyMetadata( Visibility.Visible ) );
+    public Visibility HelpButtonVisibility
+    {
+      get
+      {
+        return ( Visibility )GetValue( HelpButtonVisibilityProperty );
+      }
+      set
+      {
+        SetValue( HelpButtonVisibilityProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty NextButtonContentProperty = DependencyProperty.Register( "NextButtonContent", typeof( object ), typeof( Wizard ), new UIPropertyMetadata( "Next >" ) );
+    public object NextButtonContent
+    {
+      get
+      {
+        return ( object )GetValue( NextButtonContentProperty );
+      }
+      set
+      {
+        SetValue( NextButtonContentProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty NextButtonVisibilityProperty = DependencyProperty.Register( "NextButtonVisibility", typeof( Visibility ), typeof( Wizard ), new UIPropertyMetadata( Visibility.Visible ) );
+    public Visibility NextButtonVisibility
+    {
+      get
+      {
+        return ( Visibility )GetValue( NextButtonVisibilityProperty );
+      }
+      set
+      {
+        SetValue( NextButtonVisibilityProperty, value );
+      }
+    }
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static Wizard()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( Wizard ), new FrameworkPropertyMetadata( typeof( Wizard ) ) );
+    }
+
+    public Wizard()
+    {
+      CommandBindings.Add( new CommandBinding( WizardCommands.Cancel, ExecuteCancelWizard, CanExecuteCancelWizard ) );
+      CommandBindings.Add( new CommandBinding( WizardCommands.Finish, ExecuteFinishWizard, CanExecuteFinishWizard ) );
+      CommandBindings.Add( new CommandBinding( WizardCommands.Help, ExecuteRequestHelp, CanExecuteRequestHelp ) );
+      CommandBindings.Add( new CommandBinding( WizardCommands.NextPage, ExecuteSelectNextPage, CanExecuteSelectNextPage ) );
+      CommandBindings.Add( new CommandBinding( WizardCommands.PreviousPage, ExecuteSelectPreviousPage, CanExecuteSelectPreviousPage ) );
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    protected override DependencyObject GetContainerForItemOverride()
+    {
+      return new WizardPage();
+    }
+
+    protected override bool IsItemItsOwnContainerOverride( object item )
+    {
+      return ( item is WizardPage );
+    }
+
+    protected override void OnInitialized( EventArgs e )
+    {
+      base.OnInitialized( e );
+
+      if( Items.Count > 0 && CurrentPage == null )
+        CurrentPage = Items[ 0 ] as WizardPage;
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Commands
+
+    private void ExecuteCancelWizard( object sender, ExecutedRoutedEventArgs e )
+    {
+      RaiseRoutedEvent( Wizard.CancelEvent );
+
+      if( CancelButtonClosesWindow )
+        CloseParentWindow( false );
+    }
+
+    private void CanExecuteCancelWizard( object sender, CanExecuteRoutedEventArgs e )
+    {
+      if( CurrentPage != null )
+      {
+        if( CurrentPage.CanCancel.HasValue )
+          e.CanExecute = CurrentPage.CanCancel.Value;
+        else
+          e.CanExecute = CanCancel;
+      }
+    }
+
+    private void ExecuteFinishWizard( object sender, ExecutedRoutedEventArgs e )
+    {
+      RaiseRoutedEvent( Wizard.FinishEvent );
+
+      if( FinishButtonClosesWindow )
+        CloseParentWindow( true );
+    }
+
+    private void CanExecuteFinishWizard( object sender, CanExecuteRoutedEventArgs e )
+    {
+      if( CurrentPage != null )
+      {
+        if( CurrentPage.CanFinish.HasValue )
+          e.CanExecute = CurrentPage.CanFinish.Value;
+        else
+          e.CanExecute = CanFinish;
+      }
+    }
+
+    private void ExecuteRequestHelp( object sender, ExecutedRoutedEventArgs e )
+    {
+      RaiseRoutedEvent( Wizard.HelpEvent );
+    }
+
+    private void CanExecuteRequestHelp( object sender, CanExecuteRoutedEventArgs e )
+    {
+      if( CurrentPage != null )
+      {
+        if( CurrentPage.CanHelp.HasValue )
+          e.CanExecute = CurrentPage.CanHelp.Value;
+        else
+          e.CanExecute = CanHelp;
+      }
+    }
+
+    private void ExecuteSelectNextPage( object sender, ExecutedRoutedEventArgs e )
+    {
+      WizardPage nextPage = null;
+
+      if( CurrentPage != null )
+      {
+        //check next page
+        if( CurrentPage.NextPage != null )
+          nextPage = CurrentPage.NextPage;
+        else
+        {
+          //no next page defined use index
+          var currentIndex = Items.IndexOf( CurrentPage );
+          var nextPageIndex = currentIndex + 1;
+          if( nextPageIndex < Items.Count )
+            nextPage = Items[ nextPageIndex ] as WizardPage;
+        }
+      }
+
+      CurrentPage = nextPage;
+    }
+
+    private void CanExecuteSelectNextPage( object sender, CanExecuteRoutedEventArgs e )
+    {
+      if( CurrentPage != null )
+      {
+        if( CurrentPage.CanSelectNextPage.HasValue ) //check to see if page has overriden default behavior
+        {
+          if( CurrentPage.CanSelectNextPage.Value )
+            e.CanExecute = NextPageExists();
+        }
+        else if( CanSelectNextPage )
+          e.CanExecute = NextPageExists();
+      }
+    }
+
+    private void ExecuteSelectPreviousPage( object sender, ExecutedRoutedEventArgs e )
+    {
+      WizardPage previousPage = null;
+
+      if( CurrentPage != null )
+      {
+        //check previous page
+        if( CurrentPage.PreviousPage != null )
+          previousPage = CurrentPage.PreviousPage;
+        else
+        {
+          //no previous page defined so use index
+          var currentIndex = Items.IndexOf( CurrentPage );
+          var previousPageIndex = currentIndex - 1;
+          if( previousPageIndex >= 0 && previousPageIndex < Items.Count )
+            previousPage = Items[ previousPageIndex ] as WizardPage;
+        }
+      }
+
+      CurrentPage = previousPage;
+    }
+
+    private void CanExecuteSelectPreviousPage( object sender, CanExecuteRoutedEventArgs e )
+    {
+      if( CurrentPage != null )
+      {
+        if( CurrentPage.CanSelectPreviousPage.HasValue ) //check to see if page has overriden default behavior
+        {
+          if( CurrentPage.CanSelectPreviousPage.Value )
+            e.CanExecute = PreviousPageExists();
+        }
+        else if( CanSelectPreviousPage )
+          e.CanExecute = PreviousPageExists();
+      }
+    }
+
+    #endregion //Commands
+
+    #region Events
+
+    public static readonly RoutedEvent CancelEvent = EventManager.RegisterRoutedEvent( "Cancel", RoutingStrategy.Bubble, typeof( EventHandler ), typeof( Wizard ) );
+    public event RoutedEventHandler Cancel
+    {
+      add
+      {
+        AddHandler( CancelEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( CancelEvent, value );
+      }
+    }
+
+    public static readonly RoutedEvent PageChangedEvent = EventManager.RegisterRoutedEvent( "PageChanged", RoutingStrategy.Bubble, typeof( EventHandler ), typeof( Wizard ) );
+    public event RoutedEventHandler PageChanged
+    {
+      add
+      {
+        AddHandler( PageChangedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( PageChangedEvent, value );
+      }
+    }
+
+    public static readonly RoutedEvent FinishEvent = EventManager.RegisterRoutedEvent( "Finish", RoutingStrategy.Bubble, typeof( EventHandler ), typeof( Wizard ) );
+    public event RoutedEventHandler Finish
+    {
+      add
+      {
+        AddHandler( FinishEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( FinishEvent, value );
+      }
+    }
+
+    public static readonly RoutedEvent HelpEvent = EventManager.RegisterRoutedEvent( "Help", RoutingStrategy.Bubble, typeof( EventHandler ), typeof( Wizard ) );
+    public event RoutedEventHandler Help
+    {
+      add
+      {
+        AddHandler( HelpEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( HelpEvent, value );
+      }
+    }
+
+    #endregion //Events
+
+    #region Methods
+
+    private void CloseParentWindow( bool dialogResult )
+    {
+      Window window = Window.GetWindow( this );
+      if( window != null )
+      {
+        //we can only set the DialogResult if the window was opened as modal with the ShowDialog() method. Otherwise an exception would occur
+        if( ComponentDispatcher.IsThreadModal )
+          window.DialogResult = dialogResult;
+
+        window.Close();
+      }
+    }
+
+    private bool NextPageExists()
+    {
+      bool exists = false;
+
+      if( CurrentPage.NextPage != null ) //check to see if a next page has been specified
+        exists = true;
+      else
+      {
+        //lets use an index to find the next page
+        var currentIndex = Items.IndexOf( CurrentPage );
+        var nextPageIndex = currentIndex + 1;
+        if( nextPageIndex < Items.Count )
+          exists = true;
+      }
+
+      return exists;
+    }
+
+    private bool PreviousPageExists()
+    {
+      bool exists = false;
+
+      if( CurrentPage.PreviousPage != null ) //check to see if a previous page has been specified
+        exists = true;
+      else
+      {
+        //lets use an index to find the next page
+        var currentIndex = Items.IndexOf( CurrentPage );
+        var previousPageIndex = currentIndex - 1;
+        if( previousPageIndex >= 0 && previousPageIndex < Items.Count )
+          exists = true;
+      }
+
+      return exists;
+    }
+
+    private void RaiseRoutedEvent( RoutedEvent routedEvent )
+    {
+      RoutedEventArgs newEventArgs = new RoutedEventArgs( routedEvent, this );
+      base.RaiseEvent( newEventArgs );
+    }
+
+    #endregion //Methods
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Wizard/Implementation/WizardCommands.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Wizard/Implementation/WizardCommands.cs
new file mode 100644
index 00000000..d2b765ac
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Wizard/Implementation/WizardCommands.cs
@@ -0,0 +1,81 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows.Input;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public static class WizardCommands
+  {
+
+    private static RoutedCommand _cancelCommand = new RoutedCommand();
+    public static RoutedCommand Cancel
+    {
+      get
+      {
+        return _cancelCommand;
+      }
+    }
+
+    private static RoutedCommand _finishCommand = new RoutedCommand();
+    public static RoutedCommand Finish
+    {
+      get
+      {
+        return _finishCommand;
+      }
+    }
+
+    private static RoutedCommand _helpCommand = new RoutedCommand();
+    public static RoutedCommand Help
+    {
+      get
+      {
+        return _helpCommand;
+      }
+    }
+
+    private static RoutedCommand _nextPageCommand = new RoutedCommand();
+    public static RoutedCommand NextPage
+    {
+      get
+      {
+        return _nextPageCommand;
+      }
+    }
+
+    private static RoutedCommand _previousPageCommand = new RoutedCommand();
+    public static RoutedCommand PreviousPage
+    {
+      get
+      {
+        return _previousPageCommand;
+      }
+    }
+
+    private static RoutedCommand _selectPageCommand = new RoutedCommand();
+    public static RoutedCommand SelectPage
+    {
+      get
+      {
+        return _selectPageCommand;
+      }
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Wizard/Implementation/WizardPage.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Wizard/Implementation/WizardPage.cs
new file mode 100644
index 00000000..641cac87
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Wizard/Implementation/WizardPage.cs
@@ -0,0 +1,288 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class WizardPage : ContentControl
+  {
+    #region Properties
+
+    public static readonly DependencyProperty BackButtonVisibilityProperty = DependencyProperty.Register( "BackButtonVisibility", typeof( WizardPageButtonVisibility ), typeof( WizardPage ), new UIPropertyMetadata( WizardPageButtonVisibility.Inherit ) );
+    public WizardPageButtonVisibility BackButtonVisibility
+    {
+      get
+      {
+        return ( WizardPageButtonVisibility )GetValue( BackButtonVisibilityProperty );
+      }
+      set
+      {
+        SetValue( BackButtonVisibilityProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CanCancelProperty = DependencyProperty.Register( "CanCancel", typeof( bool? ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
+    public bool? CanCancel
+    {
+      get
+      {
+        return ( bool? )GetValue( CanCancelProperty );
+      }
+      set
+      {
+        SetValue( CanCancelProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CancelButtonVisibilityProperty = DependencyProperty.Register( "CancelButtonVisibility", typeof( WizardPageButtonVisibility ), typeof( WizardPage ), new UIPropertyMetadata( WizardPageButtonVisibility.Inherit ) );
+    public WizardPageButtonVisibility CancelButtonVisibility
+    {
+      get
+      {
+        return ( WizardPageButtonVisibility )GetValue( CancelButtonVisibilityProperty );
+      }
+      set
+      {
+        SetValue( CancelButtonVisibilityProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CanFinishProperty = DependencyProperty.Register( "CanFinish", typeof( bool? ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
+    public bool? CanFinish
+    {
+      get
+      {
+        return ( bool? )GetValue( CanFinishProperty );
+      }
+      set
+      {
+        SetValue( CanFinishProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CanHelpProperty = DependencyProperty.Register( "CanHelp", typeof( bool? ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
+    public bool? CanHelp
+    {
+      get
+      {
+        return ( bool? )GetValue( CanHelpProperty );
+      }
+      set
+      {
+        SetValue( CanHelpProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CanSelectNextPageProperty = DependencyProperty.Register( "CanSelectNextPage", typeof( bool? ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
+    public bool? CanSelectNextPage
+    {
+      get
+      {
+        return ( bool? )GetValue( CanSelectNextPageProperty );
+      }
+      set
+      {
+        SetValue( CanSelectNextPageProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CanSelectPreviousPageProperty = DependencyProperty.Register( "CanSelectPreviousPage", typeof( bool? ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
+    public bool? CanSelectPreviousPage
+    {
+      get
+      {
+        return ( bool? )GetValue( CanSelectPreviousPageProperty );
+      }
+      set
+      {
+        SetValue( CanSelectPreviousPageProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty DescriptionProperty = DependencyProperty.Register( "Description", typeof( string ), typeof( WizardPage ) );
+    public string Description
+    {
+      get
+      {
+        return ( string )base.GetValue( DescriptionProperty );
+      }
+      set
+      {
+        base.SetValue( DescriptionProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty ExteriorPanelBackgroundProperty = DependencyProperty.Register( "ExteriorPanelBackground", typeof( Brush ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
+    public Brush ExteriorPanelBackground
+    {
+      get
+      {
+        return ( Brush )GetValue( ExteriorPanelBackgroundProperty );
+      }
+      set
+      {
+        SetValue( ExteriorPanelBackgroundProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty ExteriorPanelContentProperty = DependencyProperty.Register( "ExteriorPanelContent", typeof( object ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
+    public object ExteriorPanelContent
+    {
+      get
+      {
+        return ( object )GetValue( ExteriorPanelContentProperty );
+      }
+      set
+      {
+        SetValue( ExteriorPanelContentProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty FinishButtonVisibilityProperty = DependencyProperty.Register( "FinishButtonVisibility", typeof( WizardPageButtonVisibility ), typeof( WizardPage ), new UIPropertyMetadata( WizardPageButtonVisibility.Inherit ) );
+    public WizardPageButtonVisibility FinishButtonVisibility
+    {
+      get
+      {
+        return ( WizardPageButtonVisibility )GetValue( FinishButtonVisibilityProperty );
+      }
+      set
+      {
+        SetValue( FinishButtonVisibilityProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty HeaderBackgroundProperty = DependencyProperty.Register( "HeaderBackground", typeof( Brush ), typeof( WizardPage ), new UIPropertyMetadata( Brushes.White ) );
+    public Brush HeaderBackground
+    {
+      get
+      {
+        return ( Brush )GetValue( HeaderBackgroundProperty );
+      }
+      set
+      {
+        SetValue( HeaderBackgroundProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty HeaderImageProperty = DependencyProperty.Register( "HeaderImage", typeof( ImageSource ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
+    public ImageSource HeaderImage
+    {
+      get
+      {
+        return ( ImageSource )GetValue( HeaderImageProperty );
+      }
+      set
+      {
+        SetValue( HeaderImageProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty HelpButtonVisibilityProperty = DependencyProperty.Register( "HelpButtonVisibility", typeof( WizardPageButtonVisibility ), typeof( WizardPage ), new UIPropertyMetadata( WizardPageButtonVisibility.Inherit ) );
+    public WizardPageButtonVisibility HelpButtonVisibility
+    {
+      get
+      {
+        return ( WizardPageButtonVisibility )GetValue( HelpButtonVisibilityProperty );
+      }
+      set
+      {
+        SetValue( HelpButtonVisibilityProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty NextButtonVisibilityProperty = DependencyProperty.Register( "NextButtonVisibility", typeof( WizardPageButtonVisibility ), typeof( WizardPage ), new UIPropertyMetadata( WizardPageButtonVisibility.Inherit ) );
+    public WizardPageButtonVisibility NextButtonVisibility
+    {
+      get
+      {
+        return ( WizardPageButtonVisibility )GetValue( NextButtonVisibilityProperty );
+      }
+      set
+      {
+        SetValue( NextButtonVisibilityProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty NextPageProperty = DependencyProperty.Register( "NextPage", typeof( WizardPage ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
+    public WizardPage NextPage
+    {
+      get
+      {
+        return ( WizardPage )GetValue( NextPageProperty );
+      }
+      set
+      {
+        SetValue( NextPageProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty PageTypeProperty = DependencyProperty.Register( "PageType", typeof( WizardPageType ), typeof( WizardPage ), new UIPropertyMetadata( WizardPageType.Exterior ) );
+    public WizardPageType PageType
+    {
+      get
+      {
+        return ( WizardPageType )GetValue( PageTypeProperty );
+      }
+      set
+      {
+        SetValue( PageTypeProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty PreviousPageProperty = DependencyProperty.Register( "PreviousPage", typeof( WizardPage ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
+    public WizardPage PreviousPage
+    {
+      get
+      {
+        return ( WizardPage )GetValue( PreviousPageProperty );
+      }
+      set
+      {
+        SetValue( PreviousPageProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty TitleProperty = DependencyProperty.Register( "Title", typeof( string ), typeof( WizardPage ) );
+    public string Title
+    {
+      get
+      {
+        return ( string )base.GetValue( TitleProperty );
+      }
+      set
+      {
+        base.SetValue( TitleProperty, value );
+      }
+    }
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static WizardPage()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( WizardPage ), new FrameworkPropertyMetadata( typeof( WizardPage ) ) );
+    }
+
+    #endregion //Constructors
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Wizard/Implementation/WizardPageButtonVisibility.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Wizard/Implementation/WizardPageButtonVisibility.cs
new file mode 100644
index 00000000..6f7bad79
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Wizard/Implementation/WizardPageButtonVisibility.cs
@@ -0,0 +1,29 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit
+{
+  public enum WizardPageButtonVisibility
+  {
+    Inherit,
+    Collapsed,
+    Hidden,
+    Visible
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Wizard/Implementation/WizardPageType.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Wizard/Implementation/WizardPageType.cs
new file mode 100644
index 00000000..fcf33a8f
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Wizard/Implementation/WizardPageType.cs
@@ -0,0 +1,28 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit
+{
+  public enum WizardPageType
+  {
+    Blank,
+    Exterior,
+    Interior
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Wizard/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Wizard/Themes/Generic.xaml
new file mode 100644
index 00000000..33168b23
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Wizard/Themes/Generic.xaml
@@ -0,0 +1,209 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
+
+   <conv:WizardPageButtonVisibilityConverter x:Key="WizardPageButtonVisibilityConverter" />
+
+   <Style TargetType="{x:Type local:Wizard}">
+      <Setter Property="Background" Value="#F0F0F0" />
+      <Setter Property="BorderBrush" Value="#A0A0A0" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="ItemsPanel">
+         <Setter.Value>
+            <ItemsPanelTemplate>
+               <Grid />
+            </ItemsPanelTemplate>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:Wizard}">
+               <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+                  <Grid Background="{TemplateBinding Background}">
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="*" />
+                        <RowDefinition Height="Auto" />
+                     </Grid.RowDefinitions>
+
+                     <ContentPresenter Content="{Binding CurrentPage, RelativeSource={RelativeSource TemplatedParent}}" />
+
+                     <Border Grid.Row="1" Background="#F0F0F0" BorderBrush="#A0A0A0" BorderThickness="0,1,0,0" Padding="7">
+                        <StackPanel Background="{TemplateBinding Background}">
+                           <Grid Margin="{TemplateBinding Padding}">
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="Auto" />
+                                 <ColumnDefinition Width="*" />
+                              </Grid.ColumnDefinitions>
+                              <Button Name="PART_HelpButton"
+                                      Grid.Column="0"
+                                      MinWidth="75" 
+                                      Command="local:WizardCommands.Help" 
+                                      Content="{TemplateBinding HelpButtonContent}">
+                                 <Button.Visibility>
+                                    <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
+                                       <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="HelpButtonVisibility" />
+                                       <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.HelpButtonVisibility" />
+                                    </MultiBinding>
+                                 </Button.Visibility>
+                              </Button>
+                              <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
+                                 <Button Name="PART_CancelButton"
+                                         Margin="0,0,7,0"
+                                         MinWidth="75" 
+                                         Command="local:WizardCommands.Cancel" 
+                                         Content="{TemplateBinding CancelButtonContent}">
+                                    <Button.Visibility>
+                                       <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
+                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CancelButtonVisibility" />
+                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.CancelButtonVisibility" />
+                                       </MultiBinding>
+                                    </Button.Visibility>
+                                 </Button>
+                                 <Button Name="PART_BackButton"
+                                         MinWidth="75" 
+                                         Command="local:WizardCommands.PreviousPage" 
+                                         Content="{TemplateBinding BackButtonContent}">
+                                    <Button.Visibility>
+                                       <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
+                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="BackButtonVisibility" />
+                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.BackButtonVisibility" />
+                                       </MultiBinding>
+                                    </Button.Visibility>
+                                 </Button>
+                                 <Button Name="PART_NextButton"
+                                         MinWidth="75" 
+                                         Command="local:WizardCommands.NextPage"
+                                         Content="{TemplateBinding NextButtonContent}">
+                                    <Button.Visibility>
+                                       <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
+                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="NextButtonVisibility" />
+                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.NextButtonVisibility" />
+                                       </MultiBinding>
+                                    </Button.Visibility>
+                                 </Button>
+                                 <Button Name="PART_FinishButton"
+                                         Margin="7,0,0,0"
+                                         MinWidth="75" 
+                                         Command="local:WizardCommands.Finish" 
+                                         Content="{TemplateBinding FinishButtonContent}">
+                                    <Button.Visibility>
+                                       <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
+                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="FinishButtonVisibility" />
+                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.FinishButtonVisibility" />
+                                       </MultiBinding>
+                                    </Button.Visibility>
+                                 </Button>
+                              </StackPanel>
+                           </Grid>
+                        </StackPanel>
+                     </Border>
+                  </Grid>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <ControlTemplate x:Key="BlankWizardPageTemplate" TargetType="{x:Type local:WizardPage}">
+      <Border SnapsToDevicePixels="true" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+         <Grid Background="{TemplateBinding Background}">
+            <ContentPresenter Margin="14" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
+         </Grid>
+      </Border>
+   </ControlTemplate>
+
+   <ControlTemplate x:Key="ExteriorWizardPageTemplate" TargetType="{x:Type local:WizardPage}">
+      <Grid Background="{TemplateBinding Background}">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="*" />
+         </Grid.ColumnDefinitions>
+         <Border SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+            <Grid Grid.Column="0" Background="{TemplateBinding ExteriorPanelBackground}" MinWidth="{Binding ExteriorPanelMinWidth, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:Wizard}}">
+               <ContentControl Content="{TemplateBinding ExteriorPanelContent}" />
+            </Grid>
+         </Border>
+         <Grid Column="1" Margin="14">
+            <Grid.RowDefinitions>
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+            <TextBlock Grid.Row="0" TextWrapping="Wrap" Margin="0,0,0,14" FontSize="16" FontWeight="Bold" Text="{TemplateBinding Title}" />
+            <TextBlock Grid.Row="1" TextWrapping="Wrap" Margin="0,0,0,14" Text="{TemplateBinding Description}" />
+            <ContentPresenter Grid.Row="2" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
+         </Grid>
+      </Grid>
+   </ControlTemplate>
+
+   <ControlTemplate x:Key="InteriorWizardPageTemplate" TargetType="{x:Type local:WizardPage}">
+      <Grid>
+         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+         </Grid.RowDefinitions>
+
+         <Grid Background="{TemplateBinding HeaderBackground}" MinHeight="56">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="*" />
+               <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+            <StackPanel>
+               <TextBlock Margin="16,9,0,1" TextWrapping="Wrap" FontWeight="Bold" Text="{TemplateBinding Title}" />
+               <TextBlock Margin="32,0,0,3" TextWrapping="Wrap" Text="{TemplateBinding Description}" />
+            </StackPanel>
+            <Image Grid.Column="1" Margin="4" Source="{TemplateBinding HeaderImage}" Stretch="None" HorizontalAlignment="Center" VerticalAlignment="Center" />
+         </Grid>
+
+         <Border Grid.Row="1" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+            <Grid Background="{TemplateBinding Background}">
+               <ContentPresenter Margin="14" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
+            </Grid>
+         </Border>
+      </Grid>
+   </ControlTemplate>
+
+   <Style TargetType="{x:Type local:WizardPage}">
+      <Style.Triggers>
+         <Trigger Property="PageType" Value="Blank">
+            <Setter Property="Background" Value="#FFF0F0F0" />
+            <Setter Property="BorderThickness" Value="0" />
+            <Setter Property="Template" Value="{StaticResource BlankWizardPageTemplate}" />
+         </Trigger>
+         <Trigger Property="PageType" Value="Exterior">
+            <Setter Property="Background" Value="#FFFFFF" />
+            <Setter Property="BorderThickness" Value="0" />
+            <Setter Property="ExteriorPanelBackground" Value="#E3EFFF" />
+            <Setter Property="Template" Value="{StaticResource ExteriorWizardPageTemplate}" />
+         </Trigger>
+         <Trigger Property="PageType" Value="Interior">
+            <Setter Property="Background" Value="#FFF0F0F0" />
+            <Setter Property="BorderBrush" Value="{x:Static SystemColors.ActiveBorderBrush}" />
+            <Setter Property="BorderThickness" Value="0,1,0,0" />
+            <Setter Property="HeaderBackground" Value="#FFFFFF" />
+            <Setter Property="Template" Value="{StaticResource InteriorWizardPageTemplate}" />
+         </Trigger>
+      </Style.Triggers>
+   </Style>
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/Resources/Zoom.cur b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/Resources/Zoom.cur
new file mode 100644
index 00000000..f5001727
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/Resources/Zoom.cur differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/Resources/ZoomRelative.cur b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/Resources/ZoomRelative.cur
new file mode 100644
index 00000000..7df27fd6
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/Resources/ZoomRelative.cur differ
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/Themes/Generic.xaml b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/Themes/Generic.xaml
new file mode 100644
index 00000000..189b238a
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/Themes/Generic.xaml
@@ -0,0 +1,601 @@
+<!--************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************-->
+
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
+    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.Zoombox">
+
+   <conv:RoundedValueConverter x:Key="RoundedValueConverter" Precision="2" />
+   <conv:VisibilityToBoolConverter x:Key="TrueIfVisibleConverter"
+      Inverted="False" Not="False" />
+   <conv:VisibilityToBoolConverter x:Key="TrueIfNotVisibleConverter"
+      Inverted="False" Not="True" />
+   <conv:VisibilityToBoolConverter x:Key="VisibleIfTrueConverter"
+      Inverted="True" Not="False" />
+   <conv:VisibilityToBoolConverter x:Key="VisibleIfNotTrueConverter"
+      Inverted="True" Not="True" />
+
+   <SolidColorBrush x:Key="GlyphBrush" Color="white" />
+
+   <Style x:Key="TransparentButton" TargetType="{x:Type ButtonBase}"
+      BasedOn="{x:Null}">
+      <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+      <Setter Property="Background" Value="#333333" />
+      <Setter Property="Foreground" Value="#cccccc" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ButtonBase}">
+               <Grid Background="Transparent" Cursor="Hand">
+                  <Rectangle Fill="{TemplateBinding Background}"
+                Stroke="{TemplateBinding Foreground}" RadiusX="3" RadiusY="3"
+                x:Name="BackgroundTextBoxRectangle" Opacity="0" />
+                  <ContentPresenter />
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsEnabled" Value="False">
+                     <Setter Property="Opacity" Value="0.4" />
+                  </Trigger>
+                  <Trigger Property="IsMouseOver" Value="True">
+                     <Setter TargetName="BackgroundTextBoxRectangle" Property="Opacity"
+                  Value="1" />
+                  </Trigger>
+                  <Trigger Property="IsKeyboardFocusWithin" Value="True">
+                     <Setter TargetName="BackgroundTextBoxRectangle" Property="Opacity"
+                  Value="1" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="ViewFinderToggleButtonStyle" BasedOn="{StaticResource TransparentButton}" TargetType="{x:Type ToggleButton}">
+      <Setter Property="Visibility" Value="Visible" />
+      <Style.Triggers>
+         <DataTrigger Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:Zoombox}}, Path=ViewFinderVisibility}" Value="Hidden">
+            <Setter Property="Visibility" Value="Collapsed" />
+         </DataTrigger>
+      </Style.Triggers>
+   </Style>
+
+   <DrawingImage x:Key="ShowViewFinderGlyph" >
+      <DrawingImage.Drawing>
+         <DrawingGroup>
+            <DrawingGroup>
+               <DrawingGroup.Transform>
+                  <MatrixTransform Matrix="0.707,0.707,-0.707,0.707,11.533,0.664" />
+               </DrawingGroup.Transform>
+               <GeometryDrawing Brush="#FF000000" Geometry="M8.823,9.895 
+              L12.440,13.460 10.784,15.092 15.347,15.092 15.347,15.125 
+              9.651,15.125 11.306,13.493 8.239,10.470 8.823,9.895 z 
+              M15.347,9.511 L15.347,10.595 14.842,11.093 14.292,10.551
+              15.347,9.511 z M0,9.481 L1.133,10.598 1.133,15.092 
+              5.694,15.092 5.727,15.125 0,15.125 0,9.481 z M14.842,3.963 
+              L15.347,4.461 15.347,5.611 14.258,4.538 14.842,3.963 z 
+              M2.793,3.952 L6.410,7.517 2.793,11.082 2.243,10.540 
+              5.276,7.551 2.209,4.527 2.793,3.952 z M9.653,0 L10.821,0 
+              12.429,1.585 8.812,5.150 8.262,4.608 11.296,1.618 9.653,0 z
+              M0,0 L1.133,0 1.133,4.504 0,5.621 0,0 z"/>
+            </DrawingGroup>
+            <DrawingGroup>
+               <DrawingGroup.Transform>
+                  <MatrixTransform Matrix="0.707,0.707,-0.707,0.707,12.048,1.182"/>
+               </DrawingGroup.Transform>
+               <GeometryDrawing Brush="#4B5F5F5F" Geometry="M0,0 L5.703,0 
+              4.061,1.618 7.678,5.183 11.295,1.618 9.653,0 15.347,0 15.347,5.611
+              13.704,3.996 10.091,7.561 13.708,11.126 15.347,9.511 15.347,15.125 
+              9.651,15.125 11.306,13.493 7.689,9.928 4.071,13.493 5.727,15.125 
+              0,15.125 0,9.480 1.659,11.115 5.276,7.551 1.659,3.986 0,5.621 0,0 z"/>
+            </DrawingGroup>
+            <DrawingGroup>
+               <DrawingGroup.Transform>
+                  <MatrixTransform Matrix="0.707,0.707,-0.707,0.707,12.186,1.538"/>
+               </DrawingGroup.Transform>
+               <GeometryDrawing Brush="#FFFFFFFF" Geometry="M6.867,9.820 L7.334,10.280 
+              4.072,13.494 5.727,15.126 0,15.126 0,15.016 4.906,15.016 3.250,13.384
+              6.867,9.820 z M15.347,9.512 L15.347,15.126 9.651,15.126 9.762,15.016
+              14.525,15.016 14.525,10.322 15.347,9.512 z M0,9.481 L1.193 ,10.657 
+              0.837,11.007 0,10.182 0,9.481 z M12.887,3.888 L13.353,4.347 
+              10.091,7.56 13.242,10.667 12.887,11.018 9.270,7.453 12.887,3.888 z
+              M0.837,3.878 L1.303,4.337 0,5.621 0,4.703 0.837,3.878 z M14.525,0 
+              L15.347,0 15.347,5.612 14.525,4.802 14.525,0 z M4.772,0 L5.703,0
+              4.061,1.617 7.212,4.724 6.857,5.075 3.239,1.511 4.772,0 z"/>
+            </DrawingGroup>
+         </DrawingGroup>
+      </DrawingImage.Drawing>
+   </DrawingImage>
+
+   <DrawingImage x:Key="FillToBoundsGlyph">
+      <DrawingImage.Drawing>
+         <DrawingGroup>
+            <DrawingGroup.Children>
+               <GeometryDrawing Geometry="F1 M 218.138,210.145L 255.599,210.145L
+              255.599,246.628L 218.138,246.628L 218.138,210.145 Z">
+                  <GeometryDrawing.Pen>
+                     <Pen Thickness="1.2" LineJoin="Round"
+                  Brush="{StaticResource GlyphBrush}"/>
+                  </GeometryDrawing.Pen>
+               </GeometryDrawing>
+               <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 249.378,215.741L 249.378,215.743L 249.383,215.743L 
+              249.383,219.159L 249.378,219.159L 249.378,224.598L 245.962,224.598L 
+              245.962,219.159L 240.525,219.159L 240.525,215.743L 245.962,215.743L 
+              245.962,215.741L 249.378,215.741 Z"/>
+               <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 249.383,240.726L 249.381,240.726L 249.381,240.73L 
+              245.965,240.73L 245.965,240.726L 240.526,240.726L 240.526,237.31L 
+              245.965,237.31L 245.965,231.873L 249.381,231.873L 249.381,237.31L 
+              249.383,237.31L 249.383,240.726 Z"/>
+               <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 247.539,220.321L 239.801,228.059L 247.539,235.796L 
+              244.962,238.373L 237.224,230.635L 229.487,238.373L 226.91,235.796L 
+              234.648,228.059L 226.91,220.321L 229.487,217.744L 237.224,225.482L 
+              244.962,217.744L 247.539,220.321 Z"/>
+               <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 224.879,240.73L 224.879,240.729L 224.874,240.729L 
+              224.874,237.312L 224.879,237.312L 224.879,231.873L 228.295,231.873L 
+              228.295,237.312L 233.732,237.312L 233.732,240.729L 228.295,240.729L 
+              228.295,240.73L 224.879,240.73 Z"/>
+               <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 224.874,215.746L 224.876,215.746L 224.876,215.741L 
+              228.292,215.741L 228.292,215.746L 233.731,215.746L 233.731,219.162L 
+              228.292,219.162L 228.292,224.598L 224.876,224.598L 224.876,219.162L 
+              224.874,219.162L 224.874,215.746 Z"/>
+            </DrawingGroup.Children>
+         </DrawingGroup>
+      </DrawingImage.Drawing>
+   </DrawingImage>
+
+   <DrawingImage x:Key="FitContentGlyph">
+      <DrawingImage.Drawing>
+         <DrawingGroup>
+            <DrawingGroup.Children>
+               <GeometryDrawing Geometry="F1 M 267.334,210.477L 304.795,210.477L 
+              304.795,246.96L 267.334,246.96L 267.334,210.477 Z">
+                  <GeometryDrawing.Pen>
+                     <Pen Thickness="1.2" LineJoin="Round"
+                  Brush="{StaticResource GlyphBrush}"/>
+                  </GeometryDrawing.Pen>
+               </GeometryDrawing>
+               <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 298.574,216.073L 298.574,216.075L 298.579,216.075L 
+              298.579,219.491L 298.574,219.491L 298.574,224.93L 295.158,224.93L 
+              295.158,219.491L 289.721,219.491L 289.721,216.075L 295.158,216.075L 
+              295.158,216.073L 298.574,216.073 Z"/>
+               <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 298.579,241.058L 298.577,241.058L 298.577,241.062L 
+              295.161,241.062L 295.161,241.058L 289.722,241.058L 289.722,237.642L 
+              295.161,237.642L 295.161,232.205L 298.577,232.205L 298.577,237.642L 
+              298.579,237.642L 298.579,241.058 Z"/>
+               <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 274.075,241.062L 274.075,241.061L 274.07,241.061L 
+              274.07,237.644L 274.075,237.644L 274.075,232.205L 277.491,232.205L 
+              277.491,237.644L 282.928,237.644L 282.928,241.061L 277.491,241.061L 
+              277.491,241.062L 274.075,241.062 Z"/>
+               <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 274.07,216.078L 274.072,216.078L 274.072,216.073L 
+              277.488,216.073L 277.488,216.078L 282.927,216.078L 282.927,219.494L 
+              277.488,219.494L 277.488,224.93L 274.072,224.93L 274.072,219.494L 
+              274.07,219.494L 274.07,216.078 Z"/>
+            </DrawingGroup.Children>
+         </DrawingGroup>
+      </DrawingImage.Drawing>
+   </DrawingImage>
+
+   <DrawingImage x:Key="CenterGlyph">
+      <DrawingImage.Drawing>
+         <DrawingGroup>
+            <DrawingGroup.Children>
+               <GeometryDrawing Geometry="F1 M 315.334,209.944L 352.795,209.944L 
+              352.795,246.427L 315.334,246.427L 315.334,209.944 Z">
+                  <GeometryDrawing.Pen>
+                     <Pen Thickness="1.2" LineJoin="Round"
+                  Brush="{StaticResource GlyphBrush}"/>
+                  </GeometryDrawing.Pen>
+               </GeometryDrawing>
+               <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 328.878,223.652L 338.19,223.652C 338.27,223.652 
+              338.334,223.716 338.334,223.796L 338.334,233.108C 338.334,233.188 
+              338.27,233.252 338.19,233.252L 328.878,233.252C 328.799,233.252 
+              328.734,233.188 328.734,233.108L 328.734,223.796C 328.734,223.716 
+              328.799,223.652 328.878,223.652 Z"/>
+            </DrawingGroup.Children>
+         </DrawingGroup>
+      </DrawingImage.Drawing>
+   </DrawingImage>
+
+   <DrawingImage x:Key="RefocusGlyph" >
+      <DrawingImage.Drawing>
+         <DrawingGroup>
+            <DrawingGroup>
+               <DrawingGroup.Transform>
+                  <MatrixTransform Matrix="1,0,0,1,0.667,1.667"/>
+               </DrawingGroup.Transform>
+               <GeometryDrawing Brush="#FFFFFFFF" Geometry="M6.624,0 C10.281,0 
+              13.247,2.836 13.247,6.334 13.247,7.176 13.075,7.980 12.734,8.703
+              L14.666,10.550 14.666,10.631 8.989,10.631 8.989,5.202 9.072,5.202
+              10.971,7.018 C11.095,6.810 11.116,6.573 11.116,6.331 11.116,3.959
+              9.104,2.034 6.622,2.034 4.139,2.034 2.127,3.959 2.127,6.331
+              2.127,8.575 3.925,10.417 6.224,10.552 L8.220,12.461 C7.712,12.602
+              7.176,12.667 6.624,12.667 2.966,12.667 0,9.831 0,6.334 0,2.836
+              2.966,0 6.624,0 z"/>
+            </DrawingGroup>
+            <GeometryDrawing Brush="#00FFFFFF">
+               <GeometryDrawing.Geometry>
+                  <RectangleGeometry RadiusX="0" RadiusY="0" Rect="0,0,16,16"/>
+               </GeometryDrawing.Geometry>
+            </GeometryDrawing>
+         </DrawingGroup>
+      </DrawingImage.Drawing>
+   </DrawingImage>
+
+   <DrawingImage x:Key="HomeGlyph">
+      <DrawingImage.Drawing>
+         <DrawingGroup>
+            <DrawingGroup.Children>
+               <GeometryDrawing Geometry="F1 M 414.001,209.411L 451.462,209.411L 
+              451.462,245.893L 414.001,245.893L 414.001,209.411 Z">
+                  <GeometryDrawing.Pen>
+                     <Pen Thickness="1.2" LineJoin="Round" Brush="transparent"/>
+                  </GeometryDrawing.Pen>
+               </GeometryDrawing>
+               <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 442.009,240.438C 442.009,240.534 441.886,240.612 
+              441.735,240.612L 423.992,240.612C 423.841,240.612 423.718,240.534 
+              423.718,240.438L 423.718,229.595L 418.991,229.595C 418.874,229.479 
+              418.874,229.289 418.991,229.173L 432.652,215.511C 432.769,215.395 
+              432.958,215.395 433.075,215.511L 446.736,229.173C 446.853,229.289 
+              446.853,229.479 446.736,229.595L 442.009,229.595L 442.009,240.438 Z"/>
+            </DrawingGroup.Children>
+         </DrawingGroup>
+      </DrawingImage.Drawing>
+   </DrawingImage>
+
+   <DrawingImage x:Key="PreviousGlyph">
+      <DrawingImage.Drawing>
+         <DrawingGroup>
+            <DrawingGroup.Children>
+               <GeometryDrawing Brush="#00000000" Geometry="F1 M 8.47772,268.99L 
+              75.1444,268.99L 75.1444,335.657L 8.47772,335.657L 8.47772,268.99 Z">
+                  <GeometryDrawing.Pen>
+                     <Pen Thickness="1" LineJoin="Round" Brush="Transparent"/>
+                  </GeometryDrawing.Pen>
+               </GeometryDrawing>
+               <GeometryDrawing Brush="{StaticResource GlyphBrush}" Geometry="F1 M 
+              57.2513,286.303L 57.2513,318.344L 26.3707,302.323L 57.2513,286.303 Z">
+                  <GeometryDrawing.Pen>
+                     <Pen Thickness="1" LineJoin="Round"
+                  Brush="{StaticResource GlyphBrush}"/>
+                  </GeometryDrawing.Pen>
+               </GeometryDrawing>
+            </DrawingGroup.Children>
+         </DrawingGroup>
+      </DrawingImage.Drawing>
+   </DrawingImage>
+
+   <DrawingImage x:Key="NextGlyph">
+      <DrawingImage.Drawing>
+         <DrawingGroup>
+            <DrawingGroup.Children>
+               <GeometryDrawing Brush="#00000000" Geometry="F1 M 75.1444,415.886L 
+              8.47772,415.886L 8.47772,349.219L 75.1444,349.219L 75.1444,415.886 Z">
+                  <GeometryDrawing.Pen>
+                     <Pen Thickness="1" LineJoin="Round" Brush="#00FFFFFF"/>
+                  </GeometryDrawing.Pen>
+               </GeometryDrawing>
+               <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 26.3708,398.573L 26.3708,366.532L 57.2514,382.553L 
+              26.3708,398.573 Z">
+                  <GeometryDrawing.Pen>
+                     <Pen Thickness="1" LineJoin="Round"
+                  Brush="{StaticResource GlyphBrush}"/>
+                  </GeometryDrawing.Pen>
+               </GeometryDrawing>
+            </DrawingGroup.Children>
+         </DrawingGroup>
+      </DrawingImage.Drawing>
+   </DrawingImage>
+
+   <DrawingImage x:Key="CloseXDrawingImage">
+      <DrawingImage.Drawing>
+         <DrawingGroup>
+            <DrawingGroup.Children>
+               <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 470.57,422.952C 470.414,423.109 470.161,423.109 
+              470.005,422.952L 451.714,404.662C 451.558,404.506 451.558,404.252 
+              451.714,404.096L 489.144,366.667L 451.714,329.237C 451.558,329.081 
+              451.558,328.828 451.714,328.671L 470.005,310.381C 470.161,310.225 
+              470.414,310.225 470.57,310.381L 508,347.81L 545.43,310.381C 
+              545.586,310.225 545.839,310.225 545.995,310.381L 564.286,328.671C 
+              564.442,328.828 564.442,329.081 564.286,329.237L 526.856,366.667L 
+              564.286,404.096C 564.442,404.252 564.442,404.506 564.286,404.662L 
+              545.995,422.952C 545.839,423.109 545.586,423.109 545.43,422.952L 
+              508,385.523L 470.57,422.952 Z"/>
+            </DrawingGroup.Children>
+         </DrawingGroup>
+      </DrawingImage.Drawing>
+   </DrawingImage>
+
+   <Style x:Key="{x:Type local:Zoombox}" TargetType="{x:Type local:Zoombox}">
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="Foreground" Value="White" />
+      <Setter Property="PanDistance" Value="5.0" />
+      <Setter Property="ZoomOrigin" Value="0.5,0.5" />
+      <Setter Property="ZoomPercentage" Value="5.0" />
+      <Setter Property="DragModifiers" Value="Ctrl,Exact" />
+      <Setter Property="DragOnPreview" Value="False" />
+      <Setter Property="ZoomModifiers" Value="Shift,Exact" />
+      <Setter Property="ZoomOnPreview" Value="True" />
+      <Setter Property="RelativeZoomModifiers" Value="Ctrl,Alt,Exact" />
+      <Setter Property="ZoomToSelectionModifiers" Value="Alt,Exact" />
+      <Setter Property="NavigateOnPreview" Value="False" />
+      <Setter Property="ViewFinderVisibility" Value="Collapsed" />
+      <Setter Property="MinScale" Value="0.01" />
+      <Setter Property="MaxScale" Value="100.0" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="IsTabStop" Value="False" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:Zoombox}">
+               <ControlTemplate.Resources>
+                  <SolidColorBrush x:Key="SelectionBrush" Color="Transparent" />
+                  <Pen x:Key="SelectionPen" Thickness="2.0" Brush="#7F3F3F3F" />
+                  <Pen x:Key="ViewportPen" Thickness="1.0" Brush="Red" />
+                  <InputBindingCollection x:Key="InputBindings">
+                     <KeyBinding Command="local:Zoombox.ZoomOut" Key="Left"
+                  Modifiers="Control" />
+                     <KeyBinding Command="local:Zoombox.ZoomOut" Key="Up"
+                  Modifiers="Control" />
+                     <KeyBinding Command="local:Zoombox.ZoomIn" Key="Right"
+                  Modifiers="Control" />
+                     <KeyBinding Command="local:Zoombox.ZoomIn" Key="Down"
+                  Modifiers="Control" />
+                     <KeyBinding Command="local:Zoombox.PanLeft" Key="Left"
+                  Modifiers="Shift+Control" />
+                     <KeyBinding Command="local:Zoombox.PanUp" Key="Up"
+                  Modifiers="Shift+Control" />
+                     <KeyBinding Command="local:Zoombox.PanRight" Key="Right"
+                  Modifiers="Shift+Control" />
+                     <KeyBinding Command="local:Zoombox.PanDown" Key="Down"
+                  Modifiers="Shift+Control" />
+                     <KeyBinding Command="local:Zoombox.Forward" Key="BrowserForward" />
+                     <KeyBinding Command="local:Zoombox.Back" Key="BrowserBack" />
+                     <KeyBinding Command="local:Zoombox.Back" Key="Back" />
+                  </InputBindingCollection>
+               </ControlTemplate.Resources>
+               <Grid Name="BackgroundGrid" Background="{TemplateBinding Background}">
+                  <ContentPresenter />
+                  <Border Name="ViewFinder" RenderTransformOrigin="1,1"
+                Background="#b0666666" BorderBrush="{TemplateBinding Foreground}"
+                BorderThickness="2" Opacity="0" Width="200" Height="190"
+                HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="10"
+                CornerRadius="4" >
+                     <Border.RenderTransform>
+                        <TransformGroup>
+                           <ScaleTransform x:Name="LayoutScaleTransform"
+                      ScaleX="0" ScaleY="0"/>
+                        </TransformGroup>
+                     </Border.RenderTransform>
+                     <Grid Margin="4">
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="Auto" />
+                           <RowDefinition Height="*"/>
+                           <RowDefinition Height="Auto"/>
+                        </Grid.RowDefinitions>
+                        <StackPanel Orientation="Horizontal" Margin="0,0,0,3">
+                           <Button x:Name="BackButton" Command="local:Zoombox.Back"
+                      ToolTip="Go Back" Width="20px" Height="20px"
+                      Style="{StaticResource TransparentButton}">
+                              <Image Source="{StaticResource PreviousGlyph}" />
+                           </Button>
+                           <Button x:Name="ForwardButton" Command="local:Zoombox.Forward"
+                      ToolTip="Go Forward" Width="20px" Height="20px"
+                      Style="{StaticResource TransparentButton}">
+                              <Image Source="{StaticResource NextGlyph}"  />
+                           </Button>
+                           <Button x:Name="HomeButton" Command="local:Zoombox.Home"
+                      ToolTip="Go Home" Width="20px" Height="20px"
+                      Style="{StaticResource TransparentButton}">
+                              <Image Source="{StaticResource HomeGlyph}" Margin="2"/>
+                           </Button>
+                           <Button x:Name="FitButton" Command="local:Zoombox.Fit"
+                      ToolTip="Fit Content within Bounds" Width="20px" Height="20px"
+                      Margin="2,0"  Style="{StaticResource TransparentButton}">
+                              <Image Source="{StaticResource FitContentGlyph}" Margin="2"/>
+                           </Button>
+                           <Button x:Name="FillButton" Command="local:Zoombox.Fill"
+                      ToolTip="Fill Bounds with Content" Width="20px" Height="20px"
+                      Margin="2,0"  Style="{StaticResource TransparentButton}">
+                              <Image Source="{StaticResource FillToBoundsGlyph}" Margin="2"/>
+                           </Button>
+                           <Button x:Name="CenterButton" Command="local:Zoombox.Center"
+                      ToolTip="Center Content" Width="20px" Height="20px"
+                      Margin="2,0" Style="{StaticResource TransparentButton}">
+                              <Image Source="{StaticResource CenterGlyph}" Margin="2"/>
+                           </Button>
+                           <Button x:Name="RefocusButton" Command="local:Zoombox.Refocus"
+                      Visibility="Collapsed" ToolTip="Refocus View"
+                      Width="20px" Height="20px" Margin="2,0"
+                      Style="{StaticResource TransparentButton}">
+                              <Image Source="{StaticResource RefocusGlyph}" Margin="2"/>
+                           </Button>
+                        </StackPanel>
+                        <ToggleButton x:Name="ToggleViewFinderButton"
+                    ToolTip="Hide View Finder" Height="13" Width="13"
+                    Margin="0,2,0,0" HorizontalAlignment="Right"
+                    VerticalAlignment="Top"
+                    Style="{StaticResource TransparentButton}" Foreground="White"
+                    IsChecked="{Binding ElementName=ShowViewFinder, Path=IsChecked}" >
+                           <Image Source="{StaticResource CloseXDrawingImage}" Margin="2" />
+                        </ToggleButton>
+                        <Border Grid.Row="1" BorderBrush="{StaticResource GlyphBrush}"
+                    BorderThickness="2" Background="#80FFFFFF" />
+                        <local:ZoomboxViewFinderDisplay Grid.Row="1" Name="ViewFinderDisplay"
+                    ClipToBounds="True" Background="#C0FFFFFF" Margin="2" 
+                    ShadowBrush="#80FFFFFF" ViewportBrush="Transparent"
+                    ViewportPen="{StaticResource ViewportPen}" />
+                     </Grid>
+                  </Border>
+                  <ToggleButton Name="ShowViewFinder" IsTabStop="False"
+                ToolTip="Show View Finder" HorizontalAlignment="Right"
+                VerticalAlignment="Bottom" Margin="5" Height="22" Width="22"
+                FocusVisualStyle="{x:Null}"
+                Style="{StaticResource ViewFinderToggleButtonStyle}"
+                Foreground="Transparent" Background="Transparent"
+                IsChecked="{Binding Path=ViewFinderVisibility, 
+                    Mode=TwoWay,RelativeSource={RelativeSource TemplatedParent},
+                    Converter={StaticResource TrueIfVisibleConverter}}">
+                     <Grid Name="ShowViewFinderGlyph" Opacity="0">
+                        <Image x:Name="ShowViewFinderGlyphImage" 
+                    Source="{StaticResource ShowViewFinderGlyph}" />
+                     </Grid>
+                  </ToggleButton>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="EffectiveViewStackMode" Value="Manual">
+                     <Setter TargetName="RefocusButton" Property="Visibility" Value="Visible" />
+                  </Trigger>
+                  <Trigger Property="IsMouseOver" Value="True">
+                     <Trigger.EnterActions>
+                        <BeginStoryboard>
+                           <Storyboard>
+                              <DoubleAnimation Storyboard.TargetName="ShowViewFinderGlyph"
+                        Storyboard.TargetProperty="Opacity"
+                        DecelerationRatio="1"  Duration="0:0:0.3" From="0" To="1"
+                        FillBehavior="HoldEnd" />
+                           </Storyboard>
+                        </BeginStoryboard>
+                     </Trigger.EnterActions>
+                     <Trigger.ExitActions>
+                        <BeginStoryboard>
+                           <Storyboard>
+                              <DoubleAnimation Storyboard.TargetName="ShowViewFinderGlyph"
+                        Storyboard.TargetProperty="Opacity"
+                        DecelerationRatio="1"  Duration="0:0:0.3" From="1" To="0"
+                        FillBehavior="HoldEnd" />
+                           </Storyboard>
+                        </BeginStoryboard>
+                     </Trigger.ExitActions>
+                  </Trigger>
+                  <Trigger Property="IsChecked" Value="False" SourceName="ShowViewFinder">
+                     <Setter Property="Focusable" Value="False" TargetName="BackButton" />
+                     <Setter Property="Focusable" Value="False"
+                  TargetName="ForwardButton" />
+                     <Setter Property="Focusable" Value="False" TargetName="HomeButton" />
+                     <Setter Property="Focusable" Value="False" TargetName="FitButton" />
+                     <Setter Property="Focusable" Value="False" TargetName="FillButton" />
+                     <Setter Property="Focusable" Value="False" TargetName="CenterButton" />
+                     <Setter Property="Focusable" Value="False"
+                  TargetName="ToggleViewFinderButton" />
+                  </Trigger>
+                  <EventTrigger RoutedEvent="ToggleButton.Checked"
+                SourceName="ShowViewFinder">
+                     <BeginStoryboard>
+                        <Storyboard>
+                           <DoubleAnimation Storyboard.TargetName="ViewFinder"
+                      Storyboard.TargetProperty="Opacity"
+                      DecelerationRatio="1"  Duration="0:0:0.3" From="0" To="1"
+                      FillBehavior="HoldEnd" />
+                           <DoubleAnimation Storyboard.TargetName="ShowViewFinder"
+                      Storyboard.TargetProperty="Opacity"
+                      DecelerationRatio="1"  Duration="0:0:0.3" From="1" To="0"
+                      FillBehavior="HoldEnd" />
+                           <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
+                      Storyboard.TargetProperty="(ScaleTransform.ScaleY)"
+                      Storyboard.TargetName="LayoutScaleTransform"
+                      AccelerationRatio="1">
+                              <SplineDoubleKeyFrame KeySpline="0.5,0.5,0.5,0.5" Value="1"
+                      KeyTime="00:00:00.3"/>
+                           </DoubleAnimationUsingKeyFrames>
+                           <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
+                      Storyboard.TargetProperty="(ScaleTransform.ScaleX)"
+                      Storyboard.TargetName="LayoutScaleTransform"
+                      AccelerationRatio="1">
+                              <SplineDoubleKeyFrame  KeySpline="0.5,0.5,0.5,0.5" Value="1"
+                      KeyTime="00:00:00.3"/>
+                           </DoubleAnimationUsingKeyFrames>
+                        </Storyboard>
+                     </BeginStoryboard>
+                  </EventTrigger>
+                  <EventTrigger RoutedEvent="ToggleButton.Unchecked"
+                SourceName="ShowViewFinder">
+                     <BeginStoryboard>
+                        <Storyboard>
+                           <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
+                      Storyboard.TargetProperty="(ScaleTransform.ScaleY)"
+                      Storyboard.TargetName="LayoutScaleTransform"
+                      AccelerationRatio="1">
+                              <SplineDoubleKeyFrame KeySpline="0.5,0.5,0.5,0.5" Value="0"
+                        KeyTime="00:00:00.3"/>
+                           </DoubleAnimationUsingKeyFrames>
+                           <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
+                      Storyboard.TargetProperty="(ScaleTransform.ScaleX)"
+                      Storyboard.TargetName="LayoutScaleTransform"
+                      AccelerationRatio="1">
+                              <SplineDoubleKeyFrame  KeySpline="0.5,0.5,0.5,0.5" Value="0"
+                        KeyTime="00:00:00.3"/>
+                           </DoubleAnimationUsingKeyFrames>
+                           <DoubleAnimation Storyboard.TargetName="ViewFinder"
+                      Storyboard.TargetProperty="Opacity"
+                      DecelerationRatio="1"  Duration="0:0:0.3" From="1" To="0"
+                      FillBehavior="HoldEnd" />
+                           <DoubleAnimation Storyboard.TargetName="ShowViewFinder"
+                      Storyboard.TargetProperty="Opacity"
+                      DecelerationRatio="1"  Duration="0:0:0.3" From="0" To="1"
+                      FillBehavior="HoldEnd" />
+                        </Storyboard>
+                     </BeginStoryboard>
+                  </EventTrigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+      <Style.Triggers>
+         <!-- NOTE:  Order matters!
+          These triggers should be ordered according to the KeyModifiers assigned to 
+          each operation. If one operation requires Ctrl and another requires 
+          Ctrl+Shift, the trigger for the operation requiring both modifier keys 
+          should appear *after* the trigger for the operation requiring only one. -->
+         <Trigger Property="AreDragModifiersActive" Value="True">
+            <Setter Property="Cursor" Value="SizeAll" />
+         </Trigger>
+         <Trigger Property="AreZoomToSelectionModifiersActive" Value="True">
+            <Setter Property="Cursor" Value="Cross" />
+         </Trigger>
+         <Trigger Property="AreZoomModifiersActive" Value="True">
+            <Setter Property="Cursor" Value="{x:Static local:ZoomboxCursors.Zoom}" />
+         </Trigger>
+         <Trigger Property="AreRelativeZoomModifiersActive" Value="True">
+            <Setter Property="Cursor" Value="{x:Static local:ZoomboxCursors.ZoomRelative}" />
+         </Trigger>
+         <!-- The IsDraggingContent and IsSelectingRegion triggers should 
+           always be last. -->
+         <Trigger Property="IsDraggingContent" Value="True">
+            <Setter Property="Cursor" Value="SizeAll" />
+         </Trigger>
+         <Trigger Property="IsSelectingRegion" Value="True">
+            <Setter Property="Cursor" Value="Cross" />
+         </Trigger>
+      </Style.Triggers>
+   </Style>
+
+
+</ResourceDictionary>
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/Zoombox.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/Zoombox.cs
new file mode 100644
index 00000000..93798650
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/Zoombox.cs
@@ -0,0 +1,3781 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Globalization;
+using System.Security;
+using System.Security.Permissions;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using Xceed.Wpf.Toolkit.Core.Input;
+using Xceed.Wpf.Toolkit.Core;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+
+namespace Xceed.Wpf.Toolkit.Zoombox
+{
+  public sealed class Zoombox : ContentControl
+  {
+
+    #region Constructors
+
+    static Zoombox()
+    {
+      Zoombox.DefaultStyleKeyProperty.OverrideMetadata( typeof( Zoombox ), new FrameworkPropertyMetadata( typeof( Zoombox ) ) );
+      Zoombox.ClipToBoundsProperty.OverrideMetadata( typeof( Zoombox ), new FrameworkPropertyMetadata( true ) );
+      Zoombox.FocusableProperty.OverrideMetadata( typeof( Zoombox ), new FrameworkPropertyMetadata( true ) );
+      Zoombox.HorizontalContentAlignmentProperty.OverrideMetadata( typeof( Zoombox ), new FrameworkPropertyMetadata( HorizontalAlignment.Center, new PropertyChangedCallback( Zoombox.RefocusView ) ) );
+      Zoombox.VerticalContentAlignmentProperty.OverrideMetadata( typeof( Zoombox ), new FrameworkPropertyMetadata( VerticalAlignment.Center, new PropertyChangedCallback( Zoombox.RefocusView ) ) );
+      Zoombox.ContentProperty.OverrideMetadata( typeof( Zoombox ), new FrameworkPropertyMetadata( ( PropertyChangedCallback )null, new CoerceValueCallback( Zoombox.CoerceContentValue ) ) );
+    }
+
+    public Zoombox()
+      : base()
+    {
+      try
+      {
+        new UIPermission( PermissionState.Unrestricted ).Demand();
+        _cacheBits[ ( int )CacheBits.HasUIPermission ] = true;
+      }
+      catch( SecurityException )
+      {
+      }
+
+      this.InitCommands();
+
+      // use the LayoutUpdated event to keep the Viewport in sync
+      this.LayoutUpdated += new EventHandler( this.OnLayoutUpdated );
+      this.AddHandler( FrameworkElement.SizeChangedEvent, new SizeChangedEventHandler( this.OnSizeChanged ), true );
+
+      this.CoerceValue( Zoombox.ViewStackModeProperty );
+    }
+
+    #endregion
+
+    #region AnimationAccelerationRatio Property
+
+    public static readonly DependencyProperty AnimationAccelerationRatioProperty =
+      DependencyProperty.Register( "AnimationAccelerationRatio", typeof( double ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( 0d ), 
+          new ValidateValueCallback( Zoombox.ValidateAccelerationRatio ) );
+
+    public double AnimationAccelerationRatio
+    {
+      get
+      {
+        return ( double )this.GetValue( Zoombox.AnimationAccelerationRatioProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.AnimationAccelerationRatioProperty, value );
+      }
+    }
+
+    private static bool ValidateAccelerationRatio( object value )
+    {
+      double newValue = ( double )value;
+      if( newValue < 0 || newValue > 1 || DoubleHelper.IsNaN( newValue ) )
+        throw new ArgumentException( ErrorMessages.GetMessage( "AnimationAccelerationRatioOOR" ) );
+
+      return true;
+    }
+
+    #endregion
+
+    #region AnimationDecelerationRatio Property
+
+    public static readonly DependencyProperty AnimationDecelerationRatioProperty =
+      DependencyProperty.Register( "AnimationDecelerationRatio", typeof( double ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( 0d ), 
+          new ValidateValueCallback( Zoombox.ValidateDecelerationRatio ) );
+
+    public double AnimationDecelerationRatio
+    {
+      get
+      {
+        return ( double )this.GetValue( Zoombox.AnimationDecelerationRatioProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.AnimationDecelerationRatioProperty, value );
+      }
+    }
+
+    private static bool ValidateDecelerationRatio( object value )
+    {
+      double newValue = ( double )value;
+      if( newValue < 0 || newValue > 1 || DoubleHelper.IsNaN( newValue ) )
+        throw new ArgumentException( ErrorMessages.GetMessage( "AnimationDecelerationRatioOOR" ) );
+
+      return true;
+    }
+
+    #endregion
+
+    #region AnimationDuration Property
+
+    public static readonly DependencyProperty AnimationDurationProperty =
+      DependencyProperty.Register( "AnimationDuration", typeof( Duration ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( new Duration( TimeSpan.FromMilliseconds( 300 ) ) ) );
+
+    public Duration AnimationDuration
+    {
+      get
+      {
+        return ( Duration )this.GetValue( Zoombox.AnimationDurationProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.AnimationDurationProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region AreDragModifiersActive Property
+
+    private static readonly DependencyPropertyKey AreDragModifiersActivePropertyKey =
+      DependencyProperty.RegisterReadOnly( "AreDragModifiersActive", typeof( bool ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( false ) );
+
+    public static readonly DependencyProperty AreDragModifiersActiveProperty = Zoombox.AreDragModifiersActivePropertyKey.DependencyProperty;
+
+    public bool AreDragModifiersActive
+    {
+      get
+      {
+        return ( bool )this.GetValue( Zoombox.AreDragModifiersActiveProperty );
+      }
+    }
+
+    private void SetAreDragModifiersActive( bool value )
+    {
+      this.SetValue( Zoombox.AreDragModifiersActivePropertyKey, value );
+    }
+
+    #endregion
+
+    #region AreRelativeZoomModifiersActive Property
+
+    private static readonly DependencyPropertyKey AreRelativeZoomModifiersActivePropertyKey =
+      DependencyProperty.RegisterReadOnly( "AreRelativeZoomModifiersActive", typeof( bool ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( false ) );
+
+    public static readonly DependencyProperty AreRelativeZoomModifiersActiveProperty = Zoombox.AreRelativeZoomModifiersActivePropertyKey.DependencyProperty;
+
+    public bool AreRelativeZoomModifiersActive
+    {
+      get
+      {
+        return ( bool )this.GetValue( Zoombox.AreRelativeZoomModifiersActiveProperty );
+      }
+    }
+
+    private void SetAreRelativeZoomModifiersActive( bool value )
+    {
+      this.SetValue( Zoombox.AreRelativeZoomModifiersActivePropertyKey, value );
+    }
+
+    #endregion
+
+    #region AreZoomModifiersActive Property
+
+    private static readonly DependencyPropertyKey AreZoomModifiersActivePropertyKey =
+      DependencyProperty.RegisterReadOnly( "AreZoomModifiersActive", typeof( bool ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( false ) );
+
+    public static readonly DependencyProperty AreZoomModifiersActiveProperty = Zoombox.AreZoomModifiersActivePropertyKey.DependencyProperty;
+
+    public bool AreZoomModifiersActive
+    {
+      get
+      {
+        return ( bool )this.GetValue( Zoombox.AreZoomModifiersActiveProperty );
+      }
+    }
+
+    private void SetAreZoomModifiersActive( bool value )
+    {
+      this.SetValue( Zoombox.AreZoomModifiersActivePropertyKey, value );
+    }
+
+    #endregion
+
+    #region AreZoomToSelectionModifiersActive Property
+
+    private static readonly DependencyPropertyKey AreZoomToSelectionModifiersActivePropertyKey =
+      DependencyProperty.RegisterReadOnly( "AreZoomToSelectionModifiersActive", typeof( bool ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( false ) );
+
+    public static readonly DependencyProperty AreZoomToSelectionModifiersActiveProperty = Zoombox.AreZoomToSelectionModifiersActivePropertyKey.DependencyProperty;
+
+    public bool AreZoomToSelectionModifiersActive
+    {
+      get
+      {
+        return ( bool )this.GetValue( Zoombox.AreZoomToSelectionModifiersActiveProperty );
+      }
+    }
+
+    private void SetAreZoomToSelectionModifiersActive( bool value )
+    {
+      this.SetValue( Zoombox.AreZoomToSelectionModifiersActivePropertyKey, value );
+    }
+
+    #endregion
+
+    #region AutoWrapContentWithViewbox Property
+
+    public static readonly DependencyProperty AutoWrapContentWithViewboxProperty =
+      DependencyProperty.Register( "AutoWrapContentWithViewbox", typeof( bool ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( true, 
+          new PropertyChangedCallback( Zoombox.OnAutoWrapContentWithViewboxChanged ) ) );
+
+    public bool AutoWrapContentWithViewbox
+    {
+      get
+      {
+        return ( bool )this.GetValue( Zoombox.AutoWrapContentWithViewboxProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.AutoWrapContentWithViewboxProperty, value );
+      }
+    }
+
+    private static void OnAutoWrapContentWithViewboxChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      o.CoerceValue( Zoombox.ContentProperty );
+    }
+
+    private static object CoerceContentValue( DependencyObject d, object value )
+    {
+      return ( ( Zoombox )d ).CoerceContentValue( value );
+    }
+
+    private object CoerceContentValue( object value )
+    {
+      if( value != null && !( value is UIElement ) && !( ( bool )this.GetValue( DesignerProperties.IsInDesignModeProperty ) ) )
+        throw new InvalidContentException( ErrorMessages.GetMessage( "ZoomboxContentMustBeUIElement" ) );
+
+      object oldContent = _content;
+      if( value != _trueContent || ( this.IsContentWrapped != this.AutoWrapContentWithViewbox ) )
+      {
+        // check whether the content is currently wrapped and needs to be unwrapped
+        if( this.IsContentWrapped && _content is Viewbox && _content != _trueContent )
+        {
+          Viewbox viewbox = ( Viewbox )_content;
+
+          BindingOperations.ClearAllBindings( viewbox );
+          ( viewbox as Viewbox ).Child = null;
+
+          this.RemoveLogicalChild( viewbox );
+        }
+
+        // make sure the view finder's visual brush is null
+        if( _viewFinderDisplay != null && _viewFinderDisplay.VisualBrush != null )
+        {
+          _viewFinderDisplay.VisualBrush.Visual = null;
+          _viewFinderDisplay.VisualBrush = null;
+        }
+
+        // update the cached content and true content values
+        _content = value as UIElement;
+        _trueContent = value as UIElement;
+
+        // if necessary, unparent the existing content
+        if( _contentPresenter != null && _contentPresenter.Content != null )
+        {
+          _contentPresenter.Content = null;
+        }
+
+        // if necessary, wrap the content
+        this.IsContentWrapped = false;
+        if( this.AutoWrapContentWithViewbox )
+        {
+          // create a viewbox and make it the logical child of the Zoombox
+          Viewbox viewbox = new Viewbox();
+          this.AddLogicalChild( viewbox );
+
+          // now set the new parent to be the viewbox
+          viewbox.Child = value as UIElement;
+          _content = viewbox;
+          viewbox.HorizontalAlignment = HorizontalAlignment.Left;
+          viewbox.VerticalAlignment = VerticalAlignment.Top;
+          this.IsContentWrapped = true;
+        }
+
+        if( _contentPresenter != null )
+        {
+          _contentPresenter.Content = _content;
+        }
+
+        if( _viewFinderDisplay != null )
+        {
+          this.CreateVisualBrushForViewFinder( _content );
+        }
+        this.UpdateViewFinderDisplayContentBounds();
+      }
+
+      // if the content changes, we need to reset the flags used to first render and arrange the content
+      if( oldContent != _content
+          && this.HasArrangedContentPresenter
+          && this.HasRenderedFirstView )
+      {
+        this.HasArrangedContentPresenter = false;
+        this.HasRenderedFirstView = false;
+        this.RefocusViewOnFirstRender = true;
+        _contentPresenter.LayoutUpdated += new EventHandler( this.ContentPresenterFirstArranged );
+      }
+      return _content;
+    }
+
+    private UIElement _trueContent; //null
+
+    #endregion
+
+    #region CurrentView Property
+
+    private static readonly DependencyPropertyKey CurrentViewPropertyKey =
+      DependencyProperty.RegisterReadOnly( "CurrentView", typeof( ZoomboxView ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( ZoomboxView.Empty, 
+          new PropertyChangedCallback( Zoombox.OnCurrentViewChanged ) ) );
+
+    public static readonly DependencyProperty CurrentViewProperty = Zoombox.CurrentViewPropertyKey.DependencyProperty;
+
+    public ZoomboxView CurrentView
+    {
+      get
+      {
+        return ( ZoomboxView )this.GetValue( Zoombox.CurrentViewProperty );
+      }
+    }
+
+    private void SetCurrentView( ZoomboxView value )
+    {
+      this.SetValue( Zoombox.CurrentViewPropertyKey, value );
+    }
+
+    private static void OnCurrentViewChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      Zoombox zoombox = ( Zoombox )o;
+      if( !zoombox.IsUpdatingView )
+      {
+        zoombox.ZoomTo( zoombox.CurrentView );
+      }
+      zoombox.RaiseEvent( new ZoomboxViewChangedEventArgs( e.OldValue as ZoomboxView, e.NewValue as ZoomboxView, zoombox._lastViewIndex, zoombox.CurrentViewIndex ) );
+    }
+
+    #endregion
+
+    #region CurrentViewIndex Property
+
+    private static readonly DependencyPropertyKey CurrentViewIndexPropertyKey =
+      DependencyProperty.RegisterReadOnly( "CurrentViewIndex", typeof( int ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( -1 ) );
+
+    public static readonly DependencyProperty CurrentViewIndexProperty = Zoombox.CurrentViewIndexPropertyKey.DependencyProperty;
+
+    public int CurrentViewIndex
+    {
+      get
+      {
+        return ( int )this.GetValue( Zoombox.CurrentViewIndexProperty );
+      }
+    }
+
+    internal void SetCurrentViewIndex( int value )
+    {
+      this.SetValue( Zoombox.CurrentViewIndexPropertyKey, value );
+    }
+
+    #endregion
+
+    #region DragModifiers Property
+
+    public static readonly DependencyProperty DragModifiersProperty =
+      DependencyProperty.Register( "DragModifiers", typeof( KeyModifierCollection ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( Zoombox.GetDefaultDragModifiers() ) );
+
+    [TypeConverter( typeof( KeyModifierCollectionConverter ) )]
+    public KeyModifierCollection DragModifiers
+    {
+      get
+      {
+        return ( KeyModifierCollection )this.GetValue( Zoombox.DragModifiersProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.DragModifiersProperty, value );
+      }
+    }
+
+    private static KeyModifierCollection GetDefaultDragModifiers()
+    {
+      KeyModifierCollection result = new KeyModifierCollection();
+      result.Add( KeyModifier.Ctrl );
+      result.Add( KeyModifier.Exact );
+      return result;
+    }
+
+    #endregion
+
+    #region DragOnPreview Property
+
+    public static readonly DependencyProperty DragOnPreviewProperty =
+      DependencyProperty.Register( "DragOnPreview", typeof( bool ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( false ) );
+
+    public bool DragOnPreview
+    {
+      get
+      {
+        return ( bool )this.GetValue( Zoombox.DragOnPreviewProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.DragOnPreviewProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region EffectiveViewStackMode Property
+
+    private static readonly DependencyPropertyKey EffectiveViewStackModePropertyKey =
+      DependencyProperty.RegisterReadOnly( "EffectiveViewStackMode", typeof( ZoomboxViewStackMode ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( ZoomboxViewStackMode.Auto ) );
+
+    public static readonly DependencyProperty EffectiveViewStackModeProperty = Zoombox.EffectiveViewStackModePropertyKey.DependencyProperty;
+
+    public ZoomboxViewStackMode EffectiveViewStackMode
+    {
+      get
+      {
+        return ( ZoomboxViewStackMode )this.GetValue( Zoombox.EffectiveViewStackModeProperty );
+      }
+    }
+
+    private void SetEffectiveViewStackMode( ZoomboxViewStackMode value )
+    {
+      this.SetValue( Zoombox.EffectiveViewStackModePropertyKey, value );
+    }
+
+    #endregion
+
+    #region HasBackStack Property
+
+    private static readonly DependencyPropertyKey HasBackStackPropertyKey =
+      DependencyProperty.RegisterReadOnly( "HasBackStack", typeof( bool ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( false ) );
+
+    public static readonly DependencyProperty HasBackStackProperty = Zoombox.HasBackStackPropertyKey.DependencyProperty;
+
+    public bool HasBackStack
+    {
+      get
+      {
+        return ( bool )this.GetValue( Zoombox.HasBackStackProperty );
+      }
+    }
+
+    #endregion
+
+    #region HasForwardStack Property
+
+    private static readonly DependencyPropertyKey HasForwardStackPropertyKey =
+      DependencyProperty.RegisterReadOnly( "HasForwardStack", typeof( bool ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( false ) );
+
+    public static readonly DependencyProperty HasForwardStackProperty = Zoombox.HasForwardStackPropertyKey.DependencyProperty;
+
+    public bool HasForwardStack
+    {
+      get
+      {
+        return ( bool )this.GetValue( Zoombox.HasForwardStackProperty );
+      }
+    }
+
+    #endregion
+
+    #region IsAnimated Property
+
+    public static readonly DependencyProperty IsAnimatedProperty =
+      DependencyProperty.Register( "IsAnimated", typeof( bool ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( true, 
+          ( PropertyChangedCallback )null, new CoerceValueCallback( Zoombox.CoerceIsAnimatedValue ) ) );
+
+    public bool IsAnimated
+    {
+      get
+      {
+        return ( bool )this.GetValue( Zoombox.IsAnimatedProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.IsAnimatedProperty, value );
+      }
+    }
+
+    private static object CoerceIsAnimatedValue( DependencyObject d, object value )
+    {
+      Zoombox zoombox = ( Zoombox )d;
+      bool result = ( bool )value;
+      if( !zoombox.IsInitialized )
+      {
+        result = false;
+      }
+      return result;
+    }
+
+    #endregion
+
+    #region IsDraggingContent Property
+
+    private static readonly DependencyPropertyKey IsDraggingContentPropertyKey =
+      DependencyProperty.RegisterReadOnly( "IsDraggingContent", typeof( bool ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( false ) );
+
+    public static readonly DependencyProperty IsDraggingContentProperty = Zoombox.IsDraggingContentPropertyKey.DependencyProperty;
+
+    public bool IsDraggingContent
+    {
+      get
+      {
+        return ( bool )this.GetValue( Zoombox.IsDraggingContentProperty );
+      }
+    }
+
+    private void SetIsDraggingContent( bool value )
+    {
+      this.SetValue( Zoombox.IsDraggingContentPropertyKey, value );
+    }
+
+    #endregion
+
+    #region IsSelectingRegion Property
+
+    private static readonly DependencyPropertyKey IsSelectingRegionPropertyKey =
+      DependencyProperty.RegisterReadOnly( "IsSelectingRegion", typeof( bool ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( false ) );
+
+    public static readonly DependencyProperty IsSelectingRegionProperty = Zoombox.IsSelectingRegionPropertyKey.DependencyProperty;
+
+    public bool IsSelectingRegion
+    {
+      get
+      {
+        return ( bool )this.GetValue( Zoombox.IsSelectingRegionProperty );
+      }
+    }
+
+    private void SetIsSelectingRegion( bool value )
+    {
+      this.SetValue( Zoombox.IsSelectingRegionPropertyKey, value );
+    }
+
+    #endregion
+
+    #region MaxScale Property
+
+    public static readonly DependencyProperty MaxScaleProperty =
+      DependencyProperty.Register( "MaxScale", typeof( double ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( 100d, FrameworkPropertyMetadataOptions.AffectsMeasure,
+          new PropertyChangedCallback( Zoombox.OnMaxScaleChanged ), new CoerceValueCallback( Zoombox.CoerceMaxScaleValue ) ) );
+
+    public double MaxScale
+    {
+      get
+      {
+        return ( double )this.GetValue( Zoombox.MaxScaleProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.MaxScaleProperty, value );
+      }
+    }
+
+    private static void OnMaxScaleChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      Zoombox zoombox = ( Zoombox )o;
+      zoombox.CoerceValue( Zoombox.MinScaleProperty );
+      zoombox.CoerceValue( Zoombox.ScaleProperty );
+    }
+
+    private static object CoerceMaxScaleValue( DependencyObject d, object value )
+    {
+      Zoombox zoombox = ( Zoombox )d;
+      double result = ( double )value;
+      if( result < zoombox.MinScale )
+      {
+        result = zoombox.MinScale;
+      }
+      return result;
+    }
+
+    #endregion
+
+    #region MinScale Property
+
+    public static readonly DependencyProperty MinScaleProperty =
+      DependencyProperty.Register( "MinScale", typeof( double ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( 0.01d, FrameworkPropertyMetadataOptions.AffectsMeasure,
+          new PropertyChangedCallback( Zoombox.OnMinScaleChanged ), new CoerceValueCallback( Zoombox.CoerceMinScaleValue ) ) );
+
+    public double MinScale
+    {
+      get
+      {
+        return ( double )this.GetValue( Zoombox.MinScaleProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.MinScaleProperty, value );
+      }
+    }
+
+    private static void OnMinScaleChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      Zoombox zoombox = ( Zoombox )o;
+      zoombox.CoerceValue( Zoombox.MinScaleProperty );
+      zoombox.CoerceValue( Zoombox.ScaleProperty );
+    }
+
+    private static object CoerceMinScaleValue( DependencyObject d, object value )
+    {
+      Zoombox zoombox = ( Zoombox )d;
+      double result = ( double )value;
+      if( result > zoombox.MaxScale )
+      {
+        result = zoombox.MaxScale;
+      }
+      return result;
+    }
+
+    #endregion
+
+    #region NavigateOnPreview Property
+
+    public static readonly DependencyProperty NavigateOnPreviewProperty =
+      DependencyProperty.Register( "NavigateOnPreview", typeof( bool ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( false ) );
+
+    public bool NavigateOnPreview
+    {
+      get
+      {
+        return ( bool )this.GetValue( Zoombox.NavigateOnPreviewProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.NavigateOnPreviewProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region PanDistance Property
+
+    public static readonly DependencyProperty PanDistanceProperty =
+      DependencyProperty.Register( "PanDistance", typeof( double ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( 5d ) );
+
+    public double PanDistance
+    {
+      get
+      {
+        return ( double )this.GetValue( Zoombox.PanDistanceProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.PanDistanceProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region Position Property
+
+    public static readonly DependencyProperty PositionProperty =
+      DependencyProperty.Register( "Position", typeof( Point ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( PointHelper.Empty, new PropertyChangedCallback( Zoombox.OnPositionChanged ) ) );
+
+    public Point Position
+    {
+      get
+      {
+        return ( Point )this.GetValue( Zoombox.PositionProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.PositionProperty, value );
+      }
+    }
+
+    private static void OnPositionChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      Zoombox zoombox = ( Zoombox )o;
+      if( !zoombox.IsUpdatingViewport )
+      {
+        Point newPosition = ( Point )e.NewValue;
+        double scale = zoombox.Scale;
+        if( scale > 0 )
+        {
+          zoombox.ZoomTo( new Point( -newPosition.X, -newPosition.Y ) );
+        }
+      }
+    }
+
+    #endregion
+
+    #region RelativeZoomModifiers Property
+
+    public static readonly DependencyProperty RelativeZoomModifiersProperty =
+      DependencyProperty.Register( "RelativeZoomModifiers", typeof( KeyModifierCollection ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( Zoombox.GetDefaultRelativeZoomModifiers() ) );
+
+    [TypeConverter( typeof( KeyModifierCollectionConverter ) )]
+    public KeyModifierCollection RelativeZoomModifiers
+    {
+      get
+      {
+        return ( KeyModifierCollection )this.GetValue( Zoombox.RelativeZoomModifiersProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.RelativeZoomModifiersProperty, value );
+      }
+    }
+
+    private static KeyModifierCollection GetDefaultRelativeZoomModifiers()
+    {
+      KeyModifierCollection result = new KeyModifierCollection();
+      result.Add( KeyModifier.Ctrl );
+      result.Add( KeyModifier.Alt );
+      result.Add( KeyModifier.Exact );
+      return result;
+    }
+
+    #endregion
+
+    #region Scale Property
+
+    public static readonly DependencyProperty ScaleProperty =
+      DependencyProperty.Register( "Scale", typeof( double ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( double.NaN, 
+          new PropertyChangedCallback( Zoombox.OnScaleChanged ), new CoerceValueCallback( Zoombox.CoerceScaleValue ) ) );
+
+    public double Scale
+    {
+      get
+      {
+        return ( double )this.GetValue( Zoombox.ScaleProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.ScaleProperty, value );
+      }
+    }
+
+    private static void OnScaleChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      Zoombox zoombox = ( Zoombox )o;
+      if( !zoombox.IsUpdatingView )
+      {
+        double newScale = ( double )e.NewValue;
+        zoombox.ZoomTo( newScale );
+      }
+    }
+
+    private static object CoerceScaleValue( DependencyObject d, object value )
+    {
+      Zoombox zoombox = ( Zoombox )d;
+      double result = ( double )value;
+
+      if( result < zoombox.MinScale )
+      {
+        result = zoombox.MinScale;
+      }
+
+      if( result > zoombox.MaxScale )
+      {
+        result = zoombox.MaxScale;
+      }
+
+      return result;
+    }
+
+    #endregion
+
+    #region ViewFinder Property
+
+    private static readonly DependencyPropertyKey ViewFinderPropertyKey =
+      DependencyProperty.RegisterReadOnly( "ViewFinder", typeof( FrameworkElement ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( null ) );
+
+    public static readonly DependencyProperty ViewFinderProperty = Zoombox.ViewFinderPropertyKey.DependencyProperty;
+
+    public FrameworkElement ViewFinder
+    {
+      get
+      {
+        return ( FrameworkElement )this.GetValue( Zoombox.ViewFinderProperty );
+      }
+    }
+
+    #endregion
+
+    #region ViewFinderVisibility Attached Property
+
+    public static readonly DependencyProperty ViewFinderVisibilityProperty =
+      DependencyProperty.RegisterAttached( "ViewFinderVisibility", typeof( Visibility ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( Visibility.Visible ) );
+
+    public static Visibility GetViewFinderVisibility( DependencyObject d )
+    {
+      return ( Visibility )( d.GetValue( Zoombox.ViewFinderVisibilityProperty ) );
+    }
+
+    public static void SetViewFinderVisibility( DependencyObject d, Visibility value )
+    {
+      d.SetValue( Zoombox.ViewFinderVisibilityProperty, value );
+    }
+
+    #endregion
+
+    #region Viewport Property
+
+    private static readonly DependencyPropertyKey ViewportPropertyKey =
+      DependencyProperty.RegisterReadOnly( "Viewport", typeof( Rect ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( Rect.Empty, 
+          new PropertyChangedCallback( Zoombox.OnViewportChanged ) ) );
+
+    public static readonly DependencyProperty ViewportProperty = Zoombox.ViewportPropertyKey.DependencyProperty;
+
+    public Rect Viewport
+    {
+      get
+      {
+        return ( Rect )this.GetValue( Zoombox.ViewportProperty );
+      }
+    }
+
+    private static void OnViewportChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      // keep the Position property in sync with the Viewport
+      Zoombox zoombox = ( Zoombox )o;
+      zoombox.Position = new Point( -zoombox.Viewport.Left * zoombox.Scale / zoombox._viewboxFactor, -zoombox.Viewport.Top * zoombox.Scale / zoombox._viewboxFactor );
+    }
+
+    #endregion
+
+    #region ViewStackCount Property
+
+    private static readonly DependencyPropertyKey ViewStackCountPropertyKey =
+      DependencyProperty.RegisterReadOnly( "ViewStackCount", typeof( int ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( -1,
+          new PropertyChangedCallback( Zoombox.OnViewStackCountChanged ) ) );
+
+    public static readonly DependencyProperty ViewStackCountProperty = Zoombox.ViewStackCountPropertyKey.DependencyProperty;
+
+    public int ViewStackCount
+    {
+      get
+      {
+        return ( int )this.GetValue( Zoombox.ViewStackCountProperty );
+      }
+    }
+
+    internal void SetViewStackCount( int value )
+    {
+      this.SetValue( Zoombox.ViewStackCountPropertyKey, value );
+    }
+
+    private static void OnViewStackCountChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( Zoombox )d ).OnViewStackCountChanged( e );
+    }
+
+    private void OnViewStackCountChanged( DependencyPropertyChangedEventArgs e )
+    {
+      if( this.EffectiveViewStackMode == ZoomboxViewStackMode.Disabled )
+        return;
+
+      this.UpdateStackProperties();
+    }
+
+    #endregion
+
+    #region ViewStackIndex Property
+
+    public static readonly DependencyProperty ViewStackIndexProperty =
+      DependencyProperty.Register( "ViewStackIndex", typeof( int ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( -1,
+          new PropertyChangedCallback( Zoombox.OnViewStackIndexChanged ), new CoerceValueCallback( Zoombox.CoerceViewStackIndexValue ) ) );
+
+    public int ViewStackIndex
+    {
+      get
+      {
+        return ( int )this.GetValue( Zoombox.ViewStackIndexProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.ViewStackIndexProperty, value );
+      }
+    }
+
+    private static void OnViewStackIndexChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( Zoombox )d ).OnViewStackIndexChanged( e );
+    }
+
+    private void OnViewStackIndexChanged( DependencyPropertyChangedEventArgs e )
+    {
+      if( this.EffectiveViewStackMode == ZoomboxViewStackMode.Disabled )
+        return;
+
+      if( !this.IsUpdatingView )
+      {
+        int viewIndex = this.ViewStackIndex;
+        if( viewIndex >= 0 && viewIndex < ViewStack.Count )
+        {
+          // update the current view, but don't allow the new view 
+          // to be added to the view stack
+          this.UpdateView( this.ViewStack[ viewIndex ], true, false, viewIndex );
+        }
+      }
+
+      this.UpdateStackProperties();
+      this.RaiseEvent( new IndexChangedEventArgs( Zoombox.ViewStackIndexChangedEvent, ( int )e.OldValue, ( int )e.NewValue ) );
+    }
+
+    private static object CoerceViewStackIndexValue( DependencyObject d, object value )
+    {
+      Zoombox zoombox = d as Zoombox;
+      return ( zoombox.EffectiveViewStackMode == ZoomboxViewStackMode.Disabled ) ? -1 : value;
+    }
+
+    #endregion
+
+    #region ViewStackMode Property
+
+    public static readonly DependencyProperty ViewStackModeProperty = 
+      DependencyProperty.Register( "ViewStackMode", typeof( ZoomboxViewStackMode ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( ZoomboxViewStackMode.Default,
+          new PropertyChangedCallback( Zoombox.OnViewStackModeChanged ), new CoerceValueCallback( Zoombox.CoerceViewStackModeValue ) ) );
+
+    public ZoomboxViewStackMode ViewStackMode
+    {
+      get
+      {
+        return ( ZoomboxViewStackMode )this.GetValue( Zoombox.ViewStackModeProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.ViewStackModeProperty, value );
+      }
+    }
+
+    private static void OnViewStackModeChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( Zoombox )d ).OnViewStackModeChanged( e );
+    }
+
+    private void OnViewStackModeChanged( DependencyPropertyChangedEventArgs e )
+    {
+      if( ( ZoomboxViewStackMode )e.NewValue == ZoomboxViewStackMode.Disabled && _viewStack != null )
+      {
+        _viewStack.ClearViewStackSource();
+        _viewStack = null;
+      }
+    }
+
+    private static object CoerceViewStackModeValue( DependencyObject d, object value )
+    {
+      Zoombox zoombox = d as Zoombox;
+      ZoomboxViewStackMode effectiveMode = ( ZoomboxViewStackMode )value;
+
+      // if the effective mode is currently disabled, it must be updated first
+      if( zoombox.EffectiveViewStackMode == ZoomboxViewStackMode.Disabled )
+      {
+        zoombox.SetEffectiveViewStackMode( effectiveMode );
+      }
+
+      // now determine the correct effective mode
+      if( effectiveMode != ZoomboxViewStackMode.Disabled )
+      {
+        if( effectiveMode == ZoomboxViewStackMode.Default )
+        {
+          effectiveMode = ( zoombox.ViewStack.AreViewsFromSource ? ZoomboxViewStackMode.Manual : ZoomboxViewStackMode.Auto );
+        }
+        if( zoombox.ViewStack.AreViewsFromSource && ( ZoomboxViewStackMode )effectiveMode != ZoomboxViewStackMode.Manual )
+        {
+          throw new InvalidOperationException( ErrorMessages.GetMessage( "ViewModeInvalidForSource" ) );
+        }
+      }
+
+      // update the effective mode
+      zoombox.SetEffectiveViewStackMode( effectiveMode );
+      return value;
+    }
+
+    #endregion
+
+    #region ViewStackSource Property
+
+    public static readonly DependencyProperty ViewStackSourceProperty =
+      DependencyProperty.Register( "ViewStackSource", typeof( IEnumerable ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( ( IEnumerable )null,
+          new PropertyChangedCallback( Zoombox.OnViewStackSourceChanged ) ) );
+
+    [Bindable( true )]
+    public IEnumerable ViewStackSource
+    {
+      get
+      {
+        return ( _viewStack == null ) ? null : ViewStack.Source;
+      }
+      set
+      {
+        if( value == null )
+        {
+          this.ClearValue( Zoombox.ViewStackSourceProperty );
+        }
+        else
+        {
+          this.SetValue( Zoombox.ViewStackSourceProperty, value );
+        }
+      }
+    }
+
+    private static void OnViewStackSourceChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      Zoombox zoombox = ( Zoombox )d;
+      IEnumerable oldValue = ( IEnumerable )e.OldValue;
+      IEnumerable newValue = ( IEnumerable )e.NewValue;
+
+      // We need to know whether the new value represents an explicit null value 
+      // or whether it came from a binding. The latter indicates that we stay in ViewStackSource mode,
+      // but with a null collection.
+      if( e.NewValue == null && !BindingOperations.IsDataBound( d, Zoombox.ViewStackSourceProperty ) )
+      {
+        if( zoombox.ViewStack != null )
+        {
+          zoombox.ViewStack.ClearViewStackSource();
+        }
+      }
+      else
+      {
+        zoombox.ViewStack.SetViewStackSource( newValue );
+      }
+
+      zoombox.CoerceValue( Zoombox.ViewStackModeProperty );
+    }
+
+    #endregion
+
+    #region ZoomModifiers Property
+
+    public static readonly DependencyProperty ZoomModifiersProperty =
+      DependencyProperty.Register( "ZoomModifiers", typeof( KeyModifierCollection ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( Zoombox.GetDefaultZoomModifiers() ) );
+
+    [TypeConverter( typeof( KeyModifierCollectionConverter ) )]
+    public KeyModifierCollection ZoomModifiers
+    {
+      get
+      {
+        return ( KeyModifierCollection )this.GetValue( Zoombox.ZoomModifiersProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.ZoomModifiersProperty, value );
+      }
+    }
+
+    private static KeyModifierCollection GetDefaultZoomModifiers()
+    {
+      KeyModifierCollection result = new KeyModifierCollection();
+      result.Add( KeyModifier.Shift );
+      result.Add( KeyModifier.Exact );
+      return result;
+    }
+
+    #endregion
+
+    #region ZoomOnPreview Property
+
+    public static readonly DependencyProperty ZoomOnPreviewProperty =
+      DependencyProperty.Register( "ZoomOnPreview", typeof( bool ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( true ) );
+
+    public bool ZoomOnPreview
+    {
+      get
+      {
+        return ( bool )this.GetValue( Zoombox.ZoomOnPreviewProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.ZoomOnPreviewProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region ZoomOrigin Property
+
+    public static readonly DependencyProperty ZoomOriginProperty =
+      DependencyProperty.Register( "ZoomOrigin", typeof( Point ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( new Point( 0.5d, 0.5d ) ) );
+
+    public Point ZoomOrigin
+    {
+      get
+      {
+        return ( Point )this.GetValue( Zoombox.ZoomOriginProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.ZoomOriginProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region ZoomPercentage Property
+
+    public static readonly DependencyProperty ZoomPercentageProperty =
+      DependencyProperty.Register( "ZoomPercentage", typeof( double ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( 5d ) );
+
+    public double ZoomPercentage
+    {
+      get
+      {
+        return ( double )this.GetValue( Zoombox.ZoomPercentageProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.ZoomPercentageProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region ZoomOn Property
+
+    public static readonly DependencyProperty ZoomOnProperty =
+      DependencyProperty.Register( "ZoomOn", typeof( ZoomboxZoomOn ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( ZoomboxZoomOn.Content ) );
+
+    public ZoomboxZoomOn ZoomOn
+    {
+      get
+      {
+        return ( ZoomboxZoomOn )this.GetValue( Zoombox.ZoomOnProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.ZoomOnProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region ZoomToSelectionModifiers Property
+
+    public static readonly DependencyProperty ZoomToSelectionModifiersProperty =
+      DependencyProperty.Register( "ZoomToSelectionModifiers", typeof( KeyModifierCollection ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( Zoombox.GetDefaultZoomToSelectionModifiers() ) );
+
+    [TypeConverter( typeof( KeyModifierCollectionConverter ) )]
+    public KeyModifierCollection ZoomToSelectionModifiers
+    {
+      get
+      {
+        return ( KeyModifierCollection )this.GetValue( Zoombox.ZoomToSelectionModifiersProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.ZoomToSelectionModifiersProperty, value );
+      }
+    }
+
+    private static KeyModifierCollection GetDefaultZoomToSelectionModifiers()
+    {
+      KeyModifierCollection result = new KeyModifierCollection();
+      result.Add( KeyModifier.Alt );
+      result.Add( KeyModifier.Exact );
+      return result;
+    }
+
+    #endregion
+
+    #region KeepContentInBounds Property
+
+    public static readonly DependencyProperty KeepContentInBoundsProperty =
+      DependencyProperty.Register( "KeepContentInBounds", typeof( bool ), typeof( Zoombox ),
+        new FrameworkPropertyMetadata( false, 
+          new PropertyChangedCallback( Zoombox.OnKeepContentInBoundsChanged ) ) );
+
+    public bool KeepContentInBounds
+    {
+      get
+      {
+        return ( bool )this.GetValue( Zoombox.KeepContentInBoundsProperty );
+      }
+      set
+      {
+        this.SetValue( Zoombox.KeepContentInBoundsProperty, value );
+      }
+    }
+
+    private static void OnKeepContentInBoundsChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( Zoombox )d ).OnKeepContentInBoundsChanged( e );
+    }
+
+    private void OnKeepContentInBoundsChanged( DependencyPropertyChangedEventArgs e )
+    {
+      //
+      // Update view and see if we need to reposition the content
+      //
+      bool oldIsAnimated = this.IsAnimated;
+      this.IsAnimated = false;
+      try
+      {
+        this.UpdateView( this.CurrentView, false, false, this.ViewStackIndex );
+      }
+      finally
+      {
+        this.IsAnimated = oldIsAnimated;
+      }
+    }
+
+    #endregion
+
+    #region ViewStack Property
+
+    public ZoomboxViewStack ViewStack
+    {
+      get
+      {
+        if( _viewStack == null && this.EffectiveViewStackMode != ZoomboxViewStackMode.Disabled )
+        {
+          _viewStack = new ZoomboxViewStack( this );
+        }
+        return _viewStack;
+      }
+    }
+
+    #endregion
+
+    #region HasArrangedContentPresenter Internal Property
+
+    internal bool HasArrangedContentPresenter
+    {
+      get
+      {
+        return _cacheBits[ ( int )CacheBits.HasArrangedContentPresenter ];
+      }
+      set
+      {
+        _cacheBits[ ( int )CacheBits.HasArrangedContentPresenter ] = value;
+      }
+    }
+
+    #endregion
+
+    #region IsUpdatingView Internal Property
+
+    internal bool IsUpdatingView
+    {
+      get
+      {
+        return _cacheBits[ ( int )CacheBits.IsUpdatingView ];
+      }
+      set
+      {
+        _cacheBits[ ( int )CacheBits.IsUpdatingView ] = value;
+      }
+    }
+
+    #endregion
+
+    #region ContentOffset Private Property
+
+    private Vector ContentOffset
+    {
+      get
+      {
+        // auto-wrapped content is always left and top aligned
+        if( this.IsContentWrapped || _content == null || !( _content is FrameworkElement ) )
+          return new Vector( 0, 0 );
+
+        double x = 0;
+        double y = 0;
+        Size contentSize = this.ContentRect.Size;
+
+        switch( ( _content as FrameworkElement ).HorizontalAlignment )
+        {
+          case HorizontalAlignment.Center:
+          case HorizontalAlignment.Stretch:
+            x = ( this.RenderSize.Width - contentSize.Width ) / 2;
+            break;
+
+          case HorizontalAlignment.Right:
+            x = this.RenderSize.Width - contentSize.Width;
+            break;
+        }
+
+        switch( ( _content as FrameworkElement ).VerticalAlignment )
+        {
+          case VerticalAlignment.Center:
+          case VerticalAlignment.Stretch:
+            y = ( this.RenderSize.Height - contentSize.Height ) / 2;
+            break;
+
+          case VerticalAlignment.Bottom:
+            y = this.RenderSize.Height - contentSize.Height;
+            break;
+        }
+
+        return new Vector( x, y );
+      }
+    }
+
+    #endregion
+
+    #region ContentRect Private Property
+
+    private Rect ContentRect
+    {
+      get
+      {
+        return ( _content == null ) ? Rect.Empty
+            : new Rect( new Size( _content.RenderSize.Width / _viewboxFactor, _content.RenderSize.Height / _viewboxFactor ) );
+      }
+    }
+
+    #endregion
+
+    #region HasRenderedFirstView Private Property
+
+    private bool HasRenderedFirstView
+    {
+      get
+      {
+        return _cacheBits[ ( int )CacheBits.HasRenderedFirstView ];
+      }
+      set
+      {
+        _cacheBits[ ( int )CacheBits.HasRenderedFirstView ] = value;
+      }
+    }
+
+    #endregion
+
+    #region HasUIPermission Private Property
+
+    private bool HasUIPermission
+    {
+      get
+      {
+        return _cacheBits[ ( int )CacheBits.HasUIPermission ];
+      }
+    }
+
+    #endregion
+
+    #region IsContentWrapped Private Property
+
+    private bool IsContentWrapped
+    {
+      get
+      {
+        return _cacheBits[ ( int )CacheBits.IsContentWrapped ];
+      }
+      set
+      {
+        _cacheBits[ ( int )CacheBits.IsContentWrapped ] = value;
+      }
+    }
+
+    #endregion
+
+    #region IsDraggingViewport Private Property
+
+    private bool IsDraggingViewport
+    {
+      get
+      {
+        return _cacheBits[ ( int )CacheBits.IsDraggingViewport ];
+      }
+      set
+      {
+        _cacheBits[ ( int )CacheBits.IsDraggingViewport ] = value;
+      }
+    }
+
+    #endregion
+
+    #region IsMonitoringInput Private Property
+
+    private bool IsMonitoringInput
+    {
+      get
+      {
+        return _cacheBits[ ( int )CacheBits.IsMonitoringInput ];
+      }
+      set
+      {
+        _cacheBits[ ( int )CacheBits.IsMonitoringInput ] = value;
+      }
+    }
+
+    #endregion
+
+    #region IsResizingViewport Private Property
+
+    private bool IsResizingViewport
+    {
+      get
+      {
+        return _cacheBits[ ( int )CacheBits.IsResizingViewport ];
+      }
+      set
+      {
+        _cacheBits[ ( int )CacheBits.IsResizingViewport ] = value;
+      }
+    }
+
+    #endregion
+
+    #region IsUpdatingViewport Private Property
+
+    private bool IsUpdatingViewport
+    {
+      get
+      {
+        return _cacheBits[ ( int )CacheBits.IsUpdatingViewport ];
+      }
+      set
+      {
+        _cacheBits[ ( int )CacheBits.IsUpdatingViewport ] = value;
+      }
+    }
+
+    #endregion
+
+    #region RefocusViewOnFirstRender Private Property
+
+    private bool RefocusViewOnFirstRender
+    {
+      get
+      {
+        return _cacheBits[ ( int )CacheBits.RefocusViewOnFirstRender ];
+      }
+      set
+      {
+        _cacheBits[ ( int )CacheBits.RefocusViewOnFirstRender ] = value;
+      }
+    }
+
+    #endregion
+
+    #region ViewFinderDisplayRect Private Property
+
+    private Rect ViewFinderDisplayRect
+    {
+      get
+      {
+        return ( _viewFinderDisplay == null ) ? Rect.Empty
+            : new Rect( new Point( 0, 0 ), new Point( _viewFinderDisplay.RenderSize.Width, _viewFinderDisplay.RenderSize.Height ) );
+      }
+    }
+
+    #endregion
+
+    #region AnimationBeginning Event
+
+    public static readonly RoutedEvent AnimationBeginningEvent = EventManager.RegisterRoutedEvent( "AnimationBeginning", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( Zoombox ) );
+
+    public event RoutedEventHandler AnimationBeginning
+    {
+      add
+      {
+        this.AddHandler( Zoombox.AnimationBeginningEvent, value );
+      }
+      remove
+      {
+        this.RemoveHandler( Zoombox.AnimationBeginningEvent, value );
+      }
+    }
+
+    #endregion
+
+    #region AnimationCompleted Event
+
+    public static readonly RoutedEvent AnimationCompletedEvent = EventManager.RegisterRoutedEvent( "AnimationCompleted", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( Zoombox ) );
+
+    public event RoutedEventHandler AnimationCompleted
+    {
+      add
+      {
+        this.AddHandler( Zoombox.AnimationCompletedEvent, value );
+      }
+      remove
+      {
+        this.RemoveHandler( Zoombox.AnimationCompletedEvent, value );
+      }
+    }
+
+    #endregion
+
+    #region CurrentViewChanged Event
+
+    public static readonly RoutedEvent CurrentViewChangedEvent = EventManager.RegisterRoutedEvent( "CurrentViewChanged", RoutingStrategy.Bubble, typeof( ZoomboxViewChangedEventHandler ), typeof( Zoombox ) );
+
+    public event ZoomboxViewChangedEventHandler CurrentViewChanged
+    {
+      add
+      {
+        this.AddHandler( Zoombox.CurrentViewChangedEvent, value );
+      }
+      remove
+      {
+        this.RemoveHandler( Zoombox.CurrentViewChangedEvent, value );
+      }
+    }
+
+    #endregion
+
+    #region ViewStackIndexChanged Event
+
+    public static readonly RoutedEvent ViewStackIndexChangedEvent = EventManager.RegisterRoutedEvent( "ViewStackIndexChanged", RoutingStrategy.Bubble, typeof( IndexChangedEventHandler ), typeof( Zoombox ) );
+
+    public event IndexChangedEventHandler ViewStackIndexChanged
+    {
+      add
+      {
+        this.AddHandler( Zoombox.ViewStackIndexChangedEvent, value );
+      }
+      remove
+      {
+        this.RemoveHandler( Zoombox.ViewStackIndexChangedEvent, value );
+      }
+    }
+
+    #endregion
+
+    #region Back Command
+
+    public static RoutedUICommand Back = new RoutedUICommand( "Go Back", "GoBack", typeof( Zoombox ) );
+
+    private void CanGoBack( object sender, CanExecuteRoutedEventArgs e )
+    {
+      e.CanExecute = ( this.EffectiveViewStackMode != ZoomboxViewStackMode.Disabled )
+                  && ( this.ViewStackIndex > 0 );
+    }
+
+    private void GoBack( object sender, ExecutedRoutedEventArgs e )
+    {
+      this.GoBack();
+    }
+
+    #endregion
+
+    #region Center Command
+
+    public static RoutedUICommand Center = new RoutedUICommand( "Center Content", "Center", typeof( Zoombox ) );
+
+    private void CenterContent( object sender, ExecutedRoutedEventArgs e )
+    {
+      this.CenterContent();
+    }
+
+    #endregion
+
+    #region Fill Command
+
+    public static RoutedUICommand Fill = new RoutedUICommand( "Fill Bounds with Content", "FillToBounds", typeof( Zoombox ) );
+
+    private void FillToBounds( object sender, ExecutedRoutedEventArgs e )
+    {
+      this.FillToBounds();
+    }
+
+    #endregion
+
+    #region Fit Command
+
+    public static RoutedUICommand Fit = new RoutedUICommand( "Fit Content within Bounds", "FitToBounds", typeof( Zoombox ) );
+
+    private void FitToBounds( object sender, ExecutedRoutedEventArgs e )
+    {
+      this.FitToBounds();
+    }
+
+    #endregion
+
+    #region Forward Command
+
+    public static RoutedUICommand Forward = new RoutedUICommand( "Go Forward", "GoForward", typeof( Zoombox ) );
+
+    private void CanGoForward( object sender, CanExecuteRoutedEventArgs e )
+    {
+      e.CanExecute = ( this.EffectiveViewStackMode != ZoomboxViewStackMode.Disabled )
+                  && ( this.ViewStackIndex < this.ViewStack.Count - 1 );
+    }
+
+    private void GoForward( object sender, ExecutedRoutedEventArgs e )
+    {
+      this.GoForward();
+    }
+
+    #endregion
+
+    #region Home Command
+
+    public static RoutedUICommand Home = new RoutedUICommand( "Go Home", "GoHome", typeof( Zoombox ) );
+
+    private void CanGoHome( object sender, CanExecuteRoutedEventArgs e )
+    {
+      e.CanExecute = ( this.EffectiveViewStackMode != ZoomboxViewStackMode.Disabled )
+                  && ( this.ViewStack.Count > 0 )
+                  && ( this.ViewStackIndex != 0 );
+    }
+
+    private void GoHome( object sender, ExecutedRoutedEventArgs e )
+    {
+      this.GoHome();
+    }
+
+    #endregion
+
+    #region PanDown Command
+
+    public static RoutedUICommand PanDown = new RoutedUICommand( "Pan Down", "PanDown", typeof( Zoombox ) );
+
+    private void PanDownExecuted( object sender, ExecutedRoutedEventArgs e )
+    {
+      this.Position = new Point( _basePosition.X, _basePosition.Y + PanDistance );
+    }
+
+    #endregion
+
+    #region PanLeft Command
+
+    public static RoutedUICommand PanLeft = new RoutedUICommand( "Pan Left", "PanLeft", typeof( Zoombox ) );
+
+    private void PanLeftExecuted( object sender, ExecutedRoutedEventArgs e )
+    {
+      this.Position = new Point( _basePosition.X - this.PanDistance, _basePosition.Y );
+    }
+
+    #endregion
+
+    #region PanRight Command
+
+    public static RoutedUICommand PanRight = new RoutedUICommand( "Pan Right", "PanRight", typeof( Zoombox ) );
+
+    private void PanRightExecuted( object sender, ExecutedRoutedEventArgs e )
+    {
+      this.Position = new Point( _basePosition.X + this.PanDistance, _basePosition.Y );
+    }
+
+    #endregion
+
+    #region PanUp Command
+
+    public static RoutedUICommand PanUp = new RoutedUICommand( "Pan Up", "PanUp", typeof( Zoombox ) );
+
+    private void PanUpExecuted( object sender, ExecutedRoutedEventArgs e )
+    {
+      this.Position = new Point( _basePosition.X, _basePosition.Y - this.PanDistance );
+    }
+
+    #endregion
+
+    #region Refocus Command
+
+    public static RoutedUICommand Refocus = new RoutedUICommand( "Refocus View", "Refocus", typeof( Zoombox ) );
+
+    private void CanRefocusView( object sender, CanExecuteRoutedEventArgs e )
+    {
+      e.CanExecute = ( this.EffectiveViewStackMode == ZoomboxViewStackMode.Manual )
+                  && ( this.ViewStackIndex >= 0 && this.ViewStackIndex < this.ViewStack.Count )
+                  && ( this.CurrentView != this.ViewStack[ this.ViewStackIndex ] );
+    }
+
+    private void RefocusView( object sender, ExecutedRoutedEventArgs e )
+    {
+      this.RefocusView();
+    }
+
+    #endregion
+
+    #region ZoomIn Command
+
+    public static RoutedUICommand ZoomIn = new RoutedUICommand( "Zoom In", "ZoomIn", typeof( Zoombox ) );
+
+    private void ZoomInExecuted( object sender, ExecutedRoutedEventArgs e )
+    {
+      this.Zoom( this.ZoomPercentage / 100 );
+    }
+
+    #endregion
+
+    #region ZoomOut Command
+
+    public static RoutedUICommand ZoomOut = new RoutedUICommand( "Zoom Out", "ZoomOut", typeof( Zoombox ) );
+
+    private void ZoomOutExecuted( object sender, ExecutedRoutedEventArgs e )
+    {
+      this.Zoom( -this.ZoomPercentage / 100 );
+    }
+
+    #endregion
+
+    public void CenterContent()
+    {
+      if( _content != null )
+      {
+        this.ZoomTo( ZoomboxView.Center );
+      }
+    }
+
+    public void FillToBounds()
+    {
+      if( _content != null )
+      {
+        this.ZoomTo( ZoomboxView.Fill );
+      }
+    }
+
+    public void FitToBounds()
+    {
+      if( _content != null )
+      {
+        this.ZoomTo( ZoomboxView.Fit );
+      }
+    }
+
+    public void GoBack()
+    {
+      if( this.EffectiveViewStackMode == ZoomboxViewStackMode.Disabled )
+        return;
+
+      if( this.ViewStackIndex > 0 )
+      {
+        this.ViewStackIndex--;
+      }
+    }
+
+    public void GoForward()
+    {
+      if( this.EffectiveViewStackMode == ZoomboxViewStackMode.Disabled )
+        return;
+
+      if( this.ViewStackIndex < this.ViewStack.Count - 1 )
+      {
+        this.ViewStackIndex++;
+      }
+    }
+
+    public void GoHome()
+    {
+      if( this.EffectiveViewStackMode == ZoomboxViewStackMode.Disabled )
+        return;
+
+      if( this.ViewStackIndex > 0 )
+      {
+        this.ViewStackIndex = 0;
+      }
+    }
+
+    public override void OnApplyTemplate()
+    {
+      this.AttachToVisualTree();
+      base.OnApplyTemplate();
+    }
+
+    public void RefocusView()
+    {
+      if( this.EffectiveViewStackMode == ZoomboxViewStackMode.Disabled )
+        return;
+
+      if( this.ViewStackIndex >= 0 && this.ViewStackIndex < this.ViewStack.Count
+          && this.CurrentView != this.ViewStack[ this.ViewStackIndex ] )
+      {
+        this.UpdateView( this.ViewStack[ this.ViewStackIndex ], true, false, this.ViewStackIndex );
+      }
+    }
+
+    public void Zoom( double percentage )
+    {
+      // if there is nothing to scale, just return
+      if( _content == null )
+        return;
+
+      this.Zoom( percentage, this.GetZoomRelativePoint() );
+    }
+
+    public void Zoom( double percentage, Point relativeTo )
+    {
+      // if there is nothing to scale, just return
+      if( _content == null )
+        return;
+
+      // adjust the current scale relative to the given point
+      double scale = this.Scale * ( 1 + percentage );
+      this.ZoomTo( scale, relativeTo );
+    }
+
+    public void ZoomTo( Point position )
+    {
+      // if there is nothing to pan, just return
+      if( _content == null )
+        return;
+
+      // zoom to the new region
+      this.ZoomTo( new ZoomboxView( new Point( -position.X, -position.Y ) ) );
+    }
+
+    public void ZoomTo( Rect region )
+    {
+      if( _content == null )
+        return;
+
+      // adjust the current scale and position
+      this.UpdateView( new ZoomboxView( region ), true, true );
+    }
+
+    public void ZoomTo( double scale )
+    {
+      // if there is nothing to scale, just return
+      if( _content == null )
+        return;
+
+      // adjust the current scale relative to the center of the content within the control
+      this.ZoomTo( scale, true );
+    }
+
+    public void ZoomTo( double scale, Point relativeTo )
+    {
+      this.ZoomTo( scale, relativeTo, true, true );
+    }
+
+    public void ZoomTo( ZoomboxView view )
+    {
+      this.UpdateView( view, true, true );
+    }
+
+    internal void UpdateStackProperties()
+    {
+      this.SetValue( Zoombox.HasBackStackPropertyKey, this.ViewStackIndex > 0 );
+      this.SetValue( Zoombox.HasForwardStackPropertyKey, this.ViewStack.Count > this.ViewStackIndex + 1 );
+      CommandManager.InvalidateRequerySuggested();
+    }
+
+    protected override Size MeasureOverride( Size constraint )
+    {
+      if( _content != null )
+      {
+        // measure visuals according to supplied constraint
+        base.MeasureOverride( constraint );
+
+        // now re-measure content to let the child be whatever size it desires
+        _content.Measure( new Size( double.PositiveInfinity, double.PositiveInfinity ) );
+      }
+
+      // avoid returning infinity
+      if( double.IsInfinity( constraint.Height ) )
+      {
+        constraint.Height = 0;
+      }
+
+      if( double.IsInfinity( constraint.Width ) )
+      {
+        constraint.Width = 0;
+      }
+      return constraint;
+    }
+
+    protected override void OnContentChanged( object oldContent, object newContent )
+    {
+      // disconnect SizeChanged handler from old content
+      if( oldContent is FrameworkElement )
+      {
+        ( oldContent as FrameworkElement ).RemoveHandler( FrameworkElement.SizeChangedEvent, new SizeChangedEventHandler( this.OnContentSizeChanged ) );
+      }
+      else
+      {
+        this.RemoveHandler( FrameworkElement.SizeChangedEvent, new SizeChangedEventHandler( this.OnContentSizeChanged ) );
+      }
+
+      // connect SizeChanged handler to new content
+      if( _content is FrameworkElement )
+      {
+        ( _content as FrameworkElement ).AddHandler( FrameworkElement.SizeChangedEvent, new SizeChangedEventHandler( this.OnContentSizeChanged ), true );
+      }
+      else
+      {
+        this.AddHandler( FrameworkElement.SizeChangedEvent, new SizeChangedEventHandler( this.OnContentSizeChanged ), true );
+      }
+
+      // update the Visual property of the view finder display panel's VisualBrush
+      if( _viewFinderDisplay != null && _viewFinderDisplay.VisualBrush != null )
+      {
+        _viewFinderDisplay.VisualBrush.Visual = _content;
+      }
+    }
+
+    protected override void OnGotKeyboardFocus( KeyboardFocusChangedEventArgs e )
+    {
+      this.MonitorInput();
+      base.OnGotKeyboardFocus( e );
+    }
+
+    protected override void OnLostKeyboardFocus( KeyboardFocusChangedEventArgs e )
+    {
+      this.MonitorInput();
+      base.OnLostKeyboardFocus( e );
+    }
+
+    protected override void OnInitialized( EventArgs e )
+    {
+      base.OnInitialized( e );
+      this.CoerceValue( Zoombox.IsAnimatedProperty );
+    }
+
+    protected override void OnRender( DrawingContext drawingContext )
+    {
+      if( this.HasArrangedContentPresenter && !this.HasRenderedFirstView )
+      {
+        this.HasRenderedFirstView = true;
+        if( this.RefocusViewOnFirstRender )
+        {
+          this.RefocusViewOnFirstRender = false;
+          bool oldAnimated = this.IsAnimated;
+          this.IsAnimated = false;
+          try
+          {
+            this.RefocusView();
+          }
+          finally
+          {
+            this.IsAnimated = oldAnimated;
+          }
+        }
+      }
+
+      base.OnRender( drawingContext );
+    }
+
+    private static void RefocusView( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      Zoombox zoombox = o as Zoombox;
+      zoombox.UpdateView( zoombox.CurrentView, true, false, zoombox.ViewStackIndex );
+    }
+
+    private void AttachToVisualTree()
+    {
+      // detach from the old tree
+      this.DetachFromVisualTree();
+
+      // create the drag adorner for selection operations
+      _dragAdorner = new DragAdorner( this );
+
+      // check the template for a SelectionBrush resource
+      if( this.Template.Resources.Contains( "SelectionBrush" ) )
+        _dragAdorner.Brush = this.Template.Resources[ "SelectionBrush" ] as Brush;
+
+      // check the template for a SelectionPen resource
+      if( this.Template.Resources.Contains( "SelectionPen" ) )
+        _dragAdorner.Pen = this.Template.Resources[ "SelectionPen" ] as Pen;
+
+      // check the template for key bindings
+      if( this.Template.Resources.Contains( "InputBindings" ) )
+      {
+        InputBindingCollection inputBindings = this.Template.Resources[ "InputBindings" ] as InputBindingCollection;
+        if( inputBindings != null )
+        {
+          this.InputBindings.AddRange( inputBindings );
+        }
+      }
+
+      // locate the content presenter
+      _contentPresenter = VisualTreeHelperEx.FindDescendantByType( this, typeof( ContentPresenter ) ) as ContentPresenter;
+      if( _contentPresenter == null )
+        throw new InvalidTemplateException( ErrorMessages.GetMessage( "ZoomboxTemplateNeedsContent" ) );
+
+      // check the template for an AdornerDecorator
+      AdornerLayer al = null;
+      AdornerDecorator ad = VisualTreeHelperEx.FindDescendantByType( this, typeof( AdornerDecorator ) ) as AdornerDecorator;
+      if( ad != null )
+      {
+        al = ad.AdornerLayer;
+      }
+      else
+      {
+        // look for an inherited adorner layer
+        try
+        {
+          al = AdornerLayer.GetAdornerLayer( this );
+        }
+        catch( Exception )
+        {
+        }
+      }
+
+      // add the drag adorner to the adorner layer
+      if( al != null )
+      {
+        al.Add( _dragAdorner );
+      }
+
+      // TODO: Why is it necessary to walk the visual tree the first time through?
+      // If we don't do the following, the content is not laid out correctly (centered) initially.
+      VisualTreeHelperEx.FindDescendantWithPropertyValue( this, Button.IsPressedProperty, true );
+
+      // set a reference to the ViewFinder element, if present
+      this.SetValue( Zoombox.ViewFinderPropertyKey, this.Template.FindName( "ViewFinder", this ) as FrameworkElement );
+
+      // locate the view finder display panel
+      _viewFinderDisplay = VisualTreeHelperEx.FindDescendantByType( this, typeof( ZoomboxViewFinderDisplay ) ) as ZoomboxViewFinderDisplay;
+
+      // if a ViewFinder was specified but no display panel is present, throw an exception
+      if( this.ViewFinder != null && _viewFinderDisplay == null )
+        throw new InvalidTemplateException( ErrorMessages.GetMessage( "ZoomboxHasViewFinderButNotDisplay" ) );
+
+      // set up the VisualBrush and adorner for the display panel
+      if( _viewFinderDisplay != null )
+      {
+        // create VisualBrush for the view finder display panel
+        this.CreateVisualBrushForViewFinder( _content );
+
+        // hook up event handlers for dragging and resizing the viewport
+        _viewFinderDisplay.MouseMove += new MouseEventHandler( this.ViewFinderDisplayMouseMove );
+        _viewFinderDisplay.MouseLeftButtonDown += new MouseButtonEventHandler( this.ViewFinderDisplayBeginCapture );
+        _viewFinderDisplay.MouseLeftButtonUp += new MouseButtonEventHandler( this.ViewFinderDisplayEndCapture );
+
+        // bind the ViewportRect property of the display to the Viewport of the Zoombox
+        Binding binding = new Binding( "Viewport" );
+        binding.Mode = BindingMode.OneWay;
+        binding.Converter = new ViewFinderSelectionConverter( this );
+        binding.Source = this;
+        _viewFinderDisplay.SetBinding( ZoomboxViewFinderDisplay.ViewportRectProperty, binding );
+      }
+
+      // set up event handler to run once the content presenter has been arranged
+      _contentPresenter.LayoutUpdated += new EventHandler( this.ContentPresenterFirstArranged );
+    }
+
+    private void CreateVisualBrushForViewFinder( Visual visual )
+    {
+      _viewFinderDisplay.VisualBrush = new VisualBrush( visual );
+      _viewFinderDisplay.VisualBrush.Stretch = Stretch.Uniform;
+      _viewFinderDisplay.VisualBrush.AlignmentX = AlignmentX.Left;
+      _viewFinderDisplay.VisualBrush.AlignmentY = AlignmentY.Top;
+    }
+
+    private void ContentPresenterFirstArranged( object sender, EventArgs e )
+    {
+      // remove the handler
+      _contentPresenter.LayoutUpdated -= new EventHandler( this.ContentPresenterFirstArranged );
+
+      // it's now safe to update the view
+      this.HasArrangedContentPresenter = true;
+      this.InvalidateVisual();
+
+      // temporarily disable animations
+      bool oldAnimated = IsAnimated;
+      this.IsAnimated = false;
+      try
+      {
+        // set the initial view
+        double scale = this.Scale;
+        Point position = this.Position;
+
+        // if there are items in the ViewStack and a ViewStackIndex is set, use it
+        if( this.EffectiveViewStackMode != ZoomboxViewStackMode.Disabled )
+        {
+          bool isInitialViewSet = false;
+          if( this.ViewStack.Count > 0 )
+          {
+            if( this.ViewStackIndex >= 0 )
+            {
+              if( this.ViewStackIndex > this.ViewStack.Count - 1 )
+              {
+                this.ViewStackIndex = this.ViewStack.Count - 1;
+              }
+              else
+              {
+                this.UpdateView( this.ViewStack[ this.ViewStackIndex ], false, false, this.ViewStackIndex );
+              }
+            }
+            else if( this.EffectiveViewStackMode != ZoomboxViewStackMode.Auto )
+            {
+              // if this is not an auto-stack, then ensure the index is set to a valid value
+              if( this.ViewStackIndex < 0 )
+              {
+                this.ViewStackIndex = 0;
+              }
+            }
+
+            // if a ViewStackIndex has been set, apply the scale and position values, iff different than the default values
+            if( this.ViewStackIndex >= 0 )
+            {
+              isInitialViewSet = true;
+              if( !DoubleHelper.IsNaN( scale ) || !PointHelper.IsEmpty( position ) )
+              {
+                this.UpdateView( new ZoomboxView( scale, position ), false, false );
+              }
+            }
+          }
+
+          if( !isInitialViewSet )
+          {
+            // set initial view according to the scale and position values and push it on the stack, as necessary
+            ZoomboxView initialView = new ZoomboxView( DoubleHelper.IsNaN( Scale ) ? 1.0 : Scale,
+              PointHelper.IsEmpty( position ) ? new Point() : position );
+
+            if( this.EffectiveViewStackMode == ZoomboxViewStackMode.Auto )
+            {
+              this.ViewStack.PushView( initialView );
+              this.ViewStackIndex = 0;
+            }
+            else
+            {
+              this.UpdateView( initialView, false, false );
+            }
+          }
+        }
+        else
+        {
+          // just set initial view according to the scale and position values
+          ZoomboxView initialView = new ZoomboxView( DoubleHelper.IsNaN( Scale ) ? 1.0 : this.Scale, position );
+          this.UpdateView( initialView, false, false );
+        }
+      }
+      finally
+      {
+        IsAnimated = oldAnimated;
+      }
+    }
+
+    private void DetachFromVisualTree()
+    {
+      // remove the drag adorner
+      if( _dragAdorner != null )
+        AdornerLayer.GetAdornerLayer( this ).Remove( _dragAdorner );
+
+      // remove the layout updated handler, if present
+      if( _contentPresenter != null )
+      {
+        _contentPresenter.LayoutUpdated -= new EventHandler( this.ContentPresenterFirstArranged );
+      }
+
+      // remove the view finder display panel's visual brush and adorner
+      if( _viewFinderDisplay != null )
+      {
+        _viewFinderDisplay = null;
+      }
+
+      // set object references to null
+      _contentPresenter = null;
+    }
+
+    private void DragDisplayViewport( DragDeltaEventArgs e, bool end )
+    {
+      // get the scale of the view finder display panel, the selection rect, and the VisualBrush rect
+      double scale = _viewFinderDisplay.Scale;
+      Rect viewportRect = _viewFinderDisplay.ViewportRect;
+      Rect vbRect = _viewFinderDisplay.ContentBounds;
+
+      // if the entire content is visible, do nothing
+      if( viewportRect.Contains( vbRect ) )
+        return;
+
+      // ensure that we stay within the bounds of the VisualBrush
+      double dx = e.HorizontalChange;
+      double dy = e.VerticalChange;
+
+      // check left boundary
+      if( viewportRect.Left < vbRect.Left )
+      {
+        dx = Math.Max( 0, dx );
+      }
+      else if( viewportRect.Left + dx < vbRect.Left )
+      {
+        dx = vbRect.Left - viewportRect.Left;
+      }
+
+      // check right boundary
+      if( viewportRect.Right > vbRect.Right )
+      {
+        dx = Math.Min( 0, dx );
+      }
+      else if( viewportRect.Right + dx > vbRect.Left + vbRect.Width )
+      {
+        dx = vbRect.Left + vbRect.Width - viewportRect.Right;
+      }
+
+      // check top boundary
+      if( viewportRect.Top < vbRect.Top )
+      {
+        dy = Math.Max( 0, dy );
+      }
+      else if( viewportRect.Top + dy < vbRect.Top )
+      {
+        dy = vbRect.Top - viewportRect.Top;
+      }
+
+      // check bottom boundary
+      if( viewportRect.Bottom > vbRect.Bottom )
+      {
+        dy = Math.Min( 0, dy );
+      }
+      else if( viewportRect.Bottom + dy > vbRect.Top + vbRect.Height )
+      {
+        dy = vbRect.Top + vbRect.Height - viewportRect.Bottom;
+      }
+
+      // call the main OnDrag handler that is used when dragging the content directly
+      this.OnDrag( new DragDeltaEventArgs( -dx / scale / _viewboxFactor, -dy / scale / _viewboxFactor ), end );
+
+      // for a drag operation, update the origin with each delta
+      _originPoint = _originPoint + new Vector( dx, dy );
+    }
+
+    private void InitCommands()
+    {
+      CommandBinding binding = new CommandBinding( Zoombox.Back, this.GoBack, this.CanGoBack );
+      this.CommandBindings.Add( binding );
+
+      binding = new CommandBinding( Zoombox.Center, this.CenterContent );
+      this.CommandBindings.Add( binding );
+
+      binding = new CommandBinding( Zoombox.Fill, this.FillToBounds );
+      this.CommandBindings.Add( binding );
+
+      binding = new CommandBinding( Zoombox.Fit, this.FitToBounds );
+      this.CommandBindings.Add( binding );
+
+      binding = new CommandBinding( Zoombox.Forward, this.GoForward, this.CanGoForward );
+      this.CommandBindings.Add( binding );
+
+      binding = new CommandBinding( Zoombox.Home, this.GoHome, this.CanGoHome );
+      this.CommandBindings.Add( binding );
+
+      binding = new CommandBinding( Zoombox.PanDown, this.PanDownExecuted );
+      this.CommandBindings.Add( binding );
+
+      binding = new CommandBinding( Zoombox.PanLeft, this.PanLeftExecuted );
+      this.CommandBindings.Add( binding );
+
+      binding = new CommandBinding( Zoombox.PanRight, this.PanRightExecuted );
+      this.CommandBindings.Add( binding );
+
+      binding = new CommandBinding( Zoombox.PanUp, this.PanUpExecuted );
+      this.CommandBindings.Add( binding );
+
+      binding = new CommandBinding( Zoombox.Refocus, this.RefocusView, this.CanRefocusView );
+      this.CommandBindings.Add( binding );
+
+      binding = new CommandBinding( Zoombox.ZoomIn, this.ZoomInExecuted );
+      this.CommandBindings.Add( binding );
+
+      binding = new CommandBinding( Zoombox.ZoomOut, this.ZoomOutExecuted );
+      this.CommandBindings.Add( binding );
+    }
+
+    private void MonitorInput()
+    {
+      // cannot pre-process input in partial trust
+      if( this.HasUIPermission )
+      {
+        this.PreProcessInput();
+      }
+    }
+
+    private void OnContentSizeChanged( object sender, SizeChangedEventArgs e )
+    {
+      this.UpdateViewFinderDisplayContentBounds();
+
+      if( this.HasArrangedContentPresenter )
+      {
+        if( this.HasRenderedFirstView )
+        {
+          this.UpdateView( this.CurrentView, true, false, this.CurrentViewIndex );
+        }
+        else
+        {
+          // if the content size changes after the content presenter has been arranged,
+          // but before the first view is rendered, invalidate the render so we can refocus 
+          // the view on the first render
+          this.RefocusViewOnFirstRender = true;
+          this.InvalidateVisual();
+        }
+      }
+    }
+
+    private void OnDrag( DragDeltaEventArgs e, bool end )
+    {
+      Point relativePosition = _relativePosition;
+      double scale = this.Scale;
+      Point newPosition = relativePosition + ( this.ContentOffset * scale ) + new Vector( e.HorizontalChange * scale, e.VerticalChange * scale );
+
+      // update the transform
+      this.UpdateView( new ZoomboxView( scale, newPosition ), false, end );
+    }
+
+    private void OnLayoutUpdated( object sender, EventArgs e )
+    {
+      this.UpdateViewport();
+    }
+
+    private void OnSelectRegion( DragDeltaEventArgs e, bool end )
+    {
+      // draw adorner rect
+      if( end )
+      {
+        _dragAdorner.Rect = Rect.Empty;
+
+        if( _trueContent != null )
+        {
+          // get the selected region (in the content's coordinate space) based on the adorner's last position and size
+          Rect selection =
+            new Rect(
+              this.TranslatePoint( _dragAdorner.LastPosition, _trueContent ),
+              this.TranslatePoint( _dragAdorner.LastPosition + new Vector( _dragAdorner.LastSize.Width, _dragAdorner.LastSize.Height ), _trueContent ) );
+
+          // zoom to the selection
+          this.ZoomTo( selection );
+        }
+      }
+      else
+      {
+        _dragAdorner.Rect =
+          Rect.Intersect(
+            new Rect(
+              _originPoint,
+              new Vector( e.HorizontalChange, e.VerticalChange ) ),
+            new Rect(
+              new Point( 0, 0 ),
+              new Point( this.RenderSize.Width, this.RenderSize.Height ) ) );
+      }
+    }
+
+    private void OnSizeChanged( object sender, SizeChangedEventArgs e )
+    {
+      if( !this.HasArrangedContentPresenter )
+        return;
+
+      // when the size is changing, the viewbox factor must be updated before updating the view
+      this.UpdateViewboxFactor();
+
+      bool oldIsAnimated = this.IsAnimated;
+      this.IsAnimated = false;
+      try
+      {
+        this.UpdateView( this.CurrentView, false, false, this.ViewStackIndex );
+      }
+      finally
+      {
+        this.IsAnimated = oldIsAnimated;
+      }
+    }
+
+    private void PreProcessInput()
+    {
+      // if mouse is over the Zoombox element or if it has keyboard focus, pre-process input 
+      // to update the KeyModifier trigger properties (e.g., DragModifiersAreActive)
+      if( this.IsMouseOver || this.IsKeyboardFocusWithin )
+      {
+        if( !this.IsMonitoringInput )
+        {
+          this.IsMonitoringInput = true;
+          InputManager.Current.PreNotifyInput += new NotifyInputEventHandler( this.PreProcessInput );
+          this.UpdateKeyModifierTriggerProperties();
+        }
+      }
+      else
+      {
+        if( this.IsMonitoringInput )
+        {
+          this.IsMonitoringInput = false;
+          InputManager.Current.PreNotifyInput -= new NotifyInputEventHandler( this.PreProcessInput );
+
+          this.SetAreDragModifiersActive( false );
+          this.SetAreRelativeZoomModifiersActive( false );
+          this.SetAreZoomModifiersActive( false );
+          this.SetAreZoomToSelectionModifiersActive( false );
+        }
+      }
+    }
+
+    private void PreProcessInput( object sender, NotifyInputEventArgs e )
+    {
+      if( e.StagingItem.Input is KeyEventArgs )
+      {
+        this.UpdateKeyModifierTriggerProperties();
+      }
+    }
+
+    private void ProcessMouseLeftButtonDown( MouseButtonEventArgs e )
+    {
+      if( this.ZoomToSelectionModifiers.AreActive )
+      {
+        this.SetIsDraggingContent( false );
+        this.SetIsSelectingRegion( true );
+      }
+      else if( this.DragModifiers.AreActive )
+      {
+        this.SetIsSelectingRegion( false );
+        this.SetIsDraggingContent( true );
+      }
+      else
+      {
+        this.SetIsSelectingRegion( false );
+        this.SetIsDraggingContent( false );
+      }
+
+      // if nothing to do, just return
+      if( !this.IsSelectingRegion && !this.IsDraggingContent )
+        return;
+
+      // set the origin point and capture the mouse
+      _originPoint = e.GetPosition( this );
+      _contentPresenter.CaptureMouse();
+      e.Handled = true;
+      if( this.IsDraggingContent )
+      {
+        // execute the Drag operation
+        this.OnDrag( new DragDeltaEventArgs( 0, 0 ), false );
+      }
+      else if( this.IsSelectingRegion )
+      {
+        this.OnSelectRegion( new DragDeltaEventArgs( 0, 0 ), false );
+      }
+    }
+
+    private void ProcessMouseLeftButtonUp( MouseButtonEventArgs e )
+    {
+      if( !this.IsDraggingContent && !this.IsSelectingRegion )
+        return;
+
+      bool endDrag = this.IsDraggingContent;
+
+      this.SetIsDraggingContent( false );
+      this.SetIsSelectingRegion( false );
+
+      _originPoint = new Point();
+      _contentPresenter.ReleaseMouseCapture();
+      e.Handled = true;
+
+      if( endDrag )
+      {
+        this.OnDrag( new DragDeltaEventArgs( 0, 0 ), true );
+      }
+      else
+      {
+        this.OnSelectRegion( new DragDeltaEventArgs( 0, 0 ), true );
+      }
+    }
+
+    private void ProcessMouseMove( MouseEventArgs e )
+    {
+      if( e.MouseDevice.LeftButton != MouseButtonState.Pressed )
+        return;
+
+      if( !this.IsDraggingContent && !this.IsSelectingRegion )
+        return;
+
+      Point pos = e.GetPosition( this );
+      e.Handled = true;
+
+      if( this.IsDraggingContent )
+      {
+        Vector delta = ( pos - _originPoint ) / this.Scale;
+        this.OnDrag( new DragDeltaEventArgs( delta.X, delta.Y ), false );
+        _originPoint = pos;
+      }
+      else if( this.IsSelectingRegion )
+      {
+        Vector delta = pos - _originPoint;
+        this.OnSelectRegion( new DragDeltaEventArgs( delta.X, delta.Y ), false );
+      }
+    }
+
+    private void ProcessMouseWheelZoom( MouseWheelEventArgs e )
+    {
+      if( _content == null )
+        return;
+
+      // check modifiers to see if there's work to do
+      bool doZoom = this.ZoomModifiers.AreActive;
+      bool doRelativeZoom = this.RelativeZoomModifiers.AreActive;
+
+      // can't do both, so assume relative zoom
+      if( doZoom && doRelativeZoom )
+      {
+        doZoom = false;
+      }
+
+      if( !( doZoom || doRelativeZoom ) )
+        return;
+
+      e.Handled = true;
+      double percentage = ( ( e.Delta / Zoombox.MOUSE_WHEEL_DELTA ) * this.ZoomPercentage ) / 100;
+
+      // Are we doing a zoom relative to the current mouse position?
+      if( doRelativeZoom )
+      {
+        this.Zoom( percentage, Mouse.GetPosition( _content ) );
+      }
+      else
+      {
+        this.Zoom( percentage );
+      }
+    }
+
+    private void ProcessNavigationButton( RoutedEventArgs e )
+    {
+      if( e is MouseButtonEventArgs )
+      {
+        MouseButtonEventArgs mbea = e as MouseButtonEventArgs;
+        if( mbea.ChangedButton == MouseButton.XButton1
+            || mbea.ChangedButton == MouseButton.XButton2 )
+        {
+          if( mbea.ChangedButton == MouseButton.XButton2 )
+          {
+            this.GoForward();
+          }
+          else
+          {
+            this.GoBack();
+          }
+          mbea.Handled = true;
+        }
+      }
+      else if( e is KeyEventArgs )
+      {
+        KeyEventArgs kea = e as KeyEventArgs;
+        if( kea.Key == Key.Back || kea.Key == Key.BrowserBack || kea.Key == Key.BrowserForward )
+        {
+          if( kea.Key == Key.BrowserForward )
+          {
+            this.GoForward();
+          }
+          else
+          {
+            this.GoBack();
+          }
+          kea.Handled = true;
+        }
+      }
+    }
+
+    private void ResizeDisplayViewport( DragDeltaEventArgs e, ResizeEdge relativeTo )
+    {
+      // get the existing viewport rect and scale
+      Rect viewportRect = _viewFinderDisplay.ViewportRect;
+      double scale = _viewFinderDisplay.Scale;
+
+      // ensure that we stay within the bounds of the VisualBrush
+      double x = Math.Max( _resizeViewportBounds.Left, Math.Min( _resizeDraggingPoint.X + e.HorizontalChange, _resizeViewportBounds.Right ) );
+      double y = Math.Max( _resizeViewportBounds.Top, Math.Min( _resizeDraggingPoint.Y + e.VerticalChange, _resizeViewportBounds.Bottom ) );
+
+      // get the selected region in the coordinate space of the content
+      Point anchorPoint = new Point( _resizeAnchorPoint.X / scale, _resizeAnchorPoint.Y / scale );
+      Vector newRegionVector = new Vector( ( x - _resizeAnchorPoint.X ) / scale / _viewboxFactor, ( y - _resizeAnchorPoint.Y ) / scale / _viewboxFactor );
+      Rect region = new Rect( anchorPoint, newRegionVector );
+
+      // now translate the region from the coordinate space of the content 
+      // to the coordinate space of the content presenter
+      region =
+        new Rect(
+          _content.TranslatePoint( region.TopLeft, _contentPresenter ),
+          _content.TranslatePoint( region.BottomRight, _contentPresenter ) );
+
+      // calculate actual scale value
+      double aspectX = this.RenderSize.Width / region.Width;
+      double aspectY = this.RenderSize.Height / region.Height;
+      scale = aspectX < aspectY ? aspectX : aspectY;
+
+      // scale relative to the anchor point
+      this.ZoomTo( scale, anchorPoint, false, false );
+    }
+
+    private void UpdateKeyModifierTriggerProperties()
+    {
+      this.SetAreDragModifiersActive( this.DragModifiers.AreActive );
+      this.SetAreRelativeZoomModifiersActive( this.RelativeZoomModifiers.AreActive );
+      this.SetAreZoomModifiersActive( this.ZoomModifiers.AreActive );
+      this.SetAreZoomToSelectionModifiersActive( this.ZoomToSelectionModifiers.AreActive );
+    }
+
+    private void UpdateView( ZoomboxView view, bool allowAnimation, bool allowStackAddition )
+    {
+      this.UpdateView( view, allowAnimation, allowStackAddition, -1 );
+    }
+
+    private void UpdateView( ZoomboxView view, bool allowAnimation, bool allowStackAddition, int stackIndex )
+    {
+      if( _contentPresenter == null || _content == null || !this.HasArrangedContentPresenter )
+        return;
+
+      // if an absolute view is being used and only a Scale value has been specified,
+      // use the ZoomTo() function to perform a relative zoom
+      if( view.ViewKind == ZoomboxViewKind.Absolute && PointHelper.IsEmpty( view.Position ) )
+      {
+        this.ZoomTo( view.Scale, allowStackAddition );
+        return;
+      }
+
+      // disallow reentrancy
+      if( !this.IsUpdatingView )
+      {
+        this.IsUpdatingView = true;
+        try
+        {
+          // determine the new scale and position
+          double newRelativeScale = _viewboxFactor;
+          Point newRelativePosition = new Point();
+          Rect region = Rect.Empty;
+          switch( view.ViewKind )
+          {
+            case ZoomboxViewKind.Empty:
+              break;
+
+            case ZoomboxViewKind.Absolute:
+              newRelativeScale = DoubleHelper.IsNaN( view.Scale ) ? _relativeScale : view.Scale;
+              newRelativePosition = PointHelper.IsEmpty( view.Position ) ? _relativePosition
+                  : new Point( view.Position.X, view.Position.Y ) - this.ContentOffset * newRelativeScale;
+              break;
+
+            case ZoomboxViewKind.Region:
+              region = view.Region;
+              break;
+
+            case ZoomboxViewKind.Center:
+              {
+                // get the current ContentRect in the coordinate space of the Zoombox control
+                Rect currentContentRect =
+                  new Rect(
+                    _content.TranslatePoint( this.ContentRect.TopLeft, this ),
+                    _content.TranslatePoint( this.ContentRect.BottomRight, this ) );
+
+                // inflate (or deflate) the rect by the appropriate amounts in the x & y directions
+                region = Rect.Inflate( currentContentRect,
+                    ( this.RenderSize.Width / _viewboxFactor - currentContentRect.Width ) / 2,
+                    ( this.RenderSize.Height / _viewboxFactor - currentContentRect.Height ) / 2 );
+
+                // now translate the centered rect back to the coordinate space of the content
+                region = new Rect( this.TranslatePoint( region.TopLeft, _content ), this.TranslatePoint( region.BottomRight, _content ) );
+              }
+              break;
+
+            case ZoomboxViewKind.Fit:
+              region = this.ContentRect;
+              break;
+
+            case ZoomboxViewKind.Fill:
+              region = this.CalculateFillRect();
+              break;
+          }
+
+          if( view.ViewKind != ZoomboxViewKind.Empty )
+          {
+            if( !region.IsEmpty )
+            {   // ZOOMING TO A REGION
+              this.CalculatePositionAndScale( region, ref newRelativePosition, ref newRelativeScale );
+            }
+            else if( view != ZoomboxView.Empty )
+            {   // USING ABSOLUTE POSITION AND SCALE VALUES
+
+              // ensure that the scale value falls within the valid range
+              if( newRelativeScale > MaxScale )
+              {
+                newRelativeScale = MaxScale;
+              }
+              else if( newRelativeScale < MinScale )
+              {
+                newRelativeScale = MinScale;
+              }
+            }
+
+            double currentScale = _relativeScale;
+            double currentX = _relativePosition.X;
+            double currentY = _relativePosition.Y;
+
+            ScaleTransform st = null;
+            TranslateTransform tt = null;
+            TransformGroup tg = null;
+
+            if( _contentPresenter.RenderTransform != Transform.Identity )
+            {
+              tg = _contentPresenter.RenderTransform as TransformGroup;
+              st = tg.Children[ 0 ] as ScaleTransform;
+              tt = tg.Children[ 1 ] as TranslateTransform;
+              currentScale = st.ScaleX;
+              currentX = tt.X;
+              currentY = tt.Y;
+            }
+
+            if( KeepContentInBounds == true )
+            {
+              Rect boundsRect = new Rect( new Size( this.ContentRect.Width * newRelativeScale, this.ContentRect.Height * newRelativeScale ) );
+
+              // Calc viewport rect (should be inside bounds content rect)
+              Point viewportPosition = new Point( -newRelativePosition.X, -newRelativePosition.Y );
+              Rect viewportRect = new Rect( viewportPosition, _contentPresenter.RenderSize );
+
+              if( DoubleHelper.AreVirtuallyEqual( _relativeScale, newRelativeScale ) ) // we are positioning the content, not scaling
+              {
+                // Handle the width and height seperately since the content extent 
+                // could be contained only partially in the viewport.  Also if the viewport is only 
+                // partially contained within the content extent.
+
+                //
+                // Content extent width is greater than the viewport's width (Zoomed in).  Make sure we restrict
+                // the viewport X inside the content.
+                //
+                if( this.IsGreaterThanOrClose( boundsRect.Width, viewportRect.Width ) )
+                {
+                  if( boundsRect.Right < viewportRect.Right )
+                  {
+                    newRelativePosition.X = -( boundsRect.Width - viewportRect.Width );
+                  }
+
+                  if( boundsRect.Left > viewportRect.Left )
+                  {
+                    newRelativePosition.X = 0;
+                  }
+                }
+                //
+                // Viewport width is greater than the content extent's width (Zoomed out).  Make sure we restrict
+                // the content X inside the viewport.
+                //
+                else if( this.IsGreaterThanOrClose( viewportRect.Width, boundsRect.Width ) )
+                {
+                  if( viewportRect.Right < boundsRect.Right )
+                  {
+                    newRelativePosition.X = viewportRect.Width - boundsRect.Width;
+                  }
+
+                  if( viewportRect.Left > boundsRect.Left )
+                  {
+                    newRelativePosition.X = 0;
+                  }
+                }
+
+                //
+                // Content extent height is greater than the viewport's height (Zoomed in).  Make sure we restrict
+                // the viewport Y inside the content.
+                //
+                if( this.IsGreaterThanOrClose( boundsRect.Height, viewportRect.Height ) )
+                {
+                  if( boundsRect.Bottom < viewportRect.Bottom )
+                  {
+                    newRelativePosition.Y = -( boundsRect.Height - viewportRect.Height );
+                  }
+
+                  if( boundsRect.Top > viewportRect.Top )
+                  {
+                    newRelativePosition.Y = 0;
+                  }
+                }
+                //
+                // Viewport height is greater than the content extent's height (Zoomed out).  Make sure we restrict
+                // the content Y inside the viewport.
+                //
+                else if( this.IsGreaterThanOrClose( viewportRect.Height, boundsRect.Height ) )
+                {
+                  if( viewportRect.Bottom < boundsRect.Bottom )
+                  {
+                    newRelativePosition.Y = viewportRect.Height - boundsRect.Height;
+                  }
+
+                  if( viewportRect.Top > boundsRect.Top )
+                  {
+                    newRelativePosition.Y = 0;
+                  }
+                }
+              }
+            }
+
+            st = new ScaleTransform( newRelativeScale / _viewboxFactor, newRelativeScale / _viewboxFactor );
+            tt = new TranslateTransform( newRelativePosition.X, newRelativePosition.Y );
+            tg = new TransformGroup();
+            tg.Children.Add( st );
+            tg.Children.Add( tt );
+
+            _contentPresenter.RenderTransform = tg;
+
+            if( allowAnimation && IsAnimated )
+            {
+              DoubleAnimation daScale = new DoubleAnimation( currentScale, newRelativeScale / _viewboxFactor, AnimationDuration );
+              daScale.AccelerationRatio = this.AnimationAccelerationRatio;
+              daScale.DecelerationRatio = this.AnimationDecelerationRatio;
+
+              DoubleAnimation daTranslateX = new DoubleAnimation( currentX, newRelativePosition.X, AnimationDuration );
+              daTranslateX.AccelerationRatio = this.AnimationAccelerationRatio;
+              daTranslateX.DecelerationRatio = this.AnimationDecelerationRatio;
+
+              DoubleAnimation daTranslateY = new DoubleAnimation( currentY, newRelativePosition.Y, AnimationDuration );
+              daTranslateY.AccelerationRatio = this.AnimationAccelerationRatio;
+              daTranslateY.DecelerationRatio = this.AnimationDecelerationRatio;
+              daTranslateY.CurrentTimeInvalidated += new EventHandler( this.UpdateViewport );
+              daTranslateY.CurrentStateInvalidated += new EventHandler( this.ZoomAnimationCompleted );
+
+              // raise animation beginning event before beginning the animations
+              RaiseEvent( new RoutedEventArgs( AnimationBeginningEvent, this ) );
+
+              st.BeginAnimation( ScaleTransform.ScaleXProperty, daScale );
+              st.BeginAnimation( ScaleTransform.ScaleYProperty, daScale );
+              tt.BeginAnimation( TranslateTransform.XProperty, daTranslateX );
+              tt.BeginAnimation( TranslateTransform.YProperty, daTranslateY );
+            }
+
+            // maintain the relative scale and position for dragging and animating purposes
+            _relativePosition = newRelativePosition;
+            _relativeScale = newRelativeScale;
+
+            // update the Scale and Position properties to keep them in sync with the current view
+            this.Scale = newRelativeScale;
+            _basePosition = newRelativePosition + this.ContentOffset * newRelativeScale;
+            this.UpdateViewport();
+          }
+
+          // add the current view to the view stack
+          if( this.EffectiveViewStackMode == ZoomboxViewStackMode.Auto && allowStackAddition )
+          {
+            // if the last view was pushed on the stack within the last 300 milliseconds, discard it
+            // since proximally close views are probably the result of a mouse wheel scroll
+            if( this.ViewStack.Count > 1
+              && Math.Abs( DateTime.Now.Ticks - _lastStackAddition.Ticks ) < TimeSpan.FromMilliseconds( 300 ).Ticks )
+            {
+              this.ViewStack.RemoveAt( this.ViewStack.Count - 1 );
+              _lastStackAddition = DateTime.Now - TimeSpan.FromMilliseconds( 300 );
+            }
+
+            // if the current view is the same as the last view, do nothing
+            if( this.ViewStack.Count > 0 && view == this.ViewStack.SelectedView )
+            {
+              // do nothing
+            }
+            else
+            {
+              // otherwise, push the current view on stack
+              this.ViewStack.PushView( view );
+              this.ViewStackIndex++;
+              stackIndex = this.ViewStackIndex;
+
+              // update the timestamp for the last stack addition
+              _lastStackAddition = DateTime.Now;
+            }
+          }
+
+          // update the stack indices used by CurrentViewChanged event
+          _lastViewIndex = this.CurrentViewIndex;
+          this.SetCurrentViewIndex( stackIndex );
+
+          // set the new view parameters
+          // NOTE: this is the only place where the CurrentView member should be set
+          this.SetCurrentView( view );
+        }
+        finally
+        {
+          this.IsUpdatingView = false;
+        }
+      }
+    }
+
+    private bool IsGreaterThanOrClose( double value1, double value2 )
+    {
+      return value1 <= value2 ? DoubleHelper.AreVirtuallyEqual( value1, value2 ) : true;
+    }
+
+    private Rect CalculateFillRect()
+    {
+      // determine the x-y ratio of the current Viewport
+      double xyRatio = this.RenderSize.Width / this.RenderSize.Height;
+
+      // now find the maximal rect within the ContentRect that has the same ratio
+      double x = 0;
+      double y = 0;
+      double width = this.ContentRect.Width;
+      double height = this.ContentRect.Height;
+      if( xyRatio > width / height )
+      {
+        height = width / xyRatio;
+        y = ( this.ContentRect.Height - height ) / 2;
+      }
+      else
+      {
+        width = height * xyRatio;
+        x = ( this.ContentRect.Width - width ) / 2;
+      }
+
+      return new Rect( x, y, width, height );
+    }
+
+    private void CalculatePositionAndScale( Rect region, ref Point newRelativePosition, ref double newRelativeScale )
+    {
+      // if there is nothing to scale, just return
+      // if the region has no area, just return
+      if( region.Width == 0 || region.Height == 0 )
+        return;
+
+      // verify that the selected region intersects with the content, which prevents 
+      // the scale operation from zooming the content out of the current view
+      if( !this.ContentRect.IntersectsWith( region ) )
+        return;
+
+      // translate the region from the coordinate space of the content 
+      // to the coordinate space of the content presenter
+      region =
+        new Rect(
+          _content.TranslatePoint( region.TopLeft, _contentPresenter ),
+          _content.TranslatePoint( region.BottomRight, _contentPresenter ) );
+
+      // calculate actual zoom, which must fit the entire selection 
+      // while maintaining a 1:1 ratio
+      double aspectX = this.RenderSize.Width / region.Width;
+      double aspectY = this.RenderSize.Height / region.Height;
+      newRelativeScale = aspectX < aspectY ? aspectX : aspectY;
+
+      // ensure that the scale value falls within the valid range
+      if( newRelativeScale > this.MaxScale )
+      {
+        newRelativeScale = this.MaxScale;
+      }
+      else if( newRelativeScale < this.MinScale )
+      {
+        newRelativeScale = this.MinScale;
+      }
+
+      // determine the new content position for this zoom operation based 
+      // on HorizontalContentAlignment and VerticalContentAlignment
+      double horizontalOffset = 0;
+      double verticalOffset = 0;
+      switch( this.HorizontalContentAlignment )
+      {
+        case HorizontalAlignment.Center:
+        case HorizontalAlignment.Stretch:
+          horizontalOffset = ( this.RenderSize.Width - region.Width * newRelativeScale ) / 2;
+          break;
+
+        case HorizontalAlignment.Right:
+          horizontalOffset = ( this.RenderSize.Width - region.Width * newRelativeScale );
+          break;
+      }
+      switch( VerticalContentAlignment )
+      {
+        case VerticalAlignment.Center:
+        case VerticalAlignment.Stretch:
+          verticalOffset = ( this.RenderSize.Height - region.Height * newRelativeScale ) / 2;
+          break;
+
+        case VerticalAlignment.Bottom:
+          verticalOffset = ( this.RenderSize.Height - region.Height * newRelativeScale );
+          break;
+      }
+      newRelativePosition =
+        new Point( -region.TopLeft.X * newRelativeScale, -region.TopLeft.Y * newRelativeScale )
+          + new Vector( horizontalOffset, verticalOffset );
+    }
+
+    private void UpdateViewFinderDisplayContentBounds()
+    {
+      if( _content == null || _trueContent == null || _viewFinderDisplay == null )
+        return;
+
+      this.UpdateViewboxFactor();
+
+      // ensure the display panel has a size
+      Size contentSize = _content.RenderSize;
+      Size viewFinderSize = _viewFinderDisplay.AvailableSize;
+      if( viewFinderSize.Width > 0d && DoubleHelper.AreVirtuallyEqual( viewFinderSize.Height, 0d ) )
+      {
+        // update height to accomodate width, while keeping a ratio equal to the actual content
+        viewFinderSize = new Size( viewFinderSize.Width, contentSize.Height * viewFinderSize.Width / contentSize.Width );
+      }
+      else if( viewFinderSize.Height > 0d && DoubleHelper.AreVirtuallyEqual( viewFinderSize.Width, 0d ) )
+      {
+        // update width to accomodate height, while keeping a ratio equal to the actual content
+        viewFinderSize = new Size( contentSize.Width * viewFinderSize.Height / contentSize.Height, viewFinderSize.Width );
+      }
+
+      // determine the scale of the view finder display panel
+      double aspectX = viewFinderSize.Width / contentSize.Width;
+      double aspectY = viewFinderSize.Height / contentSize.Height;
+      double scale = aspectX < aspectY ? aspectX : aspectY;
+
+      // determine the rect of the VisualBrush
+      double vbWidth = contentSize.Width * scale;
+      double vbHeight = contentSize.Height * scale;
+
+      // set the ContentBounds and Scale properties on the view finder display panel
+      _viewFinderDisplay.Scale = scale;
+      _viewFinderDisplay.ContentBounds = new Rect( new Size( vbWidth, vbHeight ) );
+    }
+
+    private void UpdateViewboxFactor()
+    {
+      if( _content == null || _trueContent == null )
+        return;
+
+      double contentWidth = _content.RenderSize.Width;
+      double trueContentWidth = _trueContent.RenderSize.Width;
+
+      if( DoubleHelper.AreVirtuallyEqual( contentWidth, 0d ) || DoubleHelper.AreVirtuallyEqual( trueContentWidth, 0d ) )
+      {
+        _viewboxFactor = 1d;
+      }
+      else
+      {
+        _viewboxFactor = contentWidth / trueContentWidth;
+      }
+    }
+
+    private void UpdateViewport()
+    {
+      // if we haven't attached to the visual tree yet or we don't have content, just return
+      if( _contentPresenter == null || _trueContent == null )
+        return;
+
+      this.IsUpdatingViewport = true;
+      try
+      {
+        // calculate the current viewport
+        Rect viewport =
+          new Rect(
+            this.TranslatePoint( new Point( 0d, 0d ), _trueContent ),
+            this.TranslatePoint( new Point( RenderSize.Width, RenderSize.Height ), _trueContent ) );
+
+        // if the viewport has changed, set the Viewport dependency property
+        if( !DoubleHelper.AreVirtuallyEqual( viewport, this.Viewport ) )
+        {
+          this.SetValue( Zoombox.ViewportPropertyKey, viewport );
+        }
+      }
+      finally
+      {
+        this.IsUpdatingViewport = false;
+      }
+    }
+
+    private void UpdateViewport( object sender, EventArgs e )
+    {
+      this.UpdateViewport();
+    }
+
+    private void ViewFinderDisplayBeginCapture( object sender, MouseButtonEventArgs e )
+    {
+      const double ARBITRARY_LARGE_VALUE = 10000000000;
+
+      // if we need to acquire capture, the Tag property of the view finder display panel
+      // will be a ResizeEdge value.
+      if( _viewFinderDisplay.Tag is ResizeEdge )
+      {
+        // if the Tag is ResizeEdge.None, then its a drag operation; otherwise, its a resize
+        if( ( ResizeEdge )_viewFinderDisplay.Tag == ResizeEdge.None )
+        {
+          this.IsDraggingViewport = true;
+        }
+        else
+        {
+          this.IsResizingViewport = true;
+          Vector direction = new Vector();
+          switch( ( ResizeEdge )_viewFinderDisplay.Tag )
+          {
+            case ResizeEdge.TopLeft:
+              _resizeDraggingPoint = _viewFinderDisplay.ViewportRect.TopLeft;
+              _resizeAnchorPoint = _viewFinderDisplay.ViewportRect.BottomRight;
+              direction = new Vector( -1, -1 );
+              break;
+
+            case ResizeEdge.TopRight:
+              _resizeDraggingPoint = _viewFinderDisplay.ViewportRect.TopRight;
+              _resizeAnchorPoint = _viewFinderDisplay.ViewportRect.BottomLeft;
+              direction = new Vector( 1, -1 );
+              break;
+
+            case ResizeEdge.BottomLeft:
+              _resizeDraggingPoint = _viewFinderDisplay.ViewportRect.BottomLeft;
+              _resizeAnchorPoint = _viewFinderDisplay.ViewportRect.TopRight;
+              direction = new Vector( -1, 1 );
+              break;
+
+            case ResizeEdge.BottomRight:
+              _resizeDraggingPoint = _viewFinderDisplay.ViewportRect.BottomRight;
+              _resizeAnchorPoint = _viewFinderDisplay.ViewportRect.TopLeft;
+              direction = new Vector( 1, 1 );
+              break;
+            case ResizeEdge.Left:
+              _resizeDraggingPoint = new Point( _viewFinderDisplay.ViewportRect.Left,
+                  _viewFinderDisplay.ViewportRect.Top + ( _viewFinderDisplay.ViewportRect.Height / 2 ) );
+              _resizeAnchorPoint = new Point( _viewFinderDisplay.ViewportRect.Right,
+                  _viewFinderDisplay.ViewportRect.Top + ( _viewFinderDisplay.ViewportRect.Height / 2 ) );
+              direction = new Vector( -1, 0 );
+              break;
+            case ResizeEdge.Top:
+              _resizeDraggingPoint = new Point( _viewFinderDisplay.ViewportRect.Left + ( _viewFinderDisplay.ViewportRect.Width / 2 ),
+                  _viewFinderDisplay.ViewportRect.Top );
+              _resizeAnchorPoint = new Point( _viewFinderDisplay.ViewportRect.Left + ( _viewFinderDisplay.ViewportRect.Width / 2 ),
+                  _viewFinderDisplay.ViewportRect.Bottom );
+              direction = new Vector( 0, -1 );
+              break;
+            case ResizeEdge.Right:
+              _resizeDraggingPoint = new Point( _viewFinderDisplay.ViewportRect.Right,
+                  _viewFinderDisplay.ViewportRect.Top + ( _viewFinderDisplay.ViewportRect.Height / 2 ) );
+              _resizeAnchorPoint = new Point( _viewFinderDisplay.ViewportRect.Left,
+                  _viewFinderDisplay.ViewportRect.Top + ( _viewFinderDisplay.ViewportRect.Height / 2 ) );
+              direction = new Vector( 1, 0 );
+              break;
+            case ResizeEdge.Bottom:
+              _resizeDraggingPoint = new Point( _viewFinderDisplay.ViewportRect.Left + ( _viewFinderDisplay.ViewportRect.Width / 2 ),
+                  _viewFinderDisplay.ViewportRect.Bottom );
+              _resizeAnchorPoint = new Point( _viewFinderDisplay.ViewportRect.Left + ( _viewFinderDisplay.ViewportRect.Width / 2 ),
+                  _viewFinderDisplay.ViewportRect.Top );
+              direction = new Vector( 0, 1 );
+              break;
+          }
+          double scale = _viewFinderDisplay.Scale;
+          Rect contentRect = _viewFinderDisplay.ContentBounds;
+          Vector minVector = new Vector( direction.X * ARBITRARY_LARGE_VALUE, direction.Y * ARBITRARY_LARGE_VALUE );
+          Vector maxVector = new Vector( direction.X * contentRect.Width / MaxScale, direction.Y * contentRect.Height / MaxScale );
+          _resizeViewportBounds = new Rect( _resizeAnchorPoint + minVector, _resizeAnchorPoint + maxVector );
+        }
+
+        // store the origin of the operation and acquire capture
+        _originPoint = e.GetPosition( _viewFinderDisplay );
+        _viewFinderDisplay.CaptureMouse();
+        e.Handled = true;
+      }
+    }
+
+    private void ViewFinderDisplayEndCapture( object sender, MouseButtonEventArgs e )
+    {
+      // if a drag or resize is in progress, end it and release capture
+      if( this.IsDraggingViewport || this.IsResizingViewport )
+      {
+        // call the DragDisplayViewport method to end the operation
+        // and store the current position on the stack
+        this.DragDisplayViewport( new DragDeltaEventArgs( 0, 0 ), true );
+
+        // reset the dragging state variables and release capture
+        this.IsDraggingViewport = false;
+        this.IsResizingViewport = false;
+        _originPoint = new Point();
+        _viewFinderDisplay.ReleaseMouseCapture();
+        e.Handled = true;
+      }
+    }
+
+    private void ViewFinderDisplayMouseMove( object sender, MouseEventArgs e )
+    {
+      // if a drag operation is in progress, update the operation
+      if( e.MouseDevice.LeftButton == MouseButtonState.Pressed
+          && ( this.IsDraggingViewport || this.IsResizingViewport ) )
+      {
+        Point pos = e.GetPosition( _viewFinderDisplay );
+        Vector delta = pos - _originPoint;
+        if( this.IsDraggingViewport )
+        {
+          this.DragDisplayViewport( new DragDeltaEventArgs( delta.X, delta.Y ), false );
+        }
+        else
+        {
+          this.ResizeDisplayViewport( new DragDeltaEventArgs( delta.X, delta.Y ), ( ResizeEdge )_viewFinderDisplay.Tag );
+        }
+        e.Handled = true;
+      }
+      else
+      {
+        // update the cursor based on the nearest corner
+        Point mousePos = e.GetPosition( _viewFinderDisplay );
+        Rect viewportRect = _viewFinderDisplay.ViewportRect;
+        double cornerDelta = viewportRect.Width * viewportRect.Height > 100 ? 5.0
+            : Math.Sqrt( viewportRect.Width * viewportRect.Height ) / 2;
+
+        // if the mouse is within the Rect and the Rect does not encompass the entire content, set the appropriate cursor
+        if( viewportRect.Contains( mousePos )
+            && !DoubleHelper.AreVirtuallyEqual( Rect.Intersect( viewportRect, _viewFinderDisplay.ContentBounds ), _viewFinderDisplay.ContentBounds ) )
+        {
+          if( PointHelper.DistanceBetween( mousePos, viewportRect.TopLeft ) < cornerDelta )
+          {
+            _viewFinderDisplay.Tag = ResizeEdge.TopLeft;
+            _viewFinderDisplay.Cursor = Cursors.SizeNWSE;
+          }
+          else if( PointHelper.DistanceBetween( mousePos, viewportRect.BottomRight ) < cornerDelta )
+          {
+            _viewFinderDisplay.Tag = ResizeEdge.BottomRight;
+            _viewFinderDisplay.Cursor = Cursors.SizeNWSE;
+          }
+          else if( PointHelper.DistanceBetween( mousePos, viewportRect.TopRight ) < cornerDelta )
+          {
+            _viewFinderDisplay.Tag = ResizeEdge.TopRight;
+            _viewFinderDisplay.Cursor = Cursors.SizeNESW;
+          }
+          else if( PointHelper.DistanceBetween( mousePos, viewportRect.BottomLeft ) < cornerDelta )
+          {
+            _viewFinderDisplay.Tag = ResizeEdge.BottomLeft;
+            _viewFinderDisplay.Cursor = Cursors.SizeNESW;
+          }
+          else if( mousePos.X <= viewportRect.Left + cornerDelta )
+          {
+            _viewFinderDisplay.Tag = ResizeEdge.Left;
+            _viewFinderDisplay.Cursor = Cursors.SizeWE;
+          }
+          else if( mousePos.Y <= viewportRect.Top + cornerDelta )
+          {
+            _viewFinderDisplay.Tag = ResizeEdge.Top;
+            _viewFinderDisplay.Cursor = Cursors.SizeNS;
+          }
+          else if( mousePos.X >= viewportRect.Right - cornerDelta )
+          {
+            _viewFinderDisplay.Tag = ResizeEdge.Right;
+            _viewFinderDisplay.Cursor = Cursors.SizeWE;
+          }
+          else if( mousePos.Y >= viewportRect.Bottom - cornerDelta )
+          {
+            _viewFinderDisplay.Tag = ResizeEdge.Bottom;
+            _viewFinderDisplay.Cursor = Cursors.SizeNS;
+          }
+          else
+          {
+            _viewFinderDisplay.Tag = ResizeEdge.None;
+            _viewFinderDisplay.Cursor = Cursors.SizeAll;
+          }
+        }
+        else
+        {
+          _viewFinderDisplay.Tag = null;
+          _viewFinderDisplay.Cursor = Cursors.Arrow;
+        }
+      }
+    }
+
+    private void ZoomAnimationCompleted( object sender, EventArgs e )
+    {
+      if( ( sender as AnimationClock ).CurrentState != ClockState.Active )
+      {
+        // remove the event handlers
+        ( sender as AnimationClock ).CurrentStateInvalidated -= new EventHandler( this.ZoomAnimationCompleted );
+        ( sender as AnimationClock ).CurrentTimeInvalidated -= new EventHandler( this.UpdateViewport );
+
+        // raise animation completed event
+        this.RaiseEvent( new RoutedEventArgs( Zoombox.AnimationCompletedEvent, this ) );
+      }
+    }
+
+    private void ZoomTo( double scale, bool allowStackAddition )
+    {
+      // if there is nothing to scale, just return
+      if( _content == null )
+        return;
+
+      // adjust the current scale relative to the zoom origin
+      this.ZoomTo( scale, this.GetZoomRelativePoint(), true, allowStackAddition );
+    }
+
+    private void ZoomTo( double scale, Point relativeTo, bool restrictRelativePointToContent, bool allowStackAddition )
+    {
+      // if there is nothing to scale, just return
+      if( _content == null )
+        return;
+
+      // if necessary, verify that the relativeTo point falls within the content
+      if( restrictRelativePointToContent && !( new Rect( _content.RenderSize ) ).Contains( relativeTo ) )
+        return;
+
+      // ensure that the scale value falls within the valid range
+      if( scale > this.MaxScale )
+      {
+        scale = this.MaxScale;
+      }
+      else if( scale < this.MinScale )
+      {
+        scale = this.MinScale;
+      }
+
+      // internally, updates are always relative to the Zoombox control
+      Point translateFrom = relativeTo;
+      if( this.HasRenderedFirstView )
+      {
+        // Note that this TranslatePoint approach will not work until the first render occurs
+        relativeTo = _content.TranslatePoint( relativeTo, this );
+
+        // adjust translateFrom based on relativeTo
+        translateFrom = this.TranslatePoint( relativeTo, _contentPresenter );
+      }
+      else
+      {
+        // prior to the first render, just use the ContentPresenter's transform and do not adjust translateFrom
+        if( _contentPresenter.RenderTransform == Transform.Identity )
+        {
+          // in order for this approach to work, we must at least make one pass to update a generic view
+          // with Scale = 1.0 and Position = 0,0
+          this.UpdateView( new ZoomboxView( 1, new Point( 0, 0 ) ), false, false );
+        }
+
+        // now there should be a valid RenderTransform
+        relativeTo = ( _contentPresenter.RenderTransform as Transform ).Transform( relativeTo );
+      }
+
+      // determine the new content position for this zoom operation
+      Point translateTo = new Point( relativeTo.X - ( translateFrom.X * scale / _viewboxFactor ),
+          relativeTo.Y - ( translateFrom.Y * scale / _viewboxFactor ) )
+          + this.ContentOffset * scale / _viewboxFactor;
+      this.UpdateView( new ZoomboxView( scale, translateTo ), !this.IsResizingViewport, allowStackAddition );
+    }
+
+    private Point GetZoomRelativePoint()
+    {
+      Point zoomPoint;
+
+      if( ZoomOn == ZoomboxZoomOn.View )
+      {
+        // Transform the viewport point to the content
+        Point viewportZoomOrigin = new Point();
+
+        viewportZoomOrigin.X = this.Viewport.X + ( this.Viewport.Width * this.ZoomOrigin.X );
+        viewportZoomOrigin.Y = this.Viewport.Y + ( this.Viewport.Height * this.ZoomOrigin.Y );
+
+        Point contentZoomOrigin = _trueContent.TranslatePoint( viewportZoomOrigin, _content );
+
+        if( contentZoomOrigin.X < 0 )
+        {
+          contentZoomOrigin.X = 0;
+        }
+        else if( contentZoomOrigin.X > _content.RenderSize.Width )
+        {
+          contentZoomOrigin.X = _content.RenderSize.Width;
+        }
+
+        if( contentZoomOrigin.Y < 0 )
+        {
+          contentZoomOrigin.Y = 0;
+        }
+        else if( contentZoomOrigin.Y > _content.RenderSize.Height )
+        {
+          contentZoomOrigin.Y = _content.RenderSize.Height;
+        }
+
+        zoomPoint = contentZoomOrigin;
+      }
+      else
+      {
+        zoomPoint = new Point( _content.RenderSize.Width * ZoomOrigin.X, _content.RenderSize.Height * ZoomOrigin.Y );
+      }
+
+      return zoomPoint;
+    }
+
+    #region OnKeyDown Methods
+
+    protected override void OnPreviewKeyDown( KeyEventArgs e )
+    {
+      if( this.NavigateOnPreview && !e.Handled )
+      {
+        this.ProcessNavigationButton( e );
+      }
+
+      base.OnPreviewKeyDown( e );
+    }
+
+    protected override void OnKeyDown( KeyEventArgs e )
+    {
+      if( !this.NavigateOnPreview && !e.Handled )
+      {
+        this.ProcessNavigationButton( e );
+      }
+
+      base.OnKeyDown( e );
+    }
+
+    #endregion
+
+    #region OnMouseDown Methods
+
+    protected override void OnPreviewMouseDown( MouseButtonEventArgs e )
+    {
+      if( this.NavigateOnPreview && !e.Handled )
+      {
+        this.ProcessNavigationButton( e );
+      }
+
+      base.OnPreviewMouseDown( e );
+    }
+
+    protected override void OnMouseDown( MouseButtonEventArgs e )
+    {
+      if( !this.NavigateOnPreview && !e.Handled )
+      {
+        this.ProcessNavigationButton( e );
+      }
+
+      base.OnMouseDown( e );
+    }
+
+    #endregion
+
+    #region OnMouseEnter Methods
+
+    protected override void OnMouseEnter( MouseEventArgs e )
+    {
+      this.MonitorInput();
+
+      base.OnMouseEnter( e );
+    }
+
+    #endregion
+
+    #region OnMouseLeave Methods
+
+    protected override void OnMouseLeave( MouseEventArgs e )
+    {
+      this.MonitorInput();
+
+      base.OnMouseLeave( e );
+    }
+
+    #endregion
+
+    #region OnMouseLeftButton Methods
+
+    protected override void OnPreviewMouseLeftButtonDown( MouseButtonEventArgs e )
+    {
+      if( this.DragOnPreview && !e.Handled && _contentPresenter != null )
+      {
+        this.ProcessMouseLeftButtonDown( e );
+      }
+
+      base.OnPreviewMouseLeftButtonDown( e );
+    }
+
+    protected override void OnMouseLeftButtonDown( MouseButtonEventArgs e )
+    {
+      if( !this.DragOnPreview && !e.Handled && _contentPresenter != null )
+      {
+        this.ProcessMouseLeftButtonDown( e );
+      }
+
+      base.OnMouseLeftButtonDown( e );
+    }
+
+    protected override void OnPreviewMouseLeftButtonUp( MouseButtonEventArgs e )
+    {
+      if( this.DragOnPreview && !e.Handled && _contentPresenter != null )
+      {
+        this.ProcessMouseLeftButtonUp( e );
+      }
+
+      base.OnPreviewMouseLeftButtonUp( e );
+    }
+
+    protected override void OnMouseLeftButtonUp( MouseButtonEventArgs e )
+    {
+      if( !this.DragOnPreview && !e.Handled && _contentPresenter != null )
+      {
+        this.ProcessMouseLeftButtonUp( e );
+      }
+
+      base.OnMouseLeftButtonUp( e );
+    }
+
+    #endregion
+
+    #region OnMouseMove Methods
+
+    protected override void OnPreviewMouseMove( MouseEventArgs e )
+    {
+      if( this.DragOnPreview && !e.Handled && _contentPresenter != null )
+      {
+        this.ProcessMouseMove( e );
+      }
+
+      base.OnPreviewMouseMove( e );
+    }
+
+    protected override void OnMouseMove( MouseEventArgs e )
+    {
+      if( !this.DragOnPreview && !e.Handled && _contentPresenter != null )
+      {
+        this.ProcessMouseMove( e );
+      }
+
+      base.OnMouseMove( e );
+    }
+
+    #endregion
+
+    #region OnMouseWheel Methods
+
+    protected override void OnPreviewMouseWheel( MouseWheelEventArgs e )
+    {
+      if( this.ZoomOnPreview && !e.Handled && _contentPresenter != null )
+      {
+        this.ProcessMouseWheelZoom( e );
+      }
+
+      base.OnPreviewMouseWheel( e );
+    }
+
+    protected override void OnMouseWheel( MouseWheelEventArgs e )
+    {
+      if( !this.ZoomOnPreview && !e.Handled && _contentPresenter != null )
+      {
+        this.ProcessMouseWheelZoom( e );
+      }
+
+      base.OnMouseWheel( e );
+    }
+
+    #endregion
+
+    #region Private Fields
+
+    // the default value for a single mouse wheel delta appears to be 28
+    private static int MOUSE_WHEEL_DELTA = 28;
+
+    // the content control's one and only content presenter
+    private ContentPresenter _contentPresenter = null;
+
+    // the content of the Zoombox (cast as a UIElement)
+    private UIElement _content = null;
+
+    // the drag adorner used for selecting a region in a zoom-to-selection operation
+    private DragAdorner _dragAdorner = null;
+
+    // the view stack
+    private ZoomboxViewStack _viewStack = null;
+
+    // the view finder display panel
+    // this is used to show the current viewport
+    private ZoomboxViewFinderDisplay _viewFinderDisplay = null;
+
+    // state variables used during drag and select operations
+    private Rect _resizeViewportBounds = Rect.Empty;
+    private Point _resizeAnchorPoint = new Point( 0, 0 );
+    private Point _resizeDraggingPoint = new Point( 0, 0 );
+    private Point _originPoint = new Point( 0, 0 );
+
+    private double _viewboxFactor = 1.0;
+    private double _relativeScale = 1.0;
+    private Point _relativePosition = new Point();
+    private Point _basePosition = new Point();
+
+    // used to track the time delta between stack operations
+    private DateTime _lastStackAddition;
+
+    // used to provide stack index when view changes
+    private int _lastViewIndex = -1;
+
+    private BitVector32 _cacheBits = new BitVector32( 0 );
+
+    #endregion
+
+    #region ViewFinderSelectionConverter Nested Type
+
+    private sealed class ViewFinderSelectionConverter : IValueConverter
+    {
+      public ViewFinderSelectionConverter( Zoombox zoombox )
+      {
+        _zoombox = zoombox;
+      }
+
+      public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
+      {
+        Rect viewport = ( Rect )value;
+        if( viewport.IsEmpty )
+          return viewport;
+
+        // adjust the viewport from the coordinate space of the Content element
+        // to the coordinate space of the view finder display panel
+        double scale = _zoombox._viewFinderDisplay.Scale * _zoombox._viewboxFactor;
+        Rect result = new Rect( viewport.Left * scale, viewport.Top * scale,
+            viewport.Width * scale, viewport.Height * scale );
+        result.Offset( _zoombox._viewFinderDisplay.ContentBounds.Left,
+            _zoombox._viewFinderDisplay.ContentBounds.Top );
+        return result;
+      }
+
+      public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
+      {
+        return null;
+      }
+
+      private readonly Zoombox _zoombox;
+    }
+
+    #endregion
+
+    #region DragAdorner Nested Type
+
+    internal sealed class DragAdorner : Adorner
+    {
+      public DragAdorner( UIElement adornedElement )
+        : base( adornedElement )
+      {
+        this.ClipToBounds = true;
+      }
+
+      public static readonly DependencyProperty BrushProperty =
+        DependencyProperty.Register( "Brush", typeof( Brush ), typeof( DragAdorner ),
+          new FrameworkPropertyMetadata( Brushes.Transparent, FrameworkPropertyMetadataOptions.AffectsRender ) );
+
+      public Brush Brush
+      {
+        get
+        {
+          return ( Brush )this.GetValue( DragAdorner.BrushProperty );
+        }
+        set
+        {
+          this.SetValue( DragAdorner.BrushProperty, value );
+        }
+      }
+
+      public static readonly DependencyProperty PenProperty =
+        DependencyProperty.Register( "Pen", typeof( Pen ), typeof( DragAdorner ),
+          new FrameworkPropertyMetadata( new Pen( new SolidColorBrush( Color.FromArgb( 0x7F, 0x3F, 0x3F, 0x3F ) ), 2d ), FrameworkPropertyMetadataOptions.AffectsRender ) );
+
+      public Pen Pen
+      {
+        get
+        {
+          return ( Pen )this.GetValue( DragAdorner.PenProperty );
+        }
+        set
+        {
+          this.SetValue( DragAdorner.PenProperty, value );
+        }
+      }
+
+      public static readonly DependencyProperty RectProperty =
+        DependencyProperty.Register( "Rect", typeof( Rect ), typeof( DragAdorner ),
+          new FrameworkPropertyMetadata( Rect.Empty, FrameworkPropertyMetadataOptions.AffectsRender,
+            new PropertyChangedCallback( DragAdorner.OnRectChanged ) ) );
+
+      public Rect Rect
+      {
+        get
+        {
+          return ( Rect )this.GetValue( DragAdorner.RectProperty );
+        }
+        set
+        {
+          this.SetValue( DragAdorner.RectProperty, value );
+        }
+      }
+
+      private static void OnRectChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+      {
+        DragAdorner dragAdorner = ( DragAdorner )d;
+        Rect rect = ( Rect )e.NewValue;
+
+        // ignore empty values
+        if( rect.IsEmpty )
+          return;
+
+        // if the value is not empty, cache the position and size
+        dragAdorner._cachedPosition = ( ( Rect )e.NewValue ).TopLeft;
+        dragAdorner._cachedSize = ( ( Rect )e.NewValue ).Size;
+      }
+
+      public Point LastPosition
+      {
+        get
+        {
+          return _cachedPosition;
+        }
+      }
+
+      public Size LastSize
+      {
+        get
+        {
+          return _cachedSize;
+        }
+      }
+
+      protected override void OnRender( DrawingContext drawingContext )
+      {
+        drawingContext.DrawRectangle( Brush, Pen, Rect );
+      }
+
+      private Point _cachedPosition;
+      private Size _cachedSize;
+    }
+
+    #endregion
+
+    #region CacheBits Nested Type
+
+    private enum CacheBits
+    {
+      IsUpdatingView = 0x00000001,
+      IsUpdatingViewport = 0x00000002,
+      IsDraggingViewport = 0x00000004,
+      IsResizingViewport = 0x00000008,
+      IsMonitoringInput = 0x00000010,
+      IsContentWrapped = 0x00000020,
+      HasArrangedContentPresenter = 0x00000040,
+      HasRenderedFirstView = 0x00000080,
+      RefocusViewOnFirstRender = 0x00000100,
+      HasUIPermission = 0x00000200,
+    }
+
+    #endregion
+
+    #region ResizeEdge Nested Type
+
+    private enum ResizeEdge
+    {
+      None,
+      TopLeft,
+      TopRight,
+      BottomLeft,
+      BottomRight,
+      Left,
+      Top,
+      Right,
+      Bottom,
+    }
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxCursors.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxCursors.cs
new file mode 100644
index 00000000..960504dc
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxCursors.cs
@@ -0,0 +1,76 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System.Reflection;
+using System.Security;
+using System.Security.Permissions;
+using System.Windows.Input;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+
+namespace Xceed.Wpf.Toolkit.Zoombox
+{
+  public class ZoomboxCursors
+  {
+    #region Constructors
+
+    static ZoomboxCursors()
+    {
+      try
+      {
+        new EnvironmentPermission( PermissionState.Unrestricted ).Demand();
+        _zoom = new Cursor( ResourceHelper.LoadResourceStream( Assembly.GetExecutingAssembly(), "Zoombox/Resources/Zoom.cur" ) );
+        _zoomRelative = new Cursor( ResourceHelper.LoadResourceStream( Assembly.GetExecutingAssembly(), "Zoombox/Resources/ZoomRelative.cur" ) );
+      }
+      catch( SecurityException )
+      {
+        // partial trust, so just use default cursors
+      }
+    }
+
+    #endregion
+
+    #region Zoom Static Property
+
+    public static Cursor Zoom
+    {
+      get
+      {
+        return _zoom;
+      }
+    }
+
+    private static readonly Cursor _zoom = Cursors.Arrow;
+
+    #endregion
+
+    #region ZoomRelative Static Property
+
+    public static Cursor ZoomRelative
+    {
+      get
+      {
+        return _zoomRelative;
+      }
+    }
+
+    private static readonly Cursor _zoomRelative = Cursors.Arrow;
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxView.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxView.cs
new file mode 100644
index 00000000..f1776222
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxView.cs
@@ -0,0 +1,317 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.ComponentModel;
+using System.Windows;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+using Xceed.Wpf.Toolkit.Core;
+
+namespace Xceed.Wpf.Toolkit.Zoombox
+{
+  [TypeConverter( typeof( ZoomboxViewConverter ) )]
+  public class ZoomboxView
+  {
+    #region Constructors
+
+    public ZoomboxView()
+    {
+    }
+
+    public ZoomboxView( double scale )
+    {
+      this.Scale = scale;
+    }
+
+    public ZoomboxView( Point position )
+    {
+      this.Position = position;
+    }
+
+    public ZoomboxView( double scale, Point position )
+    {
+      this.Position = position;
+      this.Scale = scale;
+    }
+
+    public ZoomboxView( Rect region )
+    {
+      this.Region = region;
+    }
+
+    public ZoomboxView( double x, double y )
+      : this( new Point( x, y ) )
+    {
+    }
+
+    public ZoomboxView( double scale, double x, double y )
+      : this( scale, new Point( x, y ) )
+    {
+    }
+
+    public ZoomboxView( double x, double y, double width, double height )
+      : this( new Rect( x, y, width, height ) )
+    {
+    }
+
+    #endregion
+
+    #region Empty Static Property
+
+    public static ZoomboxView Empty
+    {
+      get
+      {
+        return _empty;
+      }
+    }
+
+    private static readonly ZoomboxView _empty = new ZoomboxView( ZoomboxViewKind.Empty );
+
+    #endregion
+
+    #region Fill Static Property
+
+    public static ZoomboxView Fill
+    {
+      get
+      {
+        return _fill;
+      }
+    }
+
+    private static readonly ZoomboxView _fill = new ZoomboxView( ZoomboxViewKind.Fill );
+
+    #endregion
+
+    #region Fit Static Property
+
+    public static ZoomboxView Fit
+    {
+      get
+      {
+        return _fit;
+      }
+    }
+
+    private static readonly ZoomboxView _fit = new ZoomboxView( ZoomboxViewKind.Fit );
+
+    #endregion
+
+    #region Center Static Property
+
+    public static ZoomboxView Center
+    {
+      get
+      {
+        return _center;
+      }
+    }
+
+    private static readonly ZoomboxView _center = new ZoomboxView( ZoomboxViewKind.Center );
+
+    #endregion
+
+    #region ViewKind Property
+
+    public ZoomboxViewKind ViewKind
+    {
+      get
+      {
+        if( _kindHeight > 0 )
+        {
+          return ZoomboxViewKind.Region;
+        }
+        else
+        {
+          return ( ZoomboxViewKind )( int )_kindHeight;
+        }
+      }
+    }
+
+    private double _kindHeight = ( int )ZoomboxViewKind.Empty;
+
+    #endregion
+
+    #region Position Property
+
+    public Point Position
+    {
+      get
+      {
+        if( this.ViewKind != ZoomboxViewKind.Absolute )
+          throw new InvalidOperationException( ErrorMessages.GetMessage( "PositionOnlyAccessibleOnAbsolute" ) );
+
+        return new Point( _x, _y );
+      }
+      set
+      {
+        if( this.ViewKind != ZoomboxViewKind.Absolute && this.ViewKind != ZoomboxViewKind.Empty )
+          throw new InvalidOperationException( String.Format( ErrorMessages.GetMessage( "ZoomboxViewAlreadyInitialized" ), this.ViewKind.ToString() ) );
+
+        _x = value.X;
+        _y = value.Y;
+        _kindHeight = ( int )ZoomboxViewKind.Absolute;
+      }
+    }
+
+    private double _x = double.NaN;
+    private double _y = double.NaN;
+
+    #endregion
+
+    #region Scale Property
+
+    public double Scale
+    {
+      get
+      {
+        if( this.ViewKind != ZoomboxViewKind.Absolute )
+          throw new InvalidOperationException( ErrorMessages.GetMessage( "ScaleOnlyAccessibleOnAbsolute" ) );
+
+        return _scaleWidth;
+      }
+      set
+      {
+        if( this.ViewKind != ZoomboxViewKind.Absolute && this.ViewKind != ZoomboxViewKind.Empty )
+          throw new InvalidOperationException( String.Format( ErrorMessages.GetMessage( "ZoomboxViewAlreadyInitialized" ), this.ViewKind.ToString() ) );
+
+        _scaleWidth = value;
+        _kindHeight = ( int )ZoomboxViewKind.Absolute;
+      }
+    }
+
+    private double _scaleWidth = double.NaN;
+
+    #endregion
+
+    #region Region Property
+
+    public Rect Region
+    {
+      get
+      {
+        // a region view has a positive _typeHeight value
+        if( _kindHeight < 0 )
+          throw new InvalidOperationException( ErrorMessages.GetMessage( "RegionOnlyAccessibleOnRegionalView" ) );
+
+        return new Rect( _x, _y, _scaleWidth, _kindHeight );
+      }
+      set
+      {
+        if( this.ViewKind != ZoomboxViewKind.Region && this.ViewKind != ZoomboxViewKind.Empty )
+          throw new InvalidOperationException( String.Format( ErrorMessages.GetMessage( "ZoomboxViewAlreadyInitialized" ), this.ViewKind.ToString() ) );
+
+        if( !value.IsEmpty )
+        {
+          _x = value.X;
+          _y = value.Y;
+          _scaleWidth = value.Width;
+          _kindHeight = value.Height;
+        }
+      }
+    }
+
+    #endregion
+
+    public override int GetHashCode()
+    {
+      return _x.GetHashCode() ^ _y.GetHashCode() ^ _scaleWidth.GetHashCode() ^ _kindHeight.GetHashCode();
+    }
+
+    public override bool Equals( object o )
+    {
+      bool result = false;
+      if( o is ZoomboxView )
+      {
+        ZoomboxView other = ( ZoomboxView )o;
+        if( this.ViewKind == other.ViewKind )
+        {
+          switch( this.ViewKind )
+          {
+            case ZoomboxViewKind.Absolute:
+              result = ( DoubleHelper.AreVirtuallyEqual( _scaleWidth, other._scaleWidth ) )
+                    && ( DoubleHelper.AreVirtuallyEqual( Position, other.Position ) );
+              break;
+
+            case ZoomboxViewKind.Region:
+              result = DoubleHelper.AreVirtuallyEqual( Region, other.Region );
+              break;
+
+            default:
+              result = true;
+              break;
+          }
+        }
+      }
+      return result;
+    }
+
+    public override string ToString()
+    {
+      switch( ViewKind )
+      {
+        case ZoomboxViewKind.Empty:
+          return "ZoomboxView: Empty";
+
+        case ZoomboxViewKind.Center:
+          return "ZoomboxView: Center";
+
+        case ZoomboxViewKind.Fill:
+          return "ZoomboxView: Fill";
+
+        case ZoomboxViewKind.Fit:
+          return "ZoomboxView: Fit";
+
+        case ZoomboxViewKind.Absolute:
+          return string.Format( "ZoomboxView: Scale = {0}; Position = ({1}, {2})", _scaleWidth.ToString( "f" ), _x.ToString( "f" ), _y.ToString( "f" ) );
+
+        case ZoomboxViewKind.Region:
+          return string.Format( "ZoomboxView: Region = ({0}, {1}, {2}, {3})", _x.ToString( "f" ), _y.ToString( "f" ), _scaleWidth.ToString( "f" ), _kindHeight.ToString( "f" ) );
+      }
+
+      return base.ToString();
+    }
+
+    private ZoomboxView( ZoomboxViewKind viewType )
+    {
+      _kindHeight = ( int )viewType;
+    }
+
+    #region Operators Methods
+
+    public static bool operator ==( ZoomboxView v1, ZoomboxView v2 )
+    {
+      if( ( object )v1 == null )
+        return ( object )v2 == null;
+
+      if( ( object )v2 == null )
+        return ( object )v1 == null;
+
+      return v1.Equals( v2 );
+    }
+
+    public static bool operator !=( ZoomboxView v1, ZoomboxView v2 )
+    {
+      return !( v1 == v2 );
+    }
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewChangedEventArgs.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewChangedEventArgs.cs
new file mode 100644
index 00000000..bc7b6d2c
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewChangedEventArgs.cs
@@ -0,0 +1,99 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using Xceed.Wpf.Toolkit.Core;
+
+namespace Xceed.Wpf.Toolkit.Zoombox
+{
+  public class ZoomboxViewChangedEventArgs : PropertyChangedEventArgs<ZoomboxView>
+  {
+    #region Constructors
+
+    public ZoomboxViewChangedEventArgs(
+      ZoomboxView oldView,
+      ZoomboxView newView,
+      int oldViewStackIndex,
+      int newViewStackIndex )
+      : base( Zoombox.CurrentViewChangedEvent, oldView, newView )
+    {
+      _newViewStackIndex = newViewStackIndex;
+      _oldViewStackIndex = oldViewStackIndex;
+    }
+
+    #endregion
+
+    #region NewViewStackIndex Property
+
+    public int NewViewStackIndex
+    {
+      get
+      {
+        return _newViewStackIndex;
+      }
+    }
+
+    private readonly int _newViewStackIndex = -1;
+
+    #endregion
+
+    #region NewViewStackIndex Property
+
+    public int OldViewStackIndex
+    {
+      get
+      {
+        return _oldViewStackIndex;
+      }
+    }
+
+    private readonly int _oldViewStackIndex = -1;
+
+    #endregion
+
+    #region NewViewStackIndex Property
+
+    public bool IsNewViewFromStack
+    {
+      get
+      {
+        return _newViewStackIndex >= 0;
+      }
+    }
+
+    #endregion
+
+    #region NewViewStackIndex Property
+
+    public bool IsOldViewFromStack
+    {
+      get
+      {
+        return _oldViewStackIndex >= 0;
+      }
+    }
+
+    #endregion
+
+    protected override void InvokeEventHandler( Delegate genericHandler, object genericTarget )
+    {
+      ( ( ZoomboxViewChangedEventHandler )genericHandler )( genericTarget, this );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewChangedEventHandler.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewChangedEventHandler.cs
new file mode 100644
index 00000000..8662caf5
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewChangedEventHandler.cs
@@ -0,0 +1,23 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit.Zoombox
+{
+  public delegate void ZoomboxViewChangedEventHandler( object sender, ZoomboxViewChangedEventArgs e );
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewConverter.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewConverter.cs
new file mode 100644
index 00000000..6e77d7b1
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewConverter.cs
@@ -0,0 +1,210 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Globalization;
+using System.Windows;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+
+namespace Xceed.Wpf.Toolkit.Zoombox
+{
+  public sealed class ZoomboxViewConverter : TypeConverter
+  {
+    #region Converter Static Property
+
+    internal static ZoomboxViewConverter Converter
+    {
+      get
+      {
+        if( _converter == null )
+        {
+          _converter = new ZoomboxViewConverter();
+        }
+        return _converter;
+      }
+    }
+
+    private static ZoomboxViewConverter _converter; //null
+
+    #endregion
+
+    public override bool CanConvertFrom( ITypeDescriptorContext typeDescriptorContext, Type type )
+    {
+      return ( type == typeof( string ) )
+          || ( type == typeof( double ) )
+          || ( type == typeof( Point ) )
+          || ( type == typeof( Rect ) )
+          || ( base.CanConvertFrom( typeDescriptorContext, type ) );
+    }
+
+    public override bool CanConvertTo( ITypeDescriptorContext typeDescriptorContext, Type type )
+    {
+      return ( type == typeof( string ) )
+          || ( base.CanConvertTo( typeDescriptorContext, type ) );
+    }
+
+    public override object ConvertFrom( 
+      ITypeDescriptorContext typeDescriptorContext,
+      CultureInfo cultureInfo, 
+      object value )
+    {
+      ZoomboxView result = null;
+      if( value is double )
+      {
+        result = new ZoomboxView( ( double )value );
+      }
+      else if( value is Point )
+      {
+        result = new ZoomboxView( ( Point )value );
+      }
+      else if( value is Rect )
+      {
+        result = new ZoomboxView( ( Rect )value );
+      }
+      else if( value is string )
+      {
+        if( string.IsNullOrEmpty( ( value as string ).Trim() ) )
+        {
+          result = ZoomboxView.Empty;
+        }
+        else
+        {
+          switch( ( value as string ).Trim().ToLower() )
+          {
+            case "center":
+              result = ZoomboxView.Center;
+              break;
+
+            case "empty":
+              result = ZoomboxView.Empty;
+              break;
+
+            case "fill":
+              result = ZoomboxView.Fill;
+              break;
+
+            case "fit":
+              result = ZoomboxView.Fit;
+              break;
+
+            default:
+              // parse double values; respect the following separators: ' ', ';', or ','
+              List<double> values = new List<double>();
+              foreach( string token in ( value as string ).Split( new char[] { ' ', ';', ',' }, StringSplitOptions.RemoveEmptyEntries ) )
+              {
+                double d;
+                if( double.TryParse( token, out d ) )
+                {
+                  values.Add( d );
+                }
+                if( values.Count >= 4 )
+                {
+                  // disregard additional values
+                  break;
+                }
+              }
+
+              switch( values.Count )
+              {
+                case 1: // scale
+                  result = new ZoomboxView( values[ 0 ] );
+                  break;
+
+                case 2: // x, y
+                  result = new ZoomboxView( values[ 0 ], values[ 1 ] );
+                  break;
+
+                case 3: // scale, x, y
+                  result = new ZoomboxView( values[ 0 ], values[ 1 ], values[ 2 ] );
+                  break;
+
+                case 4: // x, y, width, height
+                  result = new ZoomboxView( values[ 0 ], values[ 1 ], values[ 2 ], values[ 3 ] );
+                  break;
+              }
+              break;
+          }
+        }
+      }
+      return ( result == null ? base.ConvertFrom( typeDescriptorContext, cultureInfo, value ) : result );
+    }
+
+    public override object ConvertTo( 
+      ITypeDescriptorContext typeDescriptorContext,
+      CultureInfo cultureInfo, 
+      object value, 
+      Type destinationType )
+    {
+      object result = null;
+      ZoomboxView view = value as ZoomboxView;
+
+      if( view != null )
+      {
+        if( destinationType == typeof( string ) )
+        {
+          result = "Empty";
+          switch( view.ViewKind )
+          {
+            case ZoomboxViewKind.Absolute:
+              if( PointHelper.IsEmpty( view.Position ) )
+              {
+                if( !DoubleHelper.IsNaN( view.Scale ) )
+                {
+                  result = view.Scale.ToString();
+                }
+              }
+              else if( DoubleHelper.IsNaN( view.Scale ) )
+              {
+                result = view.Position.X.ToString() + "," + view.Position.Y.ToString();
+              }
+              else
+              {
+                result = view.Scale.ToString() + ","
+                    + view.Position.X.ToString() + ","
+                    + view.Position.Y.ToString();
+              }
+              break;
+
+            case ZoomboxViewKind.Center:
+              result = "Center";
+              break;
+
+            case ZoomboxViewKind.Fill:
+              result = "Fill";
+              break;
+
+            case ZoomboxViewKind.Fit:
+              result = "Fit";
+              break;
+
+            case ZoomboxViewKind.Region:
+              result = view.Region.X.ToString() + ","
+                  + view.Region.Y.ToString() + ","
+                  + view.Region.Width.ToString() + ","
+                  + view.Region.Height.ToString();
+              break;
+          }
+        }
+      }
+      return ( result == null ? base.ConvertTo( typeDescriptorContext, cultureInfo, value, destinationType ) : result );
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewException.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewException.cs
new file mode 100644
index 00000000..142be476
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewException.cs
@@ -0,0 +1,35 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+
+namespace Xceed.Wpf.Toolkit.Zoombox
+{
+  public class ZoomboxViewException : Exception
+  {
+    #region Constructors
+
+    public ZoomboxViewException( string message ) 
+      : base( message )
+    {
+    }
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewFinderDisplay.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewFinderDisplay.cs
new file mode 100644
index 00000000..f9f5baef
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewFinderDisplay.cs
@@ -0,0 +1,287 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Media;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+
+namespace Xceed.Wpf.Toolkit.Zoombox
+{
+  public class ZoomboxViewFinderDisplay : FrameworkElement
+  {
+    #region Constructors
+
+    static ZoomboxViewFinderDisplay()
+    {
+      ZoomboxViewFinderDisplay.DefaultStyleKeyProperty.OverrideMetadata( typeof( ZoomboxViewFinderDisplay ), new FrameworkPropertyMetadata( typeof( ZoomboxViewFinderDisplay ) ) );
+    }
+
+    public ZoomboxViewFinderDisplay()
+    {
+    }
+
+    #endregion
+
+    #region Background Property
+
+    public static readonly DependencyProperty BackgroundProperty =
+      DependencyProperty.Register( "Background", typeof( Brush ), typeof( ZoomboxViewFinderDisplay ),
+        new FrameworkPropertyMetadata( new SolidColorBrush( Color.FromArgb( 0xC0, 0xFF, 0xFF, 0xFF ) ), FrameworkPropertyMetadataOptions.AffectsRender ) );
+
+    public Brush Background
+    {
+      get
+      {
+        return ( Brush )this.GetValue( ZoomboxViewFinderDisplay.BackgroundProperty );
+      }
+      set
+      {
+        this.SetValue( ZoomboxViewFinderDisplay.BackgroundProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region ContentBounds Property
+
+    private static readonly DependencyPropertyKey ContentBoundsPropertyKey =
+      DependencyProperty.RegisterReadOnly( "ContentBounds", typeof( Rect ), typeof( ZoomboxViewFinderDisplay ),
+        new FrameworkPropertyMetadata( ( Rect )Rect.Empty, FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender ) );
+
+    public static readonly DependencyProperty ContentBoundsProperty = ZoomboxViewFinderDisplay.ContentBoundsPropertyKey.DependencyProperty;
+
+    internal Rect ContentBounds
+    {
+      get
+      {
+        return ( Rect )this.GetValue( ZoomboxViewFinderDisplay.ContentBoundsProperty );
+      }
+      set
+      {
+        this.SetValue( ZoomboxViewFinderDisplay.ContentBoundsPropertyKey, value );
+      }
+    }
+
+    #endregion
+
+    #region ShadowBrush Property
+
+    public static readonly DependencyProperty ShadowBrushProperty =
+      DependencyProperty.Register( "ShadowBrush", typeof( Brush ), typeof( ZoomboxViewFinderDisplay ),
+        new FrameworkPropertyMetadata( new SolidColorBrush( Color.FromArgb( 0x80, 0xFF, 0xFF, 0xFF ) ), FrameworkPropertyMetadataOptions.AffectsRender ) );
+
+    public Brush ShadowBrush
+    {
+      get
+      {
+        return ( Brush )this.GetValue( ZoomboxViewFinderDisplay.ShadowBrushProperty );
+      }
+      set
+      {
+        this.SetValue( ZoomboxViewFinderDisplay.ShadowBrushProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region ViewportBrush Property
+
+    public static readonly DependencyProperty ViewportBrushProperty =
+      DependencyProperty.Register( "ViewportBrush", typeof( Brush ), typeof( ZoomboxViewFinderDisplay ),
+        new FrameworkPropertyMetadata( Brushes.Transparent, FrameworkPropertyMetadataOptions.AffectsRender ) );
+
+    public Brush ViewportBrush
+    {
+      get
+      {
+        return ( Brush )this.GetValue( ZoomboxViewFinderDisplay.ViewportBrushProperty );
+      }
+      set
+      {
+        this.SetValue( ZoomboxViewFinderDisplay.ViewportBrushProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region ViewportPen Property
+
+    public static readonly DependencyProperty ViewportPenProperty =
+      DependencyProperty.Register( "ViewportPen", typeof( Pen ), typeof( ZoomboxViewFinderDisplay ),
+        new FrameworkPropertyMetadata( new Pen( new SolidColorBrush( Color.FromArgb( 0x80, 0x00, 0x00, 0x00 ) ), 1d ), FrameworkPropertyMetadataOptions.AffectsRender ) );
+
+    public Pen ViewportPen
+    {
+      get
+      {
+        return ( Pen )this.GetValue( ZoomboxViewFinderDisplay.ViewportPenProperty );
+      }
+      set
+      {
+        this.SetValue( ZoomboxViewFinderDisplay.ViewportPenProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region ViewportRect Property
+
+    public static readonly DependencyProperty ViewportRectProperty =
+      DependencyProperty.Register( "ViewportRect", typeof( Rect ), typeof( ZoomboxViewFinderDisplay ),
+        new FrameworkPropertyMetadata( Rect.Empty, FrameworkPropertyMetadataOptions.AffectsRender ) );
+
+    public Rect ViewportRect
+    {
+      get
+      {
+        return ( Rect )this.GetValue( ZoomboxViewFinderDisplay.ViewportRectProperty );
+      }
+      set
+      {
+        this.SetValue( ZoomboxViewFinderDisplay.ViewportRectProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region VisualBrush Property
+
+    private static readonly DependencyPropertyKey VisualBrushPropertyKey =
+      DependencyProperty.RegisterReadOnly( "VisualBrush", typeof( VisualBrush ), typeof( ZoomboxViewFinderDisplay ),
+        new FrameworkPropertyMetadata( ( VisualBrush )null ) );
+
+    public static readonly DependencyProperty VisualBrushProperty = ZoomboxViewFinderDisplay.VisualBrushPropertyKey.DependencyProperty;
+
+    internal VisualBrush VisualBrush
+    {
+      get
+      {
+        return ( VisualBrush )this.GetValue( ZoomboxViewFinderDisplay.VisualBrushProperty );
+      }
+      set
+      {
+        this.SetValue( ZoomboxViewFinderDisplay.VisualBrushPropertyKey, value );
+      }
+    }
+
+    #endregion
+
+    #region AvailableSize Internal Property
+
+    internal Size AvailableSize
+    {
+      get
+      {
+        return _availableSize;
+      }
+    }
+
+    private Size _availableSize = Size.Empty;
+
+    #endregion
+
+    #region Scale Internal Property
+
+    internal double Scale
+    {
+      get
+      {
+        return _scale;
+      }
+      set
+      {
+        _scale = value;
+      }
+    }
+
+    private double _scale = 1d;
+
+    #endregion
+
+    protected override Size ArrangeOverride( Size finalSize )
+    {
+      // Note that we do not call the Arrange method on any children
+      // because a ViewFinderDisplay has no children
+
+      // the control's RenderSize should always match its DesiredSize
+      return this.DesiredSize;
+    }
+
+    protected override Size MeasureOverride( Size availableSize )
+    {
+      // Note that we do not call the Measure method on any children
+      // because a ViewFinderDisplay has no children.  It is merely used 
+      // as a surface for the view finder's VisualBrush.
+
+      // store the available size for use by the Zoombox control
+      _availableSize = availableSize;
+
+      // Simulate size-to-content for the display panel by ensuring a width and height
+      // based on the content bounds. Otherwise, the display panel may have no size, since it doesn't 
+      // contain content.
+      double width = DoubleHelper.IsNaN( this.ContentBounds.Width ) ? 0 : Math.Max( 0, this.ContentBounds.Width );
+      double height = DoubleHelper.IsNaN( this.ContentBounds.Height ) ? 0 : Math.Max( 0, this.ContentBounds.Height );
+      Size displayPanelSize = new Size( width, height );
+
+      // Now ensure that the result fits within the available size while maintaining
+      // the width/height ratio of the content bounds
+      if( displayPanelSize.Width > availableSize.Width || displayPanelSize.Height > availableSize.Height )
+      {
+        double aspectX = availableSize.Width / displayPanelSize.Width;
+        double aspectY = availableSize.Height / displayPanelSize.Height;
+        double scale = ( aspectX < aspectY ) ? aspectX : aspectY;
+        displayPanelSize = new Size( displayPanelSize.Width * scale, displayPanelSize.Height * scale );
+      }
+
+      return displayPanelSize;
+    }
+
+    protected override void OnRender( DrawingContext dc )
+    {
+      base.OnRender( dc );
+
+      dc.DrawRectangle( this.Background, null, this.ContentBounds );
+
+      dc.DrawRectangle( this.VisualBrush, null, this.ContentBounds );
+
+      if( this.ViewportRect.IntersectsWith( new Rect( this.RenderSize ) ) )
+      {
+        // draw shadow rectangles over the non-viewport regions
+        Rect r1 = new Rect( new Point( 0, 0 ), new Size( this.RenderSize.Width, Math.Max( 0, this.ViewportRect.Top ) ) );
+        Rect r2 = new Rect( new Point( 0, this.ViewportRect.Top ), new Size( Math.Max( 0, this.ViewportRect.Left ), this.ViewportRect.Height ) );
+        Rect r3 = new Rect( new Point( this.ViewportRect.Right, this.ViewportRect.Top ), new Size( Math.Max( 0, this.RenderSize.Width - this.ViewportRect.Right ), this.ViewportRect.Height ) );
+        Rect r4 = new Rect( new Point( 0, this.ViewportRect.Bottom ), new Size( this.RenderSize.Width, Math.Max( 0, this.RenderSize.Height - this.ViewportRect.Bottom ) ) );
+        dc.DrawRectangle( this.ShadowBrush, null, r1 );
+        dc.DrawRectangle( this.ShadowBrush, null, r2 );
+        dc.DrawRectangle( this.ShadowBrush, null, r3 );
+        dc.DrawRectangle( this.ShadowBrush, null, r4 );
+
+        // draw the rectangle around the viewport region
+        dc.DrawRectangle( this.ViewportBrush, this.ViewportPen, this.ViewportRect );
+      }
+      else
+      {
+        // if no part of the Rect is visible, just draw a 
+        // shadow over the entire content bounds
+        dc.DrawRectangle( this.ShadowBrush, null, new Rect( this.RenderSize ) );
+      }
+    }
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewKind.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewKind.cs
new file mode 100644
index 00000000..f458c307
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewKind.cs
@@ -0,0 +1,32 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+
+namespace Xceed.Wpf.Toolkit.Zoombox
+{
+  public enum ZoomboxViewKind
+  {
+    Absolute = -5,
+    Fit = -4,
+    Fill = -3,
+    Center = -2,
+    Empty = -1,
+    Region,
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewStack.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewStack.cs
new file mode 100644
index 00000000..d083cd01
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewStack.cs
@@ -0,0 +1,558 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+using System;
+using System.Collections;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.Windows;
+using Xceed.Wpf.Toolkit.Core;
+
+namespace Xceed.Wpf.Toolkit.Zoombox
+{
+  public sealed class ZoomboxViewStack : Collection<ZoomboxView>, IWeakEventListener
+  {
+    #region Constructors
+
+    public ZoomboxViewStack( Zoombox zoombox )
+    {
+      _zoomboxRef = new WeakReference( zoombox );
+    }
+
+    #endregion
+
+    #region SelectedView Property
+
+    public ZoomboxView SelectedView
+    {
+      get
+      {
+        int currentIndex = this.Zoombox.ViewStackIndex;
+        return ( currentIndex < 0 || currentIndex > Count - 1 ) ? ZoomboxView.Empty : this[ currentIndex ];
+      }
+    }
+
+    #endregion
+
+    #region AreViewsFromSource Internal Property
+
+    internal bool AreViewsFromSource
+    {
+      get
+      {
+        return _cacheBits[ ( int )CacheBits.AreViewsFromSource ];
+      }
+      set
+      {
+        _cacheBits[ ( int )CacheBits.AreViewsFromSource ] = value;
+      }
+    }
+
+    #endregion
+
+    #region Source Internal Property
+
+    internal IEnumerable Source
+    {
+      get
+      {
+        return _source;
+      }
+    }
+
+    // if the view stack is generated by items within the ViewStackSource collection
+    // of the Zoombox, then we maintain a strong reference to the source
+    private IEnumerable _source; //null
+
+    #endregion
+
+    #region IsChangeFromSource Private Property
+
+    private bool IsChangeFromSource
+    {
+      get
+      {
+        return _cacheBits[ ( int )CacheBits.IsChangeFromSource ];
+      }
+      set
+      {
+        _cacheBits[ ( int )CacheBits.IsChangeFromSource ] = value;
+      }
+    }
+
+    #endregion
+
+    #region IsMovingViews Private Property
+
+    private bool IsMovingViews
+    {
+      get
+      {
+        return _cacheBits[ ( int )CacheBits.IsMovingViews ];
+      }
+      set
+      {
+        _cacheBits[ ( int )CacheBits.IsMovingViews ] = value;
+      }
+    }
+
+    #endregion
+
+    #region IsResettingViews Private Property
+
+    private bool IsResettingViews
+    {
+      get
+      {
+        return _cacheBits[ ( int )CacheBits.IsResettingViews ];
+      }
+      set
+      {
+        _cacheBits[ ( int )CacheBits.IsResettingViews ] = value;
+      }
+    }
+
+    #endregion
+
+    #region IsSettingInitialViewAfterClear Private Property
+
+    private bool IsSettingInitialViewAfterClear
+    {
+      get
+      {
+        return _cacheBits[ ( int )CacheBits.IsSettingInitialViewAfterClear ];
+      }
+      set
+      {
+        _cacheBits[ ( int )CacheBits.IsSettingInitialViewAfterClear ] = value;
+      }
+    }
+
+    #endregion
+
+    #region Zoombox Private Property
+
+    private Zoombox Zoombox
+    {
+      get
+      {
+        return _zoomboxRef.Target as Zoombox;
+      }
+    }
+
+    // maintain a weak reference to the Zoombox that owns the stack
+    private WeakReference _zoomboxRef;
+
+    #endregion
+
+    internal void ClearViewStackSource()
+    {
+      if( this.AreViewsFromSource )
+      {
+        this.AreViewsFromSource = false;
+        this.MonitorSource( false );
+        _source = null;
+        using( new SourceAccess( this ) )
+        {
+          this.Clear();
+        }
+        this.Zoombox.CoerceValue( Zoombox.ViewStackModeProperty );
+      }
+    }
+
+    internal void PushView( ZoomboxView view )
+    {
+      // clear the forward stack
+      int currentIndex = this.Zoombox.ViewStackIndex;
+      while( this.Count - 1 > currentIndex )
+      {
+        this.RemoveAt( Count - 1 );
+      }
+      this.Add( view );
+    }
+
+    internal void SetViewStackSource( IEnumerable source )
+    {
+      if( _source != source )
+      {
+        this.MonitorSource( false );
+        _source = source;
+        this.MonitorSource( true );
+        this.AreViewsFromSource = true;
+        this.Zoombox.CoerceValue( Zoombox.ViewStackModeProperty );
+        this.ResetViews();
+      }
+    }
+
+    protected override void ClearItems()
+    {
+      this.VerifyStackModification();
+
+      bool currentDeleted = ( this.Zoombox.CurrentViewIndex >= 0 );
+      base.ClearItems();
+      this.Zoombox.SetViewStackCount( Count );
+
+      // if resetting the views due to a change in the view source collection, just return
+      if( this.IsResettingViews )
+        return;
+
+      if( this.Zoombox.EffectiveViewStackMode == ZoomboxViewStackMode.Auto && this.Zoombox.CurrentView != ZoomboxView.Empty )
+      {
+        this.IsSettingInitialViewAfterClear = true;
+        try
+        {
+          this.Add( this.Zoombox.CurrentView );
+        }
+        finally
+        {
+          this.IsSettingInitialViewAfterClear = false;
+        }
+        this.Zoombox.ViewStackIndex = 0;
+        if( currentDeleted )
+        {
+          this.Zoombox.SetCurrentViewIndex( 0 );
+        }
+      }
+      else
+      {
+        this.Zoombox.ViewStackIndex = -1;
+        this.Zoombox.SetCurrentViewIndex( -1 );
+      }
+    }
+
+    protected override void InsertItem( int index, ZoomboxView view )
+    {
+      this.VerifyStackModification();
+
+      if( this.Zoombox.HasArrangedContentPresenter
+          && this.Zoombox.ViewStackIndex >= index
+          && !this.IsSettingInitialViewAfterClear
+          && !this.IsResettingViews
+          && !this.IsMovingViews )
+      {
+        bool oldUpdatingView = this.Zoombox.IsUpdatingView;
+        this.Zoombox.IsUpdatingView = true;
+        try
+        {
+          this.Zoombox.ViewStackIndex++;
+          if( this.Zoombox.CurrentViewIndex != -1 )
+          {
+            this.Zoombox.SetCurrentViewIndex( this.Zoombox.CurrentViewIndex + 1 );
+          }
+        }
+        finally
+        {
+          this.Zoombox.IsUpdatingView = oldUpdatingView;
+        }
+      }
+
+      base.InsertItem( index, view );
+      this.Zoombox.SetViewStackCount( Count );
+    }
+
+    protected override void RemoveItem( int index )
+    {
+      this.VerifyStackModification();
+
+      bool currentDeleted = ( this.Zoombox.ViewStackIndex == index );
+      if( !this.IsMovingViews )
+      {
+        // if an item below the current index was deleted 
+        // (or if the last item is currently selected and it was deleted),
+        // adjust the ViewStackIndex and CurrentViewIndex values
+        if( this.Zoombox.HasArrangedContentPresenter
+            && ( this.Zoombox.ViewStackIndex > index
+                || ( currentDeleted && this.Zoombox.ViewStackIndex == this.Zoombox.ViewStack.Count - 1 ) ) )
+        {
+          // if removing the last item, just clear the stack, which ensures the proper
+          // behavior based on the ViewStackMode
+          if( currentDeleted && this.Zoombox.ViewStack.Count == 1 )
+          {
+            this.Clear();
+            return;
+          }
+
+          bool oldUpdatingView = this.Zoombox.IsUpdatingView;
+          this.Zoombox.IsUpdatingView = true;
+          try
+          {
+            this.Zoombox.ViewStackIndex--;
+            if( this.Zoombox.CurrentViewIndex != -1 )
+            {
+              this.Zoombox.SetCurrentViewIndex( this.Zoombox.CurrentViewIndex - 1 );
+            }
+          }
+          finally
+          {
+            this.Zoombox.IsUpdatingView = oldUpdatingView;
+          }
+        }
+      }
+
+      base.RemoveItem( index );
+
+      // if the current view was deleted, we may need to update the view index 
+      // (unless a non-stack view is in effect)
+      if( !this.IsMovingViews && currentDeleted && this.Zoombox.CurrentViewIndex != -1 )
+      {
+        this.Zoombox.RefocusView();
+      }
+
+      this.Zoombox.SetViewStackCount( Count );
+    }
+
+    protected override void SetItem( int index, ZoomboxView view )
+    {
+      this.VerifyStackModification();
+
+      base.SetItem( index, view );
+
+      // if the set item is the current item, update the zoombox
+      if( index == this.Zoombox.CurrentViewIndex )
+      {
+        this.Zoombox.RefocusView();
+      }
+    }
+
+    private static ZoomboxView GetViewFromSourceItem( object item )
+    {
+      ZoomboxView view = ( item is ZoomboxView ) ? item as ZoomboxView : ZoomboxViewConverter.Converter.ConvertFrom( item ) as ZoomboxView;
+      if( view == null )
+        throw new InvalidCastException( string.Format( ErrorMessages.GetMessage( "UnableToConvertToZoomboxView" ), item ) );
+
+      return view;
+    }
+
+    private void InsertViews( int index, IList newItems )
+    {
+      using( new SourceAccess( this ) )
+      {
+        foreach( object item in newItems )
+        {
+          ZoomboxView view = ZoomboxViewStack.GetViewFromSourceItem( item );
+          if( index >= this.Count )
+          {
+            this.Add( view );
+          }
+          else
+          {
+            this.Insert( index, view );
+          }
+          index++;
+        }
+      }
+    }
+
+    private void MonitorSource( bool monitor )
+    {
+      if( _source != null && ( _source is INotifyCollectionChanged ) )
+      {
+        if( monitor )
+        {
+          CollectionChangedEventManager.AddListener( _source as INotifyCollectionChanged, this );
+        }
+        else
+        {
+          CollectionChangedEventManager.RemoveListener( _source as INotifyCollectionChanged, this );
+        }
+      }
+    }
+
+    private void MoveViews( int oldIndex, int newIndex, IList movedItems )
+    {
+      using( new SourceAccess( this ) )
+      {
+        int currentIndex = this.Zoombox.ViewStackIndex;
+        int indexAfterMove = currentIndex;
+
+        // adjust the current index, if it was affected by the move
+        if( !( ( oldIndex < currentIndex && newIndex < currentIndex )
+            || ( oldIndex > currentIndex && newIndex > currentIndex ) ) )
+        {
+          if( currentIndex >= oldIndex && currentIndex < oldIndex + movedItems.Count )
+          {
+            indexAfterMove += newIndex - oldIndex;
+          }
+          else if( currentIndex >= newIndex )
+          {
+            indexAfterMove += movedItems.Count;
+          }
+        }
+
+        this.IsMovingViews = true;
+        try
+        {
+          for( int i = 0; i < movedItems.Count; i++ )
+          {
+            this.RemoveAt( oldIndex );
+          }
+          for( int i = 0; i < movedItems.Count; i++ )
+          {
+            this.Insert( newIndex + i, ZoomboxViewStack.GetViewFromSourceItem( movedItems[ i ] ) );
+          }
+          if( indexAfterMove != currentIndex )
+          {
+            this.Zoombox.ViewStackIndex = indexAfterMove;
+            this.Zoombox.SetCurrentViewIndex( indexAfterMove );
+          }
+        }
+        finally
+        {
+          this.IsMovingViews = false;
+        }
+      }
+    }
+
+    private void OnSourceCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
+    {
+      switch( e.Action )
+      {
+        case NotifyCollectionChangedAction.Add:
+          this.InsertViews( e.NewStartingIndex, e.NewItems );
+          break;
+
+        case NotifyCollectionChangedAction.Move:
+          this.MoveViews( e.OldStartingIndex, e.NewStartingIndex, e.OldItems );
+          break;
+
+        case NotifyCollectionChangedAction.Remove:
+          this.RemoveViews( e.OldStartingIndex, e.OldItems );
+          break;
+
+        case NotifyCollectionChangedAction.Replace:
+          this.ResetViews();
+          break;
+
+        case NotifyCollectionChangedAction.Reset:
+          this.ResetViews();
+          break;
+      }
+    }
+
+    private void ResetViews()
+    {
+      using( new SourceAccess( this ) )
+      {
+        int currentIndex = this.Zoombox.ViewStackIndex;
+        this.IsResettingViews = true;
+        try
+        {
+          this.Clear();
+          foreach( object item in _source )
+          {
+            ZoomboxView view = ZoomboxViewStack.GetViewFromSourceItem( item );
+            this.Add( view );
+          }
+
+          currentIndex = Math.Min( Math.Max( 0, currentIndex ), this.Count - 1 );
+
+          this.Zoombox.ViewStackIndex = currentIndex;
+          this.Zoombox.SetCurrentViewIndex( currentIndex );
+          this.Zoombox.RefocusView();
+        }
+        finally
+        {
+          this.IsResettingViews = false;
+        }
+      }
+    }
+
+    private void RemoveViews( int index, IList removedItems )
+    {
+      using( new SourceAccess( this ) )
+      {
+        for( int i = 0; i < removedItems.Count; i++ )
+        {
+          this.RemoveAt( index );
+        }
+      }
+    }
+
+    private void VerifyStackModification()
+    {
+      if( this.AreViewsFromSource && !this.IsChangeFromSource )
+        throw new InvalidOperationException( ErrorMessages.GetMessage( "ViewStackCannotBeManipulatedNow" ) );
+    }
+
+    #region IWeakEventListener Members
+
+    public bool ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
+    {
+      if( managerType == typeof( CollectionChangedEventManager ) )
+      {
+        this.OnSourceCollectionChanged( sender, ( NotifyCollectionChangedEventArgs )e );
+      }
+      else
+      {
+        return false;
+      }
+
+      return true;
+    }
+
+    #endregion
+
+    #region Private Fields
+
+    // to save memory, store bool variables in a bit vector
+    private BitVector32 _cacheBits = new BitVector32( 0 );
+
+    #endregion
+
+    #region SourceAccess Nested Type
+
+    private sealed class SourceAccess : IDisposable
+    {
+      public SourceAccess( ZoomboxViewStack viewStack )
+      {
+        _viewStack = viewStack;
+        _viewStack.IsChangeFromSource = true;
+      }
+
+      ~SourceAccess()
+      {
+        this.Dispose();
+      }
+
+      public void Dispose()
+      {
+        _viewStack.IsChangeFromSource = false;
+        _viewStack = null;
+        GC.SuppressFinalize( this );
+      }
+
+      private ZoomboxViewStack _viewStack;
+    }
+
+    #endregion
+
+    #region CacheBits Nested Type
+
+    private enum CacheBits
+    {
+      AreViewsFromSource = 0x00000001,
+      IsChangeFromSource = 0x00000002,
+      IsResettingViews = 0x00000004,
+      IsMovingViews = 0x00000008,
+      IsSettingInitialViewAfterClear = 0x00000010,
+    }
+
+    #endregion
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewStackMode.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewStackMode.cs
new file mode 100644
index 00000000..4b296f38
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxViewStackMode.cs
@@ -0,0 +1,29 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit.Zoombox
+{
+  public enum ZoomboxViewStackMode
+  {
+    Auto,
+    Default,
+    Disabled,
+    Manual,
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxZoomOn.cs b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxZoomOn.cs
new file mode 100644
index 00000000..30eb5c0a
--- /dev/null
+++ b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Zoombox/ZoomboxZoomOn.cs
@@ -0,0 +1,27 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
+namespace Xceed.Wpf.Toolkit.Zoombox
+{
+  public enum ZoomboxZoomOn
+  {
+    Content = 1,
+    View,
+  }
+}
diff --git a/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/sn.snk b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/sn.snk
new file mode 100644
index 00000000..1bdc9120
Binary files /dev/null and b/Release/v1.7.0/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/sn.snk differ