diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 9dfffb9..0025d46 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,7 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1" />
@@ -20,7 +20,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 797acea..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/src/main/java/fr/mobdev/peertubelive/dialog/AddInstanceDialog.kt b/app/src/main/java/fr/mobdev/peertubelive/dialog/AddInstanceDialog.kt
index 5e702ad..d04342f 100644
--- a/app/src/main/java/fr/mobdev/peertubelive/dialog/AddInstanceDialog.kt
+++ b/app/src/main/java/fr/mobdev/peertubelive/dialog/AddInstanceDialog.kt
@@ -40,6 +40,7 @@ class AddInstanceDialog : DialogFragment() {
 
         if (this::oAuthData.isInitialized)
         {
+            builder.setTitle(R.string.connection)
             binding.username.isEnabled = false
             binding.instance.isEnabled = false
             binding.instance.setText(oAuthData.baseUrl)
@@ -86,7 +87,7 @@ class AddInstanceDialog : DialogFragment() {
                         inError = true
                     }
                 }
-                if (DatabaseManager.existsCredential(requireContext(),instance,username)) {
+                if (!this::oAuthData.isInitialized && DatabaseManager.existsCredential(requireContext(),instance,username)) {
                     inError = true
                     binding.error.visibility = View.VISIBLE
                     binding.error.text = requireContext().getString(R.string.account_exist)
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
deleted file mode 100644
index 171f570..0000000
--- a/app/src/main/res/values-de/strings.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="no_instance">Kein Konto registriert. Um ein Peertube-Konto hinzuzufügen, klicken Sie auf das + in der oberen Leiste</string>
-    <string name="german">Deutsch</string>
-    <string name="arabic">Arabisch</string>
-    <string name="food">Essen</string>
-    <string name="kids">Kinder</string>
-    <string name="animals">Tiere</string>
-    <string name="science_tech">Wissenschaft und Technik</string>
-    <string name="activism">Aktivismus</string>
-    <string name="education">Bildung</string>
-    <string name="how_to">Tutorials</string>
-    <string name="news_politics">Nachrichten und Politik</string>
-    <string name="entertainment">Unterhaltung</string>
-    <string name="comedy">Humor</string>
-    <string name="people">Menschen</string>
-    <string name="gaming">Videospiele</string>
-    <string name="travels">Reise</string>
-    <string name="sports">Sport</string>
-    <string name="art">Kunst</string>
-    <string name="vehicles">Fahrzeuge</string>
-    <string name="films">Filme</string>
-    <string name="music">Musik</string>
-    <string name="description">Beschreibung</string>
-    <string name="tags">Markierungen</string>
-    <string name="nsfw">Enthält sensible Inhalte</string>
-    <string name="download_enabled">Herunterladen-Option aktivieren</string>
-    <string name="comments_enabled">Videokommentare aktivieren</string>
-    <string name="delete_account_title">Dieses Konto löschen</string>
-    <string name="instance">Instanz</string>
-    <string name="password">Passwort</string>
-    <string name="username">Benutzername</string>
-    <string name="add_instance">Dieses Konto hinzufügen</string>
-    <string name="advanced_settings_expand">▼ Erweiterte Einstellungen</string>
-    <string name="advanced_settings">▶ Erweiterte Einstellungen</string>
-    <string name="stream_licence">Lizenz</string>
-    <string name="stream_language">Sprache</string>
-    <string name="stream_privacy">Privatsphäre</string>
-    <string name="stream_category">Kategorie</string>
-    <string name="stream_title">Titel</string>
-    <string name="connect">Verbinden</string>
-    <string name="goto_permissions">Einstellungen anzeigen</string>
-    <string name="no">Nein</string>
-    <string name="yes">Ja</string>
-    <string name="cancel">Abbrechen</string>
-    <string name="choose_channel">Kanal</string>
-    <string name="stop_reason">Ihr Live ist beendet</string>
-    <string name="background_reason">Ihr Live ist beendet, weil die Anwendung in den Hintergrund gegangen ist</string>
-    <string name="back_reason">Ihr Leben wurde beendet, nachdem Sie die Zurück-Taste gedrückt haben</string>
-    <string name="tags_rules">Maximal 5 Markierungen, jeweils zwischen 2 und 30 Zeichen, durch Komma getrennt</string>
-    <string name="delete_account">Sind Sie sicher, dass Sie das Konto %s, das mit dem Server %s verbunden ist, löschen möchten\?</string>
-    <string name="permissions">Wir benötigen den Zugriff auf die Kamera und das Mikrofon, um live zu streamen. Zum Ändern der Berechtigungseinstellungen klicken Sie unten</string>
-    <string name="try_connect">Warten auf Verbindung</string>
-    <string name="loading_channels">Ihr Kanalliste wird geladen</string>
-    <string name="account_exist">Dieses Konto existiert bereits</string>
-    <string name="malformed_instance_error">Instanz sollte eine gültige URL sein</string>
-    <string name="password_error">Passwort kann nicht leer sein</string>
-    <string name="username_error">Benutzername kann nicht leer sein</string>
-    <string name="instance_error">Instanz kann nicht leer sein</string>
-    <string name="stream_title_error">Titel sollte nicht leer sein</string>
-    <string name="json_error">JSON-Fehler</string>
-    <string name="unknown_host">Unbekannter Host</string>
-    <string name="unknwon_error">Unbekannter Fehler</string>
-    <string name="network_error">Keine Internetverbindung gefunden</string>
-    <string name="app_name">Peertube Live</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 4759835..c21c760 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -44,6 +44,7 @@
     <string name="advanced_settings">▶ Paramètres avancés</string>
     <string name="advanced_settings_expand">▼ Paramètres avancés</string>
     <string name="add_instance">Ajouter ce compte</string>
+    <string name="connection">Connexion</string>
     <string name="username">Nom d\'utilisateur</string>
     <string name="password">Mot de passe</string>
     <string name="instance">Instance</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
deleted file mode 100644
index a6b3dae..0000000
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
deleted file mode 100644
index 87548e4..0000000
--- a/app/src/main/res/values-ru/strings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">PeerTube Live</string>
-    <string name="json_error">Ошибка JSON</string>
-    <string name="unknwon_error">Неизвестная ошибка</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 13fd4dd..44cc73c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -40,10 +40,11 @@
     <string name="stream_category">Category</string>
     <string name="stream_privacy">Privacy</string>
     <string name="stream_language">Language</string>
-    <string name="stream_licence">License</string>
+    <string name="stream_licence">Licence</string>
     <string name="advanced_settings">▶ Advanced Settings</string>
     <string name="advanced_settings_expand">▼ Advanced Settings</string>
     <string name="add_instance">Add this account</string>
+    <string name="connection">Connection</string>
     <string name="username">Username</string>
     <string name="password">Password</string>
     <string name="instance">Instance</string>
@@ -294,4 +295,4 @@
         <item>480p</item>
         <item>360p</item>
     </array>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/build.gradle b/build.gradle
index 6825f01..4a75747 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.0.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.3.5'
 
diff --git a/encoder/build.gradle b/encoder/build.gradle
index 900aaf2..fc032a0 100644
--- a/encoder/build.gradle
+++ b/encoder/build.gradle
@@ -6,8 +6,6 @@ android {
   defaultConfig {
     minSdkVersion 16
     targetSdkVersion 30
-    versionCode 182
-    versionName "1.8.2"
   }
   buildTypes {
     release {
diff --git a/fastlane/metadata/android/de/short_description.txt b/fastlane/metadata/android/de/short_description.txt
deleted file mode 100644
index 99e243c..0000000
--- a/fastlane/metadata/android/de/short_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-hilft Dir, einen Live-Stream von Deinem Gerät zu erstellen
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/create.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/create.png
new file mode 100644
index 0000000..e1d70e6
Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/create.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/home.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/home.png
new file mode 100644
index 0000000..b739ab2
Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/home.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/stream.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/stream.png
new file mode 100644
index 0000000..668253a
Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/stream.png differ
diff --git a/fastlane/metadata/android/fr/images/icon.png b/fastlane/metadata/android/fr/images/icon.png
new file mode 100644
index 0000000..b5ecfc8
Binary files /dev/null and b/fastlane/metadata/android/fr/images/icon.png differ
diff --git a/fastlane/metadata/android/fr/images/phoneScreenshots/create.png b/fastlane/metadata/android/fr/images/phoneScreenshots/create.png
new file mode 100644
index 0000000..936d039
Binary files /dev/null and b/fastlane/metadata/android/fr/images/phoneScreenshots/create.png differ
diff --git a/fastlane/metadata/android/fr/images/phoneScreenshots/home.png b/fastlane/metadata/android/fr/images/phoneScreenshots/home.png
new file mode 100644
index 0000000..b739ab2
Binary files /dev/null and b/fastlane/metadata/android/fr/images/phoneScreenshots/home.png differ
diff --git a/fastlane/metadata/android/fr/images/phoneScreenshots/stream.png b/fastlane/metadata/android/fr/images/phoneScreenshots/stream.png
new file mode 100644
index 0000000..668253a
Binary files /dev/null and b/fastlane/metadata/android/fr/images/phoneScreenshots/stream.png differ
diff --git a/fastlane/metadata/android/ru/short_description.txt b/fastlane/metadata/android/ru/short_description.txt
deleted file mode 100644
index f133f6d..0000000
--- a/fastlane/metadata/android/ru/short_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Транслируйте камеру устройства на свой канал PeerTube!
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d7577eb..69f08a3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
diff --git a/rtmp/build.gradle b/rtmp/build.gradle
index 2990edf..4f56f3c 100644
--- a/rtmp/build.gradle
+++ b/rtmp/build.gradle
@@ -6,8 +6,6 @@ android {
   defaultConfig {
     minSdkVersion 16
     targetSdkVersion 30
-    versionCode 182
-    versionName "1.8.2"
   }
   buildTypes {
     release {
diff --git a/rtplibrary/build.gradle b/rtplibrary/build.gradle
index b7158d0..5a36bda 100644
--- a/rtplibrary/build.gradle
+++ b/rtplibrary/build.gradle
@@ -6,8 +6,6 @@ android {
   defaultConfig {
     minSdkVersion 16
     targetSdkVersion 30
-    versionCode 182
-    versionName "1.8.2"
   }
   buildTypes {
     release {
diff --git a/rtsp/build.gradle b/rtsp/build.gradle
index d16f3ec..7625382 100644
--- a/rtsp/build.gradle
+++ b/rtsp/build.gradle
@@ -6,8 +6,6 @@ android {
   defaultConfig {
     minSdkVersion 16
     targetSdkVersion 30
-    versionCode 182
-    versionName "1.8.2"
   }
   buildTypes {
     release {