Working on PPC...

20 files changed, 176 insertions, 23 deletions

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/JobView/delete.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/JobView/delete.png
new file mode 100644
index 000000000..1e4cf9945
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/JobView/delete.png
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/JobView/job-details.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/JobView/job-details.png
new file mode 100644
index 000000000..e0ebc547e
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/JobView/job-details.png
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/JobView/remove.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/JobView/remove.png
new file mode 100644
index 000000000..68ee07788
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/JobView/remove.png
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj
index 810191efe..8381120e5 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj
@@ -194,5 +194,14 @@
   <ItemGroup>
     <Resource Include="Images\pantone.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\JobView\job-details.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\JobView\delete.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\JobView\remove.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
index 59c6aafc3..99daba4cb 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
@@ -15,14 +15,14 @@ namespace Tango.PPC.Jobs.ViewModels
     /// <seealso cref="Tango.PPC.Common.PPCViewModel" />
     public class JobViewVM : PPCViewModel
     {
-        private Job _selectedJob;
+        private Job _job;
         /// <summary>
         /// Gets or sets the selected job.
         /// </summary>
-        public Job SelectedJob
+        public Job Job
         {
-            get { return _selectedJob; }
-            set { _selectedJob = value; RaisePropertyChangedAuto(); }
+            get { return _job; }
+            set { _job = value; RaisePropertyChangedAuto(); }
         }
 
         /// <summary>
@@ -39,7 +39,7 @@ namespace Tango.PPC.Jobs.ViewModels
         /// <param name="message">The message.</param>
         private void HandleJobSelectedMessage(JobSelectedMessage message)
         {
-            SelectedJob = message.Job;
+            Job = message.Job;
         }
 
         /// <summary>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml
index 16a448d67..e82b0ad2c 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml
@@ -4,7 +4,9 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:vm="clr-namespace:Tango.PPC.Jobs.ViewModels"
+             xmlns:touch="clr-namespace:Tango.Touch.Controls;assembly=Tango.Touch"
              xmlns:global="clr-namespace:Tango.PPC.Jobs"
+             xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
              xmlns:local="clr-namespace:Tango.PPC.Jobs.Views"
              mc:Ignorable="d" 
              d:DesignHeight="1280" d:DesignWidth="800" d:DataContext="{d:DesignInstance Type=vm:JobViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.JobViewVM}">
@@ -18,7 +20,77 @@
             <Border.Effect>
                 <DropShadowEffect Color="Silver" ShadowDepth="0" BlurRadius="20" Opacity="1" />
             </Border.Effect>
-            <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoHeaderFontSize}" FontWeight="SemiBold" Text="{Binding SelectedJob.Name}"></TextBlock>
+            <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoHeaderFontSize}" FontWeight="SemiBold" Text="{Binding Job.Name}"></TextBlock>
         </Border>
