diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index ab2cbba7..8df4e92b 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -28,10 +28,10 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Setup .NET 8
+      - name: Setup .NET 9
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 9.0.x
           include-prerelease: true
 
       - uses: actions/setup-java@v4
@@ -51,4 +51,4 @@ jobs:
         run: dotnet restore Trimble.Modus.Components.sln
 
       - name: Build MAUI Android
-        run: dotnet build Trimble.Modus.Components.sln -f net8.0-android -c Release --no-restore
+        run: dotnet build Trimble.Modus.Components.sln -f net9.0-android -c Release --no-restore
diff --git a/DemoApp/DemoApp/DemoApp.csproj b/DemoApp/DemoApp/DemoApp.csproj
index 0d09e3d3..3a1a439b 100644
--- a/DemoApp/DemoApp/DemoApp.csproj
+++ b/DemoApp/DemoApp/DemoApp.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
+		<TargetFrameworks>net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
 		<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
 		<!-- <TargetFrameworks>$(TargetFrameworks);net7.0-tizen</TargetFrameworks> -->
 		<OutputType>Exe</OutputType>
@@ -14,8 +14,8 @@
 		<!-- Display name -->
 		<ApplicationTitle>DemoApp</ApplicationTitle>
 
-		<!-- App Identifier -->
-		<ApplicationId>com.trimble.ModusMAUI</ApplicationId>
+		<!-- App Identifier -->
+    <ApplicationId>com.trimble.ModusMAUI</ApplicationId>
 		<ApplicationIdGuid>4ca86287-676e-49cb-9a5d-75d22c1b3771</ApplicationIdGuid>
     <PackageVersion>1.0.0</PackageVersion>
 		<!-- Versions -->
diff --git a/DemoApp/DemoApp/Views/ModalSamplePage.xaml.cs b/DemoApp/DemoApp/Views/ModalSamplePage.xaml.cs
index 41e88a55..a21c70bd 100644
--- a/DemoApp/DemoApp/Views/ModalSamplePage.xaml.cs
+++ b/DemoApp/DemoApp/Views/ModalSamplePage.xaml.cs
@@ -66,7 +66,7 @@ private void ShowModalClicked(object sender, EventArgs e)
         catch (Exception ex)
         {
             TMToast tMToast = new(ex.Message);
-            tMToast.theme = ToastTheme.Danger;
+            tMToast.theme = ToastTheme.DangerToast;
             tMToast.Show();
         }
     }
diff --git a/DemoApp/DemoApp/Views/ToastSamplePage.xaml b/DemoApp/DemoApp/Views/ToastSamplePage.xaml
index be26a039..6098674a 100644
--- a/DemoApp/DemoApp/Views/ToastSamplePage.xaml
+++ b/DemoApp/DemoApp/Views/ToastSamplePage.xaml
@@ -34,12 +34,12 @@
       <Picker.ItemsSource>
         <x:Array Type="{x:Type theme:ToastTheme}">
           <theme:ToastTheme></theme:ToastTheme>
-          <theme:ToastTheme>Dark</theme:ToastTheme>
-          <theme:ToastTheme>Primary</theme:ToastTheme>
-          <theme:ToastTheme>Secondary</theme:ToastTheme>
-          <theme:ToastTheme>Danger</theme:ToastTheme>
-          <theme:ToastTheme>Warning</theme:ToastTheme>
-          <theme:ToastTheme>Success</theme:ToastTheme>
+          <theme:ToastTheme>DarkToast</theme:ToastTheme>
+          <theme:ToastTheme>PrimaryToast</theme:ToastTheme>
+          <theme:ToastTheme>SecondaryToast</theme:ToastTheme>
+          <theme:ToastTheme>DangerToast</theme:ToastTheme>
+          <theme:ToastTheme>WarningToast</theme:ToastTheme>
+          <theme:ToastTheme>SuccessToast</theme:ToastTheme>
         </x:Array>
       </Picker.ItemsSource>
 
diff --git a/DemoApp/DemoApp/Views/ToastSamplePage.xaml.cs b/DemoApp/DemoApp/Views/ToastSamplePage.xaml.cs
index 9298ceb1..3c7e8289 100644
--- a/DemoApp/DemoApp/Views/ToastSamplePage.xaml.cs
+++ b/DemoApp/DemoApp/Views/ToastSamplePage.xaml.cs
@@ -9,7 +9,7 @@ public partial class ToastSamplePage : ContentPage
     public ToastSamplePage()
     {
         InitializeComponent();
-        toastPicker.SelectedItem = ToastTheme.Default;
+        toastPicker.SelectedItem = ToastTheme.DefaultToast;
     }
 
     private void OnToastActionTapped(object sender, EventArgs e)
diff --git a/Trimble.Modus.Components/Controls/Button/TMButton.xaml b/Trimble.Modus.Components/Controls/Button/TMButton.xaml
index df4036cc..30bb7954 100644
--- a/Trimble.Modus.Components/Controls/Button/TMButton.xaml
+++ b/Trimble.Modus.Components/Controls/Button/TMButton.xaml
@@ -9,9 +9,9 @@
              HorizontalOptions="Start">
   <ContentView.Resources>
     <ResourceDictionary>
-      <ResourceDictionary.MergedDictionaries>
+      <!--<ResourceDictionary.MergedDictionaries>
         <local:TMButtonStyles></local:TMButtonStyles>
-      </ResourceDictionary.MergedDictionaries>
+      </ResourceDictionary.MergedDictionaries>-->
       <converters:ImageNullOrEmptyBoolConverter x:Key="ImageNullOrEmptyBoolConverter" />
       <converters:StringNotNullOrEmptyBoolConverter x:Key="StringNotNullOrEmptyBoolConverter" />
     </ResourceDictionary>
