diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 4d24a7c33..1dd6d3889 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -13,30 +13,35 @@
     <system:String x:Key="iconTraySettings">Settings</system:String>
     <system:String x:Key="iconTrayAbout">About</system:String>
     <system:String x:Key="iconTrayExit">Exit</system:String>
+    <system:String x:Key="closeWindow">Close</system:String>
 
     <!--Setting General-->
     <system:String x:Key="flowlauncher_settings">Flow Launcher Settings</system:String>
     <system:String x:Key="general">General</system:String>
     <system:String x:Key="portableMode">Portable Mode</system:String>
+    <system:String x:Key="portableModeToolTIp">All setting into single folder. You can use with USB drive or cloud.</system:String>
     <system:String x:Key="startFlowLauncherOnSystemStartup">Start Flow Launcher on system startup</system:String>
     <system:String x:Key="hideFlowLauncherWhenLoseFocus">Hide Flow Launcher when focus is lost</system:String>
     <system:String x:Key="dontPromptUpdateMsg">Do not show new version notifications</system:String>
     <system:String x:Key="rememberLastLocation">Remember last launch location</system:String>
     <system:String x:Key="language">Language</system:String>
     <system:String x:Key="lastQueryMode">Last Query Style</system:String>
+    <system:String x:Key="lastQueryModeToolTip">When you open Query box, decide what to do.</system:String>
     <system:String x:Key="LastQueryPreserved">Preserve Last Query</system:String>
     <system:String x:Key="LastQuerySelected">Select last Query</system:String>
     <system:String x:Key="LastQueryEmpty">Empty last Query</system:String>
     <system:String x:Key="maxShowResults">Maximum results shown</system:String>
     <system:String x:Key="ignoreHotkeysOnFullscreen">Ignore hotkeys in fullscreen mode</system:String>
+    <system:String x:Key="ignoreHotkeysOnFullscreenToolTip">If you're a gamer, We recommend turning it on.</system:String>
     <system:String x:Key="pythonDirectory">Python Directory</system:String>
     <system:String x:Key="autoUpdates">Auto Update</system:String>
-    <system:String x:Key="autoHideScrollBar">Auto Hide Scroll Bar</system:String>
-    <system:String x:Key="autoHideScrollBarToolTip">Automatically hides the Settings window scroll bar and show when hover the mouse over it</system:String>
+    <system:String x:Key="autoHideScrollBar">Auto Hide Scroll Bar in Setting</system:String>
+    <system:String x:Key="autoHideScrollBarToolTip">If you feel the scroll bar in the setting window is small, We recommend turning it off.</system:String>
     <system:String x:Key="selectPythonDirectory">Select</system:String>
     <system:String x:Key="hideOnStartup">Hide Flow Launcher on startup</system:String>
     <system:String x:Key="hideNotifyIcon">Hide tray icon</system:String>
     <system:String x:Key="querySearchPrecision">Query Search Precision</system:String>
+    <system:String x:Key="querySearchPrecisionToolTip">Search results become more accurate.</system:String>
     <system:String x:Key="ShouldUsePinyin">Should Use Pinyin</system:String>
     <system:String x:Key="ShouldUsePinyinToolTip">Allows using Pinyin to search. Pinyin is the standard system of romanized spelling for translating Chinese</system:String>
     <system:String x:Key="shadowEffectNotAllowed">Shadow effect is not allowed while current theme has blur effect enabled</system:String>
@@ -57,6 +62,12 @@
     <system:String x:Key="plugin_init_time">Init time:</system:String>
     <system:String x:Key="plugin_query_time">Query time:</system:String>
 
+
+    <!--Setting Plugin Store-->
+    <system:String x:Key="pluginStore">Plugin Store</system:String>
+    <system:String x:Key="refresh">Refresh</system:String>
+    <system:String x:Key="install">Install</system:String>
+
     <!--Setting Theme-->
     <system:String x:Key="theme">Theme</system:String>
     <system:String x:Key="browserMoreThemes">Browse for more themes</system:String>
@@ -67,12 +78,17 @@
     <system:String x:Key="opacity">Opacity</system:String>
     <system:String x:Key="theme_load_failure_path_not_exists">Theme {0} not exists, fallback to default theme</system:String>
     <system:String x:Key="theme_load_failure_parse_error">Fail to load theme {0}, fallback to default theme</system:String>