+
+        <Grid Grid.Row="1">
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Top" Height="57" Margin="0 -28 30 0">
+                <touch:TouchButton Margin="0 0 30 0" Padding="15" Style="{StaticResource TangoRoundTouchButton}">
+                    <Image Source="../Images/JobView/delete.png" />
+                </touch:TouchButton>
+                <touch:TouchButton Padding="20" Style="{StaticResource TangoRoundTouchButton}">
+                    <Image Source="../Images/JobView/remove.png" />
+                </touch:TouchButton>
+            </StackPanel>
+
+            <Grid Margin="10 60 10 0">
+                <StackPanel>
+                    <touch:TouchExpander Padding="20 15">
+                        <touch:TouchExpander.Header>
+                            <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="0 0 20 0">
+                                <Image Source="../Images/JobView/job-details.png" Width="39" />
+                                <TextBlock FontWeight="Medium" Margin="20 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoExpanderHeaderFontSize}">Job Details</TextBlock>
+
+                                <TextBlock FontWeight="Medium" Margin="50 0 0 0" VerticalAlignment="Center" Text="{Binding Job.Rml.Name}"></TextBlock>
+                            </StackPanel>
+                        </touch:TouchExpander.Header>
+
+                        <StackPanel Margin="60 30 60 20" TextElement.FontWeight="Medium">
+                            <controls:TableGrid RowHeight="50">
+                                <TextBlock>Job name:</TextBlock>
+                                <touch:TouchTextBox Text="{Binding Job.Name,UpdateSourceTrigger=PropertyChanged}" />
+                                <TextBlock>Customer name:</TextBlock>
+                                <touch:TouchComboBox/>
+                                <TextBlock>Thread type:</TextBlock>
+                                <touch:TouchComboBox/>
+                                <TextBlock>Comment:</TextBlock>
+                                <TextBox Margin="20 0 0 -42" Text="{Binding Job.Description}" FocusVisualStyle="{x:Null}" BorderBrush="{StaticResource TangoDividerBrush}" Foreground="{StaticResource TangoDarkForegroundBrush}" AcceptsReturn="True" TextWrapping="Wrap" Height="60" Padding="5">
+                                    
+                                </TextBox>
+                            </controls:TableGrid>
+
+                            <Grid HorizontalAlignment="Center" Margin="0 20 0 0" TextElement.Foreground="{StaticResource TangoGrayTextBrush}">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+
+                                <TextBlock HorizontalAlignment="Left">
+                                    <Run Text="Job status:"></Run>
+                                    <Run Text="{Binding Job.JobStatus}"></Run>
+                                </TextBlock>
+
+                                <Rectangle Margin="20 0" Grid.Column="1" HorizontalAlignment="Center" StrokeThickness="1" Stroke="{StaticResource TangoGrayTextBrush}" />
+
+                                <TextBlock Grid.Column="2" HorizontalAlignment="Center">
+                                    <Run Text="Last updated:"></Run>
+                                    <Run Text="{Binding Job.LastUpdated,Converter={StaticResource DateTimeUTCToShortDateConverter},TargetNullValue=Never}"></Run>
+                                </TextBlock>
+
+                                <Rectangle Margin="20 0" Grid.Column="3" HorizontalAlignment="Center" StrokeThickness="1" Stroke="{StaticResource TangoGrayTextBrush}" />
+
+                                <TextBlock Grid.Column="4" HorizontalAlignment="Right">
+                                    <Run Text="Last dye:"></Run>
+                                    <Run Text="{Binding Job.LastRun,Converter={StaticResource DateTimeUTCToShortDateConverter},TargetNullValue=Never}"></Run>
+                                </TextBlock>
+                            </Grid>
+                        </StackPanel>
+                    </touch:TouchExpander>
+                </StackPanel>
+            </Grid>
+        </Grid>
     </Grid>
 </UserControl>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml
index beb273e2e..405868e24 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml
@@ -22,6 +22,7 @@
             <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
             <converters:BooleanInverseConverter x:Key="BooleanInverseConverter" />
             <converters:BooleanToVisibilityInverseConverter x:Key="BooleanToVisibilityInverseConverter" />
+            <converters:DateTimeUTCToShortDateConverter x:Key="DateTimeUTCToShortDateConverter" />
         </ResourceDictionary>
     </ResourceDictionary.MergedDictionaries>
     
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/GlobalStatus/ready-to-dye.png b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/GlobalStatus/ready-to-dye.png
new file mode 100644
index 000000000..7edf624be
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/GlobalStatus/ready-to-dye.png
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/MainWindow.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/MainWindow.xaml
index cabd05265..718eb5519 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/MainWindow.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/MainWindow.xaml
@@ -9,7 +9,8 @@
         Title="MainWindow" Height="1000" Stylus.IsTapFeedbackEnabled="False" Stylus.IsPressAndHoldEnabled="False" Stylus.IsTouchFeedbackEnabled="False"  Width="800" WindowStyle="SingleBorderWindow" ResizeMode="CanResize" WindowStartupLocation="CenterScreen" 
         FontFamily="{StaticResource TangoFlexoFontFamily}"
         FontSize="{StaticResource TangoDefaultFontSize}"
-        Foreground="{StaticResource TangoDarkForegroundBrush}">
+        Foreground="{StaticResource TangoDarkForegroundBrush}"
+        FontWeight="Medium">
     <Grid>
         <views:MainView/>
     </Grid>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
