diff --git a/UPDATING.md b/UPDATING.md
index e633511..a85c4eb 100644
--- a/UPDATING.md
+++ b/UPDATING.md
@@ -55,9 +55,9 @@ UPGRADE messages) with:
 
     # Upgrade to NC version 24.0.10 (latest 24 minor on 2023-03-14)
     # Note this commit already includes the reworked image
-    ./dd-ctl update 010a04bf37d75b39cf24bcc2b80c81023e037f78
+    ./dd-ctl update e401b47c84be5c71b102a02f3d9d505bc6b1106b
     # Upgrade to NC version 25.0.5  (latest 25 minor on 2023-03-31)
-    ./dd-ctl update a4f51d102396ebc0883882dfbcebd9e08f60a7b8
+    ./dd-ctl update ce61cfffbe9b0466ee6312ddd5199b7459da6d30
 
 ### 2023-02 - Nextcloud 24.0.10
 
diff --git a/dd-apps/docker/nextcloud/src/themes/dd/core/templates/layout.user.php b/dd-apps/docker/nextcloud/src/themes/dd/core/templates/layout.user.php
index 92fe167..c977087 100644
--- a/dd-apps/docker/nextcloud/src/themes/dd/core/templates/layout.user.php
+++ b/dd-apps/docker/nextcloud/src/themes/dd/core/templates/layout.user.php
@@ -74,26 +74,6 @@ $getUserAvatar = static function (int $size) use ($_): string {
 			.newFileMenu > ul:nth-child(1) > li:nth-child(3) {
 				order: 1;
 			}
-			#header .header-right>div>.menu:after {
-				display:none;
-			}
-			.ddicon {
-				position: relative;
-				left: 8px;
-				top: 9px;
-			}
-			.ddiconcontainer {
-				margin-right: 16px;
-				width: 36px;
-				height: 36px;
-				background-color: #f0f0f0;
-				position: relative;
-				border-radius: 5px;
-				left: -7px;
-			}
-			#expanddiv {
-				padding: .5rem .7rem;
-			}
 		</style>
 	</head>
 	<?php array_push($_['enabledThemes'], "light");?>
@@ -159,33 +139,15 @@ $getUserAvatar = static function (int $size) use ($_): string {
 					</div>
 					<nav class="settings-menu" id="expanddiv" style="display:none;">
 					<ul>
-						<li>						
-							<a target="_blank" href="<?php p($profile_url)?>">
-								<div class="ddiconcontainer">
-									<i class="icon fa fa-user fa-fw ddicon"></i>
-								</div>
-								<?php p($_['user_displayname']); ?>
-							</a>
-						</li>	
 					<?php foreach ($_['settingsnavigation'] as $entry):?>
-						<?php if ($showsettings) { ?>
-							<li data-id="<?php p($entry['id']); ?>">
-								<a href="<?php print_unescaped($entry['href']); ?>"
-									<?php if ($entry["active"]): ?> class="active"<?php endif; ?>>
-									<img alt="" src="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>">
-									<?php p($entry['name']) ?>
-								</a>
-							</li>
-						<?php } else if ($entry['id'] == 'logout') { ?>
-							<li data-id="<?php p($entry['id']); ?>">
-								<a href="<?php print_unescaped($entry['href']); ?>">
-									<div class="ddiconcontainer">
-										<i class="icon fa fa-sign-out fa-fw ddicon" aria-hidden="true"></i> </div>
-										<?php p($entry['name']) ?>
-								</a>
-							</li>
-						<?php } ?>																									
-				<?php endforeach; ?>					
+						<li data-id="<?php p($entry['id']); ?>">
+							<a href="<?php print_unescaped($entry['href'] !== '' ? $entry['href'] : '#'); ?>"
+								<?php if ($entry["active"]): ?> class="active"<?php endif; ?>>
+								<img alt="" src="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>">
+								<?php p($entry['name']) ?>
+							</a>
+						</li>
+					<?php endforeach; ?>
 					</ul>
 					</nav>
 				</div>
diff --git a/dd.conf.sample b/dd.conf.sample
index 135ddf4..ba56750 100644
--- a/dd.conf.sample
+++ b/dd.conf.sample
@@ -75,6 +75,11 @@ DDADMIN_EMAIL=theemail@mymailserver.com
 #BBB_HOST=bbb.example.org
 #BBB_API_SECRET=APISECRET
 
+# BBB settings
+# This gets automatically configured on Nextcloud
+#BBB_HOST=bbb.example.org
+#BBB_API_SECRET=APISECRET
+
 # ------ Api Secret -----------------------------------------------------------
 ## Generate your own SECRET! (or apply securize script)
 ## openssl rand -base64 32
@@ -122,14 +127,10 @@ NEXTCLOUD_POSTGRES_PASSWORD=N3xtcl0ud
 ### These should be available from https://apps.nextcloud.com/
 ### Example: NEXTCLOUD_PLUGINS_ENABLE=cospend,cookbook
 #NEXTCLOUD_PLUGINS_ENABLE=
-<<<<<<< HEAD
-#NEXTCLOUD_PLUGINS_DISABLE
-=======
 #NEXTCLOUD_PLUGINS_DISABLE=
 #
 ### This language will be forced (currently only Nextcloud)
 #FORCED_LANGUAGE=ca
->>>>>>> b61286cf97c4d84ffae9afc062549a70fb0ae62a
 
 ## WORDPRESS
 ##=============================================================================
@@ -176,11 +177,7 @@ MOODLE_MEMORY_LIMIT=128M
 ## NEXTCLOUD
 # If enabled overrides nextcloud.yaml default image.
 # You usually do not want to change this, but instead rely on DD's version.
-<<<<<<< HEAD
-#NEXTCLOUD_IMG_OVERRIDE=nextcloud:25.0.4-fpm-alpine
-=======
 #NEXTCLOUD_IMG_OVERRIDE=nextcloud:25.0.5-fpm-alpine
->>>>>>> b61286cf97c4d84ffae9afc062549a70fb0ae62a
 
 ## ONLYOFFICE
 ONLYOFFICE_IMG=alehoho/oo-ce-docker-license:6.3.1.32