diff --git a/Flow.Launcher/Languages/da.xaml b/Flow.Launcher/Languages/da.xaml
index a57a58888..4c3d4bd85 100644
--- a/Flow.Launcher/Languages/da.xaml
+++ b/Flow.Launcher/Languages/da.xaml
@@ -4,7 +4,7 @@
     <!--MainWindow-->
     <system:String x:Key="registerHotkeyFailed">Kunne ikke registrere genvejstast: {0}</system:String>
     <system:String x:Key="couldnotStartCmd">Kunne ikke starte {0}</system:String>
-    <system:String x:Key="invalidFlow.LauncherPluginFileFormat">Ugyldigt Flow Launcher plugin filformat</system:String>
+    <system:String x:Key="invalidFlowLauncherPluginFileFormat">Ugyldigt Flow Launcher plugin filformat</system:String>
     <system:String x:Key="setAsTopMostInThisQuery">Sæt øverst i denne søgning</system:String>
     <system:String x:Key="cancelTopMostInThisQuery">Annuller øverst i denne søgning</system:String>
     <system:String x:Key="executeQuery">Udfør søgning: {0}</system:String>
@@ -17,8 +17,8 @@
     <!--Setting General-->
     <system:String x:Key="flowlauncher_settings">Flow Launcher indstillinger</system:String>
     <system:String x:Key="general">Generelt</system:String>
-    <system:String x:Key="startFlow.LauncherOnSystemStartup">Start Flow Launcher ved system start</system:String>
-    <system:String x:Key="hideFlow.LauncherWhenLoseFocus">Skjul Flow Launcher ved mistet fokus</system:String>
+    <system:String x:Key="startFlowLauncherOnSystemStartup">Start Flow Launcher ved system start</system:String>
+    <system:String x:Key="hideFlowLauncherWhenLoseFocus">Skjul Flow Launcher ved mistet fokus</system:String>
     <system:String x:Key="dontPromptUpdateMsg">Vis ikke notifikationer om nye versioner</system:String>
     <system:String x:Key="rememberLastLocation">Husk seneste position</system:String>
     <system:String x:Key="language">Sprog</system:String>
@@ -42,7 +42,7 @@
     <!--Setting Theme-->
     <system:String x:Key="theme">Tema</system:String>
     <system:String x:Key="browserMoreThemes">Søg efter flere temaer</system:String>
-    <system:String x:Key="helloFlow.Launcher">Hej Flow Launcher</system:String>
+    <system:String x:Key="helloFlowLauncher">Hej Flow Launcher</system:String>
     <system:String x:Key="queryBoxFont">Søgefelt skrifttype</system:String>
     <system:String x:Key="resultItemFont">Resultat skrifttype</system:String>
     <system:String x:Key="windowMode">Vindue mode</system:String>
diff --git a/Flow.Launcher/Languages/de.xaml b/Flow.Launcher/Languages/de.xaml
index f6deb49fd..d1eae3124 100644
--- a/Flow.Launcher/Languages/de.xaml
+++ b/Flow.Launcher/Languages/de.xaml
@@ -4,7 +4,7 @@
     <!--MainWindow-->
     <system:String x:Key="registerHotkeyFailed">Tastenkombinationregistrierung: {0} fehlgeschlagen</system:String>
     <system:String x:Key="couldnotStartCmd">Kann {0} nicht starten</system:String>
-    <system:String x:Key="invalidFlow.LauncherPluginFileFormat">Fehlerhaftes Flow Launcher-Plugin Dateiformat</system:String>
+    <system:String x:Key="invalidFlowLauncherPluginFileFormat">Fehlerhaftes Flow Launcher-Plugin Dateiformat</system:String>
     <system:String x:Key="setAsTopMostInThisQuery">In dieser Abfrage als oberstes setzen</system:String>
     <system:String x:Key="cancelTopMostInThisQuery">In dieser Abfrage oberstes abbrechen</system:String>
     <system:String x:Key="executeQuery">Abfrage ausführen:{0}</system:String>
@@ -17,8 +17,8 @@
     <!--Setting General-->
     <system:String x:Key="flowlauncher_settings">Flow Launcher Einstellungen</system:String>
     <system:String x:Key="general">Allgemein</system:String>
-    <system:String x:Key="startFlow.LauncherOnSystemStartup">Starte Flow Launcher bei Systemstart</system:String>
-    <system:String x:Key="hideFlow.LauncherWhenLoseFocus">Verstecke Flow Launcher wenn der Fokus verloren geht</system:String>
+    <system:String x:Key="startFlowLauncherOnSystemStartup">Starte Flow Launcher bei Systemstart</system:String>
+    <system:String x:Key="hideFlowLauncherWhenLoseFocus">Verstecke Flow Launcher wenn der Fokus verloren geht</system:String>
     <system:String x:Key="dontPromptUpdateMsg">Zeige keine Nachricht wenn eine neue Version vorhanden ist</system:String>
     <system:String x:Key="rememberLastLocation">Merke letzte Ausführungsposition</system:String>
     <system:String x:Key="language">Sprache</system:String>
@@ -42,7 +42,7 @@
     <!--Setting Theme-->
     <system:String x:Key="theme">Theme</system:String>
     <system:String x:Key="browserMoreThemes">Suche nach weiteren Themes</system:String>
-    <system:String x:Key="helloFlow.Launcher">Hallo Flow Launcher</system:String>
+    <system:String x:Key="helloFlowLauncher">Hallo Flow Launcher</system:String>
     <system:String x:Key="queryBoxFont">Abfragebox Schriftart</system:String>
     <system:String x:Key="resultItemFont">Ergebnis Schriftart</system:String>
     <system:String x:Key="windowMode">Fenstermodus</system:String>
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 0326aa6d4..46519f058 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -4,7 +4,7 @@
     <!--MainWindow-->
     <system:String x:Key="registerHotkeyFailed">Failed to register hotkey: {0}</system:String>
     <system:String x:Key="couldnotStartCmd">Could not start {0}</system:String>
-    <system:String x:Key="invalidFlow.LauncherPluginFileFormat">Invalid Flow Launcher plugin file format</system:String>
+    <system:String x:Key="invalidFlowLauncherPluginFileFormat">Invalid Flow Launcher plugin file format</system:String>
     <system:String x:Key="setAsTopMostInThisQuery">Set as topmost in this query</system:String>
     <system:String x:Key="cancelTopMostInThisQuery">Cancel topmost in this query</system:String>
     <system:String x:Key="executeQuery">Execute query: {0}</system:String>