index 2f6491be3..d4c2bb037 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
@@ -182,6 +182,7 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <Resource Include="Images\GlobalStatus\ready-to-dye.png" />
     <Resource Include="Images\user-profile.png" />
     <Resource Include="Images\warning-test.png" />
     <EmbeddedResource Include="Properties\Resources.resx">
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoginViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoginViewVM.cs
index 5086fd323..6107a906d 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoginViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoginViewVM.cs
@@ -35,6 +35,9 @@ namespace Tango.PPC.UI.ViewModels
         public LoginViewVM()
         {
             LoginCommand = new RelayCommand(Login);
+
+            Email = "roy@twine-s.com";
+            Password = "1234";
         }
 
         public override void OnApplicationStarted()
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
index 9e59b7f33..78d040d27 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
@@ -102,6 +102,12 @@
                                 </touch:TouchHamburgerButton.Effect>
                             </touch:TouchHamburgerButton>
                         </Border>
+                        <Grid DockPanel.Dock="Right" Margin="0 0 20 0">
+                            <StackPanel VerticalAlignment="Center">
+                                <Image Source="/Images/GlobalStatus/ready-to-dye.png" Width="33" />
+                                <TextBlock Margin="0 10 0 0">Ready to Dye</TextBlock>
+                            </StackPanel>
+                        </Grid>
                         <Grid>
                             <!--External Header Content Here-->
                         </Grid>
diff --git a/Software/Visual_Studio/Tango.SharedUI/Controls/TableGrid.cs b/Software/Visual_Studio/Tango.SharedUI/Controls/TableGrid.cs
index 084df75ac..0987e2445 100644
--- a/Software/Visual_Studio/Tango.SharedUI/Controls/TableGrid.cs
+++ b/Software/Visual_Studio/Tango.SharedUI/Controls/TableGrid.cs
@@ -20,6 +20,19 @@ namespace Tango.SharedUI.Controls
             DependencyProperty.Register("RowHeight", typeof(GridLength), typeof(TableGrid), new FrameworkPropertyMetadata(new GridLength(1, GridUnitType.Star), FrameworkPropertyMetadataOptions.AffectsRender));
 
 
+
+        public Thickness SecondRowMargin
+        {
+            get { return (Thickness)GetValue(SecondRowMarginProperty); }
+            set { SetValue(SecondRowMarginProperty, value); }
+        }
+
+        // Using a DependencyProperty as the backing store for SecondRowMargin.  This enables animation, styling, binding, etc...
+        public static readonly DependencyProperty SecondRowMarginProperty =
+            DependencyProperty.Register("SecondRowMargin", typeof(Thickness), typeof(TableGrid), new PropertyMetadata(new Thickness(20, 0, 0, 0)));
+
+
+
         public TableGrid()
         {
             ColumnDefinitions.Add(new ColumnDefinition() { Width = new GridLength(1, GridUnitType.Auto) });
@@ -27,11 +40,6 @@ namespace Tango.SharedUI.Controls
             this.Loaded += TableGrid_Loaded;
         }
 
