diff --git a/roles/docker-discourse/templates/discourse_application.yml.j2 b/roles/docker-discourse/templates/discourse_application.yml.j2
index 915e321b..c7911158 100644
--- a/roles/docker-discourse/templates/discourse_application.yml.j2
+++ b/roles/docker-discourse/templates/discourse_application.yml.j2
@@ -117,6 +117,14 @@ run:
   - exec: rails r "SiteSetting.enable_local_logins = false"
   - exec: rails r "SiteSetting.enable_passkeys = false" # https://meta.discourse.org/t/passwordless-login-using-passkeys/285589
 
+  - exec: rails r "SiteSetting.username_change_period = 0" # Deactivate changing of username
+
+  # Activate Administrator User
+  - exec: printf '{{administrator_email}}\n{{administrator_initial_password}}\n{{administrator_initial_password}}\nY\n' | rake admin:create
+  - exec: rails r "User.find_by_email('{{administrator_email}}').update(username: '{{administrator_username}}')"
+  # The following code is just an inspiration, how to connect with the oidc account. as long as this is not set the admini account needs to be manually connected with oidc 
+  # docker exec -it discourse_application rails runner "user = User.find_by_email('test@flock.town'); UserAuth.create(user_id: user.id, provider: 'oidc', uid: 'eindeutige_oidc_id', info: { name: user.username, email: user.email })"
+
   # OIDC Activation
   - exec: rails r "SiteSetting.openid_connect_enabled = true"
   - exec: rails r "SiteSetting.openid_connect_discovery_document = '{{oidc.client.discovery_document}}'"
diff --git a/roles/docker-mastodon/tasks/create-administrator.yml b/roles/docker-mastodon/tasks/create-administrator.yml
index d07469f0..dc909b87 100644
--- a/roles/docker-mastodon/tasks/create-administrator.yml
+++ b/roles/docker-mastodon/tasks/create-administrator.yml
@@ -2,12 +2,18 @@
 # @see https://chatgpt.com/share/67b9b12c-064c-800f-9354-8e42e6459764 
 
 - name: Remove line containing "- administrator" from config/settings.yml to allow creating administrator account
-  shell: docker compose exec -u root web sed -i '/- administrator/d' config/settings.yml
+  command: 
+    cmd:  "docker compose exec -u root web sed -i '/- administrator/d' config/settings.yml"
+    chdir: "{{docker_compose.directories.instance}}"
   when: administrator_username == "administrator"
 
 - name: Create admin account via tootctl
-  shell: 'docker compose exec -u root web bash -c "RAILS_ENV=production bin/tootctl accounts create {{administrator_username}} --email {{administrator_email}} --confirmed --role Owner"'
+  command: 
+    cmd: 'docker compose exec -u root web bash -c "RAILS_ENV=production bin/tootctl accounts create {{administrator_username}} --email {{administrator_email}} --confirmed --role Owner"'
+    chdir: "{{docker_compose.directories.instance}}"
   ignore_errors: true
 
 - name: Approve the administrator account in Mastodon
-  shell: docker compose exec -u root web bash -c "RAILS_ENV=production bin/tootctl accounts modify {{administrator_username}} --approve"
+  command: 
+    cmd: docker compose exec -u root web bash -c "RAILS_ENV=production bin/tootctl accounts modify {{administrator_username}} --approve"
+    chdir: "{{docker_compose.directories.instance}}"
\ No newline at end of file
diff --git a/roles/nginx-modifier-css/templates/global.css.j2 b/roles/nginx-modifier-css/templates/global.css.j2
index 05abf5e0..2c566915 100644
--- a/roles/nginx-modifier-css/templates/global.css.j2
+++ b/roles/nginx-modifier-css/templates/global.css.j2
@@ -82,7 +82,6 @@ HINT:
   --bs-code-color: var(--color-55); /* Original tone: Pink (#d63384) */
   --bs-highlight-bg: var(--color-93); /* Original tone: Light Yellow (#fff3cd) */
   --bs-list-group-bg: var(--color-40);
-
   --bs-emphasis-color: var(--color-01); /* Gemappt von #000 */
   --bs-emphasis-color-rgb: var(--color-rgb-01); /* Gemappt von 0, 0, 0 */
   --bs-secondary-color: rgba(var(--color-rgb-10), 0.75); /* Gemappt von rgba(33, 37, 41, 0.75) */
@@ -110,7 +109,7 @@ HINT:
   --quaternary:                var(--color-50); /* originally #5e99b9 */
 
   /* Header & Highlight */
-  --header_background:         var(--color-70); /* originally #86bddb */
+  --header_background:         var(--color-86); /* originally #86bddb */
   --header_primary:            var(--color-20); /* same as --primary */
   --highlight:                 var(--color-70); /* same as header_background */
   --d-selected:                var(--color-85); /* originally #bee0f2 */
@@ -943,6 +942,11 @@ html.dark-mode .listing li.selected, html.dark-mode .listing li.selected>a, html
     background-color: rgba(var(--color-rgb-82), 0.5);
 }
 
+html.dark-mode .message-htmlpart {
+    background-color: rgba(var(--color-rgb-99), 0.08);
+    color: var(--color-15);
+}
+
 /** Nextcloud specific **/
 html.ng-csp header#header{
     background-color: var(--color-80);