+    <system:String x:Key="ThemeFolder">Theme Folder</system:String>
+    <system:String x:Key="OpenThemeFolder">Open Theme Folder</system:String>
 
     <!--Setting Hotkey-->
     <system:String x:Key="hotkey">Hotkey</system:String>
     <system:String x:Key="flowlauncherHotkey">Flow Launcher Hotkey</system:String>
+    <system:String x:Key="flowlauncherHotkeyToolTip">Enter the shortcut that open the Flow Launcher.</system:String>
     <system:String x:Key="openResultModifiers">Open Result Modifiers</system:String>
+    <system:String x:Key="openResultModifiersToolTip">Shortcuts to select the result list.</system:String>
     <system:String x:Key="showOpenResultHotkey">Show Hotkey</system:String>
+    <system:String x:Key="showOpenResultHotkeyToolTip">Display Shortcut in Result list .</system:String>
     <system:String x:Key="customQueryHotkey">Custom Query Hotkey</system:String>
     <system:String x:Key="customQuery">Query</system:String>
     <system:String x:Key="delete">Delete</system:String>
@@ -117,6 +133,7 @@
     <system:String x:Key="documentation">Usage Tips:</system:String>
 
     <!--Priority Setting Dialog-->
+    <system:String x:Key="changePriorityWindow">Change Priority</system:String>
     <system:String x:Key="priority_tips">Greater the number, the higher the result will be ranked. Try setting it as 5. If you want the results to be lower than any other plugin's, provide a negative number</system:String>
     <system:String x:Key="invalidPriority">Please provide an valid integer for Priority!</system:String>
 
diff --git a/Flow.Launcher/Languages/ko.xaml b/Flow.Launcher/Languages/ko.xaml
index 6c755dbae..6a145d670 100644
--- a/Flow.Launcher/Languages/ko.xaml
+++ b/Flow.Launcher/Languages/ko.xaml
@@ -13,55 +13,92 @@
     <system:String x:Key="iconTraySettings">설정</system:String>
     <system:String x:Key="iconTrayAbout">정보</system:String>
     <system:String x:Key="iconTrayExit">종료</system:String>
+    <system:String x:Key="closeWindow">닫기</system:String>
 
     <!--Setting General-->
     <system:String x:Key="flowlauncher_settings">Flow Launcher 설정</system:String>
     <system:String x:Key="general">일반</system:String>
+    <system:String x:Key="portableMode">포터블 모드</system:String>
+    <system:String x:Key="portableModeToolTIp">모든 설정이 폴더안에 들어갑니다. USB 드라이브나 클라우드로 사용 가능합니다.</system:String>
     <system:String x:Key="startFlowLauncherOnSystemStartup">시스템 시작 시 Flow Launcher 실행</system:String>
     <system:String x:Key="hideFlowLauncherWhenLoseFocus">포커스 잃으면 Flow Launcher 숨김</system:String>
     <system:String x:Key="dontPromptUpdateMsg">새 버전 알림 끄기</system:String>
     <system:String x:Key="rememberLastLocation">마지막 실행 위치 기억</system:String>
     <system:String x:Key="language">언어</system:String>
     <system:String x:Key="lastQueryMode">마지막 쿼리 스타일</system:String>
+    <system:String x:Key="lastQueryModeToolTip">쿼리박스를 열었을 때 쿼리 처리 방식</system:String>
     <system:String x:Key="LastQueryPreserved">직전 쿼리에 계속 입력</system:String>
     <system:String x:Key="LastQuerySelected">직전 쿼리 내용 선택</system:String>
     <system:String x:Key="LastQueryEmpty">직전 쿼리 지우기</system:String>
     <system:String x:Key="maxShowResults">표시할 결과 수</system:String>
     <system:String x:Key="ignoreHotkeysOnFullscreen">전체화면 모드에서는 핫키 무시</system:String>
+    <system:String x:Key="ignoreHotkeysOnFullscreenToolTip">게이머라면 켜는 것을 추천합니다.</system:String>
     <system:String x:Key="pythonDirectory">Python 디렉토리</system:String>
     <system:String x:Key="autoUpdates">자동 업데이트</system:String>
+    <system:String x:Key="autoHideScrollBar">설정 창 스크롤바 숨기기</system:String>
+    <system:String x:Key="autoHideScrollBarToolTip">설정 창 스크롤바가 작다면 끄는 것을 추천합니다.</system:String>
     <system:String x:Key="selectPythonDirectory">선택</system:String>
     <system:String x:Key="hideOnStartup">시작 시 Flow Launcher 숨김</system:String>
