diff --git a/src/renderer/components/WorkspaceAddConnectionPanel.vue b/src/renderer/components/WorkspaceAddConnectionPanel.vue
index 5b4681ec..8382b21e 100644
--- a/src/renderer/components/WorkspaceAddConnectionPanel.vue
+++ b/src/renderer/components/WorkspaceAddConnectionPanel.vue
@@ -34,7 +34,7 @@
                   <fieldset class="m-0" :disabled="isBusy">
                      <div class="form-group columns">
                         <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.connectionName') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.connectionName') }}</label>
                         </div>
                         <div class="column col-7 col-sm-12">
                            <input
@@ -47,7 +47,7 @@
                      </div>
                      <div class="form-group columns">
                         <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.client') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.client') }}</label>
                         </div>
                         <div class="column col-7 col-sm-12">
                            <BaseSelect
@@ -61,7 +61,7 @@
                      </div>
                      <div v-if="connection.client === 'pg'" class="form-group columns">
                         <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.connectionString') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.connectionString') }}</label>
                         </div>
                         <div class="column col-7 col-sm-12">
                            <input
@@ -74,7 +74,7 @@
                      </div>
                      <div v-if="!clientCustomizations.fileConnection" class="form-group columns">
                         <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.hostName') }}/IP</label>
+                           <label class="form-label cut-text">{{ t('connection.hostName') }}/IP</label>
                         </div>
                         <div class="column col-7 col-sm-12">
                            <input
@@ -86,7 +86,7 @@
                      </div>
                      <div v-if="clientCustomizations.fileConnection" class="form-group columns">
                         <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.database') }}</label>
+                           <label class="form-label cut-text">{{ t('database.database') }}</label>
                         </div>
                         <div class="column col-7 col-sm-12">
                            <BaseUploadInput
@@ -99,7 +99,7 @@
                      </div>
                      <div v-if="!clientCustomizations.fileConnection" class="form-group columns">
                         <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.port') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.port') }}</label>
                         </div>
                         <div class="column col-7 col-sm-12">
                            <input
@@ -113,7 +113,7 @@
                      </div>
                      <div v-if="clientCustomizations.database" class="form-group columns">
                         <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.database') }}</label>
+                           <label class="form-label cut-text">{{ t('database.database') }}</label>
                         </div>
                         <div class="column col-7 col-sm-12">
                            <input
@@ -126,7 +126,7 @@
                      </div>
                      <div v-if="!clientCustomizations.fileConnection" class="form-group columns">
                         <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.user') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.user') }}</label>
                         </div>
                         <div class="column col-7 col-sm-12">
                            <input
@@ -139,7 +139,7 @@
                      </div>
                      <div v-if="!clientCustomizations.fileConnection" class="form-group columns">
                         <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.password') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.password') }}</label>
                         </div>
                         <div class="column col-7 col-sm-12">
                            <input
@@ -152,7 +152,7 @@
                      </div>
                      <div v-if="clientCustomizations.connectionSchema" class="form-group columns">
                         <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.schema') }}</label>
+                           <label class="form-label cut-text">{{ t('database.schema') }}</label>
                         </div>
                         <div class="column col-7 col-sm-12">
                            <input
@@ -202,7 +202,7 @@
                   <fieldset class="m-0" :disabled="isBusy || !connection.ssl">
                      <div class="form-group columns">
                         <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.privateKey') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.privateKey') }}</label>
                         </div>
                         <div class="column col-7 col-sm-12">
                            <BaseUploadInput
@@ -215,7 +215,7 @@
                      </div>
                      <div class="form-group columns">
                         <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.certificate') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.certificate') }}</label>
                         </div>
                         <div class="column col-7 col-sm-12">
                            <BaseUploadInput
@@ -228,7 +228,7 @@
                      </div>
                      <div class="form-group columns">
                         <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.caCertificate') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.caCertificate') }}</label>
                         </div>
                         <div class="column col-7 col-sm-12">
                            <BaseUploadInput
