diff --git a/app/src/acad/java/app/fedilab/fedilabtube/helper/Theme.java b/app/src/acad/java/app/fedilab/fedilabtube/helper/Theme.java
new file mode 100644
index 0000000..cb0d09d
--- /dev/null
+++ b/app/src/acad/java/app/fedilab/fedilabtube/helper/Theme.java
@@ -0,0 +1,59 @@
+package app.fedilab.fedilabtube.helper;
+/* Copyright 2022 Thomas Schneider
+ *
+ * This file is a part of TubeLab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with TubeLab; if not,
+ * see <http://www.gnu.org/licenses>. */
+import androidx.appcompat.app.AppCompatActivity;
+
+import app.fedilab.fedilabtube.R;
+
+public class Theme {
+
+    public static void setTheme(AppCompatActivity activity, String instance, boolean noActionBar) {
+
+        switch (instance) {
+            case "tube-institutionnel.apps.education.fr":
+                activity.setTheme(noActionBar? R.style.InstitutionnelNoActionBar:R.style.Institutionnel);
+                break;
+            case "tube-maternelle.apps.education.fr":
+                activity.setTheme(noActionBar?R.style.MaternelleNoActionBar:R.style.Maternelle);
+                break;
+            case "tube-arts-lettres-sciences-humaines.apps.education.fr":
+                activity.setTheme(noActionBar?R.style.ArtNoActionBar:R.style.Art);
+                break;
+            case "tube-sciences-technologies.apps.education.fr":
+                activity.setTheme(noActionBar?R.style.SciencesNoActionBar:R.style.Sciences);
+                break;
+            case "tube-education-physique-et-sportive.apps.education.fr":
+                activity.setTheme(noActionBar?R.style.EducationNoActionBar:R.style.Education);
+                break;
+            case "tube-enseignement-professionnel.apps.education.fr":
+                activity.setTheme(noActionBar?R.style.EnseignementProNoActionBar:R.style.EnseignementPro);
+                break;
+            case "tube-langues-vivantes.apps.education.fr":
+                activity.setTheme(noActionBar?R.style.LanguesNoActionBar:R.style.Langues);
+                break;
+            case "tube-action-educative.apps.education.fr":
+                activity.setTheme(noActionBar?R.style.ActionEducativeNoActionBar:R.style.ActionEducative);
+                break;
+            case "tube-cycle-2.apps.education.fr":
+                activity.setTheme(noActionBar?R.style.Cycle2NoActionBar:R.style.Cycle2);
+                break;
+            case "tube-cycle-3.apps.education.fr":
+                activity.setTheme(noActionBar?R.style.Cycle3NoActionBar:R.style.Cycle3);
+                break;
+            default:
+                activity.setTheme(noActionBar?R.style.AppThemeNoActionBar:R.style.AppTheme);
+        }
+    }
+}
diff --git a/app/src/full/java/app/fedilab/fedilabtube/helper/Theme.java b/app/src/full/java/app/fedilab/fedilabtube/helper/Theme.java
new file mode 100644
index 0000000..4f9eee3
--- /dev/null
+++ b/app/src/full/java/app/fedilab/fedilabtube/helper/Theme.java
@@ -0,0 +1,26 @@
+package app.fedilab.fedilabtube.helper;
+/* Copyright 2022 Thomas Schneider
+ *
+ * This file is a part of TubeLab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with TubeLab; if not,
+ * see <http://www.gnu.org/licenses>. */
+import androidx.appcompat.app.AppCompatActivity;
+
+import app.fedilab.fedilabtube.R;
+
+public class Theme {
+
+    @SuppressWarnings("unused")
+    public static void setTheme(AppCompatActivity activity, String instance, boolean noActionBar) {
+        activity.setTheme(noActionBar?R.style.AppThemeNoActionBar:R.style.AppTheme);
+    }
+}
diff --git a/app/src/full/res/values-night/styles.xml b/app/src/full/res/values-night/styles.xml
index 38f981f..2db6c11 100644
--- a/app/src/full/res/values-night/styles.xml
+++ b/app/src/full/res/values-night/styles.xml
@@ -24,28 +24,6 @@
         <item name="android:colorBackground">@android:color/black</item>
     </style>
 
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:textColor">?attr/colorOnBackground</item>
-        <item name="backgroundView">@color/backgroundDark</item>
-        <item name="android:windowBackground">@android:color/black</item>
-        <item name="android:colorBackground">@android:color/black</item>
-    </style>
-
-    <style name="AppThemeNoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="backgroundView">@color/backgroundDark</item>
-        <item name="android:textColor">?attr/colorOnBackground</item>
-        <item name="android:windowBackground">@android:color/black</item>
-        <item name="android:colorBackground">@android:color/black</item>
-    </style>
 
 
 