diff --git a/Trimble.Modus.Components/Controls/Button/TMButtonStyles.xaml b/Trimble.Modus.Components/Controls/Button/TMButtonStyles.xaml
deleted file mode 100644
index 8d885be7..00000000
--- a/Trimble.Modus.Components/Controls/Button/TMButtonStyles.xaml
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ResourceDictionary xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-                    xmlns:local="clr-namespace:Trimble.Modus.Components;assembly=Trimble.Modus.Components"
-                    x:Class="Trimble.Modus.Components.TMButtonStyles">
-
-  <Style TargetType="local:TMButton" x:Key="PrimaryFill">
-    <Setter Property="TextColor" Value="{DynamicResource PrimaryFillButtonTextColor}"></Setter>
-    <Setter Property="IconTintColor" Value="{DynamicResource PrimaryFillIconTintColor}"></Setter>
-    <Setter Property="BorderColor" Value="{DynamicResource PrimaryFillButtonBackgroundColor}"/>
-    <Setter Property="VisualStateManager.VisualStateGroups">
-      <VisualStateGroupList>
-        <VisualStateGroup x:Name="CommonStates">
-          <VisualState x:Name="Normal">
-            <VisualState.Setters>
-              <Setter Property="BackgroundColor" Value="{DynamicResource PrimaryFillButtonBackgroundColor}"/>
-            </VisualState.Setters>
-          </VisualState>
-          <VisualState x:Name="Pressed">
-            <VisualState.Setters>
-              <Setter Property="BackgroundColor" Value="{DynamicResource PrimaryFillButtonSelectedBackgroundColor}"/>
-            </VisualState.Setters>
-          </VisualState>                            
-        </VisualStateGroup>
-      </VisualStateGroupList>
-    </Setter>
-  </Style>
-
-  <Style TargetType="local:TMButton" x:Key="SecondaryFill">
-    <Setter Property="TextColor" Value="{DynamicResource SecondaryFillButtonTextColor}"></Setter>
-    <Setter Property="IconTintColor" Value="{DynamicResource SecondaryFillIconTintColor}"></Setter>
-    <Setter Property="BorderColor" Value="{DynamicResource SecondaryFillButtonBackgroundColor}"/>
-    <Setter Property="VisualStateManager.VisualStateGroups">
-      <VisualStateGroupList>
-        <VisualStateGroup x:Name="CommonStates">
-          <VisualState x:Name="Normal">
-            <VisualState.Setters>
-              <Setter Property="BackgroundColor" Value="{DynamicResource SecondaryFillButtonBackgroundColor}"/>
-            </VisualState.Setters>
-          </VisualState>
-          <VisualState x:Name="Pressed">
-            <VisualState.Setters>
-              <Setter Property="BackgroundColor" Value="{DynamicResource SecondaryFillButtonSelectedBackgroundColor}"/>
-            </VisualState.Setters>
-          </VisualState>                            
-        </VisualStateGroup>
-      </VisualStateGroupList>
-    </Setter>
-  </Style>
-
-  <Style TargetType="local:TMButton" x:Key="TertiaryFill">
-    <Setter Property="TextColor" Value="{DynamicResource TertiaryFillButtonTextColor}"></Setter>
-    <Setter Property="IconTintColor" Value="{DynamicResource TertiaryFillIconTintColor}"></Setter>
-    <Setter Property="BorderColor" Value="{DynamicResource TertiaryFillButtonBackgroundColor}"/>
-    <Setter Property="VisualStateManager.VisualStateGroups">
-      <VisualStateGroupList>
-        <VisualStateGroup x:Name="CommonStates">
-          <VisualState x:Name="Normal">
-            <VisualState.Setters>
-              <Setter Property="BackgroundColor" Value="{DynamicResource TertiaryFillButtonBackgroundColor}"/>
-            </VisualState.Setters>
-          </VisualState>
-          <VisualState x:Name="Pressed">
-            <VisualState.Setters>
-              <Setter Property="BackgroundColor" Value="{DynamicResource TertiaryFillButtonSelectedBackgroundColor}"/>
-            </VisualState.Setters>
-          </VisualState>                            
-        </VisualStateGroup>
-      </VisualStateGroupList>
-    </Setter>
-  </Style>
-
-  <Style TargetType="local:TMButton" x:Key="DangerFill">
-    <Setter Property="TextColor" Value="{DynamicResource DangerFillButtonTextColor}"></Setter>
-    <Setter Property="IconTintColor" Value="{DynamicResource DangerFillIconTintColor}"></Setter>
-    <Setter Property="BorderColor" Value="{DynamicResource DangerFillButtonBackgroundColor}"/>
-    <Setter Property="VisualStateManager.VisualStateGroups">
-      <VisualStateGroupList>
-        <VisualStateGroup x:Name="CommonStates">
-          <VisualState x:Name="Normal">
-            <VisualState.Setters>
-              <Setter Property="BackgroundColor" Value="{DynamicResource DangerFillButtonBackgroundColor}"/>
-            </VisualState.Setters>
-          </VisualState>
-          <VisualState x:Name="Pressed">
-            <VisualState.Setters>
-              <Setter Property="BackgroundColor" Value="{DynamicResource DangerFillButtonSelectedBackgroundColor}"/>
-            </VisualState.Setters>
-          </VisualState>                            
-        </VisualStateGroup>
-      </VisualStateGroupList>
-    </Setter>
-  </Style>
-
-  <Style TargetType="local:TMButton" x:Key="PrimaryOutline">
-    <Setter Property="TextColor" Value="{DynamicResource PrimaryOutlineButtonTextColor}"></Setter>
-    <Setter Property="IconTintColor" Value="{DynamicResource PrimaryOutlineIconTintColor}"></Setter>
-    <Setter Property="BorderColor" Value="{DynamicResource PrimaryOutlineButtonTextColor}"></Setter>
-    <Setter Property="VisualStateManager.VisualStateGroups">
-      <VisualStateGroupList>
-        <VisualStateGroup x:Name="CommonStates">
-          <VisualState x:Name="Normal">
-            <VisualState.Setters>
-              <Setter Property="BackgroundColor" Value="{DynamicResource PrimaryOutlineButtonBackgroundColor}"/>
-            </VisualState.Setters>
-          </VisualState>
-          <VisualState x:Name="Pressed">
-            <VisualState.Setters>
-              <Setter Property="BackgroundColor" Value="{DynamicResource PrimaryOutlineButtonSelectedBackgroundColor}"/>
-            </VisualState.Setters>
-          </VisualState>                            
-        </VisualStateGroup>
-      </VisualStateGroupList>
-    </Setter>
-  </Style>
-
-  <Style TargetType="local:TMButton" x:Key="SecondaryOutline">
-    <Setter Property="TextColor" Value="{DynamicResource SecondaryOutlineButtonTextColor}"></Setter>
-    <Setter Property="IconTintColor" Value="{DynamicResource SecondaryOutlineIconTintColor}"></Setter>
-    <Setter Property="BorderColor" Value="{DynamicResource SecondaryOutlineButtonTextColor}"></Setter>
-    <Setter Property="VisualStateManager.VisualStateGroups">
-      <VisualStateGroupList>
-        <VisualStateGroup x:Name="CommonStates">
-          <VisualState x:Name="Normal">
-            <VisualState.Setters>
-              <Setter Property="BackgroundColor" Value="{DynamicResource SecondaryOutlineButtonBackgroundColor}"/>
-            </VisualState.Setters>
-          </VisualState>
-          <VisualState x:Name="Pressed">
-            <VisualState.Setters>
-              <Setter Property="BackgroundColor" Value="{DynamicResource SecondaryOutlineButtonSelectedBackgroundColor}"/>
-            </VisualState.Setters>
-          </VisualState>                            
-        </VisualStateGroup>
-      </VisualStateGroupList>
-    </Setter>
-  </Style>
-
-  <Style TargetType="local:TMButton" x:Key="Borderless">
-    <Setter Property="TextColor" Value="{DynamicResource BorderlessButtonTextColor}"></Setter>
-    <Setter Property="IconTintColor" Value="{DynamicResource BorderlessIconTintColor}"></Setter>
-    <Setter Property="VisualStateManager.VisualStateGroups">
-      <VisualStateGroupList>
-        <VisualStateGroup x:Name="CommonStates">
-          <VisualState x:Name="Normal">
-            <VisualState.Setters>
-              <Setter Property="BackgroundColor" Value="{DynamicResource BorderlessButtonBackgroundColor}"/>
-              <Setter Property="BorderColor" Value="{DynamicResource BorderlessButtonBorderColor}"/>
-            </VisualState.Setters>
-          </VisualState>
-          <VisualState x:Name="Pressed">
-            <VisualState.Setters>
-              <Setter Property="BackgroundColor" Value="{DynamicResource BorderlessButtonSelectedBackgroundColor}"/>
-              <Setter Property="BorderColor" Value="{DynamicResource BorderlessButtonSelectedBorderColor}"/>
-            </VisualState.Setters>
-          </VisualState>                            
-        </VisualStateGroup>
-      </VisualStateGroupList>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
-
diff --git a/Trimble.Modus.Components/Controls/Button/TMButtonStyles.xaml.cs b/Trimble.Modus.Components/Controls/Button/TMButtonStyles.xaml.cs
deleted file mode 100644
index ab20b4bc..00000000
--- a/Trimble.Modus.Components/Controls/Button/TMButtonStyles.xaml.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Trimble.Modus.Components;
-
-public partial class TMButtonStyles : ResourceDictionary
-{
-    public TMButtonStyles()
-    {
-        InitializeComponent();
-    }
-}
-
diff --git a/Trimble.Modus.Components/Controls/DropDown/DropDownContents.xaml b/Trimble.Modus.Components/Controls/DropDown/DropDownContents.xaml
index a7d5edcd..83c4d7f4 100644
--- a/Trimble.Modus.Components/Controls/DropDown/DropDownContents.xaml
+++ b/Trimble.Modus.Components/Controls/DropDown/DropDownContents.xaml
@@ -5,14 +5,7 @@
                  xmlns:local="clr-namespace:Trimble.Modus.Components"
                  x:Class="Trimble.Modus.Components.DropDownContents"
                  BackgroundColor="{DynamicResource Transparent}"
-                 Title="DropDownPopupPage">
-  <Modus:PopupPage.Resources>
-    <ResourceDictionary>
-      <ResourceDictionary.MergedDictionaries>
-        <local:DropDownStyles />
-      </ResourceDictionary.MergedDictionaries>
-    </ResourceDictionary>
-  </Modus:PopupPage.Resources>
+                 Title="DropDownPopupPage"> 
   <Border x:Name="border"
           VerticalOptions="Start"
           HorizontalOptions="Start"
diff --git a/Trimble.Modus.Components/Controls/DropDown/DropDownStyles.xaml b/Trimble.Modus.Components/Controls/DropDown/DropDownStyles.xaml
deleted file mode 100644
index 95ce0404..00000000
--- a/Trimble.Modus.Components/Controls/DropDown/DropDownStyles.xaml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ResourceDictionary xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-                    xmlns:local="clr-namespace:Trimble.Modus.Components;assembly=Trimble.Modus.Components"
-                    x:Class="Trimble.Modus.Components.DropDownStyles">
-  <Style TargetType="local:TMDropDown"
-         x:Key="DefaultStyle">
-    <Setter Property="BackgroundColor"
-            Value="{DynamicResource DropDownBackgroundColor}" />
-    <Setter Property="BorderColor"
-            Value="{DynamicResource DropDownBorderColor}" />
-    <Setter Property="TextAndIconColor"
-            Value="{DynamicResource DropDownTextAndIconColor}" />
-  </Style>
-
-  <Style TargetType="local:DropDownContents"
-         x:Key="DefaulDropDownContentstStyle">
-    <Setter Property="BorderColor"
-            Value="{DynamicResource DropDownContentBorderColor}" />
-  </Style>
-</ResourceDictionary>
diff --git a/Trimble.Modus.Components/Controls/DropDown/DropDownStyles.xaml.cs b/Trimble.Modus.Components/Controls/DropDown/DropDownStyles.xaml.cs
deleted file mode 100644
index 2b04f577..00000000
--- a/Trimble.Modus.Components/Controls/DropDown/DropDownStyles.xaml.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Trimble.Modus.Components;
-
-public partial class DropDownStyles : ResourceDictionary
-{
-	public DropDownStyles()
-	{
-		InitializeComponent();
-	}
-}
diff --git a/Trimble.Modus.Components/Controls/DropDown/TMDropDown.xaml b/Trimble.Modus.Components/Controls/DropDown/TMDropDown.xaml
index a5a7f330..83af92e3 100644
--- a/Trimble.Modus.Components/Controls/DropDown/TMDropDown.xaml
+++ b/Trimble.Modus.Components/Controls/DropDown/TMDropDown.xaml
@@ -9,16 +9,13 @@
              xmlns:converters="clr-namespace:Trimble.Modus.Components.Converters">
   <ContentView.Resources>
     <ResourceDictionary>
-      <ResourceDictionary.MergedDictionaries>
-        <local:DropDownStyles />
-      </ResourceDictionary.MergedDictionaries>
-      <converters:StringNotNullOrEmptyBoolConverter x:Key="StringNotNullOrEmptyBoolConverter" />
-    </ResourceDictionary>    
+    <converters:StringNotNullOrEmptyBoolConverter x:Key="StringNotNullOrEmptyBoolConverter" />
+    </ResourceDictionary>
   </ContentView.Resources>
   <VerticalStackLayout BindingContext="{x:Reference dropDown}">
     <local:ControlLabel TitleText="{Binding TitleText}"
                         IsRequired="{Binding IsRequired}"