+    <system:String x:Key="hideNotifyIcon">트레이 아이콘 숨기기</system:String>
+    <system:String x:Key="querySearchPrecision">쿼리 검색 정확도</system:String>
+    <system:String x:Key="querySearchPrecisionToolTip">검색 결과가 좀 더 정확해집니다.</system:String>
+    <system:String x:Key="ShouldUsePinyin">항상 Pinyin 사용</system:String>
+    <system:String x:Key="ShouldUsePinyinToolTip">Pinyin을 사용하여 검색할 수 있습니다. Pinyin(병음)은 로마자 중국어 입력 방식입니다.</system:String>
+    <system:String x:Key="shadowEffectNotAllowed">반투명 흐림 효과를 사용하는 경우, 그림자 효과를 쓸 수 없습니다.</system:String>
 
     <!--Setting Plugin-->
     <system:String x:Key="plugin">플러그인</system:String>
     <system:String x:Key="browserMorePlugins">플러그인 더 찾아보기</system:String>
-    <system:String x:Key="disable">비활성화</system:String>
+    <system:String x:Key="enable">On</system:String>
+    <system:String x:Key="disable">Off</system:String>
     <system:String x:Key="actionKeywords">액션 키워드</system:String>
+    <system:String x:Key="currentPriority">현재 중요도:</system:String>
+    <system:String x:Key="newPriority">새 중요도:</system:String>
+    <system:String x:Key="priority">중요도</system:String>
     <system:String x:Key="pluginDirectory">플러그인 디렉토리</system:String>
     <system:String x:Key="author">저자</system:String>
     <system:String x:Key="plugin_init_time">초기화 시간:</system:String>
     <system:String x:Key="plugin_query_time">쿼리 시간:</system:String>
+    
+    
+    <!--Setting Plugin Store-->
+    <system:String x:Key="pluginStore">플러그인 스토어</system:String>
+    <system:String x:Key="refresh">새로고침</system:String>
+    <system:String x:Key="install">설치</system:String>
+
 
     <!--Setting Theme-->
     <system:String x:Key="theme">테마</system:String>
     <system:String x:Key="browserMoreThemes">테마 더 찾아보기</system:String>
+    <system:String x:Key="hiThere">Hi There</system:String>
     <system:String x:Key="queryBoxFont">쿼리 상자 글꼴</system:String>
     <system:String x:Key="resultItemFont">결과 항목 글꼴</system:String>
     <system:String x:Key="windowMode">윈도우 모드</system:String>
     <system:String x:Key="opacity">투명도</system:String>
+    <system:String x:Key="theme_load_failure_path_not_exists">{0} 테마가 존재하지 않습니다. 기본 테마로 변경합니다.</system:String>
+    <system:String x:Key="theme_load_failure_parse_error">{0} 테마 로드에 실패했습니다. 기본 테마로 변경합니다.</system:String>
+    <system:String x:Key="ThemeFolder">테마 폴더</system:String>
+    <system:String x:Key="OpenThemeFolder">테마 폴더 열기</system:String>
 
     <!--Setting Hotkey-->
     <system:String x:Key="hotkey">핫키</system:String>
     <system:String x:Key="flowlauncherHotkey">Flow Launcher 핫키</system:String>
-    <system:String x:Key="openResultModifiers">결과 수정 자 열기</system:String>
-    <system:String x:Key="customQueryHotkey">사용자지정 쿼리 핫키</system:String>
+    <system:String x:Key="flowlauncherHotkeyToolTip">Flow Launcher를 열 때 사용할 단축키를 입력합니다.</system:String>
+    <system:String x:Key="openResultModifiers">결과 선택 단축키</system:String>
+    <system:String x:Key="openResultModifiersToolTip">결과 목록을 선택하는 단축키입니다.</system:String>
     <system:String x:Key="showOpenResultHotkey">단축키 표시</system:String>
+    <system:String x:Key="showOpenResultHotkeyToolTip">결과창에서 결과 선택 단축키를 표시합니다.</system:String>
+    <system:String x:Key="customQueryHotkey">사용자지정 쿼리 핫키</system:String>
+    <system:String x:Key="customQuery">Query</system:String>
     <system:String x:Key="delete">삭제</system:String>
     <system:String x:Key="edit">편집</system:String>
     <system:String x:Key="add">추가</system:String>
     <system:String x:Key="pleaseSelectAnItem">항목을 선택하세요.</system:String>
     <system:String x:Key="deleteCustomHotkeyWarning">{0} 플러그인 핫키를 삭제하시겠습니까?</system:String>