@@ -17,8 +17,8 @@
     <!--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="startFlow.LauncherOnSystemStartup">Start Flow Launcher on system startup</system:String>
-    <system:String x:Key="hideFlow.LauncherWhenLoseFocus">Hide Flow Launcher when focus is lost</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>
@@ -49,7 +49,7 @@
     <!--Setting Theme-->
     <system:String x:Key="theme">Theme</system:String>
     <system:String x:Key="browserMoreThemes">Browse for more themes</system:String>
-    <system:String x:Key="helloFlow.Launcher">Hello Flow Launcher</system:String>
+    <system:String x:Key="helloFlowLauncher">Hello Flow Launcher</system:String>
     <system:String x:Key="queryBoxFont">Query Box Font</system:String>
     <system:String x:Key="resultItemFont">Result Item Font</system:String>
     <system:String x:Key="windowMode">Window Mode</system:String>
diff --git a/Flow.Launcher/Languages/fr.xaml b/Flow.Launcher/Languages/fr.xaml
index 9094d5442..4ceb06249 100644
--- a/Flow.Launcher/Languages/fr.xaml
+++ b/Flow.Launcher/Languages/fr.xaml
@@ -4,7 +4,7 @@
     <!--MainWindow-->
     <system:String x:Key="registerHotkeyFailed">Échec lors de l'enregistrement du raccourci : {0}</system:String>
     <system:String x:Key="couldnotStartCmd">Impossible de lancer {0}</system:String>
-    <system:String x:Key="invalidFlow.LauncherPluginFileFormat">Le format de fichier n'est pas un plugin Flow Launcher valide</system:String>
+    <system:String x:Key="invalidFlowLauncherPluginFileFormat">Le format de fichier n'est pas un plugin Flow Launcher valide</system:String>
     <system:String x:Key="setAsTopMostInThisQuery">Définir en tant que favori pour cette requête</system:String>
     <system:String x:Key="cancelTopMostInThisQuery">Annuler le favori</system:String>
     <system:String x:Key="executeQuery">Lancer la requête : {0}</system:String>
@@ -17,8 +17,8 @@
     <!--Setting General-->
     <system:String x:Key="flowlauncher_settings">Paramètres - Flow Launcher</system:String>
     <system:String x:Key="general">Général</system:String>
-    <system:String x:Key="startFlow.LauncherOnSystemStartup">Lancer Flow Launcher au démarrage du système</system:String>
-    <system:String x:Key="hideFlow.LauncherWhenLoseFocus">Cacher Flow Launcher lors de la perte de focus</system:String>
+    <system:String x:Key="startFlowLauncherOnSystemStartup">Lancer Flow Launcher au démarrage du système</system:String>
+    <system:String x:Key="hideFlowLauncherWhenLoseFocus">Cacher Flow Launcher lors de la perte de focus</system:String>
     <system:String x:Key="dontPromptUpdateMsg">Ne pas afficher le message de mise à jour pour les nouvelles versions</system:String>
     <system:String x:Key="rememberLastLocation">Se souvenir du dernier emplacement de la fenêtre</system:String>
     <system:String x:Key="language">Langue</system:String>
@@ -46,7 +46,7 @@
     <!--Setting Theme-->
     <system:String x:Key="theme">Thèmes</system:String>
     <system:String x:Key="browserMoreThemes">Trouver plus de thèmes</system:String>
-    <system:String x:Key="helloFlow.Launcher">Hello Flow Launcher</system:String>
+    <system:String x:Key="helloFlowLauncher">Hello Flow Launcher</system:String>
     <system:String x:Key="queryBoxFont">Police (barre de recherche)</system:String>
     <system:String x:Key="resultItemFont">Police (liste des résultats)  </system:String>
     <system:String x:Key="windowMode">Mode fenêtré</system:String>
@@ -86,7 +86,7 @@
     <system:String x:Key="checkUpdates">Vérifier les mises à jour</system:String>
     <system:String x:Key="newVersionTips">Nouvelle version {0} disponible, veuillez redémarrer Flow Launcher</system:String>
     <system:String x:Key="checkUpdatesFailed">Échec de la vérification de la mise à jour, vérifiez votre connexion et vos paramètres de configuration proxy pour pouvoir acceder à api.github.com.</system:String>
-    <system:String x:Key="downloadUpdatesFailed">Échec du téléchargement de la mise à jour, vérifiez votre connexion et vos paramètres de configuration proxy pour pouvoir acceder à github-cloud.s3.amazonaws.com, ou téléchargez manuelement la mise à jour sur https://github.com/jjw24/Flow.Launcher/releases.</system:String>
+    <system:String x:Key="downloadUpdatesFailed">Échec du téléchargement de la mise à jour, vérifiez votre connexion et vos paramètres de configuration proxy pour pouvoir acceder à github-cloud.s3.amazonaws.com, ou téléchargez manuelement la mise à jour sur https://github.com/Flow-Launcher/Flow.Launcher/releases.</system:String>
     <system:String x:Key="releaseNotes">Notes de changement :</system:String>
 
     <!--Action Keyword Setting Dialog-->
diff --git a/Flow.Launcher/Languages/it.xaml b/Flow.Launcher/Languages/it.xaml
index 4bed90e5a..381864f8a 100644
--- a/Flow.Launcher/Languages/it.xaml
+++ b/Flow.Launcher/Languages/it.xaml
@@ -4,7 +4,7 @@
     <!--MainWindow-->
     <system:String x:Key="registerHotkeyFailed">Impossibile salvare il tasto di scelta rapida: {0}</system:String>
     <system:String x:Key="couldnotStartCmd">Avvio fallito {0}</system:String>
-    <system:String x:Key="invalidFlow.LauncherPluginFileFormat">Formato file plugin non valido</system:String>
+    <system:String x:Key="invalidFlowLauncherPluginFileFormat">Formato file plugin non valido</system:String>
     <system:String x:Key="setAsTopMostInThisQuery">Risultato prioritario con questa query</system:String>
     <system:String x:Key="cancelTopMostInThisQuery">Rimuovi risultato prioritario con questa query</system:String>
     <system:String x:Key="executeQuery">Query d'esecuzione: {0}</system:String>
@@ -17,8 +17,8 @@
     <!--Setting General-->
     <system:String x:Key="flowlauncher_settings">Impostaizoni Flow Launcher</system:String>
     <system:String x:Key="general">Generale</system:String>
