diff --git a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
index 388f0b2c9..a28b4ae0c 100644
--- a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
+++ b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
@@ -188,7 +188,6 @@ namespace Flow.Launcher.Core.Plugin
                     };
 
                     // Create a text block for name
-                    // TODO: Move to resource
                     var name = new TextBlock()
                     {
                         Text = attributes.Label,
@@ -200,16 +199,14 @@ namespace Flow.Launcher.Core.Plugin
                     TextBlock? desc = null;
                     if (attributes.Description != null)
                     {
-                        // TODO: Move to resource
                         desc = new TextBlock()
                         {
                             Text = attributes.Description,
-                            FontSize = 12,
                             VerticalAlignment = VerticalAlignment.Center,
-                            Margin = new(0, 2, 0, 0),
                             TextWrapping = TextWrapping.WrapWithOverflow
                         };
-                        desc.SetResourceReference(TextBlock.ForegroundProperty, "Color04B"); // for theme change
+
+                        desc.SetResourceReference(TextBlock.StyleProperty, "SettingPanelTextBlockDescriptionStyle"); // for theme change
                     }
 
                     // Add the name and description to the panel
@@ -446,15 +443,9 @@ namespace Flow.Launcher.Core.Plugin
                         }
                     case "seperator":
                         {
-                            // TODO: Move to resource
-                            var sep = new Separator
-                            {
-                                VerticalAlignment = VerticalAlignment.Top,
-                                Margin = new(-70, 13.5, -18, 13.5),
-                                Height = 1
-                            };
+                            var sep = new Separator();
 
-                            sep.SetResourceReference(Separator.BackgroundProperty, "Color03B");
+                            sep.SetResourceReference(Separator.StyleProperty, "SettingPanelSeperatorStyle");
 
                             contentControl = sep;
 
diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index 65002a3a0..b646cb695 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -5607,4 +5607,10 @@
     <system:Double x:Key="SettingPanelPathTextBoxMinWidth">240</system:Double>
     <system:Double x:Key="SettingPanelAreaTextBoxMinWidth">270</system:Double>
     <system:Double x:Key="SettingPanelAreaTextBoxMinHeight">150</system:Double>
+
+    <Style x:Key="SettingPanelTextBlockDescriptionStyle" TargetType="TextBlock">
+        <Setter Property="FontSize" Value="12" />
+        <Setter Property="Margin" Value="0 2 0 0" />
+        <Setter Property="Foreground" Value="{DynamicResource Color04B}" />
+    </Style>
 </ResourceDictionary>