-                        IsVisible="{Binding TitleText, Converter={StaticResource StringNotNullOrEmptyBoolConverter}}"/>
+                        IsVisible="{Binding TitleText, Converter={StaticResource IsStringNotNullOrEmptyConverter}}"/>
     <Border x:Name="innerBorder"
             HorizontalOptions="Fill"
             StrokeThickness="2"
@@ -45,7 +42,7 @@
 
         <Image x:Name="indicatorButton"
                Source="{Static constants:ImageConstants.ChevronDownIconWhite}"
-               HorizontalOptions="EndAndExpand"
+               HorizontalOptions="End"
                VerticalOptions="Center"
                Grid.Column="1"
                HeightRequest="32"
diff --git a/Trimble.Modus.Components/Controls/DropDown/TMDropDown.xaml.cs b/Trimble.Modus.Components/Controls/DropDown/TMDropDown.xaml.cs
index 09ea26ad..abf798bf 100644
--- a/Trimble.Modus.Components/Controls/DropDown/TMDropDown.xaml.cs
+++ b/Trimble.Modus.Components/Controls/DropDown/TMDropDown.xaml.cs
@@ -4,7 +4,7 @@
 using Trimble.Modus.Components.Popup.Services;
 
 namespace Trimble.Modus.Components;
-public partial class TMDropDown : ContentView
+public partial class TMDropDown : ContentView, IDisposable
 {
     #region Private fields
     private double desiredHeight;
@@ -367,4 +367,24 @@ private void TapGestureRecognizer_Tapped(object sender, TappedEventArgs e)
             Open();
         }
     }
+
+    protected override void OnParentSet()
+    {
+        base.OnParentSet();
+        if (Parent == null) Dispose();
+    }
+
+    protected override void OnHandlerChanged()
+    {
+        base.OnHandlerChanged();
+        if (Handler == null) Dispose();
+    }
+
+    public void Dispose()
+    {
+        PopupService.Instance.Dismissed -= OnPopupRemoved;
+        SelectionChanged = null;
+        SelectionChangedCommand = null;
+        ItemsSource = null;
+    }
 }
diff --git a/Trimble.Modus.Components/Controls/Label/ControlLabel.xaml b/Trimble.Modus.Components/Controls/Label/ControlLabel.xaml
index 780a53ed..f24a45ec 100644
--- a/Trimble.Modus.Components/Controls/Label/ControlLabel.xaml
+++ b/Trimble.Modus.Components/Controls/Label/ControlLabel.xaml
@@ -7,10 +7,8 @@
              x:Name="controlLabelView">
   <ContentView.Resources>
     <ResourceDictionary>
-      <toolkit:IsStringNotNullOrEmptyConverter x:Key="IsStringNotNullOrEmptyConverter" />
-      <ResourceDictionary.MergedDictionaries>
-        <local:ControlLabelStyles />
-      </ResourceDictionary.MergedDictionaries>
+
+    <toolkit:IsStringNotNullOrEmptyConverter x:Key="IsStringNotNullOrEmptyConverter" />
     </ResourceDictionary>
   </ContentView.Resources>
   <Grid x:Name="view"
diff --git a/Trimble.Modus.Components/Controls/Label/ControlLabelStyles.xaml b/Trimble.Modus.Components/Controls/Label/ControlLabelStyles.xaml
deleted file mode 100644
index dc9fae5a..00000000
--- a/Trimble.Modus.Components/Controls/Label/ControlLabelStyles.xaml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ResourceDictionary xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-                    xmlns:local="clr-namespace:Trimble.Modus.Components;assembly=Trimble.Modus.Components"
-                    x:Class="Trimble.Modus.Components.ControlLabelStyles">
-  <Style TargetType="local:ControlLabel"
-         x:Key="DefaultControlLabelStyle">
-    <Setter Property="HeaderTextColor"
-            Value="{DynamicResource ControlLabelTextColor}" />
-  </Style>
-
-</ResourceDictionary>
diff --git a/Trimble.Modus.Components/Controls/Label/ControlLabelStyles.xaml.cs b/Trimble.Modus.Components/Controls/Label/ControlLabelStyles.xaml.cs
deleted file mode 100644
index edd19da5..00000000
--- a/Trimble.Modus.Components/Controls/Label/ControlLabelStyles.xaml.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Trimble.Modus.Components;
-
-public partial class ControlLabelStyles : ResourceDictionary
-{
-	public ControlLabelStyles()
-	{
-		InitializeComponent();
-	}
-}
diff --git a/Trimble.Modus.Components/Controls/TMInput/BaseInput.xaml b/Trimble.Modus.Components/Controls/TMInput/BaseInput.xaml
index b0f5be2c..2517077d 100644
--- a/Trimble.Modus.Components/Controls/TMInput/BaseInput.xaml
+++ b/Trimble.Modus.Components/Controls/TMInput/BaseInput.xaml
@@ -6,13 +6,9 @@
              xmlns:Modus="clr-namespace:Trimble.Modus.Components"
              xmlns:converters="clr-namespace:Trimble.Modus.Components.Converters">
 
-  <ContentView.Resources>  
-      
-    <ResourceDictionary>
-      <ResourceDictionary.MergedDictionaries>
-        <local:TMInputStyles></local:TMInputStyles>
-      </ResourceDictionary.MergedDictionaries>
-      <converters:StringNotNullOrEmptyBoolConverter x:Key="StringNotNullOrEmptyBoolConverter" />
+  <ContentView.Resources>
+    <ResourceDictionary>
+        <converters:StringNotNullOrEmptyBoolConverter x:Key="StringNotNullOrEmptyBoolConverter" />
     </ResourceDictionary>
     <ControlTemplate x:Key="InputTemplate">
       <Grid x:Name="tmInputContainer"
diff --git a/Trimble.Modus.Components/Controls/TMInput/BaseInput.xaml.cs b/Trimble.Modus.Components/Controls/TMInput/BaseInput.xaml.cs
index 06363259..d2999404 100644
--- a/Trimble.Modus.Components/Controls/TMInput/BaseInput.xaml.cs
+++ b/Trimble.Modus.Components/Controls/TMInput/BaseInput.xaml.cs
@@ -461,13 +461,13 @@ protected static void SetBorderColor(BaseInput tmInput)
             if (hasError)
             {
                 tmInput.HelperLayout.IsVisible = true;
-                tmInput.SetDynamicResource(BaseInput.StyleProperty, "Error");
+                tmInput.SetDynamicResource(BaseInput.StyleProperty, "ErrorInput");
                 tmInput.HelperLabel.Text = tmInput.ErrorText;
             }
             else if (hasSuccess)
             {
                 tmInput.HelperLayout.IsVisible = true;
-                tmInput.SetDynamicResource(BaseInput.StyleProperty, "Success");
+                tmInput.SetDynamicResource(BaseInput.StyleProperty, "SuccessInput");
                 tmInput.HelperLabel.Text = tmInput.SuccessText;
             }
             else
@@ -480,7 +480,7 @@ protected static void SetBorderColor(BaseInput tmInput)
                 {
                     tmInput.HelperLayout.IsVisible = false;
                 }
-                tmInput.SetDynamicResource(BaseInput.StyleProperty, "Primary");
+                tmInput.SetDynamicResource(BaseInput.StyleProperty, "PrimaryInput");
                 tmInput.HelperLabel.Text = tmInput.HelperText;
             }
 
@@ -495,13 +495,13 @@ protected static void SetBorderColor(BaseInput tmInput)
             {
                 tmInput.HelperLayout.IsVisible = true;
                 tmInput.HelperLabel.Text = tmInput.ErrorText;
-                tmInput.SetDynamicResource(BaseInput.StyleProperty, "Error");
+                tmInput.SetDynamicResource(BaseInput.StyleProperty, "ErrorInput");
             }
             else if (tmInput.IsRequired && string.IsNullOrEmpty(tmInput.Text))
             {
                 tmInput.HelperLayout.IsVisible = true;
                 tmInput.HelperLabel.Text = "Field is Required";
-                tmInput.SetDynamicResource(BaseInput.StyleProperty, "Error");
+                tmInput.SetDynamicResource(BaseInput.StyleProperty, "ErrorInput");
 
             }
             else
@@ -510,12 +510,12 @@ protected static void SetBorderColor(BaseInput tmInput)
                 {
                     tmInput.HelperLayout.IsVisible = true;
                     tmInput.HelperLabel.Text = tmInput.HelperText;
-                    tmInput.SetDynamicResource(BaseInput.StyleProperty, "Default");
+                    tmInput.SetDynamicResource(BaseInput.StyleProperty, "DefaultInput");
 
                 }
                 else
                 {
-                    tmInput.SetDynamicResource(BaseInput.StyleProperty, "Default");
+                    tmInput.SetDynamicResource(BaseInput.StyleProperty, "DefaultInput");
                     tmInput.HelperLayout.IsVisible = false;
                 }
             }
@@ -541,13 +541,13 @@ private void UpdateBorderColors(BaseInput tmInput)
             if (tmInput.IsEnabled)
             {
                 tmInput.InputBorder.Opacity = tmInput.HelperLayout.Opacity = 1;
-                tmInput.SetDynamicResource(BaseInput.StyleProperty, "Default");
+                tmInput.SetDynamicResource(BaseInput.StyleProperty, "DefaultInput");
                 tmInput.GetCoreContent().SetDynamicResource(BackgroundColorProperty, ColorsConstants.Transparent);
                 SetBorderColor(tmInput);
             }
             else
             {
-                tmInput.SetDynamicResource(BaseInput.StyleProperty, "Default");
+                tmInput.SetDynamicResource(BaseInput.StyleProperty, "DefaultInput");
                 tmInput.InputBorder.StrokeThickness = 1;
                 tmInput.InputBorder.Opacity = tmInput.HelperLayout.Opacity = disabledOpacity;
             }