+    <system:String x:Key="queryWindowShadowEffect">그림자 효과</system:String>
+    <system:String x:Key="shadowEffectCPUUsage">그림자 효과는 GPU를 사용합니다. 컴퓨터 퍼포먼스가 제한적인 경우 사용을 추천하지 않습니다.</system:String>
+    <system:String x:Key="useGlyphUI">플루언트 아이콘 사용</system:String>
+    <system:String x:Key="useGlyphUIEffect">결과 및 일부 메뉴에서 플루언트 아이콘을 사용합니다.</system:String>
 
     <!--Setting Proxy-->
     <system:String x:Key="proxy">HTTP 프록시</system:String>
@@ -86,8 +123,18 @@
     <system:String x:Key="about_activate_times">Flow Launcher를 {0}번 실행했습니다.</system:String>
     <system:String x:Key="checkUpdates">업데이트 확인</system:String>
     <system:String x:Key="newVersionTips">새 버전({0})이 있습니다. Flow Launcher를 재시작하세요.</system:String>
+    <system:String x:Key="checkUpdatesFailed">업데이트 확인을 실패했습니다. api.github.com로의 연결 또는 프록시 설정을 확인해주세요.</system:String>
+    <system:String x:Key="downloadUpdatesFailed">
+        업데이트 다운로드에 실패했습니다. github-cloud.s3.amazonaws.com의 연결 또는 프록시 설정을 확인해주세요. 
+        수동 다운로드를 하려면 https://github.com/Flow-Launcher/Flow.Launcher/releases 으로 방문하세요.
+    </system:String>
     <system:String x:Key="releaseNotes">릴리즈 노트:</system:String>
+    <system:String x:Key="documentation">사용 팁:</system:String>
 
+    <!--Priority Setting Dialog-->
+    <system:String x:Key="changePriorityWindow">중요도 변경</system:String>
+    <system:String x:Key="priority_tips">높은 수를 넣을수록 상위 결과에 표시됩니다. 5를 시도해보세요. 다른 플러그인 보다 결과를 낮추고 싶다면, 그보다 낮은 수를 입력하세요.</system:String>
+    <system:String x:Key="invalidPriority">중요도에 올바른 정수를 입력하세요.</system:String>
     <!--Action Keyword Setting Dialog-->
     <system:String x:Key="oldActionKeywords">예전 액션 키워드</system:String>
     <system:String x:Key="newActionKeywords">새 액션 키워드</system:String>
@@ -97,9 +144,11 @@
     <system:String x:Key="newActionKeywordsCannotBeEmpty">새 액션 키워드를 입력하세요.</system:String>
     <system:String x:Key="newActionKeywordsHasBeenAssigned">새 액션 키워드가 할당된 플러그인이 이미 있습니다. 다른 액션 키워드를 입력하세요.</system:String>
     <system:String x:Key="success">성공</system:String>
+    <system:String x:Key="completedSuccessfully">성공적으로 완료했습니다.</system:String>
     <system:String x:Key="actionkeyword_tips">액션 키워드를 지정하지 않으려면 *를 사용하세요.</system:String>
 
     <!--Custom Query Hotkey Dialog-->
+    <system:String x:Key="customeQueryHotkeyTitle">커스텀 플러그인 핫키</system:String>
     <system:String x:Key="preview">미리보기</system:String>
     <system:String x:Key="hotkeyIsNotUnavailable">핫키를 사용할 수 없습니다. 다른 핫키를 입력하세요.</system:String>
     <system:String x:Key="invalidPluginHotkey">플러그인 핫키가 유효하지 않습니다.</system:String>
@@ -123,12 +172,23 @@
     <system:String x:Key="reportWindow_report_succeed">보고서를 정상적으로 보냈습니다.</system:String>
     <system:String x:Key="reportWindow_report_failed">보고서를 보내지 못했습니다.</system:String>
     <system:String x:Key="reportWindow_flowlauncher_got_an_error">Flow Launcher에 문제가 발생했습니다.</system:String>
-
+    
+    <!--General Notice-->
+    <system:String x:Key="pleaseWait">잠시 기다려주세요...</system:String>
     <!--update-->
