From 7be12cd2188ece6c724a3ed30b7715a3245bf5b4 Mon Sep 17 00:00:00 2001
From: Hyrules <hyrules@gmail.com>
Date: Sun, 10 Mar 2019 19:34:29 -0400
Subject: [PATCH] Change some control to watermark cb and tb.

---
 HueLib2Test/HueLib2Test.csproj                | 18 +++++
 HueLib2Test/Properties/AssemblyInfo.cs        |  2 +-
 WinHue3/Build/README_TEMPLATE.txt             |  1 +
 .../BridgeSettings/Form_BridgeSettings.xaml   | 30 ++-------
 .../Groups/Creator/Form_GroupCreator.xaml     |  6 +-
 .../Form_ResourceLinksCreator.xaml            | 13 +---
 .../Rules/Creator/Form_RuleCreator.xaml       | 50 ++++----------
 .../Scenes/Creator/Form_SceneCreator.xaml     | 17 ++---
 .../NewCreator/Form_ScheduleCreator2.xaml     | 14 ++--
 .../Sensors/Creator/Form_SensorCreator.xaml   | 30 ++-------
 WinHue3/MainForm/MainWindow.xaml              | 10 +--
 WinHue3/Properties/AssemblyInfo.cs            |  2 +-
 WinHue3/Resources/GUI.Designer.cs             | 67 ++++++++++++++++++-
 WinHue3/Resources/GUI.fr.resx                 | 25 ++++++-
 WinHue3/Resources/GUI.resx                    | 25 ++++++-
 WinHue3/WinHue3.csproj                        | 22 +++++-
 WinHue3_1.sln                                 | 14 ++++
 whc/Properties/AssemblyInfo.cs                |  2 +-
 whc/whc.csproj                                | 20 ++++++
 19 files changed, 233 insertions(+), 135 deletions(-)

diff --git a/HueLib2Test/HueLib2Test.csproj b/HueLib2Test/HueLib2Test.csproj
index ba15ebc0..5c7edba4 100644
--- a/HueLib2Test/HueLib2Test.csproj
+++ b/HueLib2Test/HueLib2Test.csproj
@@ -36,6 +36,24 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="BouncyCastle.Crypto, Version=1.8.4.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
       <HintPath>..\packages\BouncyCastle.1.8.4\lib\BouncyCastle.Crypto.dll</HintPath>
