From 65ee77bd011837158f7b6036ea3d774a312cf329 Mon Sep 17 00:00:00 2001
From: Sofiya K <Sofiya_k@trimble.com>
Date: Thu, 30 May 2024 13:31:49 +0530
Subject: [PATCH] - Removed unsused codes - Refactor the code

---
 DemoApp/DemoApp/MauiProgram.cs                |   2 +-
 .../Resources/Styles/DarkThemeColors.xaml     |  29 +++-
 .../Resources/Styles/LightThemeColors.xaml    |  29 +++-
 .../Constant/ColorsConstants.cs               |  68 ++++-----
 .../Controls/DropDown/DropDownContents.xaml   |   4 +-
 .../Controls/DropDown/DropDownViewCell.cs     |   6 +-
 .../Controls/DropDown/TMDropDown.xaml         |   2 +-
 .../Controls/DropDown/TMDropDown.xaml.cs      |   4 +-
 .../Controls/Messages/MessageView.xaml.cs     |   2 +-
 .../Controls/ProgressBar/BaseProgressBar.cs   |   8 +-
 .../Controls/TMCard/TMCard.xaml.cs            |   6 +-
 .../Controls/TMDataGrid/DataGrid.xaml.cs      |   2 +-
 .../Controls/TMDataGrid/DataGridRow.cs        |   2 +-
 .../Controls/TMInput/BaseInput.xaml.cs        |   2 +-
 .../Controls/TMModal/TMModalContents.xaml     |   4 +-
 .../TMSegmentedControl/TMSegmentedItem.xaml   |   2 +-
 .../TMSegmentedItem.xaml.cs                   |   4 +-
 .../Controls/TMSlider/SliderCore.cs           |  16 +-
 .../Controls/TMSlider/SliderHelper.cs         |   4 +-
 .../Controls/TMSlider/TMRangeSlider.cs        |   4 +-
 .../Controls/TMSlider/TMSlider.cs             |   2 +-
 .../Controls/TMSpinner/TMSpinner.cs           |   2 +-
 .../Controls/TabBar/TMTabbedPage.cs           |  12 +-
 .../Controls/TabBar/TabViewItem.xaml.cs       |   8 +-
 .../Helpers/ResourceDictionary.cs             |   6 +-
 Trimble.Modus.Components/Styles/Colors.xaml   |  47 +-----
 .../Styles/LightTheme.xaml                    | 140 +++++++++---------
 .../Styles/LightThemeColors.xaml              |   6 +-
 28 files changed, 212 insertions(+), 211 deletions(-)

diff --git a/DemoApp/DemoApp/MauiProgram.cs b/DemoApp/DemoApp/MauiProgram.cs
index bc61d39a..be53816e 100644
--- a/DemoApp/DemoApp/MauiProgram.cs
+++ b/DemoApp/DemoApp/MauiProgram.cs
@@ -14,7 +14,7 @@ public static MauiApp CreateMauiApp()
         builder
             .UseMauiApp<App>()
             .UseMauiCommunityToolkit()