@@ -556,7 +556,7 @@ private void UpdateBorderColors(BaseInput tmInput)
 
     private static void SetReadOnlyStyles(BaseInput tmInput)
     {
-        tmInput.SetDynamicResource(BaseInput.StyleProperty, "ReadOnly");
+        tmInput.SetDynamicResource(BaseInput.StyleProperty, "ReadOnlyInput");
         tmInput.InputBorder.StrokeThickness = 0;
         tmInput.InputBorder.Opacity = tmInput.HelperLayout.Opacity = 1;
     }
diff --git a/Trimble.Modus.Components/Controls/TMInput/TMInput.xaml.cs b/Trimble.Modus.Components/Controls/TMInput/TMInput.xaml.cs
index 108d9545..d9683a19 100644
--- a/Trimble.Modus.Components/Controls/TMInput/TMInput.xaml.cs
+++ b/Trimble.Modus.Components/Controls/TMInput/TMInput.xaml.cs
@@ -211,5 +211,28 @@ internal void SetCenterTextAlignment()
         inputBorderlessEntry.HorizontalTextAlignment = TextAlignment.Center;
     }
 
-    #endregion
+    #endregion
+
+    protected override void OnParentSet()
+    {
+        base.OnParentSet();
+        if (Parent == null)
+            CleanupTemplateReferences();
+    }
+
+    protected override void OnHandlerChanged()
+    {
+        base.OnHandlerChanged();
+        if (Handler == null)
+            CleanupTemplateReferences();
+    }
+
+    private void CleanupTemplateReferences()
+    {
+        InputBorder = null;
+        HelperLabel = null;
+        HelperIcon = null;
+        HelperLayout = null;
+        ControlLabel = null;
+    }
 }
diff --git a/Trimble.Modus.Components/Controls/TMInput/TMInputStyles.xaml b/Trimble.Modus.Components/Controls/TMInput/TMInputStyles.xaml
deleted file mode 100644
index cb737f0a..00000000
--- a/Trimble.Modus.Components/Controls/TMInput/TMInputStyles.xaml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ResourceDictionary xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-                    xmlns:local="clr-namespace:Trimble.Modus.Components;assembly=Trimble.Modus.Components"
-                    x:Class="Trimble.Modus.Components.TMInputStyles">
-
-  <Style TargetType="local:TMInput"
-         x:Key="Default">
-    <Setter Property="HelperIconImage"
-            Value="{DynamicResource InputBlueInfoOutlineIcon}" />
-    <Setter Property="HeaderTextColor"
-            Value="{DynamicResource InputHeaderTextColor}" />
-    <Setter Property="BorderColor"
-            Value="{DynamicResource InputDefaultBorderColor}" />
-    <Setter Property="BackgroundColor"
-            Value="{DynamicResource InputDefaultBackgroundColor}" />
-    <Setter Property="HelperLayoutBackground"
-            Value="{DynamicResource InputDefaultHelperLayoutBackgroundColor}" />
-    <Setter Property="HelperTextColor"
-            Value="{DynamicResource InputDefaultHelperTextColor}" />
-  </Style>
-
-  <Style TargetType="local:TMInput"
-         x:Key="Primary">
-    <Setter Property="HelperIconImage"
-            Value="{DynamicResource InputBlueInfoOutlineIcon}" />
-    <Setter Property="HeaderTextColor"
-            Value="{DynamicResource InputHeaderTextColor}" />
-    <Setter Property="BorderColor"
-            Value="{DynamicResource InputPrimaryBorderColor}" />
-    <Setter Property="BackgroundColor"
-            Value="{DynamicResource InputDefaultBackgroundColor}" />
-    <Setter Property="HelperLayoutBackground"
-            Value="{DynamicResource InputPrimaryHelperLayoutBackgroundColor}" />
-    <Setter Property="HelperTextColor"
-            Value="{DynamicResource InputDefaultHelperTextColor}" />
-  </Style>
-
-  <Style TargetType="local:TMInput"
-         x:Key="Success">
-    <Setter Property="HelperIconImage"
-            Value="{DynamicResource InputSuccessOutlineIcon}" />
-    <Setter Property="HeaderTextColor"
-            Value="{DynamicResource InputHeaderTextColor}" />
-    <Setter Property="BorderColor"
-            Value="{DynamicResource InputSuccessBorderColor}" />
-    <Setter Property="BackgroundColor"
-            Value="{DynamicResource InputDefaultBackgroundColor}" />
-    <Setter Property="HelperLayoutBackground"
-            Value="{DynamicResource InputSuccessHelperLayoutBackgroundColor}" />
-    <Setter Property="HelperTextColor"
-            Value="{DynamicResource InputDefaultHelperTextColor}" />
-  </Style>
-
-  <Style TargetType="local:TMInput"
-         x:Key="Error">
-    <Setter Property="HelperIconImage"
-            Value="{DynamicResource InputErrorOutlineIcon}" />
-    <Setter Property="HeaderTextColor"
-            Value="{DynamicResource InputHeaderTextColor}" />
-    <Setter Property="BorderColor"
-            Value="{DynamicResource InputErrorBorderColor}" />
-    <Setter Property="BackgroundColor"
-            Value="{DynamicResource InputDefaultBackgroundColor}" />
-    <Setter Property="HelperLayoutBackground"
-            Value="{DynamicResource InputErrorHelperLayoutBackgroundColor}" />
-    <Setter Property="HelperTextColor"
-            Value="{DynamicResource InputDefaultHelperTextColor}" />
-  </Style>
-
-  <Style TargetType="local:TMInput"
-         x:Key="ReadOnly">
-    <Setter Property="HelperIconImage"
-            Value="{DynamicResource DefaultCheckBoxImage}" />
-    <Setter Property="HeaderTextColor"
-            Value="{DynamicResource InputHeaderTextColor}" />
-    <Setter Property="BorderColor"
-            Value="{DynamicResource InputReadOnlyBorderColor}" />
-    <Setter Property="BackgroundColor"
-            Value="{DynamicResource InputReadOnlyBackgroundColor}" />
-    <Setter Property="HelperLayoutBackground"
-            Value="{DynamicResource InputReadOnlyHelperLayoutBackgroundColor}" />
-    <Setter Property="HelperTextColor"
-            Value="{DynamicResource InputDefaultHelperTextColor}" />
-  </Style>
-
-</ResourceDictionary>
-
diff --git a/Trimble.Modus.Components/Controls/TMInput/TMInputStyles.xaml.cs b/Trimble.Modus.Components/Controls/TMInput/TMInputStyles.xaml.cs
deleted file mode 100644
index 736ae248..00000000
--- a/Trimble.Modus.Components/Controls/TMInput/TMInputStyles.xaml.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Trimble.Modus.Components;
-
-public partial class TMInputStyles : ResourceDictionary
-{
-    public TMInputStyles()
-    {
-        InitializeComponent();
-    }
-}
-
diff --git a/Trimble.Modus.Components/Controls/TMSwitch/TMSwitch.xaml b/Trimble.Modus.Components/Controls/TMSwitch/TMSwitch.xaml
index f90032f3..26526609 100644
--- a/Trimble.Modus.Components/Controls/TMSwitch/TMSwitch.xaml
+++ b/Trimble.Modus.Components/Controls/TMSwitch/TMSwitch.xaml
@@ -5,13 +5,7 @@
              xmlns:local="clr-namespace:Trimble.Modus.Components"
              x:Name="tmSwitch"
              x:Class="Trimble.Modus.Components.TMSwitch">
-  <ContentView.Resources>
-    <ResourceDictionary>
-      <ResourceDictionary.MergedDictionaries>
-        <local:TMSwitchStyles />
-      </ResourceDictionary.MergedDictionaries>
-    </ResourceDictionary>
-  </ContentView.Resources>
+ 
   <Grid x:Name="container"
         HorizontalOptions="Fill"
         BindingContext="{x:Reference tmSwitch}"
diff --git a/Trimble.Modus.Components/Controls/TMSwitch/TMSwitchStyles.xaml b/Trimble.Modus.Components/Controls/TMSwitch/TMSwitchStyles.xaml
deleted file mode 100644
index adfc3f20..00000000
--- a/Trimble.Modus.Components/Controls/TMSwitch/TMSwitchStyles.xaml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ResourceDictionary xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-                    xmlns:local="clr-namespace:Trimble.Modus.Components;assembly=Trimble.Modus.Components"
-                    x:Class="Trimble.Modus.Components.TMSwitchStyles">
-
-  <Style TargetType="local:TMSwitch" x:Key="SwitchStyle">
-    <Setter Property="TextColor" Value="{DynamicResource SwitchTextColor}"/>
-    <Setter Property="ThumbColor"
-            Value="{DynamicResource SwitchThumbColor}"/>
-    <Setter Property="VisualStateManager.VisualStateGroups">
-      <VisualStateGroupList>
-        <VisualStateGroup x:Name="CommonStates">
-          <VisualState x:Name="On">
-            <VisualState.Setters>
-              <Setter Property="BackgroundColor" Value="{DynamicResource SwitchOnBackgroundColor}"/>
-            </VisualState.Setters>
-          </VisualState>
-          <VisualState x:Name="Off">
-            <VisualState.Setters>
-              <Setter Property="BackgroundColor" Value="{DynamicResource SwitchOffBackgroundColor}"/>
-            </VisualState.Setters>
-          </VisualState>                            
-        </VisualStateGroup>
-      </VisualStateGroupList>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
-
diff --git a/Trimble.Modus.Components/Controls/TMSwitch/TMSwitchStyles.xaml.cs b/Trimble.Modus.Components/Controls/TMSwitch/TMSwitchStyles.xaml.cs
deleted file mode 100644
index 3d663cfa..00000000
--- a/Trimble.Modus.Components/Controls/TMSwitch/TMSwitchStyles.xaml.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Trimble.Modus.Components;
-
-public partial class TMSwitchStyles : ResourceDictionary
-{
-    public TMSwitchStyles()
-    {
-        InitializeComponent();
-    }
-}
-
diff --git a/Trimble.Modus.Components/Controls/Toast/TMToast.cs b/Trimble.Modus.Components/Controls/Toast/TMToast.cs
index cbe541e4..ad1184ba 100644
--- a/Trimble.Modus.Components/Controls/Toast/TMToast.cs
+++ b/Trimble.Modus.Components/Controls/Toast/TMToast.cs
@@ -11,7 +11,7 @@ public class TMToast
         #endregion
         #region Public Properties
         private Action? action = null;