diff --git a/app/src/main/java/app/fedilab/fedilabtube/activities/AboutActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/AboutActivity.java
index db40487..86d0486 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/activities/AboutActivity.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/activities/AboutActivity.java
@@ -34,13 +34,14 @@ import app.fedilab.fedilabtube.BuildConfig;
 import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.helper.HelperInstance;
+import app.fedilab.fedilabtube.helper.Theme;
 
 
 public class AboutActivity extends BaseActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        HelperInstance.setTheme(this, HelperInstance.getLiveInstance(this),false);
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_about);
 
diff --git a/app/src/main/java/app/fedilab/fedilabtube/activities/AccountActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/AccountActivity.java
index eb5777e..6286b6d 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/activities/AccountActivity.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/activities/AccountActivity.java
@@ -54,6 +54,7 @@ import app.fedilab.fedilabtube.fragment.DisplayNotificationsFragment;
 import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.helper.HelperInstance;
 import app.fedilab.fedilabtube.helper.SwitchAccountHelper;
+import app.fedilab.fedilabtube.helper.Theme;
 import app.fedilab.fedilabtube.sqlite.AccountDAO;
 import app.fedilab.fedilabtube.sqlite.Sqlite;
 
@@ -65,7 +66,7 @@ public class AccountActivity extends BaseActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        HelperInstance.setTheme(this, HelperInstance.getLiveInstance(this),false);
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         super.onCreate(savedInstanceState);
         binding = ActivityAccountBinding.inflate(getLayoutInflater());
         View view = binding.getRoot();
diff --git a/app/src/main/java/app/fedilab/fedilabtube/activities/AllLocalPlaylistsActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/AllLocalPlaylistsActivity.java
index 75ab08b..1c88cc4 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/activities/AllLocalPlaylistsActivity.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/activities/AllLocalPlaylistsActivity.java
@@ -35,6 +35,7 @@ import app.fedilab.fedilabtube.client.data.PlaylistData.Playlist;
 import app.fedilab.fedilabtube.client.data.VideoPlaylistData;
 import app.fedilab.fedilabtube.drawer.PlaylistAdapter;
 import app.fedilab.fedilabtube.helper.HelperInstance;
+import app.fedilab.fedilabtube.helper.Theme;
 import app.fedilab.fedilabtube.viewmodel.PlaylistsVM;
 
 
@@ -49,7 +50,7 @@ public class AllLocalPlaylistsActivity extends BaseActivity implements PlaylistA
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        HelperInstance.setTheme(this, HelperInstance.getLiveInstance(this),false);
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_all_playlist);
 
diff --git a/app/src/main/java/app/fedilab/fedilabtube/activities/AllPlaylistsActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/AllPlaylistsActivity.java
index 2716dd7..34de25a 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/activities/AllPlaylistsActivity.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/activities/AllPlaylistsActivity.java
@@ -67,6 +67,7 @@ import app.fedilab.fedilabtube.databinding.AddPlaylistBinding;
 import app.fedilab.fedilabtube.drawer.PlaylistAdapter;
 import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.helper.HelperInstance;
+import app.fedilab.fedilabtube.helper.Theme;
 import app.fedilab.fedilabtube.viewmodel.ChannelsVM;
 import app.fedilab.fedilabtube.viewmodel.PlaylistsVM;
 import es.dmoral.toasty.Toasty;