+    <system:String x:Key="update_flowlauncher_update_check">새 업데이트 확인 중</system:String>
     <system:String x:Key="update_flowlauncher_update_new_version_available">새 Flow Launcher 버전({0})을 사용할 수 있습니다.</system:String>
+    <system:String x:Key="update_flowlauncher_already_on_latest">이미 가장 최신 버전의 Flow Launcher를 사용중입니다.</system:String>
+    <system:String x:Key="update_flowlauncher_update_found">업데이트 발견</system:String>
+    <system:String x:Key="update_flowlauncher_updating">업데이트 중...</system:String>
+    <system:String x:Key="update_flowlauncher_fail_moving_portable_user_profile_data">Flow Launcher가 유저 정보 데이터를 새버전으로 옮길 수 없습니다.
+        프로필 데이터 폴더를 수동으로 {0} 에서 {1}로 옮겨주세요. </system:String>
+    <system:String x:Key="update_flowlauncher_new_update">새 업데이트</system:String>
     <system:String x:Key="update_flowlauncher_update_error">소프트웨어 업데이트를 설치하는 중에 오류가 발생했습니다.</system:String>
     <system:String x:Key="update_flowlauncher_update">업데이트</system:String>
     <system:String x:Key="update_flowlauncher_update_cancel">취소</system:String>
+    <system:String x:Key="update_flowlauncher_fail">업데이트 실패</system:String>
+    <system:String x:Key="update_flowlauncher_check_connection">Check your connection and try updating proxy settings to github-cloud.s3.amazonaws.com.</system:String>
     <system:String x:Key="update_flowlauncher_update_restart_flowlauncher_tip">업데이트를 위해 Flow Launcher를 재시작합니다.</system:String>
     <system:String x:Key="update_flowlauncher_update_upadte_files">아래 파일들이 업데이트됩니다.</system:String>
     <system:String x:Key="update_flowlauncher_update_files">업데이트 파일</system:String>
diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
index 73b13be8c..b517faf19 100644
--- a/Flow.Launcher/MainWindow.xaml
+++ b/Flow.Launcher/MainWindow.xaml
@@ -92,7 +92,7 @@
                                 <MenuItem Command="ApplicationCommands.Paste"/>
                                 <Separator />
                                 <MenuItem Header="{DynamicResource flowlauncher_settings}"  Click="OnContextMenusForSettingsClick" />
-                                <MenuItem Command="{Binding EscCommand}" Header="Close"/>
+                                <MenuItem Command="{Binding EscCommand}" Header="{DynamicResource closeWindow}"/>
                             </ContextMenu>
                         </TextBox.ContextMenu>
                     </TextBox>
diff --git a/Flow.Launcher/PriorityChangeWindow.xaml b/Flow.Launcher/PriorityChangeWindow.xaml
index 68b5a49b7..60a289e61 100644
--- a/Flow.Launcher/PriorityChangeWindow.xaml
+++ b/Flow.Launcher/PriorityChangeWindow.xaml
@@ -7,37 +7,51 @@
         Loaded="PriorityChangeWindow_Loaded"
         mc:Ignorable="d"
         WindowStartupLocation="CenterScreen"
-        Title="PriorityChangeWindow" Height="250" Width="300">
+        Title="{DynamicResource changePriorityWindow}" Height="400" Width="350" ResizeMode="NoResize" Background="#f3f3f3">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition />
-            <RowDefinition Height="60"/>
-            <RowDefinition Height="75"/>
             <RowDefinition />
+            <RowDefinition />
+            <RowDefinition Height="80"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="20" />
             <ColumnDefinition />
         </Grid.ColumnDefinitions>
-        <TextBlock FontSize="14" Grid.Row="0" Grid.Column="1" VerticalAlignment="Center"
-                   HorizontalAlignment="Left" Text="{DynamicResource currentPriority}" />
-        <TextBlock x:Name="OldPriority" Grid.Row="0" Grid.Column="1" Margin="170 10 10 10" FontSize="14"
-                   VerticalAlignment="Center" HorizontalAlignment="Left" />
-
-        <TextBlock FontSize="14" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center"
-                   HorizontalAlignment="Left" Text="{DynamicResource newPriority}" />
-        <StackPanel Grid.Row="1" Orientation="Horizontal" Grid.Column="1">
-            <TextBox x:Name="tbAction" Margin="140 10 15 10" Width="105" VerticalAlignment="Center" HorizontalAlignment="Left" />
+        <StackPanel Grid.Row="0" VerticalAlignment="Center">
+        <TextBlock Grid.Column="0" FontFamily="/Resources/#Segoe Fluent Icons" FontSize="40"  TextAlignment="Center"
+                               Margin="0 0 0 0">
+                        &#xe8d0;
+        </TextBlock>
         </StackPanel>
 