@@ -241,7 +241,7 @@
                      </div>
                      <div class="form-group columns">
                         <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.ciphers') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.ciphers') }}</label>
                         </div>
                         <div class="column col-7 col-sm-12">
                            <input
@@ -283,7 +283,7 @@
                   <fieldset class="m-0" :disabled="isBusy || !connection.ssh">
                      <div class="form-group columns">
                         <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.hostName') }}/IP</label>
+                           <label class="form-label cut-text">{{ t('connection.hostName') }}/IP</label>
                         </div>
                         <div class="column col-7 col-sm-12">
                            <input
@@ -295,7 +295,7 @@
                      </div>
                      <div class="form-group columns">
                         <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.user') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.user') }}</label>
                         </div>
                         <div class="column col-7 col-sm-12">
                            <input
@@ -307,7 +307,7 @@
                      </div>
                      <div class="form-group columns">
                         <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.password') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.password') }}</label>
                         </div>
                         <div class="column col-7 col-sm-12">
                            <input
@@ -319,7 +319,7 @@
                      </div>
                      <div class="form-group columns">
                         <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.port') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.port') }}</label>
                         </div>
                         <div class="column col-7 col-sm-12">
                            <input
@@ -333,7 +333,7 @@
                      </div>
                      <div class="form-group columns">
                         <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.privateKey') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.privateKey') }}</label>
                         </div>
                         <div class="column col-7 col-sm-12">
                            <BaseUploadInput
@@ -346,7 +346,7 @@
                      </div>
                      <div class="form-group columns">
                         <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.passphrase') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.passphrase') }}</label>
                         </div>
                         <div class="column col-7 col-sm-12">
                            <input
@@ -358,7 +358,7 @@
                      </div>
                      <div class="form-group columns">
                         <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.keepAliveInterval') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.keepAliveInterval') }}</label>
                         </div>
                         <div class="column col-7 col-sm-12">
                            <input
diff --git a/src/renderer/components/WorkspaceEditConnectionPanel.vue b/src/renderer/components/WorkspaceEditConnectionPanel.vue
index c25eaa52..3ef9e674 100644
--- a/src/renderer/components/WorkspaceEditConnectionPanel.vue
+++ b/src/renderer/components/WorkspaceEditConnectionPanel.vue
@@ -34,7 +34,7 @@
                   <fieldset class="m-0" :disabled="isBusy">
                      <div class="form-group columns">
                         <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.connectionName') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.connectionName') }}</label>
                         </div>
                         <div class="column col-7 col-sm-12">
                            <input
@@ -47,7 +47,7 @@
                      </div>
                      <div class="form-group columns">
                         <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.client') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.client') }}</label>
                         </div>
                         <div class="column col-7 col-sm-12">
                            <BaseSelect
@@ -63,7 +63,7 @@
                      </div>
                      <div v-if="localConnection.client === 'pg'" class="form-group columns">
                         <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.connectionString') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.connectionString') }}</label>
                         </div>
                         <div class="column col-7 col-sm-12">
                            <input
@@ -76,7 +76,7 @@
                      </div>
                      <div v-if="!clientCustomizations.fileConnection" class="form-group columns">
                         <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.hostName') }}/IP</label>
+                           <label class="form-label cut-text">{{ t('connection.hostName') }}/IP</label>
                         </div>
                         <div class="column col-7 col-sm-12">
                            <input
@@ -88,7 +88,7 @@
                      </div>
                      <div v-if="clientCustomizations.fileConnection" class="form-group columns">
                         <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.database') }}</label>
+                           <label class="form-label cut-text">{{ t('database.database') }}</label>
                         </div>
                         <div class="column col-7 col-sm-12">
                            <BaseUploadInput