-    <system:String x:Key="startFlow.LauncherOnSystemStartup">Avvia Wow all'avvio di Windows</system:String>
-    <system:String x:Key="hideFlow.LauncherWhenLoseFocus">Nascondi Flow Launcher quando perde il focus</system:String>
+    <system:String x:Key="startFlowLauncherOnSystemStartup">Avvia Wow all'avvio di Windows</system:String>
+    <system:String x:Key="hideFlowLauncherWhenLoseFocus">Nascondi Flow Launcher quando perde il focus</system:String>
     <system:String x:Key="dontPromptUpdateMsg">Non mostrare le notifiche per una nuova versione</system:String>
     <system:String x:Key="rememberLastLocation">Ricorda l'ultima posizione di avvio del launcher</system:String>
     <system:String x:Key="language">Lingua</system:String>
@@ -46,7 +46,7 @@
     <!--Setting Theme-->
     <system:String x:Key="theme">Tema</system:String>
     <system:String x:Key="browserMoreThemes">Sfoglia per altri temi</system:String>
-    <system:String x:Key="helloFlow.Launcher">Hello Flow Launcher</system:String>
+    <system:String x:Key="helloFlowLauncher">Hello Flow Launcher</system:String>
     <system:String x:Key="queryBoxFont">Font campo di ricerca</system:String>
     <system:String x:Key="resultItemFont">Font campo risultati</system:String>
     <system:String x:Key="windowMode">Modalità finestra</system:String>
diff --git a/Flow.Launcher/Languages/ja.xaml b/Flow.Launcher/Languages/ja.xaml
index 3690bd784..0fd5e3e79 100644
--- a/Flow.Launcher/Languages/ja.xaml
+++ b/Flow.Launcher/Languages/ja.xaml
@@ -4,7 +4,7 @@
     <!--MainWindow-->
     <system:String x:Key="registerHotkeyFailed">ホットキー「{0}」の登録に失敗しました</system:String>
     <system:String x:Key="couldnotStartCmd">{0}の起動に失敗しました</system:String>
-    <system:String x:Key="invalidFlow.LauncherPluginFileFormat">Flow Launcherプラグインの形式が正しくありません</system:String>
+    <system:String x:Key="invalidFlowLauncherPluginFileFormat">Flow Launcherプラグインの形式が正しくありません</system:String>
     <system:String x:Key="setAsTopMostInThisQuery">このクエリを最上位にセットする</system:String>
     <system:String x:Key="cancelTopMostInThisQuery">このクエリを最上位にセットをキャンセル</system:String>
     <system:String x:Key="executeQuery">次のコマンドを実行します:{0}</system:String>
@@ -17,8 +17,8 @@
     <!--Setting General-->
     <system:String x:Key="flowlauncher_settings">Flow Launcher設定</system:String>
     <system:String x:Key="general">一般</system:String>
-    <system:String x:Key="startFlow.LauncherOnSystemStartup">スタートアップ時にFlow Launcherを起動する</system:String>
-    <system:String x:Key="hideFlow.LauncherWhenLoseFocus">フォーカスを失った時にFlow Launcherを隠す</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>
@@ -47,7 +47,7 @@
     <!--Setting Theme-->
     <system:String x:Key="theme">テーマ</system:String>
     <system:String x:Key="browserMoreThemes">テーマを探す</system:String>
-    <system:String x:Key="helloFlow.Launcher">こんにちは Flow Launcher</system:String>
+    <system:String x:Key="helloFlowLauncher">こんにちは Flow Launcher</system:String>
     <system:String x:Key="queryBoxFont">検索ボックスのフォント</system:String>
     <system:String x:Key="resultItemFont">検索結果一覧のフォント</system:String>
     <system:String x:Key="windowMode">ウィンドウモード</system:String>
diff --git a/Flow.Launcher/Languages/ko.xaml b/Flow.Launcher/Languages/ko.xaml
index 9ca3b5dbd..2f7d538dc 100644
--- a/Flow.Launcher/Languages/ko.xaml
+++ b/Flow.Launcher/Languages/ko.xaml
@@ -4,7 +4,7 @@
     <!--MainWindow-->
     <system:String x:Key="registerHotkeyFailed">핫키 등록 실패: {0}</system:String>
     <system:String x:Key="couldnotStartCmd">{0}을 실행할 수 없습니다.</system:String>
-    <system:String x:Key="invalidFlow.LauncherPluginFileFormat">Flow Launcher 플러그인 파일 형식이 유효하지 않습니다.</system:String>
+    <system:String x:Key="invalidFlowLauncherPluginFileFormat">Flow Launcher 플러그인 파일 형식이 유효하지 않습니다.</system:String>
     <system:String x:Key="setAsTopMostInThisQuery">이 쿼리의 최상위로 설정</system:String>
     <system:String x:Key="cancelTopMostInThisQuery">이 쿼리의 최상위 설정 취소</system:String>
     <system:String x:Key="executeQuery">쿼리 실행: {0}</system:String>
@@ -17,8 +17,8 @@
     <!--Setting General-->
     <system:String x:Key="flowlauncher_settings">Flow Launcher 설정</system:String>
     <system:String x:Key="general">일반</system:String>
-    <system:String x:Key="startFlow.LauncherOnSystemStartup">시스템 시작 시 Flow Launcher 실행</system:String>
-    <system:String x:Key="hideFlow.LauncherWhenLoseFocus">포커스 잃으면 Flow Launcher 숨김</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>
@@ -46,7 +46,7 @@
     <!--Setting Theme-->
     <system:String x:Key="theme">테마</system:String>
     <system:String x:Key="browserMoreThemes">테마 더 찾아보기</system:String>
-    <system:String x:Key="helloFlow.Launcher">Hello Flow Launcher</system:String>
+    <system:String x:Key="helloFlowLauncher">Hello Flow Launcher</system:String>
     <system:String x:Key="queryBoxFont">쿼리 상자 글꼴</system:String>
     <system:String x:Key="resultItemFont">결과 항목 글꼴</system:String>
     <system:String x:Key="windowMode">윈도우 모드</system:String>
diff --git a/Flow.Launcher/Languages/nb-NO.xaml b/Flow.Launcher/Languages/nb-NO.xaml
index 377c13931..035b0cbdf 100644
--- a/Flow.Launcher/Languages/nb-NO.xaml
+++ b/Flow.Launcher/Languages/nb-NO.xaml
@@ -4,7 +4,7 @@
     <!--MainWindow-->
     <system:String x:Key="registerHotkeyFailed">Kunne ikke registrere hurtigtast: {0}</system:String>
     <system:String x:Key="couldnotStartCmd">Kunne ikke starte {0}</system:String>