-        <TextBlock Grid.Row="2" Grid.ColumnSpan="1" Grid.Column="1" Foreground="Gray"
-                   Text="{DynamicResource priority_tips}" TextWrapping="Wrap"
-                   Margin="0,0,20,0"/>
+        <Border Background="#ffffff" Grid.Row="1" BorderBrush="#cecece" BorderThickness="1" Margin="14 0 14 0" Padding="0 14 0 0" CornerRadius="5">
+        <StackPanel Orientation="Vertical" >
+            
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Grid.Row="1">
+            <TextBlock FontSize="14" Grid.Column="1" VerticalAlignment="Center"
+                       HorizontalAlignment="Left" Text="{DynamicResource currentPriority}" />
+            <TextBlock x:Name="OldPriority" Grid.Row="0" Grid.Column="1" Margin="14 0 10 0" FontSize="14"
+                       VerticalAlignment="Center" HorizontalAlignment="Left" FontWeight="Bold" />
+            </StackPanel>
 
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Grid.Row="3" Grid.Column="1">
-            <Button x:Name="btnCancel" Click="BtnCancel_OnClick" Margin="10 0 10 0" Width="80" Height="30"
+            <StackPanel Orientation="Horizontal" Grid.Column="1" HorizontalAlignment="Center">
+                <TextBlock FontSize="14" VerticalAlignment="Center"
+                       HorizontalAlignment="Right" Text="{DynamicResource newPriority}" />
+                <TextBox x:Name="tbAction" Margin="14 10 15 10" Width="105" VerticalAlignment="Center" HorizontalAlignment="Left" />
+            </StackPanel>
+            
+        </StackPanel>
+        </Border>
+        <StackPanel Grid.Row="2" VerticalAlignment="Center">
+        <TextBlock  Foreground="Gray"
+                   Text="{DynamicResource priority_tips}" TextWrapping="WrapWithOverflow" TextAlignment="Center"
+                   Margin="20,0,20,0"/>
+        </StackPanel>
+        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Grid.Row="3" Grid.Column="1">
+            <Button x:Name="btnCancel" Click="BtnCancel_OnClick" Margin="0 0 10 0" Width="80" Height="30"
                     Content="{DynamicResource cancel}" />
-            <Button x:Name="btnDone" Margin="10 0 10 0" Width="80" Height="30" Click="btnDone_OnClick">
+            <Button x:Name="btnDone" Margin="10 0 0 0" Width="80" Height="30" Click="btnDone_OnClick">
                 <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
             </Button>
         </StackPanel>
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index e6612e4dc..a28886094 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -478,6 +478,8 @@
                             <StackPanel Style="{StaticResource TextPanel}">
                                 <TextBlock Text="{DynamicResource ignoreHotkeysOnFullscreen}"
                                            Style="{DynamicResource SettingTitleLabel}" />
+                                <TextBlock Text="{DynamicResource ignoreHotkeysOnFullscreenToolTip}"
+                                           Style="{DynamicResource SettingSubTitleLabel}" />
                             </StackPanel>
                             <CheckBox IsChecked="{Binding Settings.IgnoreHotkeysOnFullscreen}"
                                       Style="{DynamicResource SideControlCheckBox}" />
@@ -526,6 +528,8 @@
                             <StackPanel Style="{StaticResource TextPanel}">
                                 <TextBlock Text="{DynamicResource portableMode}"
                                            Style="{DynamicResource SettingTitleLabel}" />
+                                <TextBlock Text="{DynamicResource portableModeToolTIp}"
+                                           Style="{DynamicResource SettingSubTitleLabel}" />
                             </StackPanel>
                             <ui:ToggleSwitch IsOn="{Binding PortableMode}" FocusVisualMargin="5"
                                              Style="{DynamicResource SideControlToggle}" Width="100" />
@@ -540,8 +544,12 @@
                         <StackPanel Orientation="Vertical">
                             <Border Style="{DynamicResource SettingGroupBox}" Margin="0" BorderThickness="0">
                                 <ItemsControl Style="{StaticResource SettingGrid}">