@@ -101,7 +101,7 @@
                      </div>
                      <div v-if="!clientCustomizations.fileConnection" class="form-group columns">
                         <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.port') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.port') }}</label>
                         </div>
                         <div class="column col-7 col-sm-12">
                            <input
@@ -115,7 +115,7 @@
                      </div>
                      <div v-if="clientCustomizations.database" class="form-group columns">
                         <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.database') }}</label>
+                           <label class="form-label cut-text">{{ t('database.database') }}</label>
                         </div>
                         <div class="column col-7 col-sm-12">
                            <input
@@ -128,7 +128,7 @@
                      </div>
                      <div v-if="!clientCustomizations.fileConnection" class="form-group columns">
                         <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.user') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.user') }}</label>
                         </div>
                         <div class="column col-7 col-sm-12">
                            <input
@@ -141,7 +141,7 @@
                      </div>
                      <div v-if="!clientCustomizations.fileConnection" class="form-group columns">
                         <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.password') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.password') }}</label>
                         </div>
                         <div class="column col-7 col-sm-12">
                            <input
@@ -154,7 +154,7 @@
                      </div>
                      <div v-if="clientCustomizations.connectionSchema" class="form-group columns">
                         <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.schema') }}</label>
+                           <label class="form-label cut-text">{{ t('database.schema') }}</label>
                         </div>
                         <div class="column col-7 col-sm-12">
                            <input
@@ -204,7 +204,7 @@
                   <fieldset class="m-0" :disabled="isBusy || !localConnection.ssl">
                      <div class="form-group columns">
                         <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.privateKey') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.privateKey') }}</label>
                         </div>
                         <div class="column col-7 col-sm-12">
                            <BaseUploadInput
@@ -217,7 +217,7 @@
                      </div>
                      <div class="form-group columns">
                         <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.certificate') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.certificate') }}</label>
                         </div>
                         <div class="column col-7 col-sm-12">
                            <BaseUploadInput
@@ -230,7 +230,7 @@
                      </div>
                      <div class="form-group columns">
                         <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.caCertificate') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.caCertificate') }}</label>
                         </div>
                         <div class="column col-7 col-sm-12">
                            <BaseUploadInput
@@ -243,7 +243,7 @@
                      </div>
                      <div class="form-group columns">
                         <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.ciphers') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.ciphers') }}</label>
                         </div>
                         <div class="column col-7 col-sm-12">
                            <input
@@ -285,7 +285,7 @@
                   <fieldset class="m-0" :disabled="isBusy || !localConnection.ssh">
                      <div class="form-group columns">
                         <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.hostName') }}/IP</label>
+                           <label class="form-label cut-text">{{ t('connection.hostName') }}/IP</label>
                         </div>
                         <div class="column col-7 col-sm-12">
                            <input
@@ -297,7 +297,7 @@
                      </div>
                      <div class="form-group columns">
                         <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.user') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.user') }}</label>
                         </div>
                         <div class="column col-7 col-sm-12">
                            <input
@@ -309,7 +309,7 @@
                      </div>
                      <div class="form-group columns">
                         <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.password') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.password') }}</label>
                         </div>
                         <div class="column col-7 col-sm-12">
                            <input
@@ -321,7 +321,7 @@
                      </div>
                      <div class="form-group columns">
                         <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.port') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.port') }}</label>
                         </div>
                         <div class="column col-7 col-sm-12">
                            <input
@@ -335,7 +335,7 @@
                      </div>
                      <div class="form-group columns">
                         <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.privateKey') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.privateKey') }}</label>
                         </div>
                         <div class="column col-7 col-sm-12">
                            <BaseUploadInput
@@ -348,7 +348,7 @@
                      </div>
                      <div class="form-group columns">
                         <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.passphrase') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.passphrase') }}</label>
                         </div>
                         <div class="column col-7 col-sm-12">
                            <input
@@ -360,7 +360,7 @@
                      </div>
                      <div class="form-group columns">
                         <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.keepAliveInterval') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.keepAliveInterval') }}</label>
                         </div>
                         <div class="column col-7 col-sm-12">
                            <input
diff --git a/src/renderer/i18n/de-DE.ts b/src/renderer/i18n/de-DE.ts
index 1edca0aa..6feea442 100644
--- a/src/renderer/i18n/de-DE.ts
+++ b/src/renderer/i18n/de-DE.ts
@@ -67,7 +67,8 @@ export const deDE = {
       deleteConnection: 'Verbindung löschen',
       connectionSuccessfullyMade: 'Verbindung erfolgreich erstellt!',
       enableSsl: 'Aktiviere SSL',
-      enableSsh: 'Aktiviere SSH'
+      enableSsh: 'Aktiviere SSH',
+      keepAliveInterval: 'Keep-Alive-Intervall'
    },
    database: {
       schema: 'Schema',
@@ -110,31 +111,6 @@ export const deDE = {
       processes: 'Prozesse',
       database: 'Datenbank',
       array: 'Array',
-      format: 'Formatierung',
-      sshTunnel: 'SSH Tunnel',
-      keepAliveInterval: 'Keep-Alive-Intervall'
-   },
-   message: {
-      appWelcome: 'Willkommen im Antares SQL Client!',
-      appFirstStep: 'Dein erster Schritt: Erstelle eine neue Datenbankverbindung.',
-      addConnection: 'Verbindung hinzufügen',
-      createConnection: 'Verbindung erstellen',
-      createNewConnection: 'Neue Verbindung erstellen',
-      askCredentials: 'Frage nach Zugangsdaten',
-      testConnection: 'Verbindung testen',
-      editConnection: 'Verbindung bearbeiten',
-      deleteConnection: 'Verbindung löschen',
-      deleteConfirm: 'Bestätige den Abbruch von',
-      connectionSuccessfullyMade: 'Verbindung erfolgreich erstellt!',
-      madeWithJS: 'Mit 💛 und JavaScript gemacht!',
-      checkForUpdates: 'Suche nach Aktualisierungen',
-      noUpdatesAvailable: 'Keine Aktualisierungen verfügbar',
-      checkingForUpdate: 'Suche nach Aktualisierungen',
-      checkFailure: 'Suche fehlgeschlagen, bitte versuche es später noch einmal',
-      updateAvailable: 'Aktualisierung verfügbar',
-      downloadingUpdate: 'Aktualisierung wird heruntergeladen',
-      updateDownloaded: 'Aktualisierung heruntergeladen',
-      restartToInstall: 'Starte Antares neu für die Installation',
       unableEditFieldWithoutPrimary: 'Feld kann ohne Primärschlüssel in Ergebnisliste nicht bearbeitet werden',
       editCell: 'Zelle bearbeiten',
       deleteRows: 'Zeile löschen | Lösche {count} Zeilen',
diff --git a/src/renderer/i18n/en-US.ts b/src/renderer/i18n/en-US.ts
index 514d164e..04a34e55 100644
--- a/src/renderer/i18n/en-US.ts
+++ b/src/renderer/i18n/en-US.ts
@@ -100,7 +100,8 @@ export const enUS = {
       connectionSuccessfullyMade: 'Connection successfully made!',
       readOnlyMode: 'Read-only mode',
       allConnections: 'All connections',
-      searchForConnections: 'Search for connections'
+      searchForConnections: 'Search for connections',
+      keepAliveInterval: 'Keep alive interval'
    },
    database: { // Database related terms
       schema: 'Schema',
@@ -144,10 +145,6 @@ export const enUS = {
       processes: 'Processes',
       database: 'Database',
       array: 'Array',
-      changelog: 'Changelog',
-      format: 'Format',
-      sshTunnel: 'SSH tunnel',
-      keepAliveInterval: 'Keep alive interval',
       structure: 'Structure',
       row: 'Row | Rows',
       cell: 'Cell | Cells',