-        public ToastTheme theme = ToastTheme.Default;
+        public ToastTheme theme = ToastTheme.DefaultToast;
         public bool isDismissable = true;
         #endregion
         public TMToast(string message, string actionButtonText = null, Action? action = null)
diff --git a/Trimble.Modus.Components/Controls/Toast/TMToastContents.xaml b/Trimble.Modus.Components/Controls/Toast/TMToastContents.xaml
index 8b057cb9..531d1811 100644
--- a/Trimble.Modus.Components/Controls/Toast/TMToastContents.xaml
+++ b/Trimble.Modus.Components/Controls/Toast/TMToastContents.xaml
@@ -9,38 +9,31 @@
                  CloseWhenBackgroundIsClicked="False"
                  BackgroundInputTransparent="True">
 
-  <ContentPage.Resources>
-    <ResourceDictionary>
-      <ResourceDictionary.MergedDictionaries>
-        <local:TMToastStyles></local:TMToastStyles>
-      </ResourceDictionary.MergedDictionaries>
-    </ResourceDictionary>
-  </ContentPage.Resources>
+  
 
   <VerticalStackLayout x:Name="toastLayout"
                        HorizontalOptions="Fill"
                        VerticalOptions="End">
 
-    <Border  VerticalOptions="CenterAndExpand"
-             HorizontalOptions="FillAndExpand"
+    <Border  VerticalOptions="Center"
+             HorizontalOptions="Fill"
              BackgroundColor="{DynamicResource Transparent}">
       <Border.StrokeShape>
         <RoundRectangle CornerRadius="4" />
       </Border.StrokeShape>
 
-      <StackLayout x:Name="contentLayout"
+      <Grid x:Name="contentLayout"
                    VerticalOptions="Center"
                    BackgroundColor="{Binding ToastBackgroundColor}"
-                   HorizontalOptions="FillAndExpand"
-                   Orientation="Horizontal">
+                   HorizontalOptions="Fill" ColumnDefinitions="auto, *, auto, auto">
         <Image x:Name="leftIconImage"
                Margin="16,8,16,8"
                Source="{Binding LeftIconSource}"
                WidthRequest="16"
                HeightRequest="16"
                HorizontalOptions="Start"
-               VerticalOptions="CenterAndExpand" />
-        <Label x:Name="label"
+               VerticalOptions="Center" />
+        <Label x:Name="label" Grid.Column="1"
                FontFamily="OpenSansRegular"
                Text="{Binding Message}"
                LineBreakMode="TailTruncation"
@@ -50,11 +43,11 @@
                FontSize="14"
                TextColor="{Binding TextColor}"
                VerticalOptions="Center"
-               HorizontalOptions="FillAndExpand" />
+               HorizontalOptions="Fill" />
         <Button x:Name="actionButton"
                 HorizontalOptions="End"
                 VerticalOptions="Center"
-                FontSize="14"
+                FontSize="14" Grid.Column="2"
                 Clicked="CloseButtonClicked" />
         <ImageButton x:Name="closeButton"
                      MaximumHeightRequest="16"
@@ -65,9 +58,9 @@
                      Padding="{OnPlatform '0', iOS='16,16,0,16', WinUI='16'}"
                      HorizontalOptions="End"
                      VerticalOptions="Center"
-                     Clicked="CloseButtonClicked"
+                     Clicked="CloseButtonClicked" Grid.Column="3"
                      BackgroundColor="{DynamicResource Transparent}" />
-      </StackLayout>
+      </Grid>
 
     </Border>
   </VerticalStackLayout>
diff --git a/Trimble.Modus.Components/Controls/Toast/TMToastContents.xaml.cs b/Trimble.Modus.Components/Controls/Toast/TMToastContents.xaml.cs
index ce6efeb2..55644529 100644
--- a/Trimble.Modus.Components/Controls/Toast/TMToastContents.xaml.cs
+++ b/Trimble.Modus.Components/Controls/Toast/TMToastContents.xaml.cs
@@ -117,32 +117,32 @@ private void SetTheme(String toastTheme)
         ToastTheme theme = (ToastTheme)Enum.Parse(typeof(ToastTheme), toastTheme);
         switch (theme)
         {
-            case ToastTheme.Dark:               
+            case ToastTheme.DarkToast:               
                 leftIconImage.Source = ImageSource.FromFile(ImageConstants.WhiteInfoIcon);
                 closeButton.Source = ImageSource.FromFile(ImageConstants.ToastWhiteCloseIcon);
                 break;
 
-            case ToastTheme.Primary:
+            case ToastTheme.PrimaryToast:
                 closeButton.SetDynamicResource(ImageButton.SourceProperty, "ToastPrimaryCloseIcon");
                 leftIconImage.SetDynamicResource(Image.SourceProperty, "ToastPrimaryInfoIcon");
                 break;
 
-            case ToastTheme.Secondary:
+            case ToastTheme.SecondaryToast:
                 closeButton.SetDynamicResource(ImageButton.SourceProperty, "ToastCloseIcon");
                 leftIconImage.SetDynamicResource(Image.SourceProperty, "ToastSecondaryInfoIcon");
                 break;
 
-            case ToastTheme.Danger:
+            case ToastTheme.DangerToast:
                 closeButton.SetDynamicResource(ImageButton.SourceProperty, "ToastCloseIcon");
                 leftIconImage.SetDynamicResource(Image.SourceProperty, "ToastDangerIcon");
                 break;
 
-            case ToastTheme.Warning:
+            case ToastTheme.WarningToast:
                 closeButton.SetDynamicResource(ImageButton.SourceProperty, "ToastCloseIcon");
                 leftIconImage.SetDynamicResource(Image.SourceProperty, "ToastWarningIcon");
                 break;
 
-            case ToastTheme.Success:
+            case ToastTheme.SuccessToast:
                 leftIconImage.SetDynamicResource(Image.SourceProperty, "ToastSuccessIcon");
                 closeButton.SetDynamicResource(ImageButton.SourceProperty, "ToastCloseIcon");
                 break;
diff --git a/Trimble.Modus.Components/Controls/Toast/TMToastStyles.xaml b/Trimble.Modus.Components/Controls/Toast/TMToastStyles.xaml
deleted file mode 100644
index a1a82d33..00000000
--- a/Trimble.Modus.Components/Controls/Toast/TMToastStyles.xaml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ResourceDictionary xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-                    xmlns:local="clr-namespace:Trimble.Modus.Components.Controls.Toast"
-                    x:Class="Trimble.Modus.Components.TMToastStyles">
-
-  <Style TargetType="local:TMToastContents" x:Key="Default">
-    <Setter Property="ToastBackgroundColor" Value="{DynamicResource ToastDefaultBackgroundColor}"/>
-    <Setter Property="TextColor" Value="{DynamicResource ToastDefaultTextColor}"/>
-    <Setter Property="LeftIconTintColor" Value="{DynamicResource ToastDefaultLeftIconTintColor}"/>
-    <Setter Property="RightIconTintColor" Value="{DynamicResource ToastDefaultRightIconTintColor}"/>
-  </Style>
-  <Style TargetType="local:TMToastContents" x:Key="Dark">
-    <Setter Property="ToastBackgroundColor" Value="{DynamicResource ToastDarkBackgroundColor}"/>
-    <Setter Property="TextColor" Value="{DynamicResource ToastDarkTextColor}"/>
-    <Setter Property="LeftIconTintColor" Value="{DynamicResource ToastDarkLeftIconTintColor}"/>
-    <Setter Property="RightIconTintColor" Value="{DynamicResource ToastDarkRightIconTintColor}"/>
-  </Style>
-  <Style TargetType="local:TMToastContents" x:Key="Primary">
-    <Setter Property="ToastBackgroundColor" Value="{DynamicResource ToastPrimaryBackgroundColor}"/>
-    <Setter Property="TextColor" Value="{DynamicResource ToastPrimaryTextColor}"/>
-    <Setter Property="LeftIconTintColor" Value="{DynamicResource ToastPrimaryLeftIconTintColor}"/>
-    <Setter Property="RightIconTintColor" Value="{DynamicResource ToastPrimaryRightIconTintColor}"/>
-  </Style>
-  <Style TargetType="local:TMToastContents" x:Key="Secondary">
-    <Setter Property="ToastBackgroundColor" Value="{DynamicResource ToastSecondaryBackgroundColor}"/>
-    <Setter Property="TextColor" Value="{DynamicResource ToastSecondaryTextColor}"/>
-    <Setter Property="LeftIconTintColor" Value="{DynamicResource ToastSecondaryLeftIconTintColor}"/>
-    <Setter Property="RightIconTintColor" Value="{DynamicResource ToastSecondaryRightIconTintColor}"/>
-  </Style>
-  <Style TargetType="local:TMToastContents" x:Key="Danger">
-    <Setter Property="ToastBackgroundColor" Value="{DynamicResource ToastDangerBackgroundColor}"/>
-    <Setter Property="TextColor" Value="{DynamicResource ToastDangerTextColor}"/>
-    <Setter Property="LeftIconTintColor" Value="{DynamicResource ToastDangerLeftIconTintColor}"/>
-    <Setter Property="RightIconTintColor" Value="{DynamicResource ToastDangerRightIconTintColor}"/>
-  </Style>
-  <Style TargetType="local:TMToastContents" x:Key="Warning">
-    <Setter Property="ToastBackgroundColor" Value="{DynamicResource ToastWarningBackgroundColor}"/>
-    <Setter Property="TextColor" Value="{DynamicResource ToastWarningTextColor}"/>
-    <Setter Property="LeftIconTintColor" Value="{DynamicResource ToastWarningLeftIconTintColor}"/>
-    <Setter Property="RightIconTintColor" Value="{DynamicResource ToastWarningRightIconTintColor}"/>
-  </Style>
-  <Style TargetType="local:TMToastContents" x:Key="Success">
-    <Setter Property="ToastBackgroundColor" Value="{DynamicResource ToastSuccessBackgroundColor}"/>
-    <Setter Property="TextColor" Value="{DynamicResource ToastSuccessTextColor}"/>
-    <Setter Property="LeftIconTintColor" Value="{DynamicResource ToastSuccessLeftIconTintColor}"/>
-    <Setter Property="RightIconTintColor" Value="{DynamicResource ToastSuccessRightIconTintColor}"/>
-  </Style>
-
-</ResourceDictionary>
-
diff --git a/Trimble.Modus.Components/Controls/Toast/TMToastStyles.xaml.cs b/Trimble.Modus.Components/Controls/Toast/TMToastStyles.xaml.cs
deleted file mode 100644
index 294ac226..00000000
--- a/Trimble.Modus.Components/Controls/Toast/TMToastStyles.xaml.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Trimble.Modus.Components;
-
-public partial class TMToastStyles : ResourceDictionary
-{
-    public TMToastStyles()
-    {
-        InitializeComponent();
-    }
-}
-
diff --git a/Trimble.Modus.Components/Enums/ToastTheme.cs b/Trimble.Modus.Components/Enums/ToastTheme.cs
index b5159ad7..c916d18a 100644
--- a/Trimble.Modus.Components/Enums/ToastTheme.cs
+++ b/Trimble.Modus.Components/Enums/ToastTheme.cs
@@ -2,11 +2,11 @@
 
 public enum ToastTheme
 {
-    Default,
-    Dark,
-    Primary,
-    Secondary,
-    Danger,
-    Warning,
-    Success
+    DefaultToast,
+    DarkToast,
+    PrimaryToast,
+    SecondaryToast,
+    DangerToast,
+    WarningToast,
+    SuccessToast
 }
diff --git a/Trimble.Modus.Components/Handlers/EntryHandler.cs b/Trimble.Modus.Components/Handlers/EntryHandler.cs
index 3921cffd..7bc08ef5 100644
--- a/Trimble.Modus.Components/Handlers/EntryHandler.cs
+++ b/Trimble.Modus.Components/Handlers/EntryHandler.cs
@@ -8,12 +8,12 @@ namespace Trimble.Modus.Components.Handlers;
 
 internal partial class EntryHandler : Microsoft.Maui.Handlers.EntryHandler
 {
-    public EntryHandler()
+    static EntryHandler()
     {
         Mapper.AppendToMapping("TMBorderlessEntryCustomization", MapTMEntry);
     }
 
-    public void MapTMEntry(IEntryHandler entryHandler, IEntry entry)
+    public static void MapTMEntry(IEntryHandler entryHandler, IEntry entry)
     {
         if (entry is BorderlessEntry && entryHandler is EntryHandler)
         {
diff --git a/Trimble.Modus.Components/Helpers/ThemeManager.cs b/Trimble.Modus.Components/Helpers/ThemeManager.cs
index 68324f05..39a982f3 100644
--- a/Trimble.Modus.Components/Helpers/ThemeManager.cs
+++ b/Trimble.Modus.Components/Helpers/ThemeManager.cs
@@ -1,4 +1,5 @@
 using Trimble.Modus.Components.Hosting;
+using Trimble.Modus.Components.Styles;
 
 namespace Trimble.Modus.Components.Helpers
 {
@@ -16,10 +17,15 @@ public static void Initialize(ModusConfig appConfig = null)
             UpdateColorsDictionary(appConfig);
             UpdateStylingDictionary(appConfig);
             UpdateTheme(Application.Current.RequestedTheme);
-
+            RegisterStyles();
             Application.Current.RequestedThemeChanged += Current_RequestedThemeChanged;
         }
 
+        public static void RegisterStyles()
+        {            
+            Application.Current.Resources.MergedDictionaries.Add(new ModusStyles()); 
+        }
+
         private static void UpdateColorsDictionary(ModusConfig appConfig = null)
         {
             var defaultLightThemeColors = new Styles.LightThemeColors();
diff --git a/Trimble.Modus.Components/Styles/ModusStyles.xaml b/Trimble.Modus.Components/Styles/ModusStyles.xaml
new file mode 100644
index 00000000..44ff51ff
--- /dev/null
+++ b/Trimble.Modus.Components/Styles/ModusStyles.xaml
@@ -0,0 +1,335 @@
+<?xml version="1.0" encoding="utf-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.ModusStyles"
+             xmlns:local="clr-namespace:Trimble.Modus.Components;assembly=Trimble.Modus.Components"
+             xmlns:toast="clr-namespace:Trimble.Modus.Components.Controls.Toast">
+
+  <!--TMInput Styles-->
+  <Style TargetType="local:TMInput"
+        x:Key="DefaultInput">
+    <Setter Property="HelperIconImage"
+           Value="{DynamicResource InputBlueInfoOutlineIcon}" />
+    <Setter Property="HeaderTextColor"
+           Value="{DynamicResource InputHeaderTextColor}" />
+    <Setter Property="BorderColor"
+           Value="{DynamicResource InputDefaultBorderColor}" />
+    <Setter Property="BackgroundColor"
+           Value="{DynamicResource InputDefaultBackgroundColor}" />
+    <Setter Property="HelperLayoutBackground"
+           Value="{DynamicResource InputDefaultHelperLayoutBackgroundColor}" />
+    <Setter Property="HelperTextColor"
+           Value="{DynamicResource InputDefaultHelperTextColor}" />
+  </Style>
+
+  <Style TargetType="local:TMInput"
+        x:Key="PrimaryInput">
+    <Setter Property="HelperIconImage"
+           Value="{DynamicResource InputBlueInfoOutlineIcon}" />
+    <Setter Property="HeaderTextColor"
+           Value="{DynamicResource InputHeaderTextColor}" />
+    <Setter Property="BorderColor"
+           Value="{DynamicResource InputPrimaryBorderColor}" />
+    <Setter Property="BackgroundColor"
+           Value="{DynamicResource InputDefaultBackgroundColor}" />
+    <Setter Property="HelperLayoutBackground"
+           Value="{DynamicResource InputPrimaryHelperLayoutBackgroundColor}" />
+    <Setter Property="HelperTextColor"
+           Value="{DynamicResource InputDefaultHelperTextColor}" />
+  </Style>
+
+  <Style TargetType="local:TMInput"
+        x:Key="SuccessInput">
+    <Setter Property="HelperIconImage"
+           Value="{DynamicResource InputSuccessOutlineIcon}" />
+    <Setter Property="HeaderTextColor"
+           Value="{DynamicResource InputHeaderTextColor}" />
+    <Setter Property="BorderColor"
+           Value="{DynamicResource InputSuccessBorderColor}" />
+    <Setter Property="BackgroundColor"
+           Value="{DynamicResource InputDefaultBackgroundColor}" />
+    <Setter Property="HelperLayoutBackground"
+           Value="{DynamicResource InputSuccessHelperLayoutBackgroundColor}" />
+    <Setter Property="HelperTextColor"
+           Value="{DynamicResource InputDefaultHelperTextColor}" />
+  </Style>
+
+  <Style TargetType="local:TMInput"
+        x:Key="ErrorInput">
+    <Setter Property="HelperIconImage"
+           Value="{DynamicResource InputErrorOutlineIcon}" />
+    <Setter Property="HeaderTextColor"
+           Value="{DynamicResource InputHeaderTextColor}" />
+    <Setter Property="BorderColor"
+           Value="{DynamicResource InputErrorBorderColor}" />
+    <Setter Property="BackgroundColor"
+           Value="{DynamicResource InputDefaultBackgroundColor}" />
+    <Setter Property="HelperLayoutBackground"
+           Value="{DynamicResource InputErrorHelperLayoutBackgroundColor}" />
+    <Setter Property="HelperTextColor"
+           Value="{DynamicResource InputDefaultHelperTextColor}" />
+  </Style>
+
+  <Style TargetType="local:TMInput"
+        x:Key="ReadOnlyInput">
+    <Setter Property="HelperIconImage"
+           Value="{DynamicResource DefaultCheckBoxImage}" />
+    <Setter Property="HeaderTextColor"
+           Value="{DynamicResource InputHeaderTextColor}" />
+    <Setter Property="BorderColor"
+           Value="{DynamicResource InputReadOnlyBorderColor}" />
+    <Setter Property="BackgroundColor"
+           Value="{DynamicResource InputReadOnlyBackgroundColor}" />
+    <Setter Property="HelperLayoutBackground"
+           Value="{DynamicResource InputReadOnlyHelperLayoutBackgroundColor}" />
+    <Setter Property="HelperTextColor"
+           Value="{DynamicResource InputDefaultHelperTextColor}" />
+  </Style>
+
+  <!--Control Label Styles-->
+  <Style TargetType="local:ControlLabel"
+       x:Key="DefaultControlLabelStyle">
+    <Setter Property="HeaderTextColor"
+          Value="{DynamicResource ControlLabelTextColor}" />
+  </Style>
+
+  <!--TMDropdown Styles-->
+  <Style TargetType="local:TMDropDown"
+       x:Key="DefaultStyle">
+    <Setter Property="BackgroundColor"
+          Value="{DynamicResource DropDownBackgroundColor}" />
+    <Setter Property="BorderColor"
+          Value="{DynamicResource DropDownBorderColor}" />
+    <Setter Property="TextAndIconColor"
+          Value="{DynamicResource DropDownTextAndIconColor}" />
+  </Style>
+
+  <Style TargetType="local:DropDownContents"
+       x:Key="DefaulDropDownContentstStyle">
+    <Setter Property="BorderColor"
+          Value="{DynamicResource DropDownContentBorderColor}" />
+  </Style>
+
+  <!--TMButton Styles-->
+  <Style TargetType="local:TMButton" x:Key="PrimaryFill">
+    <Setter Property="TextColor" Value="{DynamicResource PrimaryFillButtonTextColor}"></Setter>
+    <Setter Property="IconTintColor" Value="{DynamicResource PrimaryFillIconTintColor}"></Setter>
+    <Setter Property="BorderColor" Value="{DynamicResource PrimaryFillButtonBackgroundColor}"/>
+    <Setter Property="VisualStateManager.VisualStateGroups">
+      <VisualStateGroupList>
+        <VisualStateGroup x:Name="CommonStates">
+          <VisualState x:Name="Normal">
+            <VisualState.Setters>
+              <Setter Property="BackgroundColor" Value="{DynamicResource PrimaryFillButtonBackgroundColor}"/>
+            </VisualState.Setters>
+          </VisualState>
+          <VisualState x:Name="Pressed">
+            <VisualState.Setters>
+              <Setter Property="BackgroundColor" Value="{DynamicResource PrimaryFillButtonSelectedBackgroundColor}"/>
+            </VisualState.Setters>
+          </VisualState>
+        </VisualStateGroup>
+      </VisualStateGroupList>
+    </Setter>
+  </Style>
+
+  <Style TargetType="local:TMButton" x:Key="SecondaryFill">
+    <Setter Property="TextColor" Value="{DynamicResource SecondaryFillButtonTextColor}"></Setter>
+    <Setter Property="IconTintColor" Value="{DynamicResource SecondaryFillIconTintColor}"></Setter>
+    <Setter Property="BorderColor" Value="{DynamicResource SecondaryFillButtonBackgroundColor}"/>
+    <Setter Property="VisualStateManager.VisualStateGroups">
+      <VisualStateGroupList>
+        <VisualStateGroup x:Name="CommonStates">
+          <VisualState x:Name="Normal">
+            <VisualState.Setters>
+              <Setter Property="BackgroundColor" Value="{DynamicResource SecondaryFillButtonBackgroundColor}"/>
+            </VisualState.Setters>
+          </VisualState>
+          <VisualState x:Name="Pressed">
+            <VisualState.Setters>
+              <Setter Property="BackgroundColor" Value="{DynamicResource SecondaryFillButtonSelectedBackgroundColor}"/>
+            </VisualState.Setters>
+          </VisualState>
+        </VisualStateGroup>
+      </VisualStateGroupList>
+    </Setter>
+  </Style>
+
+  <Style TargetType="local:TMButton" x:Key="TertiaryFill">
+    <Setter Property="TextColor" Value="{DynamicResource TertiaryFillButtonTextColor}"></Setter>
+    <Setter Property="IconTintColor" Value="{DynamicResource TertiaryFillIconTintColor}"></Setter>
+    <Setter Property="BorderColor" Value="{DynamicResource TertiaryFillButtonBackgroundColor}"/>
+    <Setter Property="VisualStateManager.VisualStateGroups">
+      <VisualStateGroupList>
+        <VisualStateGroup x:Name="CommonStates">
+          <VisualState x:Name="Normal">
+            <VisualState.Setters>
+              <Setter Property="BackgroundColor" Value="{DynamicResource TertiaryFillButtonBackgroundColor}"/>
+            </VisualState.Setters>
+          </VisualState>
+          <VisualState x:Name="Pressed">
+            <VisualState.Setters>
+              <Setter Property="BackgroundColor" Value="{DynamicResource TertiaryFillButtonSelectedBackgroundColor}"/>
+            </VisualState.Setters>
+          </VisualState>
+        </VisualStateGroup>
+      </VisualStateGroupList>
+    </Setter>
+  </Style>
+
+  <Style TargetType="local:TMButton" x:Key="DangerFill">
+    <Setter Property="TextColor" Value="{DynamicResource DangerFillButtonTextColor}"></Setter>
+    <Setter Property="IconTintColor" Value="{DynamicResource DangerFillIconTintColor}"></Setter>
+    <Setter Property="BorderColor" Value="{DynamicResource DangerFillButtonBackgroundColor}"/>
+    <Setter Property="VisualStateManager.VisualStateGroups">
+      <VisualStateGroupList>
+        <VisualStateGroup x:Name="CommonStates">
+          <VisualState x:Name="Normal">
+            <VisualState.Setters>
+              <Setter Property="BackgroundColor" Value="{DynamicResource DangerFillButtonBackgroundColor}"/>
+            </VisualState.Setters>
+          </VisualState>
+          <VisualState x:Name="Pressed">
+            <VisualState.Setters>
+              <Setter Property="BackgroundColor" Value="{DynamicResource DangerFillButtonSelectedBackgroundColor}"/>
+            </VisualState.Setters>
+          </VisualState>
+        </VisualStateGroup>
+      </VisualStateGroupList>
+    </Setter>
+  </Style>
+
+  <Style TargetType="local:TMButton" x:Key="PrimaryOutline">
+    <Setter Property="TextColor" Value="{DynamicResource PrimaryOutlineButtonTextColor}"></Setter>
+    <Setter Property="IconTintColor" Value="{DynamicResource PrimaryOutlineIconTintColor}"></Setter>
+    <Setter Property="BorderColor" Value="{DynamicResource PrimaryOutlineButtonTextColor}"></Setter>
+    <Setter Property="VisualStateManager.VisualStateGroups">
+      <VisualStateGroupList>
+        <VisualStateGroup x:Name="CommonStates">
+          <VisualState x:Name="Normal">
+            <VisualState.Setters>
+              <Setter Property="BackgroundColor" Value="{DynamicResource PrimaryOutlineButtonBackgroundColor}"/>
+            </VisualState.Setters>
+          </VisualState>
+          <VisualState x:Name="Pressed">
+            <VisualState.Setters>
+              <Setter Property="BackgroundColor" Value="{DynamicResource PrimaryOutlineButtonSelectedBackgroundColor}"/>
+            </VisualState.Setters>
+          </VisualState>
+        </VisualStateGroup>
+      </VisualStateGroupList>
+    </Setter>
+  </Style>
+
+  <Style TargetType="local:TMButton" x:Key="SecondaryOutline">
+    <Setter Property="TextColor" Value="{DynamicResource SecondaryOutlineButtonTextColor}"></Setter>
+    <Setter Property="IconTintColor" Value="{DynamicResource SecondaryOutlineIconTintColor}"></Setter>
+    <Setter Property="BorderColor" Value="{DynamicResource SecondaryOutlineButtonTextColor}"></Setter>
+    <Setter Property="VisualStateManager.VisualStateGroups">
+      <VisualStateGroupList>
+        <VisualStateGroup x:Name="CommonStates">
+          <VisualState x:Name="Normal">
+            <VisualState.Setters>
+              <Setter Property="BackgroundColor" Value="{DynamicResource SecondaryOutlineButtonBackgroundColor}"/>
+            </VisualState.Setters>
+          </VisualState>
+          <VisualState x:Name="Pressed">
+            <VisualState.Setters>
+              <Setter Property="BackgroundColor" Value="{DynamicResource SecondaryOutlineButtonSelectedBackgroundColor}"/>
+            </VisualState.Setters>
+          </VisualState>
+        </VisualStateGroup>
+      </VisualStateGroupList>
+    </Setter>
+  </Style>
+
+  <Style TargetType="local:TMButton" x:Key="Borderless">
+    <Setter Property="TextColor" Value="{DynamicResource BorderlessButtonTextColor}"></Setter>
+    <Setter Property="IconTintColor" Value="{DynamicResource BorderlessIconTintColor}"></Setter>
+    <Setter Property="VisualStateManager.VisualStateGroups">
+      <VisualStateGroupList>
+        <VisualStateGroup x:Name="CommonStates">
+          <VisualState x:Name="Normal">
+            <VisualState.Setters>
+              <Setter Property="BackgroundColor" Value="{DynamicResource BorderlessButtonBackgroundColor}"/>
+              <Setter Property="BorderColor" Value="{DynamicResource BorderlessButtonBorderColor}"/>
+            </VisualState.Setters>
+          </VisualState>
+          <VisualState x:Name="Pressed">
+            <VisualState.Setters>
+              <Setter Property="BackgroundColor" Value="{DynamicResource BorderlessButtonSelectedBackgroundColor}"/>
+              <Setter Property="BorderColor" Value="{DynamicResource BorderlessButtonSelectedBorderColor}"/>
+            </VisualState.Setters>
+          </VisualState>
+        </VisualStateGroup>
+      </VisualStateGroupList>
+    </Setter>
+  </Style>
+
+  <!--TMSwitch Styles-->
+  <Style TargetType="local:TMSwitch" x:Key="SwitchStyle">
+    <Setter Property="TextColor" Value="{DynamicResource SwitchTextColor}"/>
+    <Setter Property="ThumbColor"
+          Value="{DynamicResource SwitchThumbColor}"/>
+    <Setter Property="VisualStateManager.VisualStateGroups">
+      <VisualStateGroupList>
+        <VisualStateGroup x:Name="CommonStates">
+          <VisualState x:Name="On">
+            <VisualState.Setters>
+              <Setter Property="BackgroundColor" Value="{DynamicResource SwitchOnBackgroundColor}"/>
+            </VisualState.Setters>
+          </VisualState>
+          <VisualState x:Name="Off">
+            <VisualState.Setters>
+              <Setter Property="BackgroundColor" Value="{DynamicResource SwitchOffBackgroundColor}"/>
+            </VisualState.Setters>
+          </VisualState>
+        </VisualStateGroup>
+      </VisualStateGroupList>
+    </Setter>
+  </Style>
+
+  <!--TMToastStyles-->
+  <Style TargetType="toast:TMToastContents" x:Key="DefaultToast">
+    <Setter Property="ToastBackgroundColor" Value="{DynamicResource ToastDefaultBackgroundColor}"/>
+    <Setter Property="TextColor" Value="{DynamicResource ToastDefaultTextColor}"/>
+    <Setter Property="LeftIconTintColor" Value="{DynamicResource ToastDefaultLeftIconTintColor}"/>
+    <Setter Property="RightIconTintColor" Value="{DynamicResource ToastDefaultRightIconTintColor}"/>
+  </Style>
+  <Style TargetType="toast:TMToastContents" x:Key="DarkToast">
+    <Setter Property="ToastBackgroundColor" Value="{DynamicResource ToastDarkBackgroundColor}"/>
+    <Setter Property="TextColor" Value="{DynamicResource ToastDarkTextColor}"/>
+    <Setter Property="LeftIconTintColor" Value="{DynamicResource ToastDarkLeftIconTintColor}"/>
+    <Setter Property="RightIconTintColor" Value="{DynamicResource ToastDarkRightIconTintColor}"/>
+  </Style>
+  <Style TargetType="toast:TMToastContents" x:Key="PrimaryToast">
+    <Setter Property="ToastBackgroundColor" Value="{DynamicResource ToastPrimaryBackgroundColor}"/>
+    <Setter Property="TextColor" Value="{DynamicResource ToastPrimaryTextColor}"/>
+    <Setter Property="LeftIconTintColor" Value="{DynamicResource ToastPrimaryLeftIconTintColor}"/>
+    <Setter Property="RightIconTintColor" Value="{DynamicResource ToastPrimaryRightIconTintColor}"/>
+  </Style>
+  <Style TargetType="toast:TMToastContents" x:Key="SecondaryToast">
+    <Setter Property="ToastBackgroundColor" Value="{DynamicResource ToastSecondaryBackgroundColor}"/>
+    <Setter Property="TextColor" Value="{DynamicResource ToastSecondaryTextColor}"/>
+    <Setter Property="LeftIconTintColor" Value="{DynamicResource ToastSecondaryLeftIconTintColor}"/>
+    <Setter Property="RightIconTintColor" Value="{DynamicResource ToastSecondaryRightIconTintColor}"/>
+  </Style>
+  <Style TargetType="toast:TMToastContents" x:Key="DangerToast">
+    <Setter Property="ToastBackgroundColor" Value="{DynamicResource ToastDangerBackgroundColor}"/>
+    <Setter Property="TextColor" Value="{DynamicResource ToastDangerTextColor}"/>
+    <Setter Property="LeftIconTintColor" Value="{DynamicResource ToastDangerLeftIconTintColor}"/>
+    <Setter Property="RightIconTintColor" Value="{DynamicResource ToastDangerRightIconTintColor}"/>
+  </Style>
+  <Style TargetType="toast:TMToastContents" x:Key="WarningToast">
+    <Setter Property="ToastBackgroundColor" Value="{DynamicResource ToastWarningBackgroundColor}"/>
+    <Setter Property="TextColor" Value="{DynamicResource ToastWarningTextColor}"/>
+    <Setter Property="LeftIconTintColor" Value="{DynamicResource ToastWarningLeftIconTintColor}"/>
+    <Setter Property="RightIconTintColor" Value="{DynamicResource ToastWarningRightIconTintColor}"/>
+  </Style>
+  <Style TargetType="toast:TMToastContents" x:Key="SuccessToast">
+    <Setter Property="ToastBackgroundColor" Value="{DynamicResource ToastSuccessBackgroundColor}"/>
+    <Setter Property="TextColor" Value="{DynamicResource ToastSuccessTextColor}"/>
+    <Setter Property="LeftIconTintColor" Value="{DynamicResource ToastSuccessLeftIconTintColor}"/>
+    <Setter Property="RightIconTintColor" Value="{DynamicResource ToastSuccessRightIconTintColor}"/>
+  </Style>
+</ResourceDictionary>
diff --git a/Trimble.Modus.Components/Styles/ModusStyles.xaml.cs b/Trimble.Modus.Components/Styles/ModusStyles.xaml.cs
new file mode 100644
index 00000000..a1b9105a
--- /dev/null
+++ b/Trimble.Modus.Components/Styles/ModusStyles.xaml.cs
@@ -0,0 +1,9 @@
+namespace Trimble.Modus.Components.Styles;
+
+public partial class ModusStyles : ResourceDictionary
+{
+	public ModusStyles()
+	{
+		InitializeComponent();
+	}
+}
\ No newline at end of file
diff --git a/Trimble.Modus.Components/Trimble.Modus.Components.csproj b/Trimble.Modus.Components/Trimble.Modus.Components.csproj
index a83f10bf..fa5dd094 100644
--- a/Trimble.Modus.Components/Trimble.Modus.Components.csproj
+++ b/Trimble.Modus.Components/Trimble.Modus.Components.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
+    <TargetFrameworks>net9.0;net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">
-      $(TargetFrameworks);net8.0-windows10.0.19041.0
+      $(TargetFrameworks);net9.0-windows10.0.19041.0
     </TargetFrameworks>
     <!-- Uncomment to also build the tizen app. You will need to install tizen by following
 		this: https://github.com/Samsung/Tizen.NET -->
@@ -27,7 +27,7 @@
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageId>Trimble.Modus.Components</PackageId>
     <Title>Trimble Modus</Title>
-    <Version>1.3.0.3</Version>
+    <Version>1.4.0</Version>
     <Authors>Trimble Inc</Authors>
     <Company>Trimble Inc</Company>
     <Product>Trimble.Modus.Components</Product>
@@ -100,18 +100,12 @@
     <Compile Update="Controls\TMDataGrid\ColumnTypes\TextColumn.xaml.cs">
       <DependentUpon>TextColumn.xaml</DependentUpon>
     </Compile>
-    <Compile Update="Controls\TMInput\TMInputStyles.xaml.cs">
-      <DependentUpon>TMInputStyles.xaml</DependentUpon>
-    </Compile>
     <Compile Update="Controls\TMInput\TMInput.xaml.cs">
       <DependentUpon>TMInput.xaml</DependentUpon>
     </Compile>
     <Compile Update="Controls\TMModal\TMModalContents.xaml.cs">
       <DependentUpon>TMModalContents.xaml</DependentUpon>
     </Compile>
-    <Compile Update="Controls\TMSwitch\TMSwitchStyles.xaml.cs">
-      <DependentUpon>TMSwitchStyles.xaml</DependentUpon>
-    </Compile>
     <Compile Update="Handlers\TMFloatingButtonAndroidTouchHandler.cs">
       <ExcludeFromCurrentConfiguration>false</ExcludeFromCurrentConfiguration>
     </Compile>
@@ -136,12 +130,6 @@
     <MauiXaml Update="Controls\Label\ControlLabel.xaml">
       <Generator>MSBuild:Compile</Generator>
     </MauiXaml>
-    <MauiXaml Update="Controls\DropDown\DropDownStyles.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </MauiXaml>
-    <MauiXaml Update="Controls\Label\ControlLabelStyles.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </MauiXaml>
     <MauiXaml Update="Controls\TMBadge\TMBadgeStyles.xaml">
       <Generator>MSBuild:Compile</Generator>
     </MauiXaml>
@@ -151,9 +139,6 @@
     <MauiXaml Update="Controls\TMCheckBox\TMCheckBoxStyles.xaml">
       <Generator>MSBuild:Compile</Generator>
     </MauiXaml>
-    <MauiXaml Update="Controls\TMInput\TMInputStyles.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </MauiXaml>
     <MauiXaml Update="Controls\TMInput\TMNumberInputStyles.xaml">
       <Generator>MSBuild:Compile</Generator>
     </MauiXaml>
@@ -202,9 +187,6 @@
     <MauiXaml Update="Controls\TMSlider\TMSlider.xaml">
       <Generator>MSBuild:Compile</Generator>
     </MauiXaml>
-    <MauiXaml Update="Controls\TMSwitch\TMSwitchStyles.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </MauiXaml>
     <MauiXaml Update="Controls\TMSwitch\TMSwitch.xaml">
       <Generator>MSBuild:Compile</Generator>
     </MauiXaml>
@@ -232,6 +214,9 @@
     <MauiXaml Update="Styles\LightThemeColors.xaml">
       <Generator>MSBuild:Compile</Generator>
     </MauiXaml>
+    <MauiXaml Update="Styles\ModusStyles.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </MauiXaml>
     <MauiXaml Update="Styles\Styles.xaml">
       <Generator>MSBuild:Compile</Generator>
     </MauiXaml>