-    <system:String x:Key="invalidFlow.LauncherPluginFileFormat">Ugyldig filformat for Flow Launcher-utvidelse</system:String>
+    <system:String x:Key="invalidFlowLauncherPluginFileFormat">Ugyldig filformat for Flow Launcher-utvidelse</system:String>
     <system:String x:Key="setAsTopMostInThisQuery">Sett til øverste for denne spørringen</system:String>
     <system:String x:Key="cancelTopMostInThisQuery">Avbryt øverste for denne spørringen</system:String>
     <system:String x:Key="executeQuery">Utfør spørring: {0}</system:String>
@@ -17,8 +17,8 @@
     <!--Setting General-->
     <system:String x:Key="flowlauncher_settings">Flow Launcher-innstillinger</system:String>
     <system:String x:Key="general">Generelt</system:String>
-    <system:String x:Key="startFlow.LauncherOnSystemStartup">Start Flow Launcher ved systemstart</system:String>
-    <system:String x:Key="hideFlow.LauncherWhenLoseFocus">Skjul Flow Launcher ved mistet fokus</system:String>
+    <system:String x:Key="startFlowLauncherOnSystemStartup">Start Flow Launcher ved systemstart</system:String>
+    <system:String x:Key="hideFlowLauncherWhenLoseFocus">Skjul Flow Launcher ved mistet fokus</system:String>
     <system:String x:Key="dontPromptUpdateMsg">Ikke vis varsel om ny versjon</system:String>
     <system:String x:Key="rememberLastLocation">Husk siste plassering</system:String>
     <system:String x:Key="language">Språk</system:String>
@@ -46,7 +46,7 @@
     <!--Setting Theme-->
     <system:String x:Key="theme">Tema</system:String>
     <system:String x:Key="browserMoreThemes">Finn flere temaer</system:String>
-    <system:String x:Key="helloFlow.Launcher">Hallo Flow Launcher</system:String>
+    <system:String x:Key="helloFlowLauncher">Hallo Flow Launcher</system:String>
     <system:String x:Key="queryBoxFont">Font for spørringsboks</system:String>
     <system:String x:Key="resultItemFont">Font for resultat</system:String>
     <system:String x:Key="windowMode">Vindusmodus</system:String>
diff --git a/Flow.Launcher/Languages/nl.xaml b/Flow.Launcher/Languages/nl.xaml
index 83d192855..be18beb9c 100644
--- a/Flow.Launcher/Languages/nl.xaml
+++ b/Flow.Launcher/Languages/nl.xaml
@@ -4,7 +4,7 @@
     <!--MainWindow-->
     <system:String x:Key="registerHotkeyFailed">Sneltoets registratie: {0} mislukt</system:String>
     <system:String x:Key="couldnotStartCmd">Kan {0} niet starten</system:String>
-    <system:String x:Key="invalidFlow.LauncherPluginFileFormat">Ongeldige Flow Launcher plugin bestandsextensie</system:String>
+    <system:String x:Key="invalidFlowLauncherPluginFileFormat">Ongeldige Flow Launcher plugin bestandsextensie</system:String>
     <system:String x:Key="setAsTopMostInThisQuery">Stel in als hoogste in deze query</system:String>
     <system:String x:Key="cancelTopMostInThisQuery">Annuleer hoogste in deze query</system:String>
     <system:String x:Key="executeQuery">Executeer query: {0}</system:String>
@@ -17,8 +17,8 @@
     <!--Setting General-->
     <system:String x:Key="flowlauncher_settings">Flow Launcher Instellingen</system:String>
     <system:String x:Key="general">Algemeen</system:String>
-    <system:String x:Key="startFlow.LauncherOnSystemStartup">Start Flow Launcher als systeem opstart</system:String>
-    <system:String x:Key="hideFlow.LauncherWhenLoseFocus">Verberg Flow Launcher als focus verloren is</system:String>
+    <system:String x:Key="startFlowLauncherOnSystemStartup">Start Flow Launcher als systeem opstart</system:String>
+    <system:String x:Key="hideFlowLauncherWhenLoseFocus">Verberg Flow Launcher als focus verloren is</system:String>
     <system:String x:Key="dontPromptUpdateMsg">Laat geen nieuwe versie notificaties zien</system:String>
     <system:String x:Key="rememberLastLocation">Herinner laatste opstart locatie</system:String>
     <system:String x:Key="language">Taal</system:String>
@@ -42,7 +42,7 @@
     <!--Setting Theme-->
     <system:String x:Key="theme">Thema</system:String>
     <system:String x:Key="browserMoreThemes">Zoek meer thema´s</system:String>
-    <system:String x:Key="helloFlow.Launcher">Hallo Flow Launcher</system:String>
+    <system:String x:Key="helloFlowLauncher">Hallo Flow Launcher</system:String>
     <system:String x:Key="queryBoxFont">Query Box lettertype</system:String>
     <system:String x:Key="resultItemFont">Resultaat Item lettertype</system:String>
     <system:String x:Key="windowMode">Window Mode</system:String>
diff --git a/Flow.Launcher/Languages/pl.xaml b/Flow.Launcher/Languages/pl.xaml
index 486ac27a7..249878ed3 100644
--- a/Flow.Launcher/Languages/pl.xaml
+++ b/Flow.Launcher/Languages/pl.xaml
@@ -4,7 +4,7 @@
     <!--MainWindow-->
     <system:String x:Key="registerHotkeyFailed">Nie udało się ustawić skrótu klawiszowego: {0}</system:String>
     <system:String x:Key="couldnotStartCmd">Nie udało się uruchomić: {0}</system:String>
-    <system:String x:Key="invalidFlow.LauncherPluginFileFormat">Niepoprawny format pliku wtyczki</system:String>
+    <system:String x:Key="invalidFlowLauncherPluginFileFormat">Niepoprawny format pliku wtyczki</system:String>
     <system:String x:Key="setAsTopMostInThisQuery">Ustaw jako najwyższy wynik dla tego zapytania</system:String>
     <system:String x:Key="cancelTopMostInThisQuery">Usuń ten najwyższy wynik dla tego zapytania</system:String>
     <system:String x:Key="executeQuery">Wyszukaj: {0}</system:String>
@@ -17,8 +17,8 @@
     <!--Setting General-->
     <system:String x:Key="flowlauncher_settings">Ustawienia Flow Launcher</system:String>
     <system:String x:Key="general">Ogólne</system:String>