-                                    <TextBlock Grid.Column="1" Text="{DynamicResource querySearchPrecision}"
+                                    <StackPanel Style="{StaticResource TextPanel}">
+                                        <TextBlock Grid.Column="1" Text="{DynamicResource querySearchPrecision}"
                                                VerticalAlignment="Center" />
+                                        <TextBlock Text="{DynamicResource querySearchPrecisionToolTip}"
+                                           Style="{DynamicResource SettingSubTitleLabel}" />
+                                    </StackPanel>
                                     <ComboBox Margin="10 0 18 0" MaxWidth="200"
                                               ItemsSource="{Binding QuerySearchPrecisionStrings}"
                                               SelectedItem="{Binding Settings.QuerySearchPrecisionString}"
@@ -551,8 +559,12 @@
                             <Separator BorderBrush="#e5e5e5" BorderThickness="1" Width="Auto" />
                             <Border Style="{DynamicResource SettingGroupBox}" Margin="0" BorderThickness="0">
                                 <ItemsControl Style="{StaticResource SettingGrid}">
-                                    <TextBlock Grid.Column="1" Text="{DynamicResource lastQueryMode}"
+                                    <StackPanel Style="{StaticResource TextPanel}">
+                                        <TextBlock Grid.Column="1" Text="{DynamicResource lastQueryMode}"
                                                VerticalAlignment="Center" />
+                                        <TextBlock Text="{DynamicResource lastQueryModeToolTip}"
+                                           Style="{DynamicResource SettingSubTitleLabel}" />
+                                    </StackPanel>
                                     <ComboBox Margin="10 0 18 0" MaxWidth="200"
                                               ItemsSource="{Binding LastQueryModes}"
                                               SelectedValue="{Binding Settings.LastQueryMode}"
@@ -651,7 +663,7 @@
                              Margin="5, 0, 0, 0" ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                              ItemContainerStyle="{StaticResource PluginList}"
                              ScrollViewer.IsDeferredScrollingEnabled="True" ScrollViewer.CanContentScroll="False"
-                             Padding="0 0 7 0" Width="Auto" HorizontalAlignment="Stretch" SnapsToDevicePixels="True">
+                             Padding="0 0 7 0" Width="Auto" HorizontalAlignment="Stretch" SnapsToDevicePixels="True"  ui:ScrollViewerHelper.AutoHideScrollBars="{Binding AutoHideScrollBar, Mode=OneWay}">
                         <ListBox.ItemsPanel>
                             <ItemsPanelTemplate>
                                 <StackPanel Margin="0,0,0,18"/>
@@ -871,7 +883,7 @@
                                Margin="0 0 12 0">
                         &#xe719;
                     </TextBlock>
-                    <TextBlock Grid.Column="1" Text="Plugin Store" />
+                    <TextBlock Grid.Column="1" Text="{DynamicResource pluginStore}" />
                 </Grid>
             </TabItem.Header>
 
@@ -885,10 +897,10 @@
                     <RowDefinition Height="*"></RowDefinition>
                 </Grid.RowDefinitions>
                 <Border Grid.Row="0" Grid.Column="0" Background="#f3f3f3" Padding="5 18 0 0">
-                    <TextBlock Text="Plugin Store" TextAlignment="left" FontSize="30" Margin="0 5 0 5"/>
+                    <TextBlock Text="{DynamicResource pluginStore}" TextAlignment="left" FontSize="30" Margin="0 5 0 5"/>
                 </Border>
                 <Border Grid.Row="0" Grid.Column="1" Background="#f3f3f3" Padding="5 18 32 0">
-                    <Button Content="Refresh" 
+                    <Button Content="{DynamicResource refresh}" 
                             FontSize="13" 
                             Margin="0 5 0 5" 
                             HorizontalAlignment="Right" 
@@ -905,7 +917,7 @@
                              Margin="6, 0, 0, 0" ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                              ItemContainerStyle="{StaticResource StoreList}" SelectionMode="Single"
                              ScrollViewer.IsDeferredScrollingEnabled="True" ScrollViewer.CanContentScroll="False"
