diff --git a/Flow.Launcher.Infrastructure/Logger/Log.cs b/Flow.Launcher.Infrastructure/Logger/Log.cs
index d4bd473ac..fff52a8ab 100644
--- a/Flow.Launcher.Infrastructure/Logger/Log.cs
+++ b/Flow.Launcher.Infrastructure/Logger/Log.cs
@@ -12,7 +12,7 @@ namespace Flow.Launcher.Infrastructure.Logger
 {
     public static class Log
     {
-        public const string DirectoryName = "Logs";
+        public const string DirectoryName = Constant.Logs;
 
         public static string CurrentLogDirectory { get; }
 
diff --git a/Flow.Launcher.Infrastructure/UserSettings/DataLocation.cs b/Flow.Launcher.Infrastructure/UserSettings/DataLocation.cs
index 97cd2da54..96997b806 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/DataLocation.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/DataLocation.cs
@@ -25,8 +25,12 @@ namespace Flow.Launcher.Infrastructure.UserSettings
             return false;
         }
 
+        public static readonly string VersionLogDirectory = Path.Combine(LogDirectory, Constant.Version);
+
+        public static readonly string LogDirectory = Path.Combine(DataDirectory(), Constant.Logs);
         public static readonly string SettingsDirectorty = Path.Combine(DataDirectory(), Constant.Settings);
         public static readonly string PluginsDirectory = Path.Combine(DataDirectory(), Constant.Plugins);
+        public static readonly string ThemesDirectory = Path.Combine(DataDirectory(), Constant.Themes);
 
         public static readonly string PluginSettingsDirectory = Path.Combine(SettingsDirectorty, Constant.Plugins);
         public static readonly string PluginCacheDirectory = Path.Combine(DataDirectory(), Constant.Cache, Constant.Plugins);
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
index 2892a0654..ee684e7ca 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
@@ -115,7 +115,7 @@ public partial class SettingsPaneAboutViewModel : BaseModel
 
     private static DirectoryInfo GetLogDir(string version = "")
     {
-        return new DirectoryInfo(Path.Combine(DataLocation.DataDirectory(), Constant.Logs, version));
+        return new DirectoryInfo(Path.Combine(DataLocation.LogDirectory, version));
     }
 
     private static List<FileInfo> GetLogFiles(string version = "")
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
index 8d8ccb780..fc9122b53 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
@@ -420,7 +420,7 @@ public partial class SettingsPaneThemeViewModel : BaseModel
     [RelayCommand]
     private void OpenThemesFolder()
     {
-        App.API.OpenDirectory(Path.Combine(DataLocation.DataDirectory(), Constant.Themes));
+        App.API.OpenDirectory(DataLocation.ThemesDirectory);
     }
 
     public void UpdateColorScheme()
diff --git a/Plugins/Flow.Launcher.Plugin.Sys/Main.cs b/Plugins/Flow.Launcher.Plugin.Sys/Main.cs
index 2331ee68c..13bba04b4 100644
--- a/Plugins/Flow.Launcher.Plugin.Sys/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Sys/Main.cs
@@ -147,8 +147,6 @@ namespace Flow.Launcher.Plugin.Sys
         private List<Result> Commands()
         {
             var results = new List<Result>();
-            var logPath = Path.Combine(DataLocation.DataDirectory(), "Logs", Constant.Version);
-            var userDataPath = DataLocation.DataDirectory();
             var recycleBinFolder = "shell:RecycleBinFolder";
             results.AddRange(new[]
             {
@@ -406,11 +404,11 @@ namespace Flow.Launcher.Plugin.Sys
                     Title = "Open Log Location",
                     SubTitle = context.API.GetTranslation("flowlauncher_plugin_sys_open_log_location"),
                     IcoPath = "Images\\app.png",
-                    CopyText = logPath,
-                    AutoCompleteText = logPath,
+                    CopyText = DataLocation.VersionLogDirectory,
+                    AutoCompleteText = DataLocation.VersionLogDirectory,
                     Action = c =>
                     {
-                        context.API.OpenDirectory(logPath);
+                        context.API.OpenDirectory(DataLocation.VersionLogDirectory);
                         return true;
                     }
                 },
@@ -432,11 +430,11 @@ namespace Flow.Launcher.Plugin.Sys
                     Title = "Flow Launcher UserData Folder",
                     SubTitle = context.API.GetTranslation("flowlauncher_plugin_sys_open_userdata_location"),
                     IcoPath = "Images\\app.png",
-                    CopyText = userDataPath,
-                    AutoCompleteText = userDataPath,
+                    CopyText = DataLocation.DataDirectory(),
+                    AutoCompleteText = DataLocation.DataDirectory(),
                     Action = c =>
                     {
-                        context.API.OpenDirectory(userDataPath);
+                        context.API.OpenDirectory(DataLocation.DataDirectory());
                         return true;
                     }
                 },