-    <system:String x:Key="startFlow.LauncherOnSystemStartup">Uruchamiaj Flow Launcher przy starcie systemu</system:String>
-    <system:String x:Key="hideFlow.LauncherWhenLoseFocus">Ukryj okno Flow Launcher kiedy przestanie ono być aktywne</system:String>
+    <system:String x:Key="startFlowLauncherOnSystemStartup">Uruchamiaj Flow Launcher przy starcie systemu</system:String>
+    <system:String x:Key="hideFlowLauncherWhenLoseFocus">Ukryj okno Flow Launcher kiedy przestanie ono być aktywne</system:String>
     <system:String x:Key="dontPromptUpdateMsg">Nie pokazuj powiadomienia o nowej wersji</system:String>
     <system:String x:Key="rememberLastLocation">Zapamiętaj ostatnią pozycję okna</system:String>
     <system:String x:Key="language">Język</system:String>
@@ -42,7 +42,7 @@
     <!--Setting Theme-->
     <system:String x:Key="theme">Skórka</system:String>
     <system:String x:Key="browserMoreThemes">Znajdź więcej skórek</system:String>
-    <system:String x:Key="helloFlow.Launcher">Witaj Flow Launcher</system:String>
+    <system:String x:Key="helloFlowLauncher">Witaj Flow Launcher</system:String>
     <system:String x:Key="queryBoxFont">Czcionka okna zapytania</system:String>
     <system:String x:Key="resultItemFont">Czcionka okna wyników</system:String>
     <system:String x:Key="windowMode">Tryb w oknie</system:String>
diff --git a/Flow.Launcher/Languages/pt-br.xaml b/Flow.Launcher/Languages/pt-br.xaml
index 940b537e3..2036744e8 100644
--- a/Flow.Launcher/Languages/pt-br.xaml
+++ b/Flow.Launcher/Languages/pt-br.xaml
@@ -4,7 +4,7 @@
     <!--MainWindow-->
     <system:String x:Key="registerHotkeyFailed">Falha ao registrar atalho: {0}</system:String>
     <system:String x:Key="couldnotStartCmd">Não foi possível iniciar {0}</system:String>
-    <system:String x:Key="invalidFlow.LauncherPluginFileFormat">Formato de plugin Flow Launcher inválido</system:String>
+    <system:String x:Key="invalidFlowLauncherPluginFileFormat">Formato de plugin Flow Launcher inválido</system:String>
     <system:String x:Key="setAsTopMostInThisQuery">Tornar a principal nessa consulta</system:String>
     <system:String x:Key="cancelTopMostInThisQuery">Cancelar a principal nessa consulta</system:String>
     <system:String x:Key="executeQuery">Executar consulta: {0}</system:String>
@@ -17,8 +17,8 @@
     <!--Setting General-->
     <system:String x:Key="flowlauncher_settings">Configurações do Flow Launcher</system:String>
     <system:String x:Key="general">Geral</system:String>
-    <system:String x:Key="startFlow.LauncherOnSystemStartup">Iniciar Flow Launcher com inicialização do sistema</system:String>
-    <system:String x:Key="hideFlow.LauncherWhenLoseFocus">Esconder Flow Launcher quando foco for perdido</system:String>
+    <system:String x:Key="startFlowLauncherOnSystemStartup">Iniciar Flow Launcher com inicialização do sistema</system:String>
+    <system:String x:Key="hideFlowLauncherWhenLoseFocus">Esconder Flow Launcher quando foco for perdido</system:String>
     <system:String x:Key="dontPromptUpdateMsg">Não mostrar notificações de novas versões</system:String>
     <system:String x:Key="rememberLastLocation">Lembrar última localização de lançamento</system:String>
     <system:String x:Key="language">Idioma</system:String>
@@ -46,7 +46,7 @@
     <!--Setting Theme-->
     <system:String x:Key="theme">Tema</system:String>
     <system:String x:Key="browserMoreThemes">Ver mais temas</system:String>
-    <system:String x:Key="helloFlow.Launcher">Olá Flow Launcher</system:String>
+    <system:String x:Key="helloFlowLauncher">Olá Flow Launcher</system:String>
     <system:String x:Key="queryBoxFont">Fonte da caixa de Consulta</system:String>
     <system:String x:Key="resultItemFont">Fonte do Resultado</system:String>
     <system:String x:Key="windowMode">Modo Janela</system:String>
diff --git a/Flow.Launcher/Languages/ru.xaml b/Flow.Launcher/Languages/ru.xaml
index 4f9315fce..66a463dcb 100644
--- a/Flow.Launcher/Languages/ru.xaml
+++ b/Flow.Launcher/Languages/ru.xaml
@@ -4,7 +4,7 @@
     <!--MainWindow-->
     <system:String x:Key="registerHotkeyFailed">Регистрация хоткея {0} не удалась</system:String>
     <system:String x:Key="couldnotStartCmd">Не удалось запустить {0}</system:String>
-    <system:String x:Key="invalidFlow.LauncherPluginFileFormat">Неверный формат файла flowlauncher плагина</system:String>
+    <system:String x:Key="invalidFlowLauncherPluginFileFormat">Неверный формат файла flowlauncher плагина</system:String>
     <system:String x:Key="setAsTopMostInThisQuery">Отображать это окно выше всех при этом запросе</system:String>
     <system:String x:Key="cancelTopMostInThisQuery">Не отображать это окно выше всех при этом запросе</system:String>
     <system:String x:Key="executeQuery">Выполнить запрос:{0}</system:String>
@@ -17,8 +17,8 @@
     <!--Setting General-->
     <system:String x:Key="flowlauncher_settings">Настройки Flow Launcher</system:String>
     <system:String x:Key="general">Общие</system:String>
-    <system:String x:Key="startFlow.LauncherOnSystemStartup">Запускать Flow Launcher при запуске системы</system:String>
-    <system:String x:Key="hideFlow.LauncherWhenLoseFocus">Скрывать Flow Launcher если потерян фокус</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>
@@ -42,7 +42,7 @@
     <!--Setting Theme-->
     <system:String x:Key="theme">Темы</system:String>
     <system:String x:Key="browserMoreThemes">Найти больше тем</system:String>
-    <system:String x:Key="helloFlow.Launcher">Привет Flow Launcher</system:String>
+    <system:String x:Key="helloFlowLauncher">Привет Flow Launcher</system:String>
     <system:String x:Key="queryBoxFont">Шрифт запросов</system:String>
     <system:String x:Key="resultItemFont">Шрифт результатов</system:String>
     <system:String x:Key="windowMode">Оконный режим</system:String>