@@ -91,7 +92,7 @@ public class AllPlaylistsActivity extends BaseActivity implements PlaylistAdapte
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        HelperInstance.setTheme(this, HelperInstance.getLiveInstance(this),false);
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         binding = ActivityAllPlaylistBinding.inflate(getLayoutInflater());
         View viewRoot = binding.getRoot();
         setContentView(viewRoot);
diff --git a/app/src/main/java/app/fedilab/fedilabtube/activities/InstancePickerActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/InstancePickerActivity.java
index 8f7551b..5299532 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/activities/InstancePickerActivity.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/activities/InstancePickerActivity.java
@@ -48,6 +48,7 @@ import app.fedilab.fedilabtube.client.entities.InstanceParams;
 import app.fedilab.fedilabtube.drawer.InstanceAdapter;
 import app.fedilab.fedilabtube.helper.HelperInstance;
 import app.fedilab.fedilabtube.helper.RoundedBackgroundSpan;
+import app.fedilab.fedilabtube.helper.Theme;
 import app.fedilab.fedilabtube.viewmodel.InstancesVM;
 import es.dmoral.toasty.Toasty;
 
@@ -69,7 +70,7 @@ public class InstancePickerActivity extends BaseActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        HelperInstance.setTheme(this, HelperInstance.getLiveInstance(this),false);
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         super.onCreate(savedInstanceState);
         if (getSupportActionBar() != null)
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
diff --git a/app/src/main/java/app/fedilab/fedilabtube/activities/LocalPlaylistsActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/LocalPlaylistsActivity.java
index aa845df..2a0d13b 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/activities/LocalPlaylistsActivity.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/activities/LocalPlaylistsActivity.java
@@ -26,6 +26,7 @@ import app.fedilab.fedilabtube.client.data.PlaylistData;
 import app.fedilab.fedilabtube.fragment.DisplayVideosFragment;
 import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.helper.HelperInstance;
+import app.fedilab.fedilabtube.helper.Theme;
 import app.fedilab.fedilabtube.viewmodel.TimelineVM;
 import es.dmoral.toasty.Toasty;
 
@@ -36,7 +37,7 @@ public class LocalPlaylistsActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        HelperInstance.setTheme(this, HelperInstance.getLiveInstance(this),false);
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         if (getSupportActionBar() != null)
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
diff --git a/app/src/main/java/app/fedilab/fedilabtube/activities/LoginActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/LoginActivity.java
index dd80878..b1707c7 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/activities/LoginActivity.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/activities/LoginActivity.java
@@ -56,6 +56,7 @@ import app.fedilab.fedilabtube.databinding.ActivityLoginBinding;
 import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.helper.HelperAcadInstance;
 import app.fedilab.fedilabtube.helper.HelperInstance;
+import app.fedilab.fedilabtube.helper.Theme;
 import es.dmoral.toasty.Toasty;
 
 