diff --git a/HueLib2Test/Properties/AssemblyInfo.cs b/HueLib2Test/Properties/AssemblyInfo.cs
index c160e68d..81444498 100644
--- a/HueLib2Test/Properties/AssemblyInfo.cs
+++ b/HueLib2Test/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // 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.542.0")]
+[assembly: AssemblyVersion("1.0.554.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/WinHue3/Build/README_TEMPLATE.txt b/WinHue3/Build/README_TEMPLATE.txt
index c169001e..51b6ef6a 100644
--- a/WinHue3/Build/README_TEMPLATE.txt
+++ b/WinHue3/Build/README_TEMPLATE.txt
@@ -21,6 +21,7 @@ Changed:
 - Replaced many Transition related up down with a practical TransitionTime Up Down. No more guessing the transition time.
 - Replaced some wpf toolkit up down with my own. ( bug alert ! there might be bugs in there )
 - Removed some black border on forms.
+- Forked my own version of WPFToolkit 3.5.0 with the Datagrid.
 
 Updated :
 - Naudio dependency.
diff --git a/WinHue3/Functions/BridgeSettings/Form_BridgeSettings.xaml b/WinHue3/Functions/BridgeSettings/Form_BridgeSettings.xaml
index 9d3d8ab3..2b7acb92 100644
--- a/WinHue3/Functions/BridgeSettings/Form_BridgeSettings.xaml
+++ b/WinHue3/Functions/BridgeSettings/Form_BridgeSettings.xaml
@@ -76,11 +76,7 @@
                     <Label x:Name="LblLinkButton" Content="{Binding GeneralModel.Linkstate}" HorizontalAlignment="Left" Margin="121,227,0,0" VerticalAlignment="Top" Width="210"/>
                     <Label Content="{x:Static resx:GUI.BridgeSettingsForm_Tab_GeneralSettings_Timezone}" HorizontalAlignment="Left" Margin="10,103,0,0" VerticalAlignment="Top" Width="106"/>
                     <ComboBox x:Name="CbTimezones" HorizontalAlignment="Left" Margin="121,107,0,0" VerticalAlignment="Top" Width="213" ItemsSource="{Binding GeneralModel.ListTimeZones}" SelectedItem="{Binding GeneralModel.Timezone}"/>
-                    <TextBox x:Name="TbName" HorizontalAlignment="Left" Margin="121,11,0,0" TextWrapping="Wrap" Text="{Binding GeneralModel.Name, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Top" Width="210">
-                        <i:Interaction.Behaviors>
-                            <behaviors:TextBoxWatermarkBehavior Text="Optional"/>
-                        </i:Interaction.Behaviors>
-                    </TextBox>
+                    <xctk:WatermarkTextBox x:Name="TbName" HorizontalAlignment="Left" Margin="121,11,0,0" TextWrapping="Wrap" Text="{Binding GeneralModel.Name, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Top" Width="210" Watermark="{x:Static resx:GUI.Optional}"/>
                     <Button x:Name="BtnApplyGeneralSettings" Content="{x:Static resx:GUI.Button_Apply}" HorizontalAlignment="Left" Margin="394,227,0,0" VerticalAlignment="Top" Width="75" Command="{Binding ApplyGeneralSettingsCommand}"/>
                 </Grid>
             </TabItem>
@@ -95,26 +91,10 @@
                     <xctk:IntegerUpDown x:Name="NudProxyPort" HorizontalAlignment="Left" Margin="107,192,0,0" VerticalAlignment="Top" Width="71" Maximum="65535" Minimum="0" Value="{Binding NetworkModel.Proxyport}" IsEnabled="{Binding NetworkModel.EnableDHCPControls}"/>
                     <Label Content="{x:Static resx:GUI.BridgeSettingsForm_Tab_NetworkSettings_ProxyPort}" HorizontalAlignment="Left" Margin="10,187,0,0" VerticalAlignment="Top" Width="92"/>
                     <CheckBox x:Name="ChbDhcp" Content="{x:Static resx:GUI.BridgeSettingsForm_Tab_NetworkSettings_DHCP}" HorizontalAlignment="Left" Margin="336,26,0,0" VerticalAlignment="Top" Width="125" IsChecked="{Binding NetworkModel.Dhcp}" Click="chbDHCP_Click"/>
-                    <TextBox x:Name="TbIpAddress" HorizontalAlignment="Left" Margin="107,52,0,0" TextWrapping="Wrap" Text="{Binding NetworkModel.Ip, ValidatesOnNotifyDataErrors=True, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Top" Width="145" IsEnabled="{Binding NetworkModel.EnableDHCPControls}">
-                        <i:Interaction.Behaviors>
-                            <behaviors:TextBoxWatermarkBehavior Text="eg. 192.168.1.123"/>
-                        </i:Interaction.Behaviors>
-                    </TextBox>
-                    <TextBox x:Name="TbNetmask" HorizontalAlignment="Left" Margin="107,80,0,0" TextWrapping="Wrap" Text="{Binding NetworkModel.Netmask, ValidatesOnNotifyDataErrors=True, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Top" Width="145" IsEnabled="{Binding NetworkModel.EnableDHCPControls}">
-                        <i:Interaction.Behaviors>
-                            <behaviors:TextBoxWatermarkBehavior Text="eg. 255.255.255.0"/>
-                        </i:Interaction.Behaviors>
-                    </TextBox>
-                    <TextBox x:Name="TbGateway" HorizontalAlignment="Left" Margin="107,108,0,0" TextWrapping="Wrap" Text="{Binding NetworkModel.Gateway, ValidatesOnNotifyDataErrors=True, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Top" Width="145" IsEnabled="{Binding NetworkModel.EnableDHCPControls}">
-                        <i:Interaction.Behaviors>
-                            <behaviors:TextBoxWatermarkBehavior Text="eg. 192.168.1.1"/>
-                        </i:Interaction.Behaviors>
-                    </TextBox>
-                    <TextBox x:Name="TbProxyAddress" HorizontalAlignment="Left" Margin="107,163,0,0" TextWrapping="Wrap" Text="{Binding NetworkModel.Proxy, ValidatesOnNotifyDataErrors=True, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Top" Width="145" IsEnabled="{Binding NetworkModel.EnableDHCPControls}">
-                        <i:Interaction.Behaviors>
-                            <behaviors:TextBoxWatermarkBehavior Text="eg. 192.168.1.2"/>
-                        </i:Interaction.Behaviors>
-                    </TextBox>
+                    <xctk:WatermarkTextBox x:Name="TbIpAddress" HorizontalAlignment="Left" Margin="107,52,0,0" TextWrapping="Wrap" Text="{Binding NetworkModel.Ip, ValidatesOnNotifyDataErrors=True, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Top" Width="145" IsEnabled="{Binding NetworkModel.EnableDHCPControls}" Watermark="{x:Static resx:GUI.ExampleIP}"/>
+                    <xctk:WatermarkTextBox x:Name="TbNetmask" HorizontalAlignment="Left" Margin="107,80,0,0" TextWrapping="Wrap" Text="{Binding NetworkModel.Netmask, ValidatesOnNotifyDataErrors=True, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Top" Width="145" IsEnabled="{Binding NetworkModel.EnableDHCPControls}" Watermark="{x:Static resx:GUI.ExampleMask}"/>
+                    <xctk:WatermarkTextBox x:Name="TbGateway" HorizontalAlignment="Left" Margin="107,108,0,0" TextWrapping="Wrap" Text="{Binding NetworkModel.Gateway, ValidatesOnNotifyDataErrors=True, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Top" Width="145" IsEnabled="{Binding NetworkModel.EnableDHCPControls}" Watermark="{x:Static resx:GUI.ExampleGateway}"/>
+                    <xctk:WatermarkTextBox x:Name="TbProxyAddress" HorizontalAlignment="Left" Margin="107,163,0,0" TextWrapping="Wrap" Text="{Binding NetworkModel.Proxy, ValidatesOnNotifyDataErrors=True, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Top" Width="145" IsEnabled="{Binding NetworkModel.EnableDHCPControls}" Watermark="{x:Static resx:GUI.ExampleIP}"/>
                     <Button x:Name="BtnApplyNetworkSettings" Style="{StaticResource BtnApplyNetwork}"  Content="{x:Static resx:GUI.Button_Apply}" Command="{Binding ApplyNetworkSettingsCommand}"  HorizontalAlignment="Left" Margin="394,227,0,0" VerticalAlignment="Top" Width="75" />
                 </Grid>
             </TabItem>
diff --git a/WinHue3/Functions/Groups/Creator/Form_GroupCreator.xaml b/WinHue3/Functions/Groups/Creator/Form_GroupCreator.xaml
index 22f87568..a3780675 100644
--- a/WinHue3/Functions/Groups/Creator/Form_GroupCreator.xaml
+++ b/WinHue3/Functions/Groups/Creator/Form_GroupCreator.xaml
@@ -50,11 +50,7 @@
 
         <Label Content="{x:Static resx:GUI.GroupCreatorForm_GroupName}" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Height="28" />
 
-        <TextBox x:Name="TbGroupName" HorizontalAlignment="Left" Margin="10,38,0,0" TextWrapping="Wrap" Text="{Binding GroupCreator.Name}" VerticalAlignment="Top" Width="170" Height="23">
-            <i:Interaction.Behaviors>
-                <behaviors:TextBoxWatermarkBehavior Text="{x:Static resx:GUI.GroupName_Watermark}"/>
-            </i:Interaction.Behaviors>
-        </TextBox>
+        <xctk:WatermarkTextBox x:Name="TbGroupName" HorizontalAlignment="Left" Margin="10,38,0,0" TextWrapping="Wrap" Text="{Binding GroupCreator.Name}" VerticalAlignment="Top" Width="170" Height="23" Watermark="{x:Static resx:GUI.GroupName_Watermark}"/>
         <customControls:BindableListView x:Name="BindableListView" Margin="185,10,9.667,47" ItemsSource="{Binding GroupCreator.ListAvailableLights}" SelectedItemsList="{Binding GroupCreator.Listlights, NotifyOnValidationError=True, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True, ValidatesOnDataErrors=True}" ScrollViewer.HorizontalScrollBarVisibility="Disabled">
             <customControls:BindableListView.ItemsPanel>
                 <ItemsPanelTemplate>
diff --git a/WinHue3/Functions/ResourceLinks/Form_ResourceLinksCreator.xaml b/WinHue3/Functions/ResourceLinks/Form_ResourceLinksCreator.xaml
index 18b8896e..294fb157 100644
--- a/WinHue3/Functions/ResourceLinks/Form_ResourceLinksCreator.xaml
+++ b/WinHue3/Functions/ResourceLinks/Form_ResourceLinksCreator.xaml
@@ -121,17 +121,8 @@
         <TextBlock x:Name="TextBlock" Margin="243,0,181.333,34.667" TextWrapping="Wrap" Text="{x:Static resx:GUI.ResourceLinkCreatorForm_HoldControl}" FontSize="10" Height="15" VerticalAlignment="Bottom"/>
         <Label x:Name="Label2" Content="{x:Static resx:GUI.ResourceLinkCreatorForm_ClassID}" HorizontalAlignment="Left" Margin="16,200,0,0" VerticalAlignment="Top"/>
         <CheckBox x:Name="CheckBox" Content="{x:Static resx:GUI.ResourceLinkCreatorForm_Recycle}" HorizontalAlignment="Left" Margin="167,327,0,0" VerticalAlignment="Top" IsThreeState="True" IsChecked="{Binding LinkCreatorModel.Recycle}" IsEnabled="{Binding NotEditing}"/>
-        <TextBox x:Name="WatermarkTextBox" HorizontalAlignment="Left" Margin="16,28,0,0" TextWrapping="Wrap" Text="{Binding LinkCreatorModel.Name, NotifyOnValidationError=True, ValidatesOnNotifyDataErrors=True, ValidatesOnDataErrors=True}" VerticalAlignment="Top" Width="210" Height="23">
-            <i:Interaction.Behaviors>
-                <behaviors:TextBoxWatermarkBehavior Text="{x:Static resx:GUI.ResourceLinkCreatorForm_Watermark_Name}"/>
-            </i:Interaction.Behaviors>
-        </TextBox>
-
-        <TextBox x:Name="WatermarkTextBox1" HorizontalAlignment="Left" Margin="16,93,0,0" TextWrapping="Wrap" Text="{Binding LinkCreatorModel.Description}" VerticalAlignment="Top" Height="107" Width="210">
-            <i:Interaction.Behaviors>
-                <behaviors:TextBoxWatermarkBehavior Text="{x:Static resx:GUI.ResourceLinkCreatorForm_Watermark_Description}"/>
-            </i:Interaction.Behaviors>
-        </TextBox>
+        <xctk:WatermarkTextBox x:Name="WatermarkTextBox" HorizontalAlignment="Left" Margin="16,28,0,0" TextWrapping="Wrap" Text="{Binding LinkCreatorModel.Name, NotifyOnValidationError=True, ValidatesOnNotifyDataErrors=True, ValidatesOnDataErrors=True}" VerticalAlignment="Top" Width="210" Height="23" Watermark="{x:Static resx:GUI.ResourceLinkCreatorForm_Watermark_Name}"/>
+        <xctk:WatermarkTextBox x:Name="WatermarkTextBox1" HorizontalAlignment="Left" Margin="16,93,0,0" TextWrapping="Wrap" Text="{Binding LinkCreatorModel.Description}" VerticalAlignment="Top" Height="107" Width="210" Watermark="{x:Static resx:GUI.ResourceLinkCreatorForm_Watermark_Description}"/>
 
         <IntegerUpDown:WinHueIntegerUpDown HorizontalAlignment="Left" Height="18" Margin="16,231,0,0" VerticalAlignment="Top" Width="210" Min="1" Max="10000" Value="{Binding LinkCreatorModel.ClassId}" IsEnabled="{Binding NotEditing}" CanBeNull="False"/>
 
diff --git a/WinHue3/Functions/Rules/Creator/Form_RuleCreator.xaml b/WinHue3/Functions/Rules/Creator/Form_RuleCreator.xaml
index e2aa10f1..b205fafc 100644
--- a/WinHue3/Functions/Rules/Creator/Form_RuleCreator.xaml
+++ b/WinHue3/Functions/Rules/Creator/Form_RuleCreator.xaml
@@ -26,11 +26,8 @@
         <creator:RuleCreatorViewModel/>
     </Window.DataContext>
     <Grid Margin="0,0,1,0">
-        <TextBox HorizontalAlignment="Left" Height="23" Margin="5,4,0,0" TextWrapping="Wrap" Text="{Binding Name}" VerticalAlignment="Top" Width="623">
-            <i:Interaction.Behaviors>
-                <behaviors:TextBoxWatermarkBehavior Text="{x:Static resx:GUI.RuleCreatorForm_Name}"/>
-            </i:Interaction.Behaviors>
-        </TextBox>
+        <xctk:WatermarkTextBox HorizontalAlignment="Left" Height="23" Margin="5,4,0,0" TextWrapping="Wrap" Text="{Binding Name}" VerticalAlignment="Top" Width="623" Watermark="{x:Static resx:GUI.RuleCreatorForm_Name}"/>
+        
         <TabControl HorizontalAlignment="Left" Height="368" Margin="5,32,0,0" VerticalAlignment="Top" Width="708">
             <TabItem Header="{x:Static resx:GUI.RuleCreatorForm_Conditions}">
                 <Grid>
@@ -81,11 +78,8 @@
                             </Style>
                         </TreeView.ItemContainerStyle>
                     </controls:BindableTreeView>
-                    <ComboBox x:Name="cbOperator"  HorizontalAlignment="Left" Margin="10,249,0,0" VerticalAlignment="Top" Width="335"  SelectedValuePath="Tag" SelectedValue="{Binding ConditionOperator}"  Style="{StaticResource {x:Type ComboBox}}" Grid.ColumnSpan="2"
+                    <xctk:WatermarkComboBox x:Name="cbOperator"  HorizontalAlignment="Left" Margin="10,249,0,0" VerticalAlignment="Top" Width="335"  SelectedValuePath="Tag" SelectedValue="{Binding ConditionOperator}"  Grid.ColumnSpan="2" Watermark="{x:Static resx:GUI.ChooseOperator}"
                               Grid.Column="0">
-                        <i:Interaction.Behaviors>
-                            <behaviors:ComboBoxWatermarkBehavior Text="(Choose the operator)"/>
-                        </i:Interaction.Behaviors>
                         <ComboBoxItem Content="{x:Static resx:GUI.RuleCreatorForm_Equals}" Tag="eq"/>
                         <ComboBoxItem Content="{x:Static resx:GUI.RuleCreatorForm_Changed}" Tag="dx"/>
                         <ComboBoxItem Content="{x:Static resx:GUI.RuleCreatorForm_Delayed_Changed}" Tag="ddx"/>
@@ -95,8 +89,8 @@
                         <ComboBoxItem Content="{x:Static resx:GUI.RuleCreatorForm_Not_Stable}" Tag="not stable"/>
                         <ComboBoxItem Content="{x:Static resx:GUI.RuleCreatorForm_Lower_Than}" Tag="lt"/>
                         <ComboBoxItem Content="{x:Static resx:GUI.RuleCreatorForm_Greater_Than}" Tag="gt"/>
-                    </ComboBox>
-                    <TextBox HorizontalAlignment="Left" Height="23" Margin="10,278,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="255" Text="{Binding ConditionValue, NotifyOnSourceUpdated=True, NotifyOnValidationError=True, UpdateSourceTrigger=PropertyChanged}"  IsEnabled="{Binding CanEnterConditionValue}" Grid.ColumnSpan="2"
+                    </xctk:WatermarkComboBox>
+                    <xctk:WatermarkTextBox HorizontalAlignment="Left" Height="23" Margin="10,278,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="255" Text="{Binding ConditionValue, NotifyOnSourceUpdated=True, NotifyOnValidationError=True, UpdateSourceTrigger=PropertyChanged}"  IsEnabled="{Binding CanEnterConditionValue}" Grid.ColumnSpan="2" Watermark="{x:Static resx:GUI.RuleCreatorForm_Value_Watermark}"
                              Grid.Column="0">
                         <TextBox.ContextMenu>
                             <ContextMenu>
@@ -140,9 +134,6 @@
                                 </MenuItem>
                             </ContextMenu>
                         </TextBox.ContextMenu>
-                        <i:Interaction.Behaviors>
-                            <behaviors:TextBoxWatermarkBehavior Text="{x:Static resx:GUI.RuleCreatorForm_Value_Watermark}"/>
-                        </i:Interaction.Behaviors>
                         <TextBox.Style>
                             <Style TargetType="{x:Type TextBox}">
                                 <Setter Property="Visibility" Value="Visible"/>
@@ -153,12 +144,8 @@
                                 </Style.Triggers>
                             </Style>
                         </TextBox.Style>
-                    </TextBox>
-                    <ComboBox x:Name="cbConditionType" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Width="127" behaviors:CommandBehavior.Command="{Binding Condition_SelectConditionObjectTypeCommand}" behaviors:CommandBehavior.RoutedEventName="SelectionChanged" SelectedValue="{Binding SelectedRuleConditionType}" SelectedValuePath="Tag" Grid.ColumnSpan="2"
-                              Grid.Column="0">
-                        <i:Interaction.Behaviors>
-                            <behaviors:ComboBoxWatermarkBehavior Text="{x:Static resx:GUI.Object_Type_Watermark}"/>
-                        </i:Interaction.Behaviors>
+                    </xctk:WatermarkTextBox>
+                    <xctk:WatermarkComboBox x:Name="cbConditionType" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Width="127" behaviors:CommandBehavior.Command="{Binding Condition_SelectConditionObjectTypeCommand}" behaviors:CommandBehavior.RoutedEventName="SelectionChanged" SelectedValue="{Binding SelectedRuleConditionType}" SelectedValuePath="Tag" Grid.ColumnSpan="2" Grid.Column="0" Watermark="{x:Static resx:GUI.Object_Type_Watermark}">
                         <ComboBoxItem Content="Lights" Tag="{x:Type light:Light}" />
                         <ComboBoxItem Content="Groups" Tag="{x:Type group:Group}"/>
                         <ComboBoxItem Content="Sensors" Tag="{x:Type sensor:Sensor}"/>
@@ -167,12 +154,9 @@
                         <ComboBoxItem Content="Resource Links" Tag="{x:Type rlink:Resourcelink}"/>
                         <ComboBoxItem Content="Rule" Tag="{x:Type rule:Rule}"/>
                         <ComboBoxItem Content="Config" Tag="{x:Type bridgeObjects:BridgeSettings}"/>
-                    </ComboBox>
+                    </xctk:WatermarkComboBox>
 
-                    <ComboBox x:Name="cbConditionObject"  HorizontalAlignment="Left" Margin="36.235,10,0,0" VerticalAlignment="Top" Width="203" ItemsSource="{Binding ListConditionHueObjects}" SelectedItem="{Binding SelectedConditionHueObject}" behaviors:CommandBehavior.Command="{Binding Condition_SelectConditionHueObjectCommand}" behaviors:CommandBehavior.RoutedEventName="SelectionChanged"  Style="{StaticResource {x:Type ComboBox}}" Grid.Column="1">
-                        <i:Interaction.Behaviors>
-                            <behaviors:ComboBoxWatermarkBehavior Text="{x:Static resx:GUI.Object_Watermark}"/>
-                        </i:Interaction.Behaviors>
+                    <xctk:WatermarkComboBox x:Name="cbConditionObject"  HorizontalAlignment="Left" Margin="36.235,10,0,0" VerticalAlignment="Top" Width="203" ItemsSource="{Binding ListConditionHueObjects}" SelectedItem="{Binding SelectedConditionHueObject}" behaviors:CommandBehavior.Command="{Binding Condition_SelectConditionHueObjectCommand}" behaviors:CommandBehavior.RoutedEventName="SelectionChanged"  Grid.Column="1" Watermark="{x:Static resx:GUI.Object_Watermark}">
                         <ComboBox.ItemTemplate>
                             <DataTemplate>
                                 <WrapPanel>
@@ -182,7 +166,7 @@
                                 </WrapPanel>
                             </DataTemplate>
                         </ComboBox.ItemTemplate>
-                    </ComboBox>
+                    </xctk:WatermarkComboBox>
                     <Button Content="{x:Static resx:GUI.Button_Delete}" HorizontalAlignment="Left" Margin="511.235,276,0,0" VerticalAlignment="Top" Width="75" Command="{Binding Condition_RemoveRuleConditionCommand}" Height="25" Grid.Column="1"/>
                     <Button Content="{x:Static resx:GUI.Button_Clear}" HorizontalAlignment="Left" Margin="244.235,276,0,0" VerticalAlignment="Top" Width="85" Command="{Binding Condition_ClearSelectedRuleConditionCommand}" Height="25" Grid.Column="1"/>
                 </Grid>
@@ -217,10 +201,7 @@
                     <Button Content="{x:Static resx:GUI.RuleCreatorForm_Actions_MoveDown}" HorizontalAlignment="Left" Margin="527,281,0,0" VerticalAlignment="Top" Width="85" Height="30" Command="{Binding Action_MoveDownRuleActionCommand}"/>
                     <Button Content="{x:Static resx:GUI.Button_Delete}" HorizontalAlignment="Left" Margin="617,281,0,0" VerticalAlignment="Top" Width="75" Height="30" Command="{Binding Action_RemoveRuleActionCommand}" Background="Red"/>
                     <Button Content="{x:Static resx:GUI.Button_Clear}" HorizontalAlignment="Left" Margin="357,281,0,0" VerticalAlignment="Top" Width="85" Command="{Binding Action_ClearRuleActionCommand}" Height="30"/>
-                    <ComboBox x:Name="cbActionObject"  HorizontalAlignment="Left" Margin="160,7,0,0" VerticalAlignment="Top" Width="192" ItemsSource="{Binding ListHueObjects}" SelectedItem="{Binding SelectedHueObject}" behaviors:CommandBehavior.Command="{Binding Action_SelectActionObjectCommand}" behaviors:CommandBehavior.RoutedEventName="SelectionChanged" Height="23" Style="{StaticResource {x:Type ComboBox}}">
-                        <i:Interaction.Behaviors>
-                            <behaviors:ComboBoxWatermarkBehavior Text="{x:Static resx:GUI.Object_Watermark}"/>
-                        </i:Interaction.Behaviors>
+                    <xctk:WatermarkComboBox x:Name="cbActionObject"  HorizontalAlignment="Left" Margin="160,7,0,0" VerticalAlignment="Top" Width="192" ItemsSource="{Binding ListHueObjects}" SelectedItem="{Binding SelectedHueObject}" behaviors:CommandBehavior.Command="{Binding Action_SelectActionObjectCommand}" behaviors:CommandBehavior.RoutedEventName="SelectionChanged" Height="23"  Watermark="{x:Static resx:GUI.Object_Watermark}">
                         <ComboBox.ItemTemplate>
                             <DataTemplate>
                                 <WrapPanel>
@@ -230,17 +211,14 @@
                                 </WrapPanel>
                             </DataTemplate>
                         </ComboBox.ItemTemplate>
-                    </ComboBox>
-                    <ComboBox x:Name="cbActionType"  HorizontalAlignment="Left" Margin="10,7,0,0" VerticalAlignment="Top" Width="145" SelectedValuePath="Tag" SelectedValue="{Binding SelectedHueObjectType}" behaviors:CommandBehavior.Command="{Binding Action_SelectHueObjectTypeCommand}" behaviors:CommandBehavior.RoutedEventName="SelectionChanged" Style="{StaticResource {x:Type ComboBox}}" Height="23" >
-                        <i:Interaction.Behaviors>
-                            <behaviors:ComboBoxWatermarkBehavior Text="{x:Static resx:GUI.Object_Type_Watermark}"/>
-                        </i:Interaction.Behaviors>
+                    </xctk:WatermarkComboBox>
+                    <xctk:WatermarkComboBox x:Name="cbActionType" HorizontalAlignment="Left" Margin="10,7,0,0" VerticalAlignment="Top" Width="145" SelectedValuePath="Tag" SelectedValue="{Binding SelectedHueObjectType}" behaviors:CommandBehavior.Command="{Binding Action_SelectHueObjectTypeCommand}" behaviors:CommandBehavior.RoutedEventName="SelectionChanged" Height="23" Watermark="{x:Static resx:GUI.Object_Type_Watermark}" >
                         <ComboBoxItem Content="{x:Static resx:GUI.Lights}" Tag="{x:Type light:Light}"/>
                         <ComboBoxItem Content="{x:Static resx:GUI.Groups}" Tag="{x:Type group:Group}"/>
                         <ComboBoxItem Content="{x:Static resx:GUI.Scenes}" Tag="{x:Type scene:Scene}"/>
                         <ComboBoxItem Content="{x:Static resx:GUI.Sensors}" Tag="{x:Type sensor:Sensor}"/>
                         <ComboBoxItem Content="{x:Static resx:GUI.Schedules}" Tag="{x:Type schedule:Schedule}"/>
-                    </ComboBox>
+                    </xctk:WatermarkComboBox>
 
                 </Grid>
             </TabItem>
diff --git a/WinHue3/Functions/Scenes/Creator/Form_SceneCreator.xaml b/WinHue3/Functions/Scenes/Creator/Form_SceneCreator.xaml
index 5d9fa78b..10bbb42d 100644
--- a/WinHue3/Functions/Scenes/Creator/Form_SceneCreator.xaml
+++ b/WinHue3/Functions/Scenes/Creator/Form_SceneCreator.xaml
@@ -10,6 +10,7 @@
     xmlns:uShortUpDown="clr-namespace:WinHue3.Controls.UShortUpDown"
     xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
     xmlns:byteUpDown="clr-namespace:WinHue3.Controls.ByteUpDown"
+    xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
     x:Name="FormSceneCreator" x:Class="WinHue3.Functions.Scenes.Creator.Form_SceneCreator" Title="{x:Static resx:GUI.SceneCreatorForm_Title}" Height="582.291" Width="929.382" WindowStartupLocation="CenterOwner" ResizeMode="NoResize" Icon="/WinHue3;component/Resources/scenes.png">
     <Window.DataContext>
         <creator:SceneCreatorViewModel/>
@@ -54,7 +55,7 @@
         <Button Content="{x:Static resx:GUI.Button_Cancel}" HorizontalAlignment="Left" Margin="799,507,0,0" VerticalAlignment="Top" Width="88" x:Name="BtnCancel" Click="btnCancel_Click" Height="30" IsCancel="True" SnapsToDevicePixels="True"/>
         <TextBlock HorizontalAlignment="Left" Margin="10,502,0,0" TextWrapping="Wrap" Text="{x:Static resx:GUI.SceneCreatorForm_Message}" VerticalAlignment="Top" Height="42" Width="611"/>
         <Button x:Name="BtnPreview" Content="{x:Static resx:GUI.SceneCreatorForm_PreviewButton}" HorizontalAlignment="Left" Margin="626,507,0,0" VerticalAlignment="Top" Width="75" Height="30" Command="{Binding DoPreviewSceneCommand}" />
-        <GroupBox Header="{x:Static resx:GUI.SceneCreatorForm_Step3}" HorizontalAlignment="Left" VerticalAlignment="Top" Height="410" Width="232" Margin="422,87,0,0" ToolTip="CTRL-Click to select multiple light.">
+        <GroupBox Header="{x:Static resx:GUI.SceneCreatorForm_Step3}" HorizontalAlignment="Left" VerticalAlignment="Top" Height="410" Width="232" Margin="8,87,0,0" ToolTip="CTRL-Click to select multiple light.">
             <Grid>
                 <controls:BindableListView x:Name="LvAvailableLights" ItemsSource="{Binding ListAvailableLights}" SelectedItemsList="{Binding SelectedAvailableLights}" HorizontalAlignment="Left" Height="359" VerticalAlignment="Top" Width="219" Margin="1,0,0,0" BorderBrush="{x:Null}" ScrollViewer.VerticalScrollBarVisibility="Visible" Background="{x:Null}">
                     <ListView.ItemTemplate>
@@ -70,7 +71,7 @@
 
             </Grid>
         </GroupBox>
-        <GroupBox Header="{x:Static resx:GUI.SceneCreatorForm_Step2}" HorizontalAlignment="Left" Margin="8,87,0,0" VerticalAlignment="Top" Height="410" Width="409">
+        <GroupBox Header="{x:Static resx:GUI.SceneCreatorForm_Step2}" HorizontalAlignment="Left" Margin="245,87,0,0" VerticalAlignment="Top" Height="410" Width="409">
             <Grid>
                 <Button x:Name="BtnColorPicker" Content="{x:Static resx:GUI.SceneCreatorForm_FromImageButton}" HorizontalAlignment="Left" Margin="5,337,0,0" VerticalAlignment="Top" Width="109" Height="31" Command="{Binding GetColorFromImageCommand}" IsEnabled="{Binding ElementName=ChbOn, Path=IsChecked}"/>
                 <Button x:Name="BtnRandomColor" Content="{x:Static resx:GUI.SceneCreatorForm_RandomColorButton}" HorizontalAlignment="Left" Margin="119,337,0,0" VerticalAlignment="Top" Width="104" Height="31" Command="{Binding SetRandomColorCommand}" IsEnabled="{Binding ElementName=ChbOn, Path=IsChecked}"/>
@@ -122,12 +123,12 @@
                     <CheckBox x:Name="cbSAT" Content="{x:Static resx:GUI.MoodCreatorForm_Saturation}" HorizontalAlignment="Left" Margin="10,147,0,0" VerticalAlignment="Top" Command="{Binding CheckSatCommand}" Width="288" HorizontalContentAlignment="Center" IsChecked="{Binding SatChecked}"/>
                     <CheckBox x:Name="cbXY" Content="{x:Static resx:GUI.MoodCreatorForm_XYColorSpace}" HorizontalAlignment="Left" Margin="10,190,0,0" VerticalAlignment="Top" Command="{Binding CheckXYCommand}" Width="288" HorizontalContentAlignment="Center" IsChecked="{Binding XYChecked}"/>
                     <CheckBox x:Name="cbTT" Content="{x:Static resx:GUI.Transitiontime}" HorizontalAlignment="Left" Margin="10,279,0,0" VerticalAlignment="Top" Height="20" Command="{Binding CheckTTCommand}" IsChecked="{Binding TtChecked}"/>
-                    <uShortUpDown:WinHueUShortUpDown HorizontalAlignment="Left" Height="23" Margin="314,31,0,0" VerticalAlignment="Top" Width="73" Padding="-1,0,0,0" Value="{Binding SceneCreatorModel.Hue}" IsEnabled="{Binding ElementName=cbHue, Path=IsChecked}"/>
-                    <byteUpDown:WinHueByteUpDown HorizontalAlignment="Left" Height="23" Margin="314,75,0,0" VerticalAlignment="Top" Width="73" Value="{Binding SceneCreatorModel.Bri}" IsEnabled="{Binding ElementName=cbBri, Path=IsChecked}"/>
-                    <byteUpDown:WinHueByteUpDown HorizontalAlignment="Left" Height="23" Margin="314,162,0,0" VerticalAlignment="Top" Width="73" Value="{Binding SceneCreatorModel.Sat}" IsEnabled="{Binding ElementName=cbSAT, Path=IsChecked}"/>
-                    <uShortUpDown:WinHueUShortUpDown HorizontalAlignment="Left" Height="23" Margin="314,119,0,0" VerticalAlignment="Top" Width="73" Value="{Binding SceneCreatorModel.Ct}" IsEnabled="{Binding ElementName=cbCT, Path=IsChecked}"/>
-                    <controls:WinHueXYUpDown HorizontalAlignment="Left" Height="20" Margin="314,205,0,0" VerticalAlignment="Top" Width="73" Value="{Binding SceneCreatorModel.X}" IsEnabled="{Binding ElementName=cbXY, Path=IsChecked}"/>
-                    <controls:WinHueXYUpDown HorizontalAlignment="Left" Height="18" Margin="314,230,0,0" VerticalAlignment="Top" Width="73" Value="{Binding SceneCreatorModel.Y}" IsEnabled="{Binding ElementName=cbXY, Path=IsChecked}"/>
+                    <xctk:ShortUpDown HorizontalAlignment="Left" Height="23" Margin="314,31,0,0" VerticalAlignment="Top" Width="73" Padding="-1,0,0,0" Value="{Binding SceneCreatorModel.Hue}" IsEnabled="{Binding ElementName=cbHue, Path=IsChecked}" Minimum="0"/>
+                    <xctk:ByteUpDown HorizontalAlignment="Left" Height="23" Margin="314,75,0,0" VerticalAlignment="Top" Width="73" Value="{Binding SceneCreatorModel.Bri}" IsEnabled="{Binding ElementName=cbBri, Path=IsChecked}"/>
+                    <xctk:ByteUpDown HorizontalAlignment="Left" Height="23" Margin="314,162,0,0" VerticalAlignment="Top" Width="73" Value="{Binding SceneCreatorModel.Sat}" IsEnabled="{Binding ElementName=cbSAT, Path=IsChecked}"/>
+                    <xctk:ShortUpDown HorizontalAlignment="Left" Height="23" Margin="314,119,0,0" VerticalAlignment="Top" Width="73" Value="{Binding SceneCreatorModel.Ct}" IsEnabled="{Binding ElementName=cbCT, Path=IsChecked}"/>
+                    <xctk:DecimalUpDown HorizontalAlignment="Left" Height="20" Margin="314,205,0,0" VerticalAlignment="Top" Width="73" Value="{Binding SceneCreatorModel.X}" IsEnabled="{Binding ElementName=cbXY, Path=IsChecked}" Maximum="1" Minimum="0" Increment="0.001"/>
+                    <xctk:DecimalUpDown HorizontalAlignment="Left" Height="18" Margin="314,230,0,0" VerticalAlignment="Top" Width="73" Value="{Binding SceneCreatorModel.Y}" IsEnabled="{Binding ElementName=cbXY, Path=IsChecked}" Maximum="1" Minimum="0" Increment="0.001"/>
                     <controls:WinHueTransitionTimeUpDown HorizontalAlignment="Left" Height="18" Margin="283,279,0,0" VerticalAlignment="Top" Width="104" Value="{Binding SceneCreatorModel.TT}" IsEnabled="{Binding ElementName=cbTT, Path=IsChecked}"/>
 
 
diff --git a/WinHue3/Functions/Schedules/NewCreator/Form_ScheduleCreator2.xaml b/WinHue3/Functions/Schedules/NewCreator/Form_ScheduleCreator2.xaml
index 74651012..a343f6a9 100644
--- a/WinHue3/Functions/Schedules/NewCreator/Form_ScheduleCreator2.xaml
+++ b/WinHue3/Functions/Schedules/NewCreator/Form_ScheduleCreator2.xaml
@@ -83,16 +83,10 @@
         <Button x:Name="btnCancel" Content="{x:Static resx:GUI.Button_Cancel}" HorizontalAlignment="Left" Margin="613,485,0,0" VerticalAlignment="Top" Width="75" Click="btnCancel_Click" />
         <Button x:Name="btnSave"  Content="{x:Static resx:GUI.Button_Save}" HorizontalAlignment="Left" Margin="533,485,0,0" VerticalAlignment="Top" Width="75" Click="btnSave_Click"/>
 
-        <TextBox HorizontalAlignment="Left" Height="23" Margin="10,18,0,0" TextWrapping="Wrap" Text="{Binding Header.Name}" VerticalAlignment="Top" Width="339">
-            <i:Interaction.Behaviors>
-                <behaviors:TextBoxWatermarkBehavior Text="{x:Static resx:GUI.Label_Name}"/>
-            </i:Interaction.Behaviors>
-        </TextBox>
-        <TextBox HorizontalAlignment="Left" Height="23" Margin="10,46,0,0" TextWrapping="Wrap" Text="{Binding Header.Description}" VerticalAlignment="Top" Width="339">
-            <i:Interaction.Behaviors>
-                <behaviors:TextBoxWatermarkBehavior Text="{x:Static resx:GUI.ScheduleCreatorForm_Description}"/>
-            </i:Interaction.Behaviors>
-        </TextBox>
+        <xctk:WatermarkTextBox HorizontalAlignment="Left" Height="23" Margin="10,18,0,0" TextWrapping="Wrap" Text="{Binding Header.Name}" VerticalAlignment="Top" Width="339" Watermark="{x:Static resx:GUI.Label_Name}"/>
+        
+        <xctk:WatermarkTextBox HorizontalAlignment="Left" Height="23" Margin="10,46,0,0" TextWrapping="Wrap" Text="{Binding Header.Description}" VerticalAlignment="Top" Width="339" Watermark="{x:Static resx:GUI.ScheduleCreatorForm_Description}"/>
+        
         <ComboBox x:Name="wcbScheduleType"  HorizontalAlignment="Left" Margin="10,74,0,0" VerticalAlignment="Top" Width="339" SelectedValuePath="Tag" SelectedValue="{Binding Header.ScheduleType}" behaviors:CommandBehavior.Command="{Binding ChangeDateTimeFormat}" behaviors:CommandBehavior.RoutedEventName="SelectionChanged">
             <ComboBoxItem Content="{x:Static resx:GUI.ScheduleCreatorForm_Schedule}" Tag="T"/>
             <ComboBoxItem Content="{x:Static resx:GUI.ScheduleCreatorForm_Alarm}" Tag="W"/>
diff --git a/WinHue3/Functions/Sensors/Creator/Form_SensorCreator.xaml b/WinHue3/Functions/Sensors/Creator/Form_SensorCreator.xaml
index 45cba0dd..d8f16231 100644
--- a/WinHue3/Functions/Sensors/Creator/Form_SensorCreator.xaml
+++ b/WinHue3/Functions/Sensors/Creator/Form_SensorCreator.xaml
@@ -87,31 +87,11 @@
                 <Label Content="{x:Static resx:GUI.SensorCreatorForm_SwVersion}" HorizontalAlignment="Left" Margin="10,91,0,0" VerticalAlignment="Top"/>
                 <Label Content="{x:Static resx:GUI.SensorCreatorForm_MfgName}" HorizontalAlignment="Left" Margin="10,122,0,0" VerticalAlignment="Top"/>
                 <Label Content="{x:Static resx:GUI.SensorCreatorForm_UniqueId}" HorizontalAlignment="Left" Margin="10,153,0,0" VerticalAlignment="Top"/>
-                <TextBox x:Name="TbUniqueId" HorizontalAlignment="Left" Margin="97,152,0,0" TextWrapping="Wrap" Text="{Binding SensorModel.Uniqueid, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True,NotifyOnValidationError=True,ValidatesOnDataErrors=True}" VerticalAlignment="Top" Width="244" MaxLength="32" IsEnabled="{Binding NotEditing}" TabIndex="5">
-                    <i:Interaction.Behaviors>
-                        <behaviors:TextBoxWatermarkBehavior Text="00:00:00:00:00:00"/>
-                    </i:Interaction.Behaviors>
-                </TextBox>
-                <TextBox x:Name="TbMfgName" HorizontalAlignment="Left" Margin="97,123,0,0" TextWrapping="Wrap" Text="{Binding SensorModel.Mfgname, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True,NotifyOnValidationError=True,ValidatesOnDataErrors=True}" VerticalAlignment="Top" Width="244" MinWidth="6" MaxLength="32" IsEnabled="{Binding NotEditing}" TabIndex="4">
-                    <i:Interaction.Behaviors>
-                        <behaviors:TextBoxWatermarkBehavior Text="my manufacturer name"/>
-                    </i:Interaction.Behaviors>
-                </TextBox>
-                <TextBox x:Name="TbSwVersion" HorizontalAlignment="Left" Margin="97,96,0,0" TextWrapping="Wrap" Text="{Binding SensorModel.Swversion, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True,NotifyOnValidationError=True,ValidatesOnDataErrors=True}" VerticalAlignment="Top" Width="244" MaxLength="16" IsEnabled="{Binding NotEditing}" TabIndex="3">
-                    <i:Interaction.Behaviors>
-                        <behaviors:TextBoxWatermarkBehavior Text="1.0"/>
-                    </i:Interaction.Behaviors>
-                </TextBox>
-                <TextBox x:Name="TbModelId" HorizontalAlignment="Left" Margin="97,67,0,0" TextWrapping="Wrap" Text="{Binding SensorModel.ModelId, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True,NotifyOnValidationError=True,ValidatesOnDataErrors=True}" VerticalAlignment="Top" Width="244" MaxLength="32" IsEnabled="{Binding NotEditing}" TabIndex="2">
-                    <i:Interaction.Behaviors>
-                        <behaviors:TextBoxWatermarkBehavior Text="IPSENSOR"/>
-                    </i:Interaction.Behaviors>
-                </TextBox>
-                <TextBox x:Name="TbSensorName" HorizontalAlignment="Left" Margin="97,13,0,0" TextWrapping="Wrap" Text="{Binding SensorModel.Name, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True,NotifyOnValidationError=True,ValidatesOnDataErrors=True}" VerticalAlignment="Top" Width="244" MaxLength="32" TabIndex="0">
-                    <i:Interaction.Behaviors>
-                        <behaviors:TextBoxWatermarkBehavior Text="my new sensor"/>
-                    </i:Interaction.Behaviors>
-                </TextBox>
+                <xctk:WatermarkTextBox x:Name="TbUniqueId" HorizontalAlignment="Left" Margin="97,152,0,0" TextWrapping="Wrap" Text="{Binding SensorModel.Uniqueid, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True,NotifyOnValidationError=True,ValidatesOnDataErrors=True}" VerticalAlignment="Top" Width="244" MaxLength="32" IsEnabled="{Binding NotEditing}" TabIndex="5" Watermark="00:00:00:00:00:00"/>
+                <xctk:WatermarkTextBox x:Name="TbMfgName" HorizontalAlignment="Left" Margin="97,123,0,0" TextWrapping="Wrap" Text="{Binding SensorModel.Mfgname, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True,NotifyOnValidationError=True,ValidatesOnDataErrors=True}" VerticalAlignment="Top" Width="244" MinWidth="6" MaxLength="32" IsEnabled="{Binding NotEditing}" TabIndex="4" Watermark="{x:Static resx:GUI.MfgName}"/>
+                <xctk:WatermarkTextBox x:Name="TbSwVersion" HorizontalAlignment="Left" Margin="97,96,0,0" TextWrapping="Wrap" Text="{Binding SensorModel.Swversion, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True,NotifyOnValidationError=True,ValidatesOnDataErrors=True}" VerticalAlignment="Top" Width="244" MaxLength="16" IsEnabled="{Binding NotEditing}" TabIndex="3" Watermark="1.0"/>
+                <xctk:WatermarkTextBox x:Name="TbModelId" HorizontalAlignment="Left" Margin="97,67,0,0" TextWrapping="Wrap" Text="{Binding SensorModel.ModelId, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True,NotifyOnValidationError=True,ValidatesOnDataErrors=True}" VerticalAlignment="Top" Width="244" MaxLength="32" IsEnabled="{Binding NotEditing}" TabIndex="2" Watermark="IPSENSOR"/>
+                <xctk:WatermarkTextBox x:Name="TbSensorName" HorizontalAlignment="Left" Margin="97,13,0,0" TextWrapping="Wrap" Text="{Binding SensorModel.Name, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True,NotifyOnValidationError=True,ValidatesOnDataErrors=True}" VerticalAlignment="Top" Width="244" MaxLength="32" TabIndex="0" Watermark="{x:Static resx:GUI.NewSensor}"/>
             </Grid>
         </GroupBox>
         <GroupBox Header="{x:Static resx:GUI.SensorCreatorForm_SensorConfig}" HorizontalAlignment="Left" Margin="374,5,0,0" VerticalAlignment="Top" Height="221" Width="256">
diff --git a/WinHue3/MainForm/MainWindow.xaml b/WinHue3/MainForm/MainWindow.xaml
index 57897a39..1b81576c 100644
--- a/WinHue3/MainForm/MainWindow.xaml
+++ b/WinHue3/MainForm/MainWindow.xaml
@@ -721,12 +721,12 @@
                                 </Style>
                             </Label.Style>
                         </Label>
-                        <sliders:BindableSlider x:Name="SlX" Maximum="1.000" Minimum="0.000" Height="23" Width="257" Value="{Binding MainFormModel.SliderX}" OldValue="{Binding MainFormModel.OldSliderX}" Margin="0,0,0,5" Command="{Binding SliderXyChangedCommand}" LargeChange="0.1" SmallChange="0.001"/>                        
-                        
-                        <!--<controls:WinHueXYUpDown Value="{Binding ElementName=SlX, Path=Value}" IsEnabled="{Binding ElementName=SlX, Path=IsEnabled}" Height="23" Width="66" Margin="5,0,0,5" behaviors:CommandBehavior.RoutedEventName="EnterPressed" behaviors:CommandBehavior.Command="{Binding SliderXyChangedCommand}"/>-->
+                        <sliders:BindableSlider x:Name="SlX" Maximum="1.000" Minimum="0.000" Height="23" Width="257" Value="{Binding MainFormModel.SliderX}" OldValue="{Binding MainFormModel.OldSliderX}" Margin="0,0,0,5" Command="{Binding SliderXyChangedCommand}" LargeChange="0.1" SmallChange="0.001"/>
+
+                        <xctk:DecimalUpDown Value="{Binding ElementName=SlX, Path=Value}" IsEnabled="{Binding ElementName=SlX, Path=IsEnabled}" Height="23" Width="66" Margin="5,0,0,5" behaviors:CommandBehavior.RoutedEventName="EnterPressed" behaviors:CommandBehavior.Command="{Binding SliderXyChangedCommand}" Maximum="1" Minimum="0" Increment="0.001" FormatString="F3"/>
                         <sliders:BindableSlider x:Name="SlY" Maximum="1.000" Minimum="0.000" Height="23" Width="257" Value="{Binding MainFormModel.SliderY}" OldValue="{Binding MainFormModel.OldSliderY}" Margin="0,0,0,5" Command="{Binding SliderXyChangedCommand}" LargeChange="0.1" SmallChange="0.001"/>
-                        <!--<controls:WinHueXYUpDown Value="{Binding ElementName=SlY, Path=Value}" IsEnabled="{Binding ElementName=SlY, Path=IsEnabled}" Height="23" Width="66" Margin="5,0,0,5" behaviors:CommandBehavior.RoutedEventName="EnterPressed" behaviors:CommandBehavior.Command="{Binding SliderXyChangedCommand}"/>-->
-                        
+                        <xctk:DecimalUpDown Value="{Binding ElementName=SlY, Path=Value}" IsEnabled="{Binding ElementName=SlY, Path=IsEnabled}" Height="23" Width="66" Margin="5,0,0,5" behaviors:CommandBehavior.RoutedEventName="EnterPressed" behaviors:CommandBehavior.Command="{Binding SliderXyChangedCommand}" Maximum="1" Minimum="0" Increment="0.001" FormatString="F3"/>
+
                     </WrapPanel>
                     <Label x:Name="LblTt" Content="{Binding TransitionTimeTooltip, Mode=OneWay}" HorizontalAlignment="Center" Width="350" HorizontalContentAlignment="Center" IsEnabled="{Binding IsEnabled, ElementName=SlTt}" Foreground="White" Background="{DynamicResource HeaderBackgroundBrush}" />
                     <WrapPanel Margin="10" VerticalAlignment="Top" HorizontalAlignment="Center">
diff --git a/WinHue3/Properties/AssemblyInfo.cs b/WinHue3/Properties/AssemblyInfo.cs
index 63dda102..da13c9c6 100644
--- a/WinHue3/Properties/AssemblyInfo.cs
+++ b/WinHue3/Properties/AssemblyInfo.cs
@@ -49,6 +49,6 @@
 // Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut 
 // en utilisant '*', comme indiqué ci-dessous :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.4098.0")]
+[assembly: AssemblyVersion("3.0.4114.0")]
 //[assembly: AssemblyFileVersion("3.0.*")]
 [assembly: log4net.Config.XmlConfigurator(ConfigFile = "log4net.config", Watch = true)]
\ No newline at end of file
diff --git a/WinHue3/Resources/GUI.Designer.cs b/WinHue3/Resources/GUI.Designer.cs
index 5f290547..63c015cf 100644
--- a/WinHue3/Resources/GUI.Designer.cs
+++ b/WinHue3/Resources/GUI.Designer.cs
@@ -708,6 +708,15 @@ public static string Button_Select {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to (Choose the operator).
+        /// </summary>
+        public static string ChooseOperator {
+            get {
+                return ResourceManager.GetString("ChooseOperator", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Copy.
         /// </summary>
@@ -852,6 +861,33 @@ public static string EventLogForm_Title {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to eg. 192.168.1.2.
+        /// </summary>
+        public static string ExampleGateway {
+            get {
+                return ResourceManager.GetString("ExampleGateway", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to eg. 192.168.1.123.
+        /// </summary>
+        public static string ExampleIP {
+            get {
+                return ResourceManager.GetString("ExampleIP", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to eg. 255.255.255.0.
+        /// </summary>
+        public static string ExampleMask {
+            get {
+                return ResourceManager.GetString("ExampleMask", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Filter data here....
         /// </summary>
@@ -2886,6 +2922,15 @@ public static string ManageUsers_Username {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to my manufacturer name.
+        /// </summary>
+        public static string MfgName {
+            get {
+                return ResourceManager.GetString("MfgName", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Custom.
         /// </summary>
@@ -2967,6 +3012,15 @@ public static string MoodCreatorForm_XYColorSpace {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to my new sensor.
+        /// </summary>
+        public static string NewSensor {
+            get {
+                return ResourceManager.GetString("NewSensor", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to (object type).
         /// </summary>
@@ -2985,6 +3039,15 @@ public static string Object_Watermark {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Optional.
+        /// </summary>
+        public static string Optional {
+            get {
+                return ResourceManager.GetString("Optional", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Paste.
         /// </summary>
@@ -3562,7 +3625,7 @@ public static string SceneCreatorForm_Step1 {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to STEP 2 : Pick a color.
+        ///   Looks up a localized string similar to STEP 3 : Pick a color.
         /// </summary>
         public static string SceneCreatorForm_Step2 {
             get {
@@ -3571,7 +3634,7 @@ public static string SceneCreatorForm_Step2 {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to STEP 3 : Choose one or more lights.
+        ///   Looks up a localized string similar to STEP 2 : Choose one or more lights.
         /// </summary>
         public static string SceneCreatorForm_Step3 {
             get {
diff --git a/WinHue3/Resources/GUI.fr.resx b/WinHue3/Resources/GUI.fr.resx
index b060b54d..27f498e7 100644
--- a/WinHue3/Resources/GUI.fr.resx
+++ b/WinHue3/Resources/GUI.fr.resx
@@ -784,10 +784,10 @@
     <value>ÉTAPE 1 : Choisir un nom</value>
   </data>
   <data name="SceneCreatorForm_Step2" xml:space="preserve">
-    <value>ÉTAPE 2 : Choisir une couleur</value>
+    <value>ÉTAPE 3 : Choisir une couleur</value>
   </data>
   <data name="SceneCreatorForm_Step3" xml:space="preserve">
-    <value>ÉTAPE 3 : Choisir une ou plus. ampoules</value>
+    <value>ÉTAPE 2 : Choisir une ou plus. ampoules</value>
   </data>
   <data name="SceneCreatorForm_Title" xml:space="preserve">
     <value>Créer / Modifer une scène...</value>
@@ -1617,4 +1617,25 @@
   <data name="Paste" xml:space="preserve">
     <value>Coller</value>
   </data>
+  <data name="NewSensor" xml:space="preserve">
+    <value>mon nouveau capteur</value>
+  </data>
+  <data name="MfgName" xml:space="preserve">
+    <value>mon nom de manufacturier</value>
+  </data>
+  <data name="ChooseOperator" xml:space="preserve">
+    <value>Choisir l'opérateur</value>
+  </data>
+  <data name="Optional" xml:space="preserve">
+    <value>Optionnel</value>
+  </data>
+  <data name="ExampleIP" xml:space="preserve">
+    <value>ex. 192.168.1.123</value>
+  </data>
+  <data name="ExampleMask" xml:space="preserve">
+    <value>ex. 255.255.255.0</value>
+  </data>
+  <data name="ExampleGateway" xml:space="preserve">
+    <value>ex. 192.168.1.1</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/WinHue3/Resources/GUI.resx b/WinHue3/Resources/GUI.resx
index 46648504..f3e32ca4 100644
--- a/WinHue3/Resources/GUI.resx
+++ b/WinHue3/Resources/GUI.resx
@@ -784,10 +784,10 @@
     <value>STEP 1 : Pick a name</value>
   </data>
   <data name="SceneCreatorForm_Step2" xml:space="preserve">
-    <value>STEP 2 : Pick a color</value>
+    <value>STEP 3 : Pick a color</value>
   </data>
   <data name="SceneCreatorForm_Step3" xml:space="preserve">
-    <value>STEP 3 : Choose one or more lights</value>
+    <value>STEP 2 : Choose one or more lights</value>
   </data>
   <data name="SceneCreatorForm_Title" xml:space="preserve">
     <value>Create / Edit a scene...</value>
@@ -1617,4 +1617,25 @@
   <data name="Paste" xml:space="preserve">
     <value>Paste</value>
   </data>
+  <data name="NewSensor" xml:space="preserve">
+    <value>my new sensor</value>
+  </data>
+  <data name="MfgName" xml:space="preserve">
+    <value>my manufacturer name</value>
+  </data>
+  <data name="ChooseOperator" xml:space="preserve">
+    <value>(Choose the operator)</value>
+  </data>
+  <data name="Optional" xml:space="preserve">
+    <value>Optional</value>
+  </data>
+  <data name="ExampleIP" xml:space="preserve">
+    <value>eg. 192.168.1.123</value>
+  </data>
+  <data name="ExampleMask" xml:space="preserve">
+    <value>eg. 255.255.255.0</value>
+  </data>
+  <data name="ExampleGateway" xml:space="preserve">
+    <value>eg. 192.168.1.2</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/WinHue3/WinHue3.csproj b/WinHue3/WinHue3.csproj
index 44fc8328..50f1e6a6 100644
--- a/WinHue3/WinHue3.csproj
+++ b/WinHue3/WinHue3.csproj
@@ -73,6 +73,26 @@
   <PropertyGroup>
     <StartupObject>WinHue3.App</StartupObject>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="BouncyCastle.Crypto, Version=1.8.4.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
       <HintPath>..\packages\BouncyCastle.1.8.4\lib\BouncyCastle.Crypto.dll</HintPath>
@@ -1040,7 +1060,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_BuildVersioningStyle="None.None.Increment.None" BuildVersion_AssemblyInfoFilename="..\..\..\..\Documents\Visual Studio 2012\Projects\WinHue3_1\WinHue3\Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="..\..\..\..\Documents\Visual Studio 2012\Projects\WinHue3_1\WinHue3\Properties\AssemblyInfo.cs" BuildVersion_BuildVersioningStyle="None.None.Increment.None" />
     </VisualStudio>
   </ProjectExtensions>
   <PropertyGroup>
diff --git a/WinHue3_1.sln b/WinHue3_1.sln
index a2f9d279..65956327 100644
--- a/WinHue3_1.sln
+++ b/WinHue3_1.sln
@@ -19,21 +19,35 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{E08F8332-0232-47BC-A7D7-212F49296577}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E08F8332-0232-47BC-A7D7-212F49296577}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E08F8332-0232-47BC-A7D7-212F49296577}.Debug|x64.ActiveCfg = Debug|x64
+		{E08F8332-0232-47BC-A7D7-212F49296577}.Debug|x64.Build.0 = Debug|x64
 		{E08F8332-0232-47BC-A7D7-212F49296577}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E08F8332-0232-47BC-A7D7-212F49296577}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E08F8332-0232-47BC-A7D7-212F49296577}.Release|x64.ActiveCfg = Release|x64
+		{E08F8332-0232-47BC-A7D7-212F49296577}.Release|x64.Build.0 = Release|x64
 		{5DBA0713-9C41-447E-B064-F41BAB888891}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5DBA0713-9C41-447E-B064-F41BAB888891}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5DBA0713-9C41-447E-B064-F41BAB888891}.Debug|x64.ActiveCfg = Debug|x64
+		{5DBA0713-9C41-447E-B064-F41BAB888891}.Debug|x64.Build.0 = Debug|x64
 		{5DBA0713-9C41-447E-B064-F41BAB888891}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5DBA0713-9C41-447E-B064-F41BAB888891}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5DBA0713-9C41-447E-B064-F41BAB888891}.Release|x64.ActiveCfg = Release|x64
+		{5DBA0713-9C41-447E-B064-F41BAB888891}.Release|x64.Build.0 = Release|x64
 		{5FC27AAC-E748-41BE-81F0-D2842D9925B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5FC27AAC-E748-41BE-81F0-D2842D9925B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5FC27AAC-E748-41BE-81F0-D2842D9925B4}.Debug|x64.ActiveCfg = Debug|x64
+		{5FC27AAC-E748-41BE-81F0-D2842D9925B4}.Debug|x64.Build.0 = Debug|x64
 		{5FC27AAC-E748-41BE-81F0-D2842D9925B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5FC27AAC-E748-41BE-81F0-D2842D9925B4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5FC27AAC-E748-41BE-81F0-D2842D9925B4}.Release|x64.ActiveCfg = Release|x64
+		{5FC27AAC-E748-41BE-81F0-D2842D9925B4}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/whc/Properties/AssemblyInfo.cs b/whc/Properties/AssemblyInfo.cs
index 1a6d3c99..419b098b 100644
--- a/whc/Properties/AssemblyInfo.cs
+++ b/whc/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@
 // 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.412.0")]
+[assembly: AssemblyVersion("1.0.424.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/whc/whc.csproj b/whc/whc.csproj
index ea026dc6..191e7674 100644
--- a/whc/whc.csproj
+++ b/whc/whc.csproj
@@ -35,6 +35,26 @@
   <PropertyGroup>
     <ApplicationIcon>icon.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="NDesk.Options">
       <HintPath>..\packages\NDesk.Options.0.2.1\lib\NDesk.Options.dll</HintPath>