diff --git a/Flow.Launcher/Languages/sk.xaml b/Flow.Launcher/Languages/sk.xaml
index 101fc84ca..824096c4c 100644
--- a/Flow.Launcher/Languages/sk.xaml
+++ b/Flow.Launcher/Languages/sk.xaml
@@ -4,7 +4,7 @@
     <!--MainWindow-->
     <system:String x:Key="registerHotkeyFailed">Nepodarilo sa registrovať klávesovú skratku {0}</system:String>
     <system:String x:Key="couldnotStartCmd">Nepodarilo sa spustiť {0}</system:String>
-    <system:String x:Key="invalidFlow.LauncherPluginFileFormat">Neplatný formát súboru pre plugin Flow Launcher</system:String>
+    <system:String x:Key="invalidFlowLauncherPluginFileFormat">Neplatný formát súboru pre plugin Flow Launcher</system:String>
     <system:String x:Key="setAsTopMostInThisQuery">Pri tomto dopyte umiestniť navrchu</system:String>
     <system:String x:Key="cancelTopMostInThisQuery">Zrušiť umiestnenie navrchu pri tomto dopyte</system:String>
     <system:String x:Key="executeQuery">Spustiť dopyt: {0}</system:String>
@@ -17,8 +17,8 @@
     <!--Setting General-->
     <system:String x:Key="flowlauncher_settings">Nastavenia Flow Launcher</system:String>
     <system:String x:Key="general">Všeobecné</system:String>
-    <system:String x:Key="startFlow.LauncherOnSystemStartup">Spustiť Flow Launcher po štarte systému</system:String>
-    <system:String x:Key="hideFlow.LauncherWhenLoseFocus">Schovať Flow Launcher po strate fokusu</system:String>
+    <system:String x:Key="startFlowLauncherOnSystemStartup">Spustiť Flow Launcher po štarte systému</system:String>
+    <system:String x:Key="hideFlowLauncherWhenLoseFocus">Schovať Flow Launcher po strate fokusu</system:String>
     <system:String x:Key="dontPromptUpdateMsg">Nezobrazovať upozornenia na novú verziu</system:String>
     <system:String x:Key="rememberLastLocation">Zapamätať si posledné umiestnenie</system:String>
     <system:String x:Key="language">Jazyk</system:String>
@@ -47,7 +47,7 @@
     <!--Setting Theme-->
     <system:String x:Key="theme">Motív</system:String>
     <system:String x:Key="browserMoreThemes">Prehliadať viac motívov</system:String>
-    <system:String x:Key="helloFlow.Launcher">Ahoj Flow Launcher</system:String>
+    <system:String x:Key="helloFlowLauncher">Ahoj Flow Launcher</system:String>
     <system:String x:Key="queryBoxFont">Písmo poľa pre dopyt</system:String>
     <system:String x:Key="resultItemFont">Písmo výsledkov</system:String>
     <system:String x:Key="windowMode">Režim okno</system:String>
diff --git a/Flow.Launcher/Languages/sr.xaml b/Flow.Launcher/Languages/sr.xaml
index 4353948a1..22aabb37f 100644
--- a/Flow.Launcher/Languages/sr.xaml
+++ b/Flow.Launcher/Languages/sr.xaml
@@ -4,7 +4,7 @@
     <!--MainWindow-->
     <system:String x:Key="registerHotkeyFailed">Neuspešno registrovana prečica: {0}</system:String>
     <system:String x:Key="couldnotStartCmd">Neuspešno pokretanje {0}</system:String>
-    <system:String x:Key="invalidFlow.LauncherPluginFileFormat">Nepravilni Flow Launcher plugin format datoteke</system:String>
+    <system:String x:Key="invalidFlowLauncherPluginFileFormat">Nepravilni Flow Launcher plugin format datoteke</system:String>
     <system:String x:Key="setAsTopMostInThisQuery">Postavi kao najviši u ovom upitu</system:String>
     <system:String x:Key="cancelTopMostInThisQuery">Poništi najviši u ovom upitu</system:String>
     <system:String x:Key="executeQuery">Izvrši upit: {0}</system:String>
@@ -17,8 +17,8 @@
     <!--Setting General-->
     <system:String x:Key="flowlauncher_settings">Flow Launcher Podešavanja</system:String>
     <system:String x:Key="general">Opšte</system:String>
-    <system:String x:Key="startFlow.LauncherOnSystemStartup">Pokreni Flow Launcher pri podizanju sistema</system:String>
-    <system:String x:Key="hideFlow.LauncherWhenLoseFocus">Sakri Flow Launcher kada se izgubi fokus</system:String>
+    <system:String x:Key="startFlowLauncherOnSystemStartup">Pokreni Flow Launcher pri podizanju sistema</system:String>
+    <system:String x:Key="hideFlowLauncherWhenLoseFocus">Sakri Flow Launcher kada se izgubi fokus</system:String>
     <system:String x:Key="dontPromptUpdateMsg">Ne prikazuj obaveštenje o novoj verziji</system:String>
     <system:String x:Key="rememberLastLocation">Zapamti lokaciju poslednjeg pokretanja</system:String>
     <system:String x:Key="language">Jezik</system:String>
@@ -46,7 +46,7 @@
     <!--Setting Theme-->
     <system:String x:Key="theme">Tema</system:String>
     <system:String x:Key="browserMoreThemes">Pretražite još tema</system:String>
-    <system:String x:Key="helloFlow.Launcher">Zdravo Flow Launcher</system:String>
+    <system:String x:Key="helloFlowLauncher">Zdravo Flow Launcher</system:String>
     <system:String x:Key="queryBoxFont">Font upita</system:String>
     <system:String x:Key="resultItemFont">Font rezultata</system:String>
     <system:String x:Key="windowMode">Režim prozora</system:String>
diff --git a/Flow.Launcher/Languages/tr.xaml b/Flow.Launcher/Languages/tr.xaml
index 7b8adf3d9..cc287f372 100644
--- a/Flow.Launcher/Languages/tr.xaml
+++ b/Flow.Launcher/Languages/tr.xaml
@@ -4,7 +4,7 @@
     <!--MainWindow-->
     <system:String x:Key="registerHotkeyFailed">Kısayol tuşu ataması başarısız oldu: {0}</system:String>
     <system:String x:Key="couldnotStartCmd">{0} başlatılamıyor</system:String>
