diff --git a/debian/changelog b/debian/changelog
index e87dcc6..ca8cc9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ desktop-base (4.0.1) UNRELEASED; urgency=low
 
   [ Fathi Boudra ]
   * Fix KSplash theme moodin engine installation.
+  * Fix MoreBlue KDM theme. Thanks to Modestas Vainius.
+    (Closes: #408513, #408947)
+  * KDM override is disabled by default. (Closes: #407799)
 
   [ Loic Minier ]
   * Depend on librsvg2-common for SVG support.
diff --git a/kdm-theme/debian-moreblue/debian-moreblue.xml b/kdm-theme/debian-moreblue/debian-moreblue.xml
index 980953a..959b9e8 100644
--- a/kdm-theme/debian-moreblue/debian-moreblue.xml
+++ b/kdm-theme/debian-moreblue/debian-moreblue.xml
@@ -10,24 +10,24 @@
 	<!-- swirl -->
 	<item type="svg">
 		<normal file="swirl.svg"/>
-		<pos x="-300" y="-300" width="250" height="290"/>
+		<pos x="-300" y="-320" width="250" height="290"/>
 	</item>
 
 	<item type="pixmap">
 		<normal file="boundingbox.png"/>
 		<pos anchor="c" x="50%" y="50%" width="400" height="282"/>
 
+		<!-- Welcome -->
+		<item type="label">
+			<pos anchor="nc" x="50%" y="18%"/>
+			<normal color="#000000" font="Sans Bold 18"/>
+			<stock type="welcome-label"/>
+		</item>
+
 		<item type="rect">
 			<normal color="#ffff00" alpha="0.0"/>
 			<pos anchor="e" x="50%" y="50%" width="190" height="180"/>
 
-			<!-- Welcome -->
-			<item type="label">
-				<pos x="50%" y="0"/>
-				<normal color="#000000" font="Sans Bold 18"/>
-				<stock type="welcome-label"/>
-			</item>
-
 			<!-- username-label -->
 			<item type="label">
 				<pos anchor="ne" x="90%" y="40%"/>
@@ -127,7 +127,7 @@
 	<!-- clock -->
 	<item type="label" id="clock">
 		<normal color="#ffffff" font="Sans Bold 11"/>
-		<pos x="-140" y="30"/>
+		<pos anchor="se" x="-20" y="-10"/>
 		<text>%c</text>
 	</item>
 </item>
diff --git a/kdm-theme/kdm.d/10_desktop-base b/kdm-theme/kdm.d/10_desktop-base
index d2be78a..1d6c032 100644
--- a/kdm-theme/kdm.d/10_desktop-base
+++ b/kdm-theme/kdm.d/10_desktop-base
@@ -1,2 +1,2 @@
-USETHEME="true"
-THEME="/usr/share/apps/kdm/themes/debian-moreblue"
+#USETHEME="true"
+#THEME="/usr/share/apps/kdm/themes/debian-moreblue"