-                             Padding="0 0 0 0" Width="Auto" VerticalContentAlignment="Center" HorizontalAlignment="Stretch">
+                             Padding="0 0 0 0" Width="Auto" VerticalContentAlignment="Center" HorizontalAlignment="Stretch"  ui:ScrollViewerHelper.AutoHideScrollBars="{Binding AutoHideScrollBar, Mode=OneWay}">
                         <ListBox.ItemsPanel>
                             <ItemsPanelTemplate>
                                 <UniformGrid IsItemsHost="True" HorizontalAlignment="Left" Columns="2" Margin="0 0 6 18" VerticalAlignment="Top" SnapsToDevicePixels="True"/>
@@ -1005,7 +1017,7 @@
                                                     </StackPanel>
                                                 </StackPanel>
                                                 <Border Padding="0 0 20 0">
-                                                    <Button Foreground="Black" Name="ShortCutButtonPrev" Content="Install"
+                                                    <Button Foreground="Black" Name="ShortCutButtonPrev" Content="{DynamicResource install}"
                                                            Click="OnExternalPluginInstallClick"
                                                             Width="90" MinHeight="40" HorizontalAlignment="Right"
                                                             VerticalAlignment="Center" Grid.Column="1" Margin="0 0 0 0">
@@ -1282,12 +1294,11 @@
                                 <Border Style="{DynamicResource SettingGroupBox}" Margin="0 12 0 18">
                                     <ItemsControl Style="{StaticResource SettingGrid}">
                                         <StackPanel Style="{StaticResource TextPanel}">
-                                            <TextBlock Text="Theme Folder" Style="{DynamicResource SettingTitleLabel}" />
+                                            <TextBlock Text="{DynamicResource ThemeFolder}" Style="{DynamicResource SettingTitleLabel}" />
                                         </StackPanel>
                                         <Button DockPanel.Dock="Top" Margin="0,0,18,0" Width="180"
                                                 HorizontalAlignment="Center"
-                                                Click="OpenPluginFolder" Grid.Column="2">
-                                            Open Theme Folder
+                                                Click="OpenPluginFolder" Grid.Column="2" Content="{DynamicResource OpenThemeFolder}">
                                         </Button>
                                         <TextBlock FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20"
                                                    Grid.Column="0" VerticalAlignment="Center" Margin="24 0 16 0">
@@ -1339,7 +1350,7 @@
                                     <StackPanel Style="{StaticResource TextPanel}">
                                         <TextBlock Text="{DynamicResource flowlauncherHotkey}"
                                                    Style="{DynamicResource SettingTitleLabel}" />
-                                        <TextBlock Text="Choose what you want"
+                                        <TextBlock Text="{DynamicResource flowlauncherHotkeyToolTip}"
                                                    Style="{DynamicResource SettingSubTitleLabel}" />
                                     </StackPanel>
                                     <flowlauncher:HotkeyControl x:Name="HotkeyControl" HotkeyChanged="OnHotkeyChanged"
@@ -1361,9 +1372,13 @@
                             <StackPanel Orientation="Vertical">
                                 <Border Style="{DynamicResource SettingGroupBox}" Margin="0" BorderThickness="0">
                                     <ItemsControl Style="{StaticResource SettingGrid}">
+                                        <StackPanel Style="{StaticResource TextPanel}">
                                         <TextBlock Grid.Column="1" Text="{DynamicResource openResultModifiers}"
                                                    VerticalAlignment="Center" />
-                                        <ComboBox Margin="0 0 18 0" Width="120"
+                                            <TextBlock Text="{DynamicResource openResultModifiersToolTip}"
+                                                   Style="{DynamicResource SettingSubTitleLabel}" />
+                                        </StackPanel>
+                            <ComboBox Margin="0 0 18 0" Width="120"
                                                   ItemsSource="{Binding OpenResultModifiersList}"
                                                   SelectedItem="{Binding Settings.OpenResultModifiers}" FontSize="14"
                                                   Grid.Column="2" />
@@ -1376,7 +1391,7 @@
                                         <StackPanel Style="{StaticResource TextPanel}" Grid.Column="1">
                                             <TextBlock Text="{DynamicResource showOpenResultHotkey}"
                                                        VerticalAlignment="Center" />
-                                            <TextBlock Text="Display Hotkey in Query Result "
+                                            <TextBlock Text="{DynamicResource showOpenResultHotkeyToolTip}"
                                                        Style="{DynamicResource SettingSubTitleLabel}" />
                                         </StackPanel>
                                         <CheckBox IsChecked="{Binding Settings.ShowOpenResultHotkey}"