-        protected override void OnRender(DrawingContext dc)
-        {
-            base.OnRender(dc);
-        }
-
         private void TableGrid_Loaded(object sender, RoutedEventArgs e)
         {
             InvalidateGrid();
@@ -62,7 +70,10 @@ namespace Tango.SharedUI.Controls
                 if (i % 2 != 0)
                 {
                     SetColumn(Children[i], 1);
-                    (Children[i] as FrameworkElement).Margin = new Thickness(20, 0, 0, 0);
+                    if ((Children[i] as FrameworkElement).Margin == new Thickness())
+                    {
+                        (Children[i] as FrameworkElement).Margin = SecondRowMargin;
+                    }
                     currentRow++;
                     RowDefinitions.Add(new RowDefinition() { Height = RowHeight });
                 }
diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchExpander.xaml b/Software/Visual_Studio/Tango.Touch/Controls/TouchExpander.xaml
index 87a164158..9122744bf 100644
--- a/Software/Visual_Studio/Tango.Touch/Controls/TouchExpander.xaml
+++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchExpander.xaml
@@ -9,6 +9,7 @@
     </ResourceDictionary.MergedDictionaries>
 
     <Style TargetType="{x:Type local:TouchExpander}">
+        <Setter Property="Padding" Value="10"></Setter>
         <Setter Property="Background" Value="{StaticResource TangoPrimaryBackgroundBrush}"></Setter>
         <Setter Property="Template">
             <Setter.Value>
@@ -17,7 +18,7 @@
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" CornerRadius="{TemplateBinding CornerRadius}">
                         <Border.Effect>
-                            <DropShadowEffect Color="Gray" ShadowDepth="0" />
+                            <DropShadowEffect Color="{StaticResource TangoDropShadowColor}" ShadowDepth="0" />
                         </Border.Effect>
 
                         <Grid>
@@ -27,7 +28,7 @@
                             </Grid.RowDefinitions>
 
                             <DockPanel Grid.Row="0">
-                                <local:TouchToggleButton CornerRadius="50" RenderTransformOrigin="0.5,0.5" Background="{StaticResource TangoExpanderIconBrush}" EnableDropShadow="False" Width="32" Height="32" DockPanel.Dock="Right" IsChecked="{Binding RelativeSource={RelativeSource AncestorType=local:TouchExpander},Path=IsExpanded,Mode=TwoWay}">
+                                <local:TouchToggleButton CornerRadius="50" RenderTransformOrigin="0.5,0.5" Background="{StaticResource TangoExpanderIconBackgroundBrush}" EnableDropShadow="False" Width="40" Height="40" DockPanel.Dock="Right" IsChecked="{Binding RelativeSource={RelativeSource AncestorType=local:TouchExpander},Path=IsExpanded,Mode=TwoWay}">
                                     <local:TouchToggleButton.RenderTransform>
                                         <RotateTransform x:Name="Rotate" />
                                     </local:TouchToggleButton.RenderTransform>
@@ -53,11 +54,11 @@
                                     </local:TouchToggleButton.Triggers>
                                     <local:TouchToggleButton.CheckedContent>
                                         <Grid>
-                                            <fa:ImageAwesome Icon="Minus" Foreground="{StaticResource TangoDarkForegroundBrush}" Width="10" Height="10" />
+                                            <fa:ImageAwesome Icon="Minus" Foreground="{StaticResource TangoExpanderIconForegroundBrush}" Width="10" Height="10" />
                                         </Grid>
                                     </local:TouchToggleButton.CheckedContent>
                                     <Grid>
-                                        <fa:ImageAwesome Icon="Plus" Foreground="{StaticResource TangoDarkForegroundBrush}" Width="10" Height="10" />
+                                        <fa:ImageAwesome Icon="Plus" Foreground="{StaticResource TangoExpanderIconForegroundBrush}" Width="10" Height="10" />
                                     </Grid>
                                 </local:TouchToggleButton>
 
diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchTable.cs b/Software/Visual_Studio/Tango.Touch/Controls/TouchTable.cs
new file mode 100644
index 000000000..3783c5bea
--- /dev/null
+++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchTable.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Tango.Touch.Controls
+{
+    public class TouchTable : Grid
+    {
+        public GridLength RowHeight
+        {
+            get { return (GridLength)GetValue(RowHeightProperty); }
+            set { SetValue(RowHeightProperty, value); }
+        }
+        public static readonly DependencyProperty RowHeightProperty =
+            DependencyProperty.Register("RowHeight", typeof(GridLength), typeof(TouchTable), new FrameworkPropertyMetadata(new GridLength(1, GridUnitType.Star), FrameworkPropertyMetadataOptions.AffectsRender));
+
+        public TouchTable()
+        {
+            this.Loaded += TouchTable_Loaded;
+        }
+
+        private void TouchTable_Loaded(object sender, RoutedEventArgs e)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchTextBox.xaml b/Software/Visual_Studio/Tango.Touch/Controls/TouchTextBox.xaml
index d49f8799e..c463b5277 100644
--- a/Software/Visual_Studio/Tango.Touch/Controls/TouchTextBox.xaml
+++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchTextBox.xaml
@@ -20,6 +20,7 @@
     </ResourceDictionary.MergedDictionaries>
 
     <Style TargetType="{x:Type local:TouchTextBox}">
+        <Setter Property="Foreground" Value="{StaticResource TangoDarkForegroundBrush}"></Setter>
         <Setter Property="Focusable" Value="False"></Setter>
         <Setter Property="FocusVisualStyle" Value="{x:Null}"></Setter>
         <Setter Property="keyboard:KeyboardView.Mode" Value="{Binding RelativeSource={RelativeSource Self},Path=KeyboardMode}"></Setter>
@@ -98,8 +99,8 @@
                                 <Grid>
                                     <components:Ripple RippleBrush="{StaticResource TangoRippleDarkBrush}" RippleFactor="15">
                                         <Grid>
-                                            <TextBox Padding="0 0 0 4" CaretBrush="{StaticResource TangoPrimaryAccentBrush}" FocusVisualStyle="{x:Null}" x:Name="PART_TextBox" Text="{Binding RelativeSource={RelativeSource AncestorType=local:TouchTextBox},Path=Text,UpdateSourceTrigger=PropertyChanged}" BorderThickness="0" Background="Transparent" Visibility="{Binding RelativeSource={RelativeSource AncestorType=local:TouchTextBox},Path=IsPassword,Converter={StaticResource BooleanToVisibilityInverseConverter}}"></TextBox>
-                                            <PasswordBox helpers:PasswordHelper.Attach="True" helpers:PasswordHelper.Password="{Binding RelativeSource={RelativeSource AncestorType=local:TouchTextBox},Path=Text,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Padding="0 0 0 4" CaretBrush="{StaticResource TangoPrimaryAccentBrush}" FocusVisualStyle="{x:Null}" x:Name="PART_PasswordBox" BorderThickness="0" Background="Transparent" Visibility="{Binding RelativeSource={RelativeSource AncestorType=local:TouchTextBox},Path=IsPassword,Converter={StaticResource BooleanToVisibilityConverter}}"></PasswordBox>
+                                            <TextBox Foreground="{TemplateBinding Foreground}" Padding="0 0 0 4" CaretBrush="{StaticResource TangoPrimaryAccentBrush}" FocusVisualStyle="{x:Null}" x:Name="PART_TextBox" Text="{Binding RelativeSource={RelativeSource AncestorType=local:TouchTextBox},Path=Text,UpdateSourceTrigger=PropertyChanged}" BorderThickness="0" Background="Transparent" Visibility="{Binding RelativeSource={RelativeSource AncestorType=local:TouchTextBox},Path=IsPassword,Converter={StaticResource BooleanToVisibilityInverseConverter}}"></TextBox>
+                                            <PasswordBox Foreground="{TemplateBinding Foreground}" helpers:PasswordHelper.Attach="True" helpers:PasswordHelper.Password="{Binding RelativeSource={RelativeSource AncestorType=local:TouchTextBox},Path=Text,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Padding="0 0 0 4" CaretBrush="{StaticResource TangoPrimaryAccentBrush}" FocusVisualStyle="{x:Null}" x:Name="PART_PasswordBox" BorderThickness="0" Background="Transparent" Visibility="{Binding RelativeSource={RelativeSource AncestorType=local:TouchTextBox},Path=IsPassword,Converter={StaticResource BooleanToVisibilityConverter}}"></PasswordBox>
                                             <TextBlock IsHitTestVisible="False" Text="{TemplateBinding Watermark}" Foreground="{StaticResource TangoTextWatermarkBrush}">
                                                 <TextBlock.Style>
                                                     <Style TargetType="TextBlock">
diff --git a/Software/Visual_Studio/Tango.Touch/Resources/Colors.xaml b/Software/Visual_Studio/Tango.Touch/Resources/Colors.xaml
index 11da08e69..75c68c749 100644
--- a/Software/Visual_Studio/Tango.Touch/Resources/Colors.xaml
+++ b/Software/Visual_Studio/Tango.Touch/Resources/Colors.xaml
@@ -10,8 +10,8 @@
     <Color x:Key="TangoMidAccentColor">#4e556f</Color>
     <Color x:Key="TangoLowAccentColor">#40455F</Color>
     <Color x:Key="TangoLowerAccentColor">#404554</Color>
-    
-    <Color x:Key="TangoDarkForegroundColor">#2f2f2f</Color>
+
+    <Color x:Key="TangoDarkForegroundColor">#3b3e4a</Color>
     <Color x:Key="TangoLightForegroundColor">#FFFFFF</Color>
     
     <Color x:Key="TangoDividerColor">#c8cbd4</Color>
@@ -31,7 +31,12 @@
 
     <Color x:Key="TangoValidationErrorColor">Red</Color>
 
-    <Color x:Key="TangoExpanderIconColor">#C5C5C6</Color>
+    <Color x:Key="TangoExpanderIconBackgroundColor">#f1f1f1</Color>
+    <Color x:Key="TangoExpanderIconForegroundColor">#55565a</Color>
+
+    <Color x:Key="TangoDropShadowColor">#dbe0e8</Color>
+
+    <Color x:Key="TangoGrayTextColor">#7e818b</Color>
 
     <!--Brushes-->
     <SolidColorBrush x:Key="TangoPrimaryBackgroundBrush" Color="{StaticResource TangoPrimaryBackgroundColor}"></SolidColorBrush>
@@ -62,5 +67,10 @@
 
     <SolidColorBrush x:Key="TangoValidationErrorBrush" Color="{StaticResource TangoValidationErrorColor}"></SolidColorBrush>
 
-    <SolidColorBrush x:Key="TangoExpanderIconBrush" Color="{StaticResource TangoExpanderIconColor}"></SolidColorBrush>
+    <SolidColorBrush x:Key="TangoExpanderIconBackgroundBrush" Color="{StaticResource TangoExpanderIconBackgroundColor}"></SolidColorBrush>
+    <SolidColorBrush x:Key="TangoExpanderIconForegroundBrush" Color="{StaticResource TangoExpanderIconForegroundColor}"></SolidColorBrush>
+
+    <SolidColorBrush x:Key="TangoDropShadowBrush" Color="{StaticResource TangoDropShadowColor}"></SolidColorBrush>
+
+    <SolidColorBrush x:Key="TangoGrayTextBrush" Color="{StaticResource TangoGrayTextColor}"></SolidColorBrush>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Touch/Resources/Fonts.xaml b/Software/Visual_Studio/Tango.Touch/Resources/Fonts.xaml
index cd2e0ea58..e10072259 100644
--- a/Software/Visual_Studio/Tango.Touch/Resources/Fonts.xaml
+++ b/Software/Visual_Studio/Tango.Touch/Resources/Fonts.xaml
@@ -6,4 +6,6 @@
     <sys:Double x:Key="TangoMessageBoxTitleFontSize">30</sys:Double>
     <sys:Double x:Key="TangoMessageBoxMessageFontSize">20</sys:Double>
 
+    <sys:Double x:Key="TangoExpanderHeaderFontSize">23</sys:Double>
+
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Touch/Tango.Touch.csproj b/Software/Visual_Studio/Tango.Touch/Tango.Touch.csproj
index e4e1ec09f..15566b31c 100644
--- a/Software/Visual_Studio/Tango.Touch/Tango.Touch.csproj
+++ b/Software/Visual_Studio/Tango.Touch/Tango.Touch.csproj
@@ -66,6 +66,7 @@
     <Compile Include="Controls\TouchInput.cs" />
     <Compile Include="Controls\TouchListBox.cs" />
     <Compile Include="Controls\TouchListBoxItem.cs" />
+    <Compile Include="Controls\TouchTable.cs" />
     <Compile Include="Controls\TouchTextBox.cs" />
     <Compile Include="Controls\TouchPanel.cs" />
     <Compile Include="Converters\StringToPasswordConverter.cs" />
diff --git a/Software/Visual_Studio/Utilities/Tango.UITests/MainWindow.xaml b/Software/Visual_Studio/Utilities/Tango.UITests/MainWindow.xaml
index daec6b930..1291c560f 100644
--- a/Software/Visual_Studio/Utilities/Tango.UITests/MainWindow.xaml
+++ b/Software/Visual_Studio/Utilities/Tango.UITests/MainWindow.xaml
@@ -43,6 +43,9 @@
                             <touch:TouchCheckBox Margin="0 20 0 0">Item 4</touch:TouchCheckBox>
                         </StackPanel>
                     </touch:TouchExpander>
+                    <controls:TableGrid Height="100" RowHeight="30">
+                                
+                    </controls:TableGrid>
                 </StackPanel>
             </Grid>
         </touch:TouchPanel>