-    <system:String x:Key="invalidFlow.LauncherPluginFileFormat">Geçersiz Flow Launcher eklenti dosyası formatı</system:String>
+    <system:String x:Key="invalidFlowLauncherPluginFileFormat">Geçersiz Flow Launcher eklenti dosyası formatı</system:String>
     <system:String x:Key="setAsTopMostInThisQuery">Bu sorgu için başa sabitle</system:String>
     <system:String x:Key="cancelTopMostInThisQuery">Sabitlemeyi kaldır</system:String>
     <system:String x:Key="executeQuery">Sorguyu çalıştır: {0}</system:String>
@@ -17,8 +17,8 @@
     <!--Setting General-->
     <system:String x:Key="flowlauncher_settings">Flow Launcher Ayarları</system:String>
     <system:String x:Key="general">Genel</system:String>
-    <system:String x:Key="startFlow.LauncherOnSystemStartup">Flow Launcher'u başlangıçta başlat</system:String>
-    <system:String x:Key="hideFlow.LauncherWhenLoseFocus">Odak pencereden ayrıldığında Flow Launcher'u gizle</system:String>
+    <system:String x:Key="startFlowLauncherOnSystemStartup">Flow Launcher'u başlangıçta başlat</system:String>
+    <system:String x:Key="hideFlowLauncherWhenLoseFocus">Odak pencereden ayrıldığında Flow Launcher'u gizle</system:String>
     <system:String x:Key="dontPromptUpdateMsg">Güncelleme bildirimlerini gösterme</system:String>
     <system:String x:Key="rememberLastLocation">Pencere konumunu hatırla</system:String>
     <system:String x:Key="language">Dil</system:String>
@@ -48,7 +48,7 @@
     <!--Setting Theme-->
     <system:String x:Key="theme">Temalar</system:String>
     <system:String x:Key="browserMoreThemes">Daha fazla tema bul</system:String>
-    <system:String x:Key="helloFlow.Launcher">Merhaba Flow Launcher</system:String>
+    <system:String x:Key="helloFlowLauncher">Merhaba Flow Launcher</system:String>
     <system:String x:Key="queryBoxFont">Pencere Yazı Tipi</system:String>
     <system:String x:Key="resultItemFont">Sonuç Yazı Tipi</system:String>
     <system:String x:Key="windowMode">Pencere Modu</system:String>
diff --git a/Flow.Launcher/Languages/uk-UA.xaml b/Flow.Launcher/Languages/uk-UA.xaml
index bcb72b15d..c7e84c231 100644
--- a/Flow.Launcher/Languages/uk-UA.xaml
+++ b/Flow.Launcher/Languages/uk-UA.xaml
@@ -4,7 +4,7 @@
     <!--MainWindow-->
     <system:String x:Key="registerHotkeyFailed">Реєстрація хоткея {0} не вдалася</system:String>
     <system:String x:Key="couldnotStartCmd">Не вдалося запустити {0}</system:String>
-    <system:String x:Key="invalidFlow.LauncherPluginFileFormat">Невірний формат файлу плагіна Flow Launcher</system:String>
+    <system:String x:Key="invalidFlowLauncherPluginFileFormat">Невірний формат файлу плагіна Flow Launcher</system:String>
     <system:String x:Key="setAsTopMostInThisQuery">Відображати першим при такому ж запиті</system:String>
     <system:String x:Key="cancelTopMostInThisQuery">Відмінити відображення першим при такому ж запиті</system:String>
     <system:String x:Key="executeQuery">Виконати запит: {0}</system:String>
@@ -17,8 +17,8 @@
     <!--Setting General-->
     <system:String x:Key="flowlauncher_settings">Налаштування Flow Launcher</system:String>
     <system:String x:Key="general">Основні</system:String>
-    <system:String x:Key="startFlow.LauncherOnSystemStartup">Запускати Flow Launcher при запуску системи</system:String>
-    <system:String x:Key="hideFlow.LauncherWhenLoseFocus">Сховати Flow Launcher якщо втрачено фокус</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>
@@ -42,7 +42,7 @@
     <!--Setting Theme-->
     <system:String x:Key="theme">Теми</system:String>
     <system:String x:Key="browserMoreThemes">Знайти більше тем</system:String>
-    <system:String x:Key="helloFlow.Launcher">Привіт Flow Launcher</system:String>
+    <system:String x:Key="helloFlowLauncher">Привіт Flow Launcher</system:String>
     <system:String x:Key="queryBoxFont">Шрифт запитів</system:String>
     <system:String x:Key="resultItemFont">Шрифт результатів</system:String>
     <system:String x:Key="windowMode">Віконний режим</system:String>
diff --git a/Flow.Launcher/Languages/zh-cn.xaml b/Flow.Launcher/Languages/zh-cn.xaml
index 85a8a344e..5801b678a 100644
--- a/Flow.Launcher/Languages/zh-cn.xaml
+++ b/Flow.Launcher/Languages/zh-cn.xaml
@@ -4,7 +4,7 @@
     <!--主窗体-->
     <system:String x:Key="registerHotkeyFailed">注册热键：{0} 失败</system:String>
     <system:String x:Key="couldnotStartCmd">启动命令 {0} 失败</system:String>
-    <system:String x:Key="invalidFlow.LauncherPluginFileFormat">不是合法的Flow Launcher插件格式</system:String>
+    <system:String x:Key="invalidFlowLauncherPluginFileFormat">不是合法的Flow Launcher插件格式</system:String>
     <system:String x:Key="setAsTopMostInThisQuery">在当前查询中置顶</system:String>
     <system:String x:Key="cancelTopMostInThisQuery">取消置顶</system:String>
     <system:String x:Key="executeQuery">执行查询：{0}</system:String>
@@ -17,8 +17,8 @@
     <!--设置，通用-->
     <system:String x:Key="flowlauncher_settings">Flow Launcher设置</system:String>
     <system:String x:Key="general">通用</system:String>
-    <system:String x:Key="startFlow.LauncherOnSystemStartup">开机启动</system:String>
-    <system:String x:Key="hideFlow.LauncherWhenLoseFocus">失去焦点时自动隐藏Flow Launcher</system:String>
+    <system:String x:Key="startFlowLauncherOnSystemStartup">开机启动</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>
@@ -47,7 +47,7 @@
     <!--设置，主题-->
     <system:String x:Key="theme">主题</system:String>
     <system:String x:Key="browserMoreThemes">浏览更多主题</system:String>
