diff --git a/Trimble.Modus.Components/Controls/Button/TMButton.xaml b/Trimble.Modus.Components/Controls/Button/TMButton.xaml
index 30bb7954..269ed04e 100644
--- a/Trimble.Modus.Components/Controls/Button/TMButton.xaml
+++ b/Trimble.Modus.Components/Controls/Button/TMButton.xaml
@@ -7,15 +7,7 @@
              xmlns:constants="clr-namespace:Trimble.Modus.Components.Constant"
              xmlns:converters="clr-namespace:Trimble.Modus.Components.Converters"
              HorizontalOptions="Start">
-  <ContentView.Resources>
-    <ResourceDictionary>
-      <!--<ResourceDictionary.MergedDictionaries>
-        <local:TMButtonStyles></local:TMButtonStyles>
-      </ResourceDictionary.MergedDictionaries>-->
-      <converters:ImageNullOrEmptyBoolConverter x:Key="ImageNullOrEmptyBoolConverter" />
-      <converters:StringNotNullOrEmptyBoolConverter x:Key="StringNotNullOrEmptyBoolConverter" />
-    </ResourceDictionary>
-  </ContentView.Resources>
+ 
   <Border Padding="0"
           BindingContext="{x:Reference tmButton}"
           x:Name="buttonFrame"
diff --git a/Trimble.Modus.Components/Controls/DropDown/TMDropDown.xaml b/Trimble.Modus.Components/Controls/DropDown/TMDropDown.xaml
index 83af92e3..7e30adf6 100644
--- a/Trimble.Modus.Components/Controls/DropDown/TMDropDown.xaml
+++ b/Trimble.Modus.Components/Controls/DropDown/TMDropDown.xaml
@@ -7,11 +7,6 @@
              xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
              x:Class="Trimble.Modus.Components.TMDropDown"
              xmlns:converters="clr-namespace:Trimble.Modus.Components.Converters">
-  <ContentView.Resources>
-    <ResourceDictionary>
-    <converters:StringNotNullOrEmptyBoolConverter x:Key="StringNotNullOrEmptyBoolConverter" />
-    </ResourceDictionary>
-  </ContentView.Resources>
   <VerticalStackLayout BindingContext="{x:Reference dropDown}">
     <local:ControlLabel TitleText="{Binding TitleText}"
                         IsRequired="{Binding IsRequired}"
diff --git a/Trimble.Modus.Components/Controls/DropDown/TMDropDown.xaml.cs b/Trimble.Modus.Components/Controls/DropDown/TMDropDown.xaml.cs
index 9ea24814..4df2567d 100644
--- a/Trimble.Modus.Components/Controls/DropDown/TMDropDown.xaml.cs
+++ b/Trimble.Modus.Components/Controls/DropDown/TMDropDown.xaml.cs
@@ -135,8 +135,6 @@ public TMDropDown()
         previousSelection = null;
         InitializeComponent();
         this.SetDynamicResource(StyleProperty, "DefaultStyle");
-        PopupService.Instance.Dismissed += OnPopupRemoved;
-        this.Unloaded += OnUnloaded;
     }
     #endregion
 
@@ -368,7 +366,6 @@ private void TapGestureRecognizer_Tapped(object sender, TappedEventArgs e)
             Open();
         }
     }
-
     protected override void OnParentSet()
     {
         base.OnParentSet();
@@ -383,17 +380,10 @@ protected override void OnHandlerChanged()
 
     public void Dispose()
     {
-        PopupService.Instance.Dismissed -= OnPopupRemoved;
-        this.Unloaded -= OnUnloaded;
         SelectionChanged = null;
         SelectionChangedCommand = null;
         ItemsSource = null;
         dropDownContents = null;
         previousSelection = null;
     }
-
-    private void OnUnloaded(object sender, EventArgs e)
-    {
-        Dispose();
-    }
 }
diff --git a/Trimble.Modus.Components/Controls/Label/ControlLabel.xaml b/Trimble.Modus.Components/Controls/Label/ControlLabel.xaml
index f24a45ec..8e611dce 100644
--- a/Trimble.Modus.Components/Controls/Label/ControlLabel.xaml
+++ b/Trimble.Modus.Components/Controls/Label/ControlLabel.xaml
@@ -5,12 +5,6 @@
              xmlns:local="clr-namespace:Trimble.Modus.Components;assembly=Trimble.Modus.Components"
              x:Class="Trimble.Modus.Components.ControlLabel"
              x:Name="controlLabelView">
-  <ContentView.Resources>
-    <ResourceDictionary>
-
-    <toolkit:IsStringNotNullOrEmptyConverter x:Key="IsStringNotNullOrEmptyConverter" />
-    </ResourceDictionary>
-  </ContentView.Resources>
   <Grid x:Name="view"
         BindingContext="{x:Reference controlLabelView}"
         ColumnSpacing="6"