-            .UseTrimbleModus(new Resources.Styles.LightThemeColors(), new Resources.Styles.DarkThemeColors())
+            .UseTrimbleModus()
             .ConfigureFonts(fonts =>
             {
                 fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
diff --git a/DemoApp/DemoApp/Resources/Styles/DarkThemeColors.xaml b/DemoApp/DemoApp/Resources/Styles/DarkThemeColors.xaml
index 510a6f92..90c144a9 100644
--- a/DemoApp/DemoApp/Resources/Styles/DarkThemeColors.xaml
+++ b/DemoApp/DemoApp/Resources/Styles/DarkThemeColors.xaml
@@ -3,5 +3,32 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="DemoApp.Resources.Styles.DarkThemeColors">
 
-  <Color x:Key="Primary">green</Color>
+  <Color x:Key="Primary">yellow</Color>
+  <Color x:Key="PrimaryLight">lightyellow</Color>
+  <Color x:Key="PrimaryDark">#ffeb3b</Color>
+
+  <Color x:Key="DefaultTextColor">#FFFFFF</Color>
+  <Color x:Key="AlternateTextColor">#252A2E</Color>
+
+  <Color x:Key="Danger">#d32f2f</Color>
+  <Color x:Key="DangerLight">#ef5350</Color>
+  <Color x:Key="DangerDark">#c62828</Color>
+
+  <Color x:Key="Tertiary">#3f51b5</Color>
+  <Color x:Key="TertiaryLight">#c5cae9</Color>
+  <Color x:Key="TertiaryDark">#1a237e</Color>
+
+  <Color x:Key="Warning">#ed6c02</Color>
+  <Color x:Key="WarningLight">#ff9800</Color>
+  <Color x:Key="WarningDark">#e65100</Color>
+
+  <Color x:Key="Success">#2e7d32</Color>
+  <Color x:Key="SuccessLight">#4caf50</Color>
+  <Color x:Key="SuccessDark">#1b5e20</Color>
+
+  <Color x:Key="Secondary">#9c27b0</Color>
+  <Color x:Key="SecondaryLight">#ba68c8</Color>
+  <Color x:Key="SecondaryDark">#7b1fa2</Color>
+
+  <Color x:Key="Transparent">transparent</Color>
 </ResourceDictionary>
diff --git a/DemoApp/DemoApp/Resources/Styles/LightThemeColors.xaml b/DemoApp/DemoApp/Resources/Styles/LightThemeColors.xaml
index 5d8f8cfb..12bff215 100644
--- a/DemoApp/DemoApp/Resources/Styles/LightThemeColors.xaml
+++ b/DemoApp/DemoApp/Resources/Styles/LightThemeColors.xaml
@@ -2,5 +2,32 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
                     x:Class="DemoApp.Resources.Styles.LightThemeColors">
-  <Color x:Key="Primary">#FFC400</Color>  
+  <Color x:Key="Primary">#019aeb</Color>
+  <Color x:Key="PrimaryLight">#DCEDF9</Color>
+  <Color x:Key="PrimaryDark">#004f83</Color>
+
+  <Color x:Key="DefaultTextColor">#FFFFFF</Color>
+  <Color x:Key="AlternateTextColor">#252A2E</Color>
+
+  <Color x:Key="Danger">#DA212C</Color>
+  <Color x:Key="DangerLight">#FBD4D7</Color>
+  <Color x:Key="DangerDark">#AB1F26</Color>
+
+  <Color x:Key="Tertiary">#353A40</Color>
+  <Color x:Key="TertiaryLight">#E0E1E9</Color>
+  <Color x:Key="TertiaryDark">#171C1E</Color>
+
+  <Color x:Key="Warning">#FBAD26</Color>
+  <Color x:Key="WarningLight">#fff5e4</Color>
+  <Color x:Key="WarningDark">#e49325</Color>
+
+  <Color x:Key="Success">#1E8A44</Color>
+  <Color x:Key="SuccessLight">#E0ECCF</Color>
+  <Color x:Key="SuccessDark">#006638</Color>
+
+  <Color x:Key="Secondary">#6A6E79</Color>
+  <Color x:Key="SecondaryLight">#B7B9C3</Color>
+  <Color x:Key="SecondaryDark">#585C65</Color>
+
+  <Color x:Key="Transparent">transparent</Color>
 </ResourceDictionary>
diff --git a/Trimble.Modus.Components/Constant/ColorsConstants.cs b/Trimble.Modus.Components/Constant/ColorsConstants.cs
index d3a2e6af..752b966a 100644
--- a/Trimble.Modus.Components/Constant/ColorsConstants.cs
+++ b/Trimble.Modus.Components/Constant/ColorsConstants.cs
@@ -1,48 +1,40 @@
 namespace Trimble.Modus.Components.Constant;
+
 internal class ColorsConstants
 {
-    // Blue
-    public const string TrimbleBlueDark = "TrimbleBlueDark";
-    public const string TrimbleBlue = "TrimbleBlue";
-    public const string Blue = "Blue";
-    public const string BlueDark = "BlueDark";
-    public const string BlueLight = "BlueLight";
-    public const string HighlightBlue = "HighlightBlue";
-    public const string BluePale = "BluePale";
+    // Primary
+    public const string Primary = "Primary";
+    public const string PrimaryLight = "PrimaryLight";
+    public const string PrimaryDark = "PrimaryDark";
+
+    // Text Colors
+    public const string DefaultTextColor = "DefaultTextColor";
+    public const string AlternateTextColor = "AlternateTextColor";
 
-    // Black
-    public const string TrimbleGray = "TrimbleGray";
-    public const string Gray10 = "Gray10";
-    public const string Gray9 = "Gray9";
-    public const string Gray8 = "Gray8";
-    public const string Gray7 = "Gray7";
-    public const string Gray6 = "Gray6";
-    public const string Gray5 = "Gray5";
-    public const string Gray4 = "Gray4";
-    public const string Gray3 = "Gray3";
-    public const string Gray2 = "Gray2";
-    public const string Gray1 = "Gray1";
-    public const string Gray0 = "Gray0";
-    public const string GrayLight = "GrayLight";
-    public const string White = "White";
+    // Danger
+    public const string Danger = "Danger";
+    public const string DangerLight = "DangerLight";
+    public const string DangerDark = "DangerDark";
+    
+    // Tertiary
+    public const string Tertiary = "Tertiary";
+    public const string TertiaryLight = "TertiaryLight";
+    public const string TertiaryDark = "TertiaryDark";
 
-    // Orange
-    public const string YellowDark = "YellowDark";
-    public const string Yellow = "Yellow";
-    public const string YellowLight = "YellowLight";
-    public const string YellowPale = "YellowPale";
+    // Warning
+    public const string Warning = "Warning";
+    public const string WarningLight = "WarningLight";
+    public const string WarningDark = "WarningDark";
 
-    // Red
-    public const string RedDark = "RedDark";
-    public const string Red = "Red";
-    public const string RedLight = "RedLight";
-    public const string RedPale = "RedPale";
+    // Success
+    public const string Success = "Success";
+    public const string SuccessLight = "SuccessLight";
+    public const string SuccessDark = "SuccessDark";
 
-    // Green
-    public const string GreenDark = "GreenDark";
-    public const string Green = "Green";
-    public const string GreenLight = "GreenLight";
-    public const string GreenPale = "GreenPale";
+    // Secondary
+    public const string Secondary = "Secondary";
+    public const string SecondaryLight = "SecondaryLight";
+    public const string SecondaryDark = "SecondaryDark";
 
     // Transparent
     public const string Transparent = "Transparent";
diff --git a/Trimble.Modus.Components/Controls/DropDown/DropDownContents.xaml b/Trimble.Modus.Components/Controls/DropDown/DropDownContents.xaml
index 955dc39e..3056e44a 100644
--- a/Trimble.Modus.Components/Controls/DropDown/DropDownContents.xaml
+++ b/Trimble.Modus.Components/Controls/DropDown/DropDownContents.xaml
@@ -8,7 +8,7 @@
   <Border x:Name="border"
           VerticalOptions="Start"
           HorizontalOptions="Start"
-          Stroke="{DynamicResource BlueLight}"
+          Stroke="{DynamicResource PrimaryLight}"
           StrokeThickness="4"
           Padding="8"
           BackgroundColor="White">
@@ -16,7 +16,7 @@
       <RoundRectangle CornerRadius="4" />
     </Border.StrokeShape>
     <Border.Shadow>
-      <Shadow Brush="{DynamicResource Gray9}"
+      <Shadow Brush="{DynamicResource Secondary}"
               Radius="3"
               Opacity="0.6">
         <Shadow.Offset>
diff --git a/Trimble.Modus.Components/Controls/DropDown/DropDownViewCell.cs b/Trimble.Modus.Components/Controls/DropDown/DropDownViewCell.cs
index bd21a9d6..60d2c673 100644
--- a/Trimble.Modus.Components/Controls/DropDown/DropDownViewCell.cs
+++ b/Trimble.Modus.Components/Controls/DropDown/DropDownViewCell.cs
@@ -19,9 +19,9 @@ public DropDownViewCell()
     {
         label = new Label
         {
-            TextColor = ResourcesDictionary.ColorsDictionary(ColorsConstants.Gray9),
+            TextColor = ResourcesDictionary.GetColor(ColorsConstants.Secondary),
             FontAttributes = FontAttributes.None,
-            BackgroundColor = ResourcesDictionary.ColorsDictionary(ColorsConstants.Transparent),
+            BackgroundColor = ResourcesDictionary.GetColor(ColorsConstants.Transparent),
             VerticalOptions = LayoutOptions.Center,
             HorizontalOptions = LayoutOptions.Start,
             Padding = new Thickness(8, 12)
@@ -33,7 +33,7 @@ public DropDownViewCell()
         {
             Children = { label
 },
-            BackgroundColor = ResourcesDictionary.ColorsDictionary(ColorsConstants.Transparent),
+            BackgroundColor = ResourcesDictionary.GetColor(ColorsConstants.Transparent),
         };
     }
     internal void UpdateBackgroundColor(Color backgroundColor, bool textAttribute)
diff --git a/Trimble.Modus.Components/Controls/DropDown/TMDropDown.xaml b/Trimble.Modus.Components/Controls/DropDown/TMDropDown.xaml
index 76273e16..c2292358 100644
--- a/Trimble.Modus.Components/Controls/DropDown/TMDropDown.xaml
+++ b/Trimble.Modus.Components/Controls/DropDown/TMDropDown.xaml
@@ -24,7 +24,7 @@
              FontSize="16"
              HorizontalOptions="Center"
              FontFamily="OpenSansSemibold"
-             TextColor="{DynamicResource White}"
+             TextColor="{DynamicResource AlternateTextColor}"
              VerticalOptions="Center" />
       <StackLayout x:Name="indicatorButton"
                    Orientation="Horizontal"
diff --git a/Trimble.Modus.Components/Controls/DropDown/TMDropDown.xaml.cs b/Trimble.Modus.Components/Controls/DropDown/TMDropDown.xaml.cs
index 3fadbb8e..43fbc27d 100644
--- a/Trimble.Modus.Components/Controls/DropDown/TMDropDown.xaml.cs
+++ b/Trimble.Modus.Components/Controls/DropDown/TMDropDown.xaml.cs
@@ -220,11 +220,11 @@ private void UpdateCellColor(ListView list)
             {
                 if (SelectedItem == textCell.BindingContext)
                 {
-                    textCell.UpdateBackgroundColor(ResourcesDictionary.ColorsDictionary(ColorsConstants.BluePale), true);
+                    textCell.UpdateBackgroundColor(ResourcesDictionary.GetColor(ColorsConstants.PrimaryLight), true);
                 }
                 else
                 {
-                    textCell.UpdateBackgroundColor(ResourcesDictionary.ColorsDictionary(ColorsConstants.White), false);
+                    textCell.UpdateBackgroundColor(ResourcesDictionary.GetColor(ColorsConstants.AlternateTextColor), false);
                 }
             }
         }
diff --git a/Trimble.Modus.Components/Controls/Messages/MessageView.xaml.cs b/Trimble.Modus.Components/Controls/Messages/MessageView.xaml.cs
index a91b091c..13d5c14f 100644
--- a/Trimble.Modus.Components/Controls/Messages/MessageView.xaml.cs
+++ b/Trimble.Modus.Components/Controls/Messages/MessageView.xaml.cs
@@ -45,7 +45,7 @@ public partial class MessageView : ContentView
         nameof(TextAndIconColor),
         typeof(Color),
         typeof(MessageView),
-        defaultValue: ResourcesDictionary.ColorsDictionary(ColorsConstants.BlueLight),
+        defaultValue: ResourcesDictionary.GetColor(ColorsConstants.PrimaryLight),
         propertyChanged: OnTextAndIconColorChanged);
 
     public static readonly BindableProperty BorderColorProperty = BindableProperty.Create(
diff --git a/Trimble.Modus.Components/Controls/ProgressBar/BaseProgressBar.cs b/Trimble.Modus.Components/Controls/ProgressBar/BaseProgressBar.cs
index 7f716190..d828b558 100644
--- a/Trimble.Modus.Components/Controls/ProgressBar/BaseProgressBar.cs
+++ b/Trimble.Modus.Components/Controls/ProgressBar/BaseProgressBar.cs
@@ -1,7 +1,9 @@
 using SkiaSharp;
 using SkiaSharp.Views.Maui;
 using SkiaSharp.Views.Maui.Controls;
-using Trimble.Modus.Components.Enums;
+using Trimble.Modus.Components.Constant;
+using Trimble.Modus.Components.Enums;
+using Trimble.Modus.Components.Helpers;
 
 namespace Trimble.Modus.Components;
 
@@ -26,10 +28,10 @@ internal class BaseProgressBar : SKCanvasView
         BindableProperty.Create(nameof(Size), typeof(ProgressBarSize), typeof(BaseProgressBar), ProgressBarSize.Default, propertyChanged: OnSizeChangedProperty);
 
     public static readonly BindableProperty ProgressColorProperty =
-        BindableProperty.Create(nameof(ProgressColor), typeof(Color), typeof(BaseProgressBar), Colors.Blue, propertyChanged: OnProgressColorChangedProperty);
+        BindableProperty.Create(nameof(ProgressColor), typeof(Color), typeof(BaseProgressBar), ResourcesDictionary.GetColor(ColorsConstants.Primary), propertyChanged: OnProgressColorChangedProperty);
 
     public static readonly BindableProperty BaseColorProperty =
-        BindableProperty.Create(nameof(BaseColor), typeof(Color), typeof(BaseProgressBar), Colors.DarkGray, propertyChanged: OnBaseColorChangedProperty);
+        BindableProperty.Create(nameof(BaseColor), typeof(Color), typeof(BaseProgressBar), ResourcesDictionary.GetColor(ColorsConstants.TertiaryDark), propertyChanged: OnBaseColorChangedProperty);
 
     public float Progress
     {
diff --git a/Trimble.Modus.Components/Controls/TMCard/TMCard.xaml.cs b/Trimble.Modus.Components/Controls/TMCard/TMCard.xaml.cs
index 9ab192bf..13aaa63c 100644
--- a/Trimble.Modus.Components/Controls/TMCard/TMCard.xaml.cs
+++ b/Trimble.Modus.Components/Controls/TMCard/TMCard.xaml.cs
@@ -1,4 +1,6 @@
 using System.Windows.Input;
+using Trimble.Modus.Components.Constant;
+using Trimble.Modus.Components.Helpers;
 
 namespace Trimble.Modus.Components;
 
@@ -46,10 +48,10 @@ public object CommandParameter
         BindableProperty.Create(nameof(IsSelected), typeof(bool), typeof(TMCard), defaultValue: true, propertyChanged: OnSelectedPropertyChanged);
 
     public static new readonly BindableProperty BackgroundColorProperty =
-        BindableProperty.Create(nameof(BackgroundColor), typeof(Color), typeof(TMCard), defaultValue: Colors.Green, propertyChanged: OnBackgroundColorPropertyChanged);
+        BindableProperty.Create(nameof(BackgroundColor), typeof(Color), typeof(TMCard), defaultValue: ResourcesDictionary.GetColor(ColorsConstants.TertiaryDark), propertyChanged: OnBackgroundColorPropertyChanged);
 
     public static readonly BindableProperty StrokeColorProperty =
-        BindableProperty.Create(nameof(StrokeColor), typeof(Color), typeof(TMCard), defaultValue: Colors.Blue, propertyChanged: OnStrokeColorPropertyChanged);
+        BindableProperty.Create(nameof(StrokeColor), typeof(Color), typeof(TMCard), defaultValue: ResourcesDictionary.GetColor(ColorsConstants.Primary), propertyChanged: OnStrokeColorPropertyChanged);
 
     public static readonly BindableProperty ClickedEventProperty =
           BindableProperty.Create(nameof(Clicked), typeof(EventHandler), typeof(TMCard));
diff --git a/Trimble.Modus.Components/Controls/TMDataGrid/DataGrid.xaml.cs b/Trimble.Modus.Components/Controls/TMDataGrid/DataGrid.xaml.cs
index 939d7c83..03cc5c3f 100644
--- a/Trimble.Modus.Components/Controls/TMDataGrid/DataGrid.xaml.cs
+++ b/Trimble.Modus.Components/Controls/TMDataGrid/DataGrid.xaml.cs
@@ -28,7 +28,7 @@ public partial class DataGrid
     /// Border color
     /// Default Value is Black
     /// </summary>
-    internal Color BorderColor = ResourcesDictionary.ColorsDictionary(ColorsConstants.Gray2);
+    internal Color BorderColor = ResourcesDictionary.GetColor(ColorsConstants.TertiaryDark);
     /// <summary>
     /// Border thickness for header &amp; each cell
     /// </summary>
diff --git a/Trimble.Modus.Components/Controls/TMDataGrid/DataGridRow.cs b/Trimble.Modus.Components/Controls/TMDataGrid/DataGridRow.cs
index 838acbbf..cfcec72b 100644
--- a/Trimble.Modus.Components/Controls/TMDataGrid/DataGridRow.cs
+++ b/Trimble.Modus.Components/Controls/TMDataGrid/DataGridRow.cs
@@ -8,7 +8,7 @@ internal sealed class DataGridRow : Grid
     #region Fields
 
     private Color? _bgColor;
-    private readonly Color? _textColor = ResourcesDictionary.ColorsDictionary(ColorsConstants.TrimbleGray);
+    private readonly Color? _textColor = ResourcesDictionary.GetColor(ColorsConstants.AlternateTextColor);
     private List<int> SelectedIndexes = new List<int>();
 
     #endregion Fields
diff --git a/Trimble.Modus.Components/Controls/TMInput/BaseInput.xaml.cs b/Trimble.Modus.Components/Controls/TMInput/BaseInput.xaml.cs
index 5d3c3ec0..d236378b 100644
--- a/Trimble.Modus.Components/Controls/TMInput/BaseInput.xaml.cs
+++ b/Trimble.Modus.Components/Controls/TMInput/BaseInput.xaml.cs
@@ -518,7 +518,7 @@ private void UpdateBorderColors(BaseInput tmInput)
             {
                 tmInput.InputBorder.Opacity = tmInput.InputLabel.Opacity = tmInput.HelperLayout.Opacity = 1;
                 tmInput.SetDynamicResource(BaseInput.StyleProperty, "Default");
-                tmInput.GetCoreContent().BackgroundColor = ResourcesDictionary.ColorsDictionary(ColorsConstants.Transparent);
+                tmInput.GetCoreContent().BackgroundColor = ResourcesDictionary.GetColor(ColorsConstants.Transparent);
                 SetBorderColor(tmInput);
             }
             else
diff --git a/Trimble.Modus.Components/Controls/TMModal/TMModalContents.xaml b/Trimble.Modus.Components/Controls/TMModal/TMModalContents.xaml
index cd502b1c..f91e19e4 100644
--- a/Trimble.Modus.Components/Controls/TMModal/TMModalContents.xaml
+++ b/Trimble.Modus.Components/Controls/TMModal/TMModalContents.xaml
@@ -33,10 +33,10 @@
             VerticalOptions="Center"
             HorizontalOptions="Fill"
             StrokeShape="RoundRectangle 4"
-            Stroke="{DynamicResource Gray9}"
+            Stroke="{DynamicResource Secondary}"
             StrokeThickness="0">
       <Border.Shadow>
-        <Shadow Brush="{DynamicResource Gray9}"
+        <Shadow Brush="{DynamicResource Secondary}"
                 Offset="0,0"
                 Opacity="0.2"
                 Radius="8" />
diff --git a/Trimble.Modus.Components/Controls/TMSegmentedControl/TMSegmentedItem.xaml b/Trimble.Modus.Components/Controls/TMSegmentedControl/TMSegmentedItem.xaml
index 80cd4483..233e4c26 100644
--- a/Trimble.Modus.Components/Controls/TMSegmentedControl/TMSegmentedItem.xaml
+++ b/Trimble.Modus.Components/Controls/TMSegmentedControl/TMSegmentedItem.xaml
@@ -53,7 +53,7 @@
              HorizontalOptions="Start"
              IsVisible="{Binding Source={x:Reference ItemContainer}, Path=ShowSeparator}"
              Margin="0,8"
-             Color="{DynamicResource Gray2}"
+             Color="{DynamicResource TertiaryDark}"
              VerticalOptions="FillAndExpand"
              WidthRequest="1.4" />
   </Grid>
diff --git a/Trimble.Modus.Components/Controls/TMSegmentedControl/TMSegmentedItem.xaml.cs b/Trimble.Modus.Components/Controls/TMSegmentedControl/TMSegmentedItem.xaml.cs
index 96756605..a9247564 100644
--- a/Trimble.Modus.Components/Controls/TMSegmentedControl/TMSegmentedItem.xaml.cs
+++ b/Trimble.Modus.Components/Controls/TMSegmentedControl/TMSegmentedItem.xaml.cs
@@ -20,11 +20,11 @@ public partial class TMSegmentedItem
 
     public static readonly BindableProperty IconProperty = BindableProperty.Create(nameof(Icon), typeof(ImageSource), typeof(TMSegmentedItem), null, propertyChanged: OnSegmentedItemPropertyChanged);
 
-    public static readonly BindableProperty CurrentBackgroundColorProperty = BindableProperty.Create(nameof(CurrentBackgroundColor), typeof(Color), typeof(TMSegmentedItem), ResourcesDictionary.ColorsDictionary(ColorsConstants.Transparent), propertyChanged: OnCurrentBackgroundColorChanged);
+    public static readonly BindableProperty CurrentBackgroundColorProperty = BindableProperty.Create(nameof(CurrentBackgroundColor), typeof(Color), typeof(TMSegmentedItem), ResourcesDictionary.GetColor(ColorsConstants.Transparent), propertyChanged: OnCurrentBackgroundColorChanged);
 
     public static readonly BindableProperty SizeProperty = BindableProperty.Create(nameof(Size), typeof(SegmentedControlSize), typeof(TMSegmentedItem), SegmentedControlSize.Small, propertyChanged: OnSizeChanged);
 
-    public static readonly BindableProperty TextColorProperty = BindableProperty.Create(nameof(TextColor), typeof(Color), typeof(TMSegmentedItem), ResourcesDictionary.ColorsDictionary(ColorsConstants.Gray9), propertyChanged: OnTextColorChanged);
+    public static readonly BindableProperty TextColorProperty = BindableProperty.Create(nameof(TextColor), typeof(Color), typeof(TMSegmentedItem), ResourcesDictionary.GetColor(ColorsConstants.Secondary), propertyChanged: OnTextColorChanged);
 
     public static readonly BindableProperty IconTintColorProperty = BindableProperty.Create(nameof(IconTintColor), typeof(Color), typeof(TMSegmentedItem), Colors.Black, propertyChanged: OnIconTintColorChanged);
     #endregion
diff --git a/Trimble.Modus.Components/Controls/TMSlider/SliderCore.cs b/Trimble.Modus.Components/Controls/TMSlider/SliderCore.cs
index cbeede58..1ed93833 100644
--- a/Trimble.Modus.Components/Controls/TMSlider/SliderCore.cs
+++ b/Trimble.Modus.Components/Controls/TMSlider/SliderCore.cs
@@ -315,11 +315,7 @@ protected void OnIsEnabledChanged()
                 }
                 else if (child is Border)
                 {
-                    (child as Border).Stroke = IsEnabled
-                        ? ThumbColor
-                        : ResourcesDictionary.ColorsDictionary(
-                            ColorsConstants.Gray1
-                        );
+                    (child as Border).Stroke = IsEnabled ? ThumbColor : ResourcesDictionary.GetColor(ColorsConstants.Tertiary);
                 }
             }
         }
@@ -335,11 +331,11 @@ internal void SetThumbStyle(Border border, double thumbStrokeThickness, double t
             border.StrokeThickness = thumbStrokeThickness;
             border.Stroke = IsEnabled
                 ? ThumbColor
-                : ResourcesDictionary.ColorsDictionary(
-                    ColorsConstants.Gray1
+                : ResourcesDictionary.GetColor(
+                    ColorsConstants.Tertiary
                 );
             border.Margin = new Thickness(0);
-            border.BackgroundColor = ResourcesDictionary.ColorsDictionary(ColorsConstants.White);
+            border.BackgroundColor = ResourcesDictionary.GetColor(ColorsConstants.DefaultTextColor);
             border.StrokeShape = new Ellipse()
             {
                 WidthRequest = thumbSize,
@@ -356,8 +352,8 @@ internal void RefreshThumbColor(Border border)
         {
             border.Stroke = IsEnabled
                 ? ThumbColor
-                : ResourcesDictionary.ColorsDictionary(
-                    ColorsConstants.Gray1
+                : ResourcesDictionary.GetColor(
+                    ColorsConstants.Tertiary
                 );
         }
         /// <summary>
diff --git a/Trimble.Modus.Components/Controls/TMSlider/SliderHelper.cs b/Trimble.Modus.Components/Controls/TMSlider/SliderHelper.cs
index cdbd7dc1..e0745ff3 100644
--- a/Trimble.Modus.Components/Controls/TMSlider/SliderHelper.cs
+++ b/Trimble.Modus.Components/Controls/TMSlider/SliderHelper.cs
@@ -59,7 +59,7 @@ public static Label CreateStepLabel(SliderSize size = SliderSize.Medium)
             }
             return new Label
             {
-                TextColor = ResourcesDictionary.ColorsDictionary(ColorsConstants.Gray9),
+                TextColor = ResourcesDictionary.GetColor(ColorsConstants.Secondary),
                 FontSize = 8,
                 HorizontalTextAlignment = TextAlignment.Start,
                 LineBreakMode = LineBreakMode.NoWrap,
@@ -96,7 +96,7 @@ public static BoxView CreateStepLine(SliderSize size = SliderSize.Medium)
                 Margin = new Thickness(leftPadding, 0, 0, 0),
                 WidthRequest = 1,
                 HeightRequest = 4,
-                Color = ResourcesDictionary.ColorsDictionary(ColorsConstants.Gray9)
+                Color = ResourcesDictionary.GetColor(ColorsConstants.Secondary)
             };
         }
     }
diff --git a/Trimble.Modus.Components/Controls/TMSlider/TMRangeSlider.cs b/Trimble.Modus.Components/Controls/TMSlider/TMRangeSlider.cs
index af35ea6d..abf06573 100644
--- a/Trimble.Modus.Components/Controls/TMSlider/TMRangeSlider.cs
+++ b/Trimble.Modus.Components/Controls/TMSlider/TMRangeSlider.cs
@@ -291,8 +291,8 @@ protected override void OnLayoutPropertyChanged()
 
             Track.StrokeThickness = 0;
             TrackHighlight.StrokeThickness = 0;
-            UpperValueLabel.TextColor = ResourcesDictionary.ColorsDictionary(ColorsConstants.White);
-            LowerValueLabel.TextColor = ResourcesDictionary.ColorsDictionary(ColorsConstants.White);
+            UpperValueLabel.TextColor = ResourcesDictionary.GetColor(ColorsConstants.DefaultTextColor);
+            LowerValueLabel.TextColor = ResourcesDictionary.GetColor(ColorsConstants.DefaultTextColor);
 
             var trackSize = 8;
             _thumbSize = 24;
diff --git a/Trimble.Modus.Components/Controls/TMSlider/TMSlider.cs b/Trimble.Modus.Components/Controls/TMSlider/TMSlider.cs
index 8d04b0cd..81f5f639 100644
--- a/Trimble.Modus.Components/Controls/TMSlider/TMSlider.cs
+++ b/Trimble.Modus.Components/Controls/TMSlider/TMSlider.cs
@@ -230,7 +230,7 @@ protected override void OnLayoutPropertyChanged()
 
             Track.StrokeThickness = 0;
             TrackHighlight.StrokeThickness = 0;
-            ValueLabel.TextColor = ResourcesDictionary.ColorsDictionary(ColorsConstants.White);
+            ValueLabel.TextColor = ResourcesDictionary.GetColor(ColorsConstants.AlternateTextColor);
             var trackSize = 8;
             _thumbSize = 24;
             var thumbStrokeThickness = 3;
diff --git a/Trimble.Modus.Components/Controls/TMSpinner/TMSpinner.cs b/Trimble.Modus.Components/Controls/TMSpinner/TMSpinner.cs
index 9442bbfa..cd4881c4 100644
--- a/Trimble.Modus.Components/Controls/TMSpinner/TMSpinner.cs
+++ b/Trimble.Modus.Components/Controls/TMSpinner/TMSpinner.cs
@@ -13,7 +13,7 @@ public class TMSpinner : SKCanvasView
     {
         #region Private Properties
         private SpinnerType _spinnerType;
-        private Color _spinnerColor = ResourcesDictionary.ColorsDictionary(ColorsConstants.TrimbleBlue);
+        private Color _spinnerColor = ResourcesDictionary.GetColor(ColorsConstants.Primary);
         private float _startAngle = 0f;
         private int minWidth = 42, minHeight = 42, animateTimerSeconds = 10;
         private float _sweepAngle = 180f;
diff --git a/Trimble.Modus.Components/Controls/TabBar/TMTabbedPage.cs b/Trimble.Modus.Components/Controls/TabBar/TMTabbedPage.cs
index 9ddceec9..1ae5f79d 100644
--- a/Trimble.Modus.Components/Controls/TabBar/TMTabbedPage.cs
+++ b/Trimble.Modus.Components/Controls/TabBar/TMTabbedPage.cs
@@ -66,14 +66,14 @@ public TMTabbedPage()
 
         tabStripContainer = new Grid
         {
-            BackgroundColor = ResourcesDictionary.ColorsDictionary(ColorsConstants.TrimbleBlue),
+            BackgroundColor = ResourcesDictionary.GetColor(ColorsConstants.Primary),
             HeightRequest = 70,
             VerticalOptions = LayoutOptions.Fill
         };
 
         mainContainer = new Grid
         {
-            BackgroundColor = ResourcesDictionary.ColorsDictionary(ColorsConstants.Red),
+            BackgroundColor = ResourcesDictionary.GetColor(ColorsConstants.Danger),
             RowSpacing = 0
         };
 
@@ -86,7 +86,7 @@ public TMTabbedPage()
         {
             contentViewContainer = new ContentView
             {
-                BackgroundColor = ResourcesDictionary.ColorsDictionary(ColorsConstants.GrayLight)
+                BackgroundColor = ResourcesDictionary.GetColor(ColorsConstants.TertiaryLight)
             };
             Grid.SetRow(contentViewContainer, 0);
             mainContainer.Children.Add(contentViewContainer);
@@ -95,7 +95,7 @@ public TMTabbedPage()
         {
             contentContainer = new CarouselView
             {
-                BackgroundColor = ResourcesDictionary.ColorsDictionary(ColorsConstants.GrayLight),
+                BackgroundColor = ResourcesDictionary.GetColor(ColorsConstants.TertiaryLight),
                 ItemsSource = TabItems,
                 ItemTemplate = new DataTemplate(() =>
                 {
@@ -150,11 +150,11 @@ private static void OnTabColorPropertyChanged(BindableObject bindable, object ol
         {
             if ((TabColor)newValue == TabColor.Primary)
             {
-                tabbedPage.tabStripContainer.BackgroundColor = ResourcesDictionary.ColorsDictionary(ColorsConstants.TrimbleBlue);
+                tabbedPage.tabStripContainer.BackgroundColor = ResourcesDictionary.GetColor(ColorsConstants.Primary);
             }
             else
             {
-                tabbedPage.tabStripContainer.BackgroundColor = ResourcesDictionary.ColorsDictionary(ColorsConstants.White);
+                tabbedPage.tabStripContainer.BackgroundColor = ResourcesDictionary.GetColor(ColorsConstants.SecondaryDark);
             }
         }
     }
diff --git a/Trimble.Modus.Components/Controls/TabBar/TabViewItem.xaml.cs b/Trimble.Modus.Components/Controls/TabBar/TabViewItem.xaml.cs
index 28156c06..6ac037f9 100644
--- a/Trimble.Modus.Components/Controls/TabBar/TabViewItem.xaml.cs
+++ b/Trimble.Modus.Components/Controls/TabBar/TabViewItem.xaml.cs
@@ -43,7 +43,7 @@ public partial class TabViewItem : ContentView
 
 
     internal static readonly BindablePropertyKey CurrentTextColorPropertyKey =
-        BindableProperty.CreateReadOnly(nameof(CurrentTextColor), typeof(Color), typeof(TabViewItem), ResourcesDictionary.ColorsDictionary(ColorsConstants.Gray9));
+        BindableProperty.CreateReadOnly(nameof(CurrentTextColor), typeof(Color), typeof(TabViewItem), ResourcesDictionary.GetColor(ColorsConstants.Secondary));
 
     public static readonly BindableProperty CurrentTextColorProperty = CurrentTextColorPropertyKey.BindableProperty;
 
@@ -129,17 +129,17 @@ public TabViewItem()
 
     private void UpdateTabColor()
     {
-        var trimbleBlueColor = ResourcesDictionary.ColorsDictionary(ColorsConstants.TrimbleBlue);
+        var trimbleBlueColor = ResourcesDictionary.GetColor(ColorsConstants.PrimaryLight);
         var selectedColor = trimbleBlueColor;
         if (TabColor == TabColor.Primary)
         {
-            selectedColor = IsSelected ? trimbleBlueColor : ResourcesDictionary.ColorsDictionary(ColorsConstants.White);
+            selectedColor = IsSelected ? trimbleBlueColor : ResourcesDictionary.GetColor(ColorsConstants.DefaultTextColor);
         }
         text.TextColor = selectedColor;
         icon.Behaviors.Clear();
         icon.Behaviors.Add(new IconTintColorBehavior { TintColor = selectedColor });
 
-        selectedBorder.BackgroundColor = !IsSelected ? ResourcesDictionary.ColorsDictionary(ColorsConstants.Transparent) : ResourcesDictionary.ColorsDictionary(ColorsConstants.BluePale);
+        selectedBorder.BackgroundColor = !IsSelected ? ResourcesDictionary.GetColor(ColorsConstants.Transparent) : ResourcesDictionary.GetColor(ColorsConstants.PrimaryLight);
     }
     private static void OnTabViewItemPropertyChanged(BindableObject bindable, object oldValue, object newValue)
     {
diff --git a/Trimble.Modus.Components/Helpers/ResourceDictionary.cs b/Trimble.Modus.Components/Helpers/ResourceDictionary.cs
index 1e31b4a2..d830f637 100644
--- a/Trimble.Modus.Components/Helpers/ResourceDictionary.cs
+++ b/Trimble.Modus.Components/Helpers/ResourceDictionary.cs
@@ -2,8 +2,8 @@
 
 public static class ResourcesDictionary
 {
-    public static Color ColorsDictionary(string styleKey)
+    public static Color GetColor(string styleKey)
     {
-        return (Color)new Styles.Colors()[styleKey];
+        return Application.Current.Resources[styleKey] as Color;
     }
-}
\ No newline at end of file
+}
diff --git a/Trimble.Modus.Components/Styles/Colors.xaml b/Trimble.Modus.Components/Styles/Colors.xaml
index 9d64b67a..a5333542 100644
--- a/Trimble.Modus.Components/Styles/Colors.xaml
+++ b/Trimble.Modus.Components/Styles/Colors.xaml
@@ -2,53 +2,8 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
                     x:Class="Trimble.Modus.Components.Styles.Colors">
-  <!--Blue-->
-  <Color x:Key="TrimbleBlueDark">#004f83</Color>
-  <Color x:Key="TrimbleBlue">#0063a3</Color>
-  <Color x:Key="Blue">#0063a3</Color>
-  <Color x:Key="BlueDark">#0E416C</Color>
-  <Color x:Key="BlueLight">#217cbb</Color>
-  <Color x:Key="HighlightBlue">#019aeb</Color>
-  <Color x:Key="BluePale">#DCEDF9</Color>
-
-  <!--Black-->
-  <Color x:Key="TrimbleGray">#252a2e</Color>
-  <Color x:Key="Gray10">#171c1e</Color>
-  <Color x:Key="Gray9">#353a40</Color>
-  <Color x:Key="Gray8">#464b52</Color>
-  <Color x:Key="Gray7">#585c65</Color>
-  <Color x:Key="Gray6">#6a6e79</Color>
-  <Color x:Key="Gray5">#7d808d</Color>
-  <Color x:Key="Gray4">#90939f</Color>
-  <Color x:Key="Gray3">#a3a6b1</Color>
-  <Color x:Key="Gray2">#b7b9c3</Color>
-  <Color x:Key="Gray1">#cbcdd6</Color>
-  <Color x:Key="Gray0">#e0e1e9</Color>
-  <Color x:Key="GrayLight">#f1f1f6</Color>
-  <Color x:Key="White">#FFFFFF</Color>
-
-  <!--Orange-->
-  <Color x:Key="YellowDark">#e49325</Color>
-  <Color x:Key="Yellow">#fbad26</Color>
-  <Color x:Key="YellowLight">#fec157</Color>
-  <Color x:Key="YellowPale">#fff5e4</Color>
-
-  <!--Red-->
-  <Color x:Key="RedDark">#AB1F26</Color>
-  <Color x:Key="Red">#da212c</Color>
-  <Color x:Key="RedLight">#e86363</Color>
-  <Color x:Key="RedPale">#FBD4D7</Color>
-
-  <!--Green-->
-  <Color x:Key="GreenDark">#006638</Color>
-  <Color x:Key="Green">#1E8A44</Color>
-  <Color x:Key="GreenLight">#4ea646</Color>
-  <Color x:Key="GreenPale">#E0ECCF</Color>
-
-  <!-- Transparent -->
-  <Color x:Key="Transparent">transparent</Color>
-
   <!--Modal colors-->
   <Color x:Key="ModalDimmedBackgroundColor">#80000000</Color>
   <Color x:Key="ModalShadowColor">#4D363545</Color>
+  
 </ResourceDictionary>
diff --git a/Trimble.Modus.Components/Styles/LightTheme.xaml b/Trimble.Modus.Components/Styles/LightTheme.xaml
index c1f1bd3f..3c87c0d1 100644
--- a/Trimble.Modus.Components/Styles/LightTheme.xaml
+++ b/Trimble.Modus.Components/Styles/LightTheme.xaml
@@ -5,7 +5,7 @@
                     x:Class="Trimble.Modus.Components.Styles.LightTheme">
   <!--Label-->
   <styles:ReferenceColor x:Key="LabelTextColor"
-                         Color="{StaticResource AlternateTextColor}" />
+                         Color="{StaticResource DefaultTextColor}"/>
 
   <!--Button-->
   <!--Fill Button-->
@@ -14,36 +14,36 @@
   <styles:ReferenceColor x:Key="PrimaryFillButtonSelectedBackgroundColor"
                          Color="{StaticResource PrimaryDark}" />
   <styles:ReferenceColor x:Key="PrimaryFillButtonTextColor"
-                         Color="{StaticResource DefaultTextColor}" />
+                         Color="{StaticResource AlternateTextColor}"  />
   <styles:ReferenceColor x:Key="PrimaryFillIconTintColor"
-                         Color="{StaticResource DefaultTextColor}" />
+                         Color="{StaticResource AlternateTextColor}"  />
 
   <styles:ReferenceColor x:Key="SecondaryFillButtonBackgroundColor"
                          Color="{StaticResource Secondary}" />
   <styles:ReferenceColor x:Key="SecondaryFillButtonSelectedBackgroundColor"
                          Color="{StaticResource SecondaryDark}" />
   <styles:ReferenceColor x:Key="SecondaryFillButtonTextColor"
-                         Color="{StaticResource DefaultTextColor}" />
+                         Color="{StaticResource AlternateTextColor}"  />
   <styles:ReferenceColor x:Key="SecondaryFillIconTintColor"
-                         Color="{StaticResource DefaultTextColor}" />
+                         Color="{StaticResource AlternateTextColor}"  />
 
   <styles:ReferenceColor x:Key="TertiaryFillButtonBackgroundColor"
                          Color="{StaticResource Tertiary}" />
   <styles:ReferenceColor x:Key="TertiaryFillButtonSelectedBackgroundColor"
                          Color="{StaticResource TertiaryDark}" />
   <styles:ReferenceColor x:Key="TertiaryFillButtonTextColor"
-                         Color="{StaticResource SecondaryDark}" />
+                         Color="{StaticResource DefaultTextColor}" />
   <styles:ReferenceColor x:Key="TertiaryFillIconTintColor"
-                         Color="{StaticResource SecondaryDark}" />
+                         Color="{StaticResource DefaultTextColor}" />
 
   <styles:ReferenceColor x:Key="DangerFillButtonBackgroundColor"
                          Color="{StaticResource Danger}" />
   <styles:ReferenceColor x:Key="DangerFillButtonSelectedBackgroundColor"
                          Color="{StaticResource DangerDark}" />
   <styles:ReferenceColor x:Key="DangerFillButtonTextColor"
-                         Color="{StaticResource DefaultTextColor}" />
+                         Color="{StaticResource AlternateTextColor}"  />
   <styles:ReferenceColor x:Key="DangerFillIconTintColor"
-                         Color="{StaticResource DefaultTextColor}" />
+                         Color="{StaticResource AlternateTextColor}"  />
 
   <!--Outline Button-->
 
@@ -97,15 +97,15 @@
   <styles:ReferenceColor x:Key="BadgeTertiaryBackgroundColor"
                          Color="{StaticResource Tertiary}" />
   <styles:ReferenceColor x:Key="BadgeSecondaryBackgroundColor"
-                         Color="{StaticResource AlternateTextColor}" />
+                         Color="{StaticResource DefaultTextColor}"/>
   <styles:ReferenceColor x:Key="BadgeAlternateTextColor"
-                         Color="{StaticResource AlternateTextColor}" />
+                         Color="{StaticResource DefaultTextColor}"/>
   <styles:ReferenceColor x:Key="BadgeTextColor"
-                         Color="{StaticResource DefaultTextColor}" />
+                         Color="{StaticResource AlternateTextColor}"  />
 
   <!--Card-->
   <styles:ReferenceColor x:Key="CardBackgroundColor"
-                         Color="{StaticResource DefaultTextColor}" />
+                         Color="{StaticResource AlternateTextColor}"  />
   <styles:ReferenceColor x:Key="CardStrokeColor"
                          Color="{StaticResource Transparent}" />
   <styles:ReferenceColor x:Key="CardSelectedBackgroundColor"
@@ -124,13 +124,13 @@
   <styles:ReferenceColor x:Key="DefaultChipSelectedBackgroundColor"
                          Color="{StaticResource PrimaryLight}" />
   <styles:ReferenceColor x:Key="DefaultChipTextColor"
-                         Color="{StaticResource SecondaryDark}" />
+                         Color="{StaticResource DefaultTextColor}" />
   <styles:ReferenceColor x:Key="DefaultChipSelectedTextColor"
-                         Color="{StaticResource AlternateTextColor}" />
+                         Color="{StaticResource DefaultTextColor}"/>
   <styles:ReferenceColor x:Key="DefaultChipIconTintColor"
-                         Color="{StaticResource SecondaryDark}" />
+                         Color="{StaticResource DefaultTextColor}" />
   <styles:ReferenceColor x:Key="DefaultChipSelectedIconTintColor"
-                         Color="{StaticResource AlternateTextColor}" />
+                         Color="{StaticResource DefaultTextColor}"/>
 
   <!--OutlineChip-->
   <styles:ReferenceColor x:Key="DefaultOutlineChipBorderColor"
@@ -142,9 +142,9 @@
   <styles:ReferenceColor x:Key="DefaultOutlineChipSelectedBackgroundColor"
                          Color="{StaticResource PrimaryLight}" />
   <styles:ReferenceColor x:Key="DefaultOutlineChipTextColor"
-                         Color="{StaticResource AlternateTextColor}" />
+                         Color="{StaticResource DefaultTextColor}"/>
   <styles:ReferenceColor x:Key="DefaultOutlineChipIconTintColor"
-                         Color="{StaticResource AlternateTextColor}" />
+                         Color="{StaticResource DefaultTextColor}"/>
 
   <!--ErrorFillChip-->
   <styles:ReferenceColor x:Key="ErrorChipBackgroundColor"
@@ -170,9 +170,9 @@
   <styles:ReferenceColor x:Key="SegmentItemTextColor"
                          Color="{StaticResource Secondary}" />
   <styles:ReferenceColor x:Key="SegmentItemSelectedTextColor"
-                         Color="{StaticResource DefaultTextColor}" />
+                         Color="{StaticResource AlternateTextColor}"  />
   <styles:ReferenceColor x:Key="SegmentItemSelectedIconTintColor"
-                         Color="{StaticResource DefaultTextColor}" />
+                         Color="{StaticResource AlternateTextColor}"  />
   <styles:ReferenceColor x:Key="SegmentItemIconTintColor"
                          Color="{StaticResource Secondary}" />
   <styles:ReferenceColor x:Key="SegmentItemPrimaryBackgroundColor"
@@ -186,17 +186,17 @@
   <styles:ReferenceColor x:Key="DataGridHeaderColor"
                          Color="{StaticResource TertiaryLight}" />
   <styles:ReferenceColor x:Key="DataGridHeaderTextColor"
-                         Color="{StaticResource AlternateTextColor}" />
+                         Color="{StaticResource DefaultTextColor}"/>
   <styles:ReferenceColor x:Key="DataGridActiveRowColor"
                          Color="{StaticResource PrimaryLight}" />
   <styles:ReferenceColor x:Key="DataGridDefaultRowColor"
-                         Color="{StaticResource DefaultTextColor}" />
+                         Color="{StaticResource AlternateTextColor}"  />
 
   <!--Modal-->
   <styles:ReferenceColor x:Key="ModalTextAndImageColor"
-                         Color="{StaticResource AlternateTextColor}" />
+                         Color="{StaticResource DefaultTextColor}"/>
   <styles:ReferenceColor x:Key="ModalBackgroundColor"
-                         Color="{StaticResource DefaultTextColor}" />
+                         Color="{StaticResource AlternateTextColor}"  />
 
 
   <!--Switch-->
@@ -205,11 +205,11 @@
   <styles:ReferenceColor x:Key="SwitchOffBackgroundColor"
                          Color="{StaticResource SecondaryLight}" />
   <styles:ReferenceColor x:Key="SwitchTextColor"
-                         Color="{StaticResource AlternateTextColor}" />
+                         Color="{StaticResource DefaultTextColor}"/>
 
   <!-- Alert Success-->
   <styles:ReferenceColor x:Key="AlertButtonColor"
-                         Color="{StaticResource AlternateTextColor}" />
+                         Color="{StaticResource DefaultTextColor}"/>
   <styles:ReferenceColor x:Key="AlertSuccessTextColor"
                          Color="{StaticResource SuccessDark}" />
   <styles:ReferenceColor x:Key="AlertSuccessBorderColor"
@@ -217,7 +217,7 @@
   <styles:ReferenceColor x:Key="AlertSuccessIconTintColor"
                          Color="{StaticResource SuccessDark}" />
   <styles:ReferenceColor x:Key="AlertSuccessBackgroundColor"
-                         Color="{StaticResource DefaultTextColor}" />
+                         Color="{StaticResource AlternateTextColor}"  />
 
   <!-- Alert Error -->
   <styles:ReferenceColor x:Key="AlertErrorTextColor"
@@ -227,17 +227,17 @@
   <styles:ReferenceColor x:Key="AlertErrorIconTintColor"
                          Color="{StaticResource Danger}" />
   <styles:ReferenceColor x:Key="AlertErrorBackgroundColor"
-                         Color="{StaticResource DefaultTextColor}" />
+                         Color="{StaticResource AlternateTextColor}"  />
 
   <!-- Alert Warning -->
   <styles:ReferenceColor x:Key="AlertWarningTextColor"
-                         Color="{StaticResource AlternateTextColor}" />
+                         Color="{StaticResource DefaultTextColor}"/>
   <styles:ReferenceColor x:Key="AlertWarningBorderColor"
                          Color="{StaticResource Warning}" />
   <styles:ReferenceColor x:Key="AlertWarningIconTintColor"
-                         Color="{StaticResource AlternateTextColor}" />
+                         Color="{StaticResource DefaultTextColor}"/>
   <styles:ReferenceColor x:Key="AlertWarningBackgroundColor"
-                         Color="{StaticResource DefaultTextColor}" />
+                         Color="{StaticResource AlternateTextColor}"  />
 
   <!-- Alert Primary -->
   <styles:ReferenceColor x:Key="AlertPrimaryTextColor"
@@ -247,7 +247,7 @@
   <styles:ReferenceColor x:Key="AlertPrimaryIconTintColor"
                          Color="{StaticResource Primary}" />
   <styles:ReferenceColor x:Key="AlertPrimaryBackgroundColor"
-                         Color="{StaticResource DefaultTextColor}" />
+                         Color="{StaticResource AlternateTextColor}"  />
 
   <!-- Alert Secondary -->
   <styles:ReferenceColor x:Key="AlertSecondaryTextColor"
@@ -257,16 +257,16 @@
   <styles:ReferenceColor x:Key="AlertSecondaryIconTintColor"
                          Color="{StaticResource SecondaryLight}" />
   <styles:ReferenceColor x:Key="AlertSecondaryBackgroundColor"
-                         Color="{StaticResource DefaultTextColor}" />
+                         Color="{StaticResource AlternateTextColor}"  />
   <!-- Alert Dark -->
   <styles:ReferenceColor x:Key="AlertDarkTextColor"
-                         Color="{StaticResource SecondaryDark}" />
+                         Color="{StaticResource DefaultTextColor}" />
   <styles:ReferenceColor x:Key="AlertDarkBorderColor"
                          Color="{StaticResource SecondaryDark}" />
   <styles:ReferenceColor x:Key="AlertDarkIconTintColor"
-                         Color="{StaticResource SecondaryDark}" />
-  <styles:ReferenceColor x:Key="AlertDarkBackgroundColor"
                          Color="{StaticResource DefaultTextColor}" />
+  <styles:ReferenceColor x:Key="AlertDarkBackgroundColor"
+                         Color="{StaticResource AlternateTextColor}"  />
 
   <!--ProgressBar-->
   <styles:ReferenceColor x:Key="ProgressBarPrimaryBackgroundColor"
@@ -279,19 +279,19 @@
   <styles:ReferenceColor x:Key="RadioButtonColor"
                          Color="{StaticResource Primary}" />
   <styles:ReferenceColor x:Key="RadioButtonTextColor"
-                         Color="{StaticResource AlternateTextColor}" />
+                         Color="{StaticResource DefaultTextColor}"/>
 
   <!--Spinner-->
   <styles:ReferenceColor x:Key="SpinnerPrimaryFillColor"
                          Color="{StaticResource Primary}" />
   <styles:ReferenceColor x:Key="SpinnerSecondaryFillColor"
-                         Color="{StaticResource DefaultTextColor}" />
+                         Color="{StaticResource AlternateTextColor}"  />
 
   <!--Slider-->
   <styles:ReferenceColor x:Key="SliderTooltipColor"
                          Color="{StaticResource Secondary}" />
   <styles:ReferenceColor x:Key="SliderTitleTextColor"
-                         Color="{StaticResource AlternateTextColor}" />
+                         Color="{StaticResource DefaultTextColor}"/>
   <styles:ReferenceColor x:Key="SliderThumbColor"
                          Color="{StaticResource Primary}" />
   <styles:ReferenceColor x:Key="SliderTrackHighlightColor"
@@ -299,22 +299,22 @@
   <styles:ReferenceColor x:Key="SliderTrackBackgroundColor"
                          Color="{StaticResource TertiaryLight}" />
   <styles:ReferenceColor x:Key="SliderIconTintColor"
-                         Color="{StaticResource AlternateTextColor}" />
+                         Color="{StaticResource DefaultTextColor}"/>
   <styles:ReferenceColor x:Key="SliderStepperColor"
-                         Color="{StaticResource AlternateTextColor}" />
+                         Color="{StaticResource DefaultTextColor}"/>
 
   <!--Accordion-->
   <styles:ReferenceColor x:Key="AccordionBackgroundColor"
-                         Color="{StaticResource DefaultTextColor}" />
+                         Color="{StaticResource AlternateTextColor}"  />
   <styles:ReferenceColor x:Key="AccordionTitleColor"
-                         Color="{StaticResource AlternateTextColor}" />
+                         Color="{StaticResource DefaultTextColor}"/>
   <styles:ReferenceColor x:Key="AccordionSubtitleColor"
                          Color="{StaticResource SecondaryLight}" />
   <styles:ReferenceColor x:Key="AccordionIconTintColor"
-                         Color="{StaticResource AlternateTextColor}" />
+                         Color="{StaticResource DefaultTextColor}"/>
   <!--List-->
   <styles:ReferenceColor x:Key="CellDefaultBackgroundColor"
-                         Color="{StaticResource DefaultTextColor}" />
+                         Color="{StaticResource AlternateTextColor}"  />
   <styles:ReferenceColor x:Key="CellSelectedBackgroundColor"
                          Color="{StaticResource PrimaryLight}" />
   <styles:ReferenceColor x:Key="SeparatorColor"
@@ -328,23 +328,23 @@
   <!--Toast-->
   <!--Default-->
   <styles:ReferenceColor x:Key="ToastDefaultBackgroundColor"
-                         Color="{StaticResource DefaultTextColor}" />
+                         Color="{StaticResource AlternateTextColor}"  />
   <styles:ReferenceColor x:Key="ToastDefaultTextColor"
-                         Color="{StaticResource AlternateTextColor}" />
+                         Color="{StaticResource DefaultTextColor}" />
   <styles:ReferenceColor x:Key="ToastDefaultRightIconTintColor"
-                         Color="{StaticResource SecondaryDark}" />
+                         Color="{StaticResource DefaultTextColor}" />
   <styles:ReferenceColor x:Key="ToastDefaultLeftIconTintColor"
-                         Color="{StaticResource AlternateTextColor}" />
+                         Color="{StaticResource DefaultTextColor}"/>
 
   <!--Dark-->
   <styles:ReferenceColor x:Key="ToastDarkBackgroundColor"
                          Color="{StaticResource SecondaryDark}" />
   <styles:ReferenceColor x:Key="ToastDarkTextColor"
-                         Color="{StaticResource DefaultTextColor}" />
+                         Color="{StaticResource AlternateTextColor}" />
   <styles:ReferenceColor x:Key="ToastDarkRightIconTintColor"
-                         Color="{StaticResource DefaultTextColor}" />
+                         Color="{StaticResource AlternateTextColor}"  />
   <styles:ReferenceColor x:Key="ToastDarkLeftIconTintColor"
-                         Color="{StaticResource DefaultTextColor}" />
+                         Color="{StaticResource AlternateTextColor}"  />
 
   <!--Primary-->
   <styles:ReferenceColor x:Key="ToastPrimaryBackgroundColor"
@@ -360,41 +360,41 @@
   <styles:ReferenceColor x:Key="ToastSecondaryBackgroundColor"
                          Color="{StaticResource TertiaryDark}" />
   <styles:ReferenceColor x:Key="ToastSecondaryTextColor"
-                         Color="{StaticResource AlternateTextColor}" />
+                         Color="{StaticResource DefaultTextColor}"/>
   <styles:ReferenceColor x:Key="ToastSecondaryRightIconTintColor"
                          Color="{StaticResource SecondaryDark}" />
   <styles:ReferenceColor x:Key="ToastSecondaryLeftIconTintColor"
-                         Color="{StaticResource AlternateTextColor}" />
+                         Color="{StaticResource DefaultTextColor}"/>
 
   <!--Danger-->
   <styles:ReferenceColor x:Key="ToastDangerBackgroundColor"
                          Color="{StaticResource DangerLight}" />
   <styles:ReferenceColor x:Key="ToastDangerTextColor"
-                         Color="{StaticResource AlternateTextColor}" />
+                         Color="{StaticResource DefaultTextColor}"/>
   <styles:ReferenceColor x:Key="ToastDangerRightIconTintColor"
                          Color="{StaticResource DangerDark}" />
   <styles:ReferenceColor x:Key="ToastDangerLeftIconTintColor"
-                         Color="{StaticResource AlternateTextColor}" />
+                         Color="{StaticResource DefaultTextColor}"/>
 
   <!--Warning-->
   <styles:ReferenceColor x:Key="ToastWarningBackgroundColor"
                          Color="{StaticResource WarningLight}" />
   <styles:ReferenceColor x:Key="ToastWarningTextColor"
-                         Color="{StaticResource AlternateTextColor}" />
+                         Color="{StaticResource DefaultTextColor}"/>
   <styles:ReferenceColor x:Key="ToastWarningRightIconTintColor"
                          Color="{StaticResource WarningDark}" />
   <styles:ReferenceColor x:Key="ToastWarningLeftIconTintColor"
-                         Color="{StaticResource AlternateTextColor}" />
+                         Color="{StaticResource DefaultTextColor}"/>
 
   <!--Success-->
   <styles:ReferenceColor x:Key="ToastSuccessBackgroundColor"
                          Color="{StaticResource SuccessLight}" />
   <styles:ReferenceColor x:Key="ToastSuccessTextColor"
-                         Color="{StaticResource AlternateTextColor}" />
+                         Color="{StaticResource DefaultTextColor}"/>
   <styles:ReferenceColor x:Key="ToastSuccessRightIconTintColor"
                          Color="{StaticResource SuccessDark}" />
   <styles:ReferenceColor x:Key="ToastSuccessLeftIconTintColor"
-                         Color="{StaticResource AlternateTextColor}" />
+                         Color="{StaticResource DefaultTextColor}"/>
 
   <!-- MessageView-->
   <!--Primary-->
@@ -407,9 +407,9 @@
 
   <!--Secondary-->
   <styles:ReferenceColor x:Key="MessageViewSecondaryBackgroundColor"
-                         Color="{StaticResource DefaultTextColor}" />
+                         Color="{StaticResource AlternateTextColor}"  />
   <styles:ReferenceColor x:Key="MessageViewSecondaryTextColor"
-                         Color="{StaticResource AlternateTextColor}" />
+                         Color="{StaticResource DefaultTextColor}"/>
   <styles:ReferenceColor x:Key="MessageViewSecondaryBorderColor"
                          Color="{StaticResource SecondaryDark}" />
 
@@ -418,17 +418,17 @@
   <styles:ReferenceColor x:Key="TitleBarBackgroundPrimaryColor"
                          Color="{StaticResource PrimaryDark}" />
   <styles:ReferenceColor x:Key="TitleBarBackgroundColor"
-                         Color="{StaticResource DefaultTextColor}" />
+                         Color="{StaticResource AlternateTextColor}"  />
   <styles:ReferenceColor x:Key="TitleBarIconTintPrimaryColor"
-                         Color="{StaticResource DefaultTextColor}" />
+                         Color="{StaticResource AlternateTextColor}"  />
   <styles:ReferenceColor x:Key="TitleBarIconTintSecondaryColor"
-                         Color="{StaticResource AlternateTextColor}" />
+                         Color="{StaticResource DefaultTextColor}"/>
 
   <!--Search Bar-->
   <styles:ReferenceColor x:Key="SearchBarPrimaryColor"
-                         Color="{StaticResource DefaultTextColor}" />
+                         Color="{StaticResource AlternateTextColor}"  />
   <styles:ReferenceColor x:Key="SearchBarSecondaryColor"
-                         Color="{StaticResource DefaultTextColor}" />
+                         Color="{StaticResource AlternateTextColor}"  />
   <styles:ReferenceColor x:Key="SearchBarIconPrimaryColor"
                          Color="{StaticResource SecondaryLight}" />
   <styles:ReferenceColor x:Key="SearchBarIconSecondaryColor"
@@ -441,9 +441,9 @@
   <styles:ReferenceColor x:Key="InputDefaultHelperLayoutBackgroundColor"
                          Color="{StaticResource Transparent}" />
   <styles:ReferenceColor x:Key="InputDefaultBackgroundColor"
-                         Color="{StaticResource DefaultTextColor}" />
+                         Color="{StaticResource AlternateTextColor}"  />
   <styles:ReferenceColor x:Key="InputTextColor"
-                         Color="{StaticResource AlternateTextColor}" />
+                         Color="{StaticResource DefaultTextColor}"/>
 
   <!--Primary-->
   <styles:ReferenceColor x:Key="InputPrimaryBorderColor"
diff --git a/Trimble.Modus.Components/Styles/LightThemeColors.xaml b/Trimble.Modus.Components/Styles/LightThemeColors.xaml
index 1715232e..0b4718f4 100644
--- a/Trimble.Modus.Components/Styles/LightThemeColors.xaml
+++ b/Trimble.Modus.Components/Styles/LightThemeColors.xaml
@@ -6,10 +6,10 @@
   <Color x:Key="Primary">#0063A3</Color>
   <Color x:Key="PrimaryLight">#DCEDF9</Color>
   <Color x:Key="PrimaryDark">#004f83</Color>
-
-  <Color x:Key="DefaultTextColor">#FFFFFF</Color>
-  <Color x:Key="AlternateTextColor">#252A2E</Color>
   
+  <Color x:Key="DefaultTextColor">#252A2E</Color>
+  <Color x:Key="AlternateTextColor">#FFFFFF</Color>
+
   <Color x:Key="Danger">#DA212C</Color>
   <Color x:Key="DangerLight">#FBD4D7</Color>
   <Color x:Key="DangerDark">#AB1F26</Color>