Added additional features to the TextBoxWithWatermark and PasswordBoxWithWatermark controls