diff --git a/dashmachine/main/routes.py b/dashmachine/main/routes.py
index 16c5939..9196844 100755
--- a/dashmachine/main/routes.py
+++ b/dashmachine/main/routes.py
@@ -60,14 +60,10 @@ def check_valid_login():
 @main.route("/")
 @main.route("/home", methods=["GET"])
 def home():
-    tags_form = TagsForm()
-    tags_form.tags.choices += [
-        (tag.name, tag.name) for tag in Tags.query.order_by(Tags.name).all()
-    ]
     settings = Settings.query.first()
     if not check_groups(settings.home_access_groups, current_user):
         return redirect(url_for("error_pages.unauthorized"))
-    return render_template("main/home.html", tags_form=tags_form)
+    return render_template("main/home.html")
 
 
 @public_route
diff --git a/dashmachine/sources.py b/dashmachine/sources.py
index 3926c8b..4522931 100644
--- a/dashmachine/sources.py
+++ b/dashmachine/sources.py
@@ -5,6 +5,7 @@ from flask_login import current_user
 from dashmachine import app
 from dashmachine.main.models import Apps
 from dashmachine.main.utils import check_groups
+from dashmachine.main.forms import TagsForm
 from dashmachine.settings_system.models import Settings
 from dashmachine.paths import static_folder, backgrounds_images_folder
 from dashmachine.cssmin import cssmin
@@ -75,13 +76,18 @@ def process_css_sources(process_bundle=None, src=None, app_global=False):
 @app.context_processor
 def context_processor():
     apps = []
+    tags = []
     apps_db = Apps.query.all()
     for app_db in apps_db:
         if not app_db.groups:
             app_db.groups = None
         if check_groups(app_db.groups, current_user):
             apps.append(app_db)
+            tags += app_db.tags.split(",")
 
+    tags_form = TagsForm()
+    tags_form.tags.choices += [(tag, tag) for tag in tags]
+    print(tags_form.tags.choices)
     settings = Settings.query.first()
     if settings.background == "random":
         if len(os.listdir(backgrounds_images_folder)) < 1:
@@ -97,4 +103,5 @@ def context_processor():
         process_css_sources=process_css_sources,
         apps=apps,
         settings=settings,
+        tags_form=tags_form,
     )
diff --git a/dashmachine/static/images/apps/cockpit-project.png b/dashmachine/static/images/apps/cockpit-project.png
index 42ee6a8..bad791f 100644
Binary files a/dashmachine/static/images/apps/cockpit-project.png and b/dashmachine/static/images/apps/cockpit-project.png differ
diff --git a/dashmachine/static/images/apps/dokuwiki.png b/dashmachine/static/images/apps/dokuwiki.png
index 617ef7c..4d542b7 100644
Binary files a/dashmachine/static/images/apps/dokuwiki.png and b/dashmachine/static/images/apps/dokuwiki.png differ
diff --git a/dashmachine/static/images/apps/duplicati.png b/dashmachine/static/images/apps/duplicati.png
index 0d540dd..34dfcd1 100644
Binary files a/dashmachine/static/images/apps/duplicati.png and b/dashmachine/static/images/apps/duplicati.png differ
diff --git a/dashmachine/static/images/apps/firefly_iii.png b/dashmachine/static/images/apps/firefly_iii.png
index f43c3ab..7e02ae0 100644
Binary files a/dashmachine/static/images/apps/firefly_iii.png and b/dashmachine/static/images/apps/firefly_iii.png differ
diff --git a/dashmachine/static/images/apps/jdownloader.png b/dashmachine/static/images/apps/jdownloader.png
index 524925f..259ae63 100644
Binary files a/dashmachine/static/images/apps/jdownloader.png and b/dashmachine/static/images/apps/jdownloader.png differ
diff --git a/dashmachine/static/images/apps/krusader.png b/dashmachine/static/images/apps/krusader.png
index 308f8cb..9acdcfb 100644
Binary files a/dashmachine/static/images/apps/krusader.png and b/dashmachine/static/images/apps/krusader.png differ
diff --git a/dashmachine/static/images/apps/nodered.png b/dashmachine/static/images/apps/nodered.png
index a4a0aff..238d905 100644
Binary files a/dashmachine/static/images/apps/nodered.png and b/dashmachine/static/images/apps/nodered.png differ
diff --git a/dashmachine/static/images/apps/openmediavault.png b/dashmachine/static/images/apps/openmediavault.png
index aa0b727..0026691 100644
Binary files a/dashmachine/static/images/apps/openmediavault.png and b/dashmachine/static/images/apps/openmediavault.png differ
diff --git a/dashmachine/static/images/apps/proxmox.png b/dashmachine/static/images/apps/proxmox.png
index 676b3f6..b6ad80e 100644
Binary files a/dashmachine/static/images/apps/proxmox.png and b/dashmachine/static/images/apps/proxmox.png differ
diff --git a/dashmachine/static/images/apps/qbittorrent.png b/dashmachine/static/images/apps/qbittorrent.png
index 7ab7911..1d1a955 100644
Binary files a/dashmachine/static/images/apps/qbittorrent.png and b/dashmachine/static/images/apps/qbittorrent.png differ
diff --git a/dashmachine/version.py b/dashmachine/version.py
index a9acad5..fd19912 100755
--- a/dashmachine/version.py
+++ b/dashmachine/version.py
@@ -1 +1 @@
-version = "v0.4"
+version = "v0.41"