-    <system:String x:Key="helloFlow.Launcher">你好，Flow Launcher</system:String>
+    <system:String x:Key="helloFlowLauncher">你好，Flow Launcher</system:String>
     <system:String x:Key="queryBoxFont">查询框字体</system:String>
     <system:String x:Key="resultItemFont">结果项字体</system:String>
     <system:String x:Key="windowMode">窗口模式</system:String>
diff --git a/Flow.Launcher/Languages/zh-tw.xaml b/Flow.Launcher/Languages/zh-tw.xaml
index 7cb525dab..f1df1a6d5 100644
--- a/Flow.Launcher/Languages/zh-tw.xaml
+++ b/Flow.Launcher/Languages/zh-tw.xaml
@@ -4,7 +4,7 @@
     <!--主視窗-->
     <system:String x:Key="registerHotkeyFailed">登錄快速鍵：{0} 失敗</system:String>
     <system:String x:Key="couldnotStartCmd">啟動命令 {0} 失敗</system:String>
-    <system:String x:Key="invalidFlow.LauncherPluginFileFormat">無效的 Flow Launcher 外掛格式</system:String>
+    <system:String x:Key="invalidFlowLauncherPluginFileFormat">無效的 Flow Launcher 外掛格式</system:String>
     <system:String x:Key="setAsTopMostInThisQuery">在目前查詢中置頂</system:String>
     <system:String x:Key="cancelTopMostInThisQuery">取消置頂</system:String>
     <system:String x:Key="executeQuery">執行查詢：{0}</system:String>
@@ -17,8 +17,8 @@
     <!--設定，一般-->
     <system:String x:Key="flowlauncher_settings">Flow Launcher 設定</system:String>
     <system:String x:Key="general">一般</system:String>
-    <system:String x:Key="startFlow.LauncherOnSystemStartup">開機時啟動</system:String>
-    <system:String x:Key="hideFlow.LauncherWhenLoseFocus">失去焦點時自動隱藏 Flow Launcher</system:String>
+    <system:String x:Key="startFlowLauncherOnSystemStartup">開機時啟動</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>
@@ -42,7 +42,7 @@
     <!--設定，主題-->
     <system:String x:Key="theme">主題</system:String>
     <system:String x:Key="browserMoreThemes">瀏覽更多主題</system:String>
-    <system:String x:Key="helloFlow.Launcher">你好，Flow Launcher</system:String>
+    <system:String x:Key="helloFlowLauncher">你好，Flow Launcher</system:String>
     <system:String x:Key="queryBoxFont">查詢框字體</system:String>
     <system:String x:Key="resultItemFont">結果項字體</system:String>
     <system:String x:Key="windowMode">視窗模式</system:String>
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 0e0370c31..2c0beaaab 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -192,7 +192,7 @@ namespace Flow.Launcher
                 }
                 else
                 {
-                    MessageBox.Show(InternationalizationManager.Instance.GetTranslation("invalidFlow.LauncherPluginFileFormat"));
+                    MessageBox.Show(InternationalizationManager.Instance.GetTranslation("invalidFlowLauncherPluginFileFormat"));
                 }
             }
             e.Handled = false;
diff --git a/Flow.Launcher/Properties/Settings.Designer.cs b/Flow.Launcher/Properties/Settings.Designer.cs
index bb9d90d17..da47c9cbe 100644
--- a/Flow.Launcher/Properties/Settings.Designer.cs
+++ b/Flow.Launcher/Properties/Settings.Designer.cs
@@ -25,7 +25,7 @@ namespace Flow.Launcher.Properties {
         
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("https://github.com/jjw24/Flow.Launcher")]
+        [global::System.Configuration.DefaultSettingValueAttribute("https://github.com/Flow-Launcher/Flow.Launcher")]
         public string GithubRepo {
             get {
                 return ((string)(this["GithubRepo"]));
diff --git a/Flow.Launcher/Properties/Settings.settings b/Flow.Launcher/Properties/Settings.settings
index 1c93c3f98..800c3cf63 100644
--- a/Flow.Launcher/Properties/Settings.settings
+++ b/Flow.Launcher/Properties/Settings.settings
@@ -3,7 +3,7 @@
   <Profiles />
   <Settings>
     <Setting Name="GithubRepo" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">https://github.com/jjw24/Flow.Launcher</Value>
+      <Value Profile="(Default)">https://github.com/Flow-Launcher/Flow.Launcher</Value>
     </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index f58e3e0ad..fc9c44201 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -36,15 +36,15 @@
                 <CheckBox Margin="10" IsChecked="{Binding PortableMode}">
                     <TextBlock Text="Portable Mode" />
                 </CheckBox>
-                <CheckBox Margin="10" IsChecked="{Binding Settings.StartFlow.LauncherOnSystemStartup}"
+                <CheckBox Margin="10" IsChecked="{Binding Settings.StartFlowLauncherOnSystemStartup}"
                           Checked="OnAutoStartupChecked" Unchecked="OnAutoStartupUncheck">
-                    <TextBlock Text="{DynamicResource startFlow.LauncherOnSystemStartup}" />
+                    <TextBlock Text="{DynamicResource startFlowLauncherOnSystemStartup}" />
                 </CheckBox>
                 <CheckBox Margin="10" IsChecked="{Binding Settings.HideOnStartup}">
                     <TextBlock Text="{DynamicResource hideOnStartup}" />
                 </CheckBox>
                 <CheckBox Margin="10" IsChecked="{Binding Settings.HideWhenDeactive}">
-                    <TextBlock Text="{DynamicResource hideFlow.LauncherWhenLoseFocus}" />
+                    <TextBlock Text="{DynamicResource hideFlowLauncherWhenLoseFocus}" />
                 </CheckBox>
                 <CheckBox Margin="10" IsChecked="{Binding Settings.HideNotifyIcon}">
                     <TextBlock Text="{DynamicResource hideNotifyIcon}" />
@@ -224,7 +224,7 @@
                                         <RowDefinition Height="50" />
                                         <RowDefinition />
                                     </Grid.RowDefinitions>
-                                    <TextBox Text="{DynamicResource helloFlow.Launcher}" IsReadOnly="True"
+                                    <TextBox Text="{DynamicResource helloFlowLauncher}" IsReadOnly="True"
                                              Style="{DynamicResource QueryBoxStyle}" Grid.Row="0" />
                                     <ContentControl Visibility="Visible" Grid.Row="1">
                                         <flowlauncher:ResultListBox DataContext="{Binding PreviewResults}" />