diff --git a/Trimble.Modus.Components/Controls/TMInput/BaseInput.xaml b/Trimble.Modus.Components/Controls/TMInput/BaseInput.xaml
index 2517077d..663846ca 100644
--- a/Trimble.Modus.Components/Controls/TMInput/BaseInput.xaml
+++ b/Trimble.Modus.Components/Controls/TMInput/BaseInput.xaml
@@ -7,9 +7,6 @@
              xmlns:converters="clr-namespace:Trimble.Modus.Components.Converters">
 
   <ContentView.Resources>
-    <ResourceDictionary>
-        <converters:StringNotNullOrEmptyBoolConverter x:Key="StringNotNullOrEmptyBoolConverter" />
-    </ResourceDictionary>
     <ControlTemplate x:Key="InputTemplate">
       <Grid x:Name="tmInputContainer"
         RowDefinitions="auto,auto,auto"
diff --git a/Trimble.Modus.Components/Controls/TMInput/TMInput.xaml b/Trimble.Modus.Components/Controls/TMInput/TMInput.xaml
index 8145d2e8..c15ce141 100644
--- a/Trimble.Modus.Components/Controls/TMInput/TMInput.xaml
+++ b/Trimble.Modus.Components/Controls/TMInput/TMInput.xaml
@@ -9,11 +9,6 @@
                 xmlns:controls="clr-namespace:Trimble.Modus.Components"
                 x:Name="singleInput">
 
-  <base:BaseInput.Resources> 
-      <converters:InverseBoolConverter x:Key="InverseBoolConverter" />
-      <converters:AllTrueConverter x:Key="AllTrueConverter" />   
-  </base:BaseInput.Resources>
-
   <Grid ColumnDefinitions="auto,*,auto"
         ColumnSpacing="0"
         RowSpacing="0"
diff --git a/Trimble.Modus.Components/Helpers/ThemeManager.cs b/Trimble.Modus.Components/Helpers/ThemeManager.cs
index 39a982f3..6485e0f0 100644
--- a/Trimble.Modus.Components/Helpers/ThemeManager.cs
+++ b/Trimble.Modus.Components/Helpers/ThemeManager.cs
@@ -23,7 +23,8 @@ public static void Initialize(ModusConfig appConfig = null)
 
         public static void RegisterStyles()
         {            
-            Application.Current.Resources.MergedDictionaries.Add(new ModusStyles()); 
+            Application.Current.Resources.MergedDictionaries.Add(new ModusStyles());
+            Application.Current.Resources.MergedDictionaries.Add(new ConvertersDictionary());
         }
 
         private static void UpdateColorsDictionary(ModusConfig appConfig = null)
diff --git a/Trimble.Modus.Components/Styles/ConvertersDictionary.xaml b/Trimble.Modus.Components/Styles/ConvertersDictionary.xaml
new file mode 100644
index 00000000..a2841056
--- /dev/null
+++ b/Trimble.Modus.Components/Styles/ConvertersDictionary.xaml
@@ -0,0 +1,12 @@
+<?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.ConvertersDictionary"
+                     xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
+                    xmlns:converters="clr-namespace:Trimble.Modus.Components.Converters;assembly=Trimble.Modus.Components">
+  <toolkit:IsStringNotNullOrEmptyConverter x:Key="IsStringNotNullOrEmptyConverter" />
+  <converters:InverseBoolConverter x:Key="InverseBoolConverter" />
+  <converters:AllTrueConverter x:Key="AllTrueConverter" />
+  <converters:ImageNullOrEmptyBoolConverter x:Key="ImageNullOrEmptyBoolConverter" />
+  <converters:StringNotNullOrEmptyBoolConverter x:Key="StringNotNullOrEmptyBoolConverter" />
+</ResourceDictionary>
diff --git a/Trimble.Modus.Components/Styles/ConvertersDictionary.xaml.cs b/Trimble.Modus.Components/Styles/ConvertersDictionary.xaml.cs
new file mode 100644
index 00000000..6404df7e
--- /dev/null
+++ b/Trimble.Modus.Components/Styles/ConvertersDictionary.xaml.cs
@@ -0,0 +1,9 @@
+namespace Trimble.Modus.Components.Styles;
+
+public partial class ConvertersDictionary : ResourceDictionary
+{
+	public ConvertersDictionary()
+	{
+		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 9e79facc..6c88cb61 100644
--- a/Trimble.Modus.Components/Trimble.Modus.Components.csproj
+++ b/Trimble.Modus.Components/Trimble.Modus.Components.csproj
@@ -27,7 +27,7 @@
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageId>Trimble.Modus.Components</PackageId>
     <Title>Trimble Modus</Title>
-    <Version>1.4.0.1</Version>
+    <Version>1.4.0.2</Version>
     <Authors>Trimble Inc</Authors>
     <Company>Trimble Inc</Company>
     <Product>Trimble.Modus.Components</Product>
@@ -202,6 +202,9 @@
     <MauiXaml Update="Styles\Colors.xaml">
       <Generator></Generator>
     </MauiXaml>
+    <MauiXaml Update="Styles\ConvertersDictionary.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </MauiXaml>
     <MauiXaml Update="Styles\DarkThemeStyling.xaml">
       <Generator>MSBuild:Compile</Generator>
     </MauiXaml>