@@ -72,7 +73,7 @@ public class LoginActivity extends BaseActivity {
     @SuppressLint("SetTextI18n")
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        HelperInstance.setTheme(this, HelperInstance.getLiveInstance(this),false);
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         super.onCreate(savedInstanceState);
         binding = ActivityLoginBinding.inflate(getLayoutInflater());
         View view = binding.getRoot();
diff --git a/app/src/main/java/app/fedilab/fedilabtube/activities/MainActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/MainActivity.java
index 5a22039..1a8057c 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/activities/MainActivity.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/activities/MainActivity.java
@@ -84,6 +84,7 @@ import app.fedilab.fedilabtube.helper.HelperAcadInstance;
 import app.fedilab.fedilabtube.helper.HelperInstance;
 import app.fedilab.fedilabtube.helper.PlaylistExportHelper;
 import app.fedilab.fedilabtube.helper.SwitchAccountHelper;
+import app.fedilab.fedilabtube.helper.Theme;
 import app.fedilab.fedilabtube.services.RetrieveInfoService;
 import app.fedilab.fedilabtube.sqlite.AccountDAO;
 import app.fedilab.fedilabtube.sqlite.Sqlite;
@@ -227,7 +228,7 @@ public class MainActivity extends BaseMainActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        HelperInstance.setTheme(MainActivity.this, HelperInstance.getLiveInstance(this),true);
+        Theme.setTheme(MainActivity.this, HelperInstance.getLiveInstance(this),true);
         super.onCreate(savedInstanceState);
 
         binding = super.binding;
diff --git a/app/src/main/java/app/fedilab/fedilabtube/activities/ManageInstancesActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/ManageInstancesActivity.java
index 398cd9e..930907a 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/activities/ManageInstancesActivity.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/activities/ManageInstancesActivity.java
@@ -39,6 +39,7 @@ import app.fedilab.fedilabtube.databinding.ActivityManageInstancesBinding;
 import app.fedilab.fedilabtube.drawer.AboutInstanceAdapter;
 import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.helper.HelperInstance;
+import app.fedilab.fedilabtube.helper.Theme;
 import app.fedilab.fedilabtube.sqlite.Sqlite;
 import app.fedilab.fedilabtube.sqlite.StoredInstanceDAO;
 import app.fedilab.fedilabtube.viewmodel.InfoInstanceVM;
@@ -53,7 +54,7 @@ public class ManageInstancesActivity extends BaseActivity implements AboutInstan
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        HelperInstance.setTheme(this, HelperInstance.getLiveInstance(this),false);
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         super.onCreate(savedInstanceState);
         binding = ActivityManageInstancesBinding.inflate(getLayoutInflater());
         View view = binding.getRoot();
diff --git a/app/src/main/java/app/fedilab/fedilabtube/activities/MastodonWebviewConnectActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/MastodonWebviewConnectActivity.java
index 20ba204..54e5223 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/activities/MastodonWebviewConnectActivity.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/activities/MastodonWebviewConnectActivity.java
@@ -41,6 +41,7 @@ import app.fedilab.fedilabtube.client.entities.Token;
 import app.fedilab.fedilabtube.client.mastodon.RetrofitMastodonAPI;
 import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.helper.HelperInstance;
+import app.fedilab.fedilabtube.helper.Theme;
 import es.dmoral.toasty.Toasty;
 
 
@@ -79,7 +80,7 @@ public class MastodonWebviewConnectActivity extends BaseActivity {
 
     @SuppressLint("SetJavaScriptEnabled")
     public void onCreate(Bundle savedInstanceState) {
-        HelperInstance.setTheme(this, HelperInstance.getLiveInstance(this),false);
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_webview_connect);
         Bundle b = getIntent().getExtras();
diff --git a/app/src/main/java/app/fedilab/fedilabtube/activities/MyAccountActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/MyAccountActivity.java
index 7b07158..e6a4997 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/activities/MyAccountActivity.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/activities/MyAccountActivity.java
@@ -57,6 +57,7 @@ import app.fedilab.fedilabtube.databinding.ActivityMyAccountSettingsBinding;
 import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.helper.HelperAcadInstance;
 import app.fedilab.fedilabtube.helper.HelperInstance;
+import app.fedilab.fedilabtube.helper.Theme;
 import app.fedilab.fedilabtube.worker.WorkHelper;
 import es.dmoral.toasty.Toasty;
 
@@ -71,7 +72,7 @@ public class MyAccountActivity extends BaseActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        HelperInstance.setTheme(this, HelperInstance.getLiveInstance(this),false);
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         super.onCreate(savedInstanceState);
         binding = ActivityMyAccountSettingsBinding.inflate(getLayoutInflater());
         View view = binding.getRoot();
diff --git a/app/src/main/java/app/fedilab/fedilabtube/activities/PeertubeActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/PeertubeActivity.java
index 80cb4a1..41ca805 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/activities/PeertubeActivity.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/activities/PeertubeActivity.java
@@ -161,6 +161,7 @@ import app.fedilab.fedilabtube.helper.CacheDataSourceFactory;
 import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.helper.HelperAcadInstance;
 import app.fedilab.fedilabtube.helper.HelperInstance;
+import app.fedilab.fedilabtube.helper.Theme;
 import app.fedilab.fedilabtube.sqlite.AccountDAO;
 import app.fedilab.fedilabtube.sqlite.Sqlite;
 import app.fedilab.fedilabtube.viewmodel.CaptionsVM;
@@ -296,7 +297,7 @@ public class PeertubeActivity extends BasePeertubeActivity implements CommentLis
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        HelperInstance.setTheme(this, HelperInstance.getLiveInstance(this),false);
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         super.onCreate(savedInstanceState);
         binding = super.binding;
         videoOrientationType = videoOrientation.LANDSCAPE;
diff --git a/app/src/main/java/app/fedilab/fedilabtube/activities/PeertubeEditUploadActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/PeertubeEditUploadActivity.java
index 99f4018..a69d230 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/activities/PeertubeEditUploadActivity.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/activities/PeertubeEditUploadActivity.java
@@ -60,6 +60,7 @@ import app.fedilab.fedilabtube.client.entities.VideoParams;
 import app.fedilab.fedilabtube.databinding.ActivityPeertubeEditBinding;
 import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.helper.HelperInstance;
+import app.fedilab.fedilabtube.helper.Theme;
 import app.fedilab.fedilabtube.viewmodel.ChannelsVM;
 import app.fedilab.fedilabtube.viewmodel.MyVideoVM;
 import app.fedilab.fedilabtube.viewmodel.PostActionsVM;
@@ -86,7 +87,7 @@ public class PeertubeEditUploadActivity extends BaseActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        HelperInstance.setTheme(this, HelperInstance.getLiveInstance(this),false);
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         super.onCreate(savedInstanceState);
         binding = ActivityPeertubeEditBinding.inflate(getLayoutInflater());
         View view = binding.getRoot();
diff --git a/app/src/main/java/app/fedilab/fedilabtube/activities/PeertubeRegisterActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/PeertubeRegisterActivity.java
index 9c63144..861115a 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/activities/PeertubeRegisterActivity.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/activities/PeertubeRegisterActivity.java
@@ -43,6 +43,7 @@ import app.fedilab.fedilabtube.client.entities.AccountCreation;
 import app.fedilab.fedilabtube.databinding.ActivityRegisterPeertubeBinding;
 import app.fedilab.fedilabtube.helper.HelperAcadInstance;
 import app.fedilab.fedilabtube.helper.HelperInstance;
+import app.fedilab.fedilabtube.helper.Theme;
 import es.dmoral.toasty.Toasty;
 
 public class PeertubeRegisterActivity extends BaseActivity {
@@ -55,7 +56,7 @@ public class PeertubeRegisterActivity extends BaseActivity {
     @SuppressLint("SetTextI18n")
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        HelperInstance.setTheme(this, HelperInstance.getLiveInstance(this),false);
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         super.onCreate(savedInstanceState);
         binding = ActivityRegisterPeertubeBinding.inflate(getLayoutInflater());
         View mainView = binding.getRoot();
diff --git a/app/src/main/java/app/fedilab/fedilabtube/activities/PeertubeUploadActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/PeertubeUploadActivity.java
index 14c746c..d8c1b9a 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/activities/PeertubeUploadActivity.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/activities/PeertubeUploadActivity.java
@@ -65,6 +65,7 @@ import app.fedilab.fedilabtube.client.entities.UserMe;
 import app.fedilab.fedilabtube.databinding.ActivityPeertubeUploadBinding;
 import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.helper.HelperInstance;
+import app.fedilab.fedilabtube.helper.Theme;
 import app.fedilab.fedilabtube.viewmodel.ChannelsVM;
 import es.dmoral.toasty.Toasty;
 
@@ -84,7 +85,7 @@ public class PeertubeUploadActivity extends BaseActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        HelperInstance.setTheme(this, HelperInstance.getLiveInstance(this),false);
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         super.onCreate(savedInstanceState);
         if (getSupportActionBar() != null)
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
diff --git a/app/src/main/java/app/fedilab/fedilabtube/activities/PlaylistsActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/PlaylistsActivity.java
index 9559b35..24bc9ee 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/activities/PlaylistsActivity.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/activities/PlaylistsActivity.java
@@ -26,6 +26,7 @@ import app.fedilab.fedilabtube.fragment.DisplayVideosFragment;
 import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.helper.HelperInstance;
 import app.fedilab.fedilabtube.helper.PlaylistExportHelper;
+import app.fedilab.fedilabtube.helper.Theme;
 import app.fedilab.fedilabtube.viewmodel.TimelineVM;
 import es.dmoral.toasty.Toasty;
 
@@ -37,7 +38,7 @@ public class PlaylistsActivity extends BaseActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        HelperInstance.setTheme(this, HelperInstance.getLiveInstance(this),false);
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         super.onCreate(savedInstanceState);
         if (getSupportActionBar() != null)
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
diff --git a/app/src/main/java/app/fedilab/fedilabtube/activities/SearchActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/SearchActivity.java
index bbcf8c4..074cbc9 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/activities/SearchActivity.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/activities/SearchActivity.java
@@ -34,6 +34,7 @@ import app.fedilab.fedilabtube.databinding.ActivitySearchResultBinding;
 import app.fedilab.fedilabtube.fragment.DisplayChannelsFragment;
 import app.fedilab.fedilabtube.fragment.DisplayVideosFragment;
 import app.fedilab.fedilabtube.helper.HelperInstance;
+import app.fedilab.fedilabtube.helper.Theme;
 import es.dmoral.toasty.Toasty;
 
 
@@ -45,7 +46,7 @@ public class SearchActivity extends BaseActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        HelperInstance.setTheme(this, HelperInstance.getLiveInstance(this),false);
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         super.onCreate(savedInstanceState);
         binding = ActivitySearchResultBinding.inflate(getLayoutInflater());
         View view = binding.getRoot();
diff --git a/app/src/main/java/app/fedilab/fedilabtube/activities/SepiaSearchActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/SepiaSearchActivity.java
index a66cf3f..37d6a2b 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/activities/SepiaSearchActivity.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/activities/SepiaSearchActivity.java
@@ -46,6 +46,7 @@ import app.fedilab.fedilabtube.fragment.DisplaySepiaSearchFragment;
 import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.helper.HelperAcadInstance;
 import app.fedilab.fedilabtube.helper.HelperInstance;
+import app.fedilab.fedilabtube.helper.Theme;
 
 
 public class SepiaSearchActivity extends BaseActivity {
@@ -58,7 +59,7 @@ public class SepiaSearchActivity extends BaseActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        HelperInstance.setTheme(this, HelperInstance.getLiveInstance(this),false);
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         super.onCreate(savedInstanceState);
         binding = ActivitySepiaSearchBinding.inflate(getLayoutInflater());
         View rootView = binding.getRoot();
diff --git a/app/src/main/java/app/fedilab/fedilabtube/activities/SettingsActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/SettingsActivity.java
index 56b85dc..504891c 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/activities/SettingsActivity.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/activities/SettingsActivity.java
@@ -5,6 +5,7 @@ import android.view.MenuItem;
 
 import app.fedilab.fedilabtube.fragment.SettingsFragment;
 import app.fedilab.fedilabtube.helper.HelperInstance;
+import app.fedilab.fedilabtube.helper.Theme;
 
 /* Copyright 2020 Thomas Schneider
  *
@@ -26,7 +27,7 @@ public class SettingsActivity extends BaseActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        HelperInstance.setTheme(this, HelperInstance.getLiveInstance(this),false);
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         super.onCreate(savedInstanceState);
         if (getSupportActionBar() != null)
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
diff --git a/app/src/main/java/app/fedilab/fedilabtube/activities/ShowAccountActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/ShowAccountActivity.java
index ca90c8d..4b04049 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/activities/ShowAccountActivity.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/activities/ShowAccountActivity.java
@@ -54,6 +54,7 @@ import app.fedilab.fedilabtube.fragment.DisplayChannelsFragment;
 import app.fedilab.fedilabtube.fragment.DisplayVideosFragment;
 import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.helper.HelperInstance;
+import app.fedilab.fedilabtube.helper.Theme;
 import app.fedilab.fedilabtube.viewmodel.AccountsVM;
 import app.fedilab.fedilabtube.viewmodel.PostActionsVM;
 import app.fedilab.fedilabtube.viewmodel.TimelineVM;
@@ -74,7 +75,7 @@ public class ShowAccountActivity extends BaseActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        HelperInstance.setTheme(this, HelperInstance.getLiveInstance(this),false);
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_show_account);
         setTitle("");
diff --git a/app/src/main/java/app/fedilab/fedilabtube/activities/ShowChannelActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/ShowChannelActivity.java
index c4beffa..e000539 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/activities/ShowChannelActivity.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/activities/ShowChannelActivity.java
@@ -71,6 +71,7 @@ import app.fedilab.fedilabtube.fragment.DisplayAccountsFragment;
 import app.fedilab.fedilabtube.fragment.DisplayVideosFragment;
 import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.helper.HelperInstance;
+import app.fedilab.fedilabtube.helper.Theme;
 import app.fedilab.fedilabtube.sqlite.AccountDAO;
 import app.fedilab.fedilabtube.sqlite.Sqlite;
 import app.fedilab.fedilabtube.viewmodel.ChannelsVM;
@@ -99,7 +100,7 @@ public class ShowChannelActivity extends BaseActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        HelperInstance.setTheme(this, HelperInstance.getLiveInstance(this),false);
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_show_channel);
         setTitle("");
diff --git a/app/src/main/java/app/fedilab/fedilabtube/activities/VideosTimelineActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/VideosTimelineActivity.java
index 1a5e90e..d36d37c 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/activities/VideosTimelineActivity.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/activities/VideosTimelineActivity.java
@@ -39,6 +39,7 @@ import app.fedilab.fedilabtube.databinding.ActivityVideosTimelineBinding;
 import app.fedilab.fedilabtube.fragment.DisplayVideosFragment;
 import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.helper.HelperInstance;
+import app.fedilab.fedilabtube.helper.Theme;
 import app.fedilab.fedilabtube.viewmodel.TimelineVM;
 
 
@@ -50,7 +51,7 @@ public class VideosTimelineActivity extends BaseActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        HelperInstance.setTheme(this, HelperInstance.getLiveInstance(this),false);
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         super.onCreate(savedInstanceState);
         ActivityVideosTimelineBinding binding = ActivityVideosTimelineBinding.inflate(getLayoutInflater());
         View mainView = binding.getRoot();
diff --git a/app/src/main/java/app/fedilab/fedilabtube/activities/WebviewActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/WebviewActivity.java
index 4ae3017..5465d28 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/activities/WebviewActivity.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/activities/WebviewActivity.java
@@ -37,6 +37,7 @@ import org.jetbrains.annotations.NotNull;
 import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.helper.HelperInstance;
+import app.fedilab.fedilabtube.helper.Theme;
 import app.fedilab.fedilabtube.webview.CustomWebview;
 import app.fedilab.fedilabtube.webview.MastalabWebChromeClient;
 import app.fedilab.fedilabtube.webview.MastalabWebViewClient;
@@ -53,7 +54,7 @@ public class WebviewActivity extends BaseActivity {
     @SuppressLint("SetJavaScriptEnabled")
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        HelperInstance.setTheme(this, HelperInstance.getLiveInstance(this),false);
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_webview);
         Bundle b = getIntent().getExtras();
diff --git a/app/src/main/java/app/fedilab/fedilabtube/activities/WebviewConnectActivity.java b/app/src/main/java/app/fedilab/fedilabtube/activities/WebviewConnectActivity.java
index ca79360..86a3f29 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/activities/WebviewConnectActivity.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/activities/WebviewConnectActivity.java
@@ -45,6 +45,7 @@ import app.fedilab.fedilabtube.client.entities.OauthParams;
 import app.fedilab.fedilabtube.client.entities.Token;
 import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.helper.HelperInstance;
+import app.fedilab.fedilabtube.helper.Theme;
 
 
 public class WebviewConnectActivity extends BaseActivity {
@@ -75,7 +76,7 @@ public class WebviewConnectActivity extends BaseActivity {
 
     @SuppressLint("SetJavaScriptEnabled")
     public void onCreate(Bundle savedInstanceState) {
-        HelperInstance.setTheme(this, HelperInstance.getLiveInstance(this),false);
+        Theme.setTheme(this, HelperInstance.getLiveInstance(this),false);
         super.onCreate(savedInstanceState);
         SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
         WebView.setWebContentsDebuggingEnabled(true);
diff --git a/app/src/main/java/app/fedilab/fedilabtube/helper/HelperInstance.java b/app/src/main/java/app/fedilab/fedilabtube/helper/HelperInstance.java
index 557ab8d..2f37c39 100644
--- a/app/src/main/java/app/fedilab/fedilabtube/helper/HelperInstance.java
+++ b/app/src/main/java/app/fedilab/fedilabtube/helper/HelperInstance.java
@@ -1,15 +1,4 @@
 package app.fedilab.fedilabtube.helper;
-
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import androidx.appcompat.app.AppCompatActivity;
-
-import java.util.Locale;
-
-import app.fedilab.fedilabtube.BuildConfig;
-import app.fedilab.fedilabtube.R;
-
 /* Copyright 2020 Thomas Schneider
  *
  * This file is a part of TubeLab
@@ -24,6 +13,17 @@ import app.fedilab.fedilabtube.R;
  *
  * You should have received a copy of the GNU General Public License along with TubeLab; if not,
  * see <http://www.gnu.org/licenses>. */
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import androidx.appcompat.app.AppCompatActivity;
+
+import java.util.Locale;
+
+import app.fedilab.fedilabtube.BuildConfig;
+import app.fedilab.fedilabtube.R;
+
+
 public class HelperInstance {
 
 
@@ -42,43 +42,6 @@ public class HelperInstance {
         }
     }
 
-    public static void setTheme(AppCompatActivity activity, String instance, boolean noActionBar) {
-
-        switch (instance) {
-            case "tube-institutionnel.apps.education.fr":
-                activity.setTheme(noActionBar?R.style.InstitutionnelNoActionBar:R.style.Institutionnel);
-                break;
-            case "tube-maternelle.apps.education.fr":
-                activity.setTheme(noActionBar?R.style.MaternelleNoActionBar:R.style.Maternelle);
-                break;
-            case "tube-arts-lettres-sciences-humaines.apps.education.fr":
-                activity.setTheme(noActionBar?R.style.ArtNoActionBar:R.style.Art);
-                break;
-            case "tube-sciences-technologies.apps.education.fr":
-                activity.setTheme(noActionBar?R.style.SciencesNoActionBar:R.style.Sciences);
-                break;
-            case "tube-education-physique-et-sportive.apps.education.fr":
-                activity.setTheme(noActionBar?R.style.EducationNoActionBar:R.style.Education);
-                break;
-            case "tube-enseignement-professionnel.apps.education.fr":
-                activity.setTheme(noActionBar?R.style.EnseignementProNoActionBar:R.style.EnseignementPro);
-                break;
-            case "tube-langues-vivantes.apps.education.fr":
-                activity.setTheme(noActionBar?R.style.LanguesNoActionBar:R.style.Langues);
-                break;
-            case "tube-action-educative.apps.education.fr":
-                activity.setTheme(noActionBar?R.style.ActionEducativeNoActionBar:R.style.ActionEducative);
-                break;
-            case "tube-cycle-2.apps.education.fr":
-                activity.setTheme(noActionBar?R.style.Cycle2NoActionBar:R.style.Cycle2);
-                break;
-            case "tube-cycle-3.apps.education.fr":
-                activity.setTheme(noActionBar?R.style.Cycle3NoActionBar:R.style.Cycle3);
-                break;
-            default:
-                activity.setTheme(noActionBar?R.style.AppThemeNoActionBar:R.style.AppTheme);
-        }
-    }
 
     /**
      * Get a default instance host name depending of the device locale