diff --git a/conf/distro/include/mortsgna-core-tweaks.inc b/conf/distro/include/mortsgna-core-tweaks.inc
index 3537497..9f96207 100644
--- a/conf/distro/include/mortsgna-core-tweaks.inc
+++ b/conf/distro/include/mortsgna-core-tweaks.inc
@@ -12,56 +12,4 @@ LICENSE_DIRECTORY = "${DEPLOY_DIR}/licenses/${MACHINE_ARCH}"
 # Shared state fixups
 MACHINEOVERRIDES[vardepsexclude] += "SOC_FAMILY"
 
-#
-# udev, devfsd, busybox-mdev (from busybox) or none
-#
-IMAGE_DEV_MANAGER ?= "udev"
-#
-# sysvinit, upstart, systemd
-#
-IMAGE_INIT_MANAGER ?= "systemd"
-IMAGE_INITSCRIPTS ?= "systemd-compat-units"
-#
-# busybox, getty
-#
-IMAGE_LOGIN_MANAGER ?= "busybox"
 
-IMAGE_BOOT ?= "${IMAGE_INITSCRIPTS} \
-               ${IMAGE_DEV_MANAGER} \
-               ${IMAGE_INIT_MANAGER} \
-               ${IMAGE_LOGIN_MANAGER}"
-
-IMAGE_INSTALL += "${IMAGE_BOOT}"
-
-# some default locales
-IMAGE_LINGUAS ?= "de-de fr-fr en-gb en-us es-es it-it"
-
-# there are important missing I bet
-IMAGE_LINGUAS_FULL ?= " \
-    af-za \
-    ar-sa \
-    da-dk \
-    de-de \
-    el-gr \
-    en-gb \
-    en-us \
-    es-es \
-    fi-fi \
-    fr-fr \
-    he-il \
-    hi-in \
-    hu-hu \
-    it-it \
-    ja-jp \
-    ko-kr \
-    nn-no \
-    ku-tr \
-    pl-pl \
-    pt-pt \
-    ru-ru \
-    sv-se \
-    vi-vn \
-    zh-cn \
-"
-# broken?
-#    tr-tr
diff --git a/conf/distro/mortsgna.conf b/conf/distro/mortsgna.conf
index 72c4030..212476e 100644
--- a/conf/distro/mortsgna.conf
+++ b/conf/distro/mortsgna.conf
@@ -116,6 +116,10 @@ require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc
 # Processor specific tunes like hard float ABI
 include conf/distro/include/${TARGET_ARCH}-defaults.inc
 
+###############################################################################
+# Image defaults
+###############################################################################
+
 # For X11/Wayland images we install an unpriviledged user by default. If this
 # is not desired override DISTRO_GUI_USER
 DISTRO_GUI_USER ?= "unpriv-user"
@@ -158,3 +162,57 @@ EXTRA_IMAGE_FEATURES += " \
 
 # make x11-base a valid IMAGE_FEATURES
 IMAGE_FEATURES[validitems] += "x11-base"
+
+#
+# udev, devfsd, busybox-mdev (from busybox) or none
+#
+IMAGE_DEV_MANAGER ?= "udev"
+#
+# sysvinit, upstart, systemd
+#
+IMAGE_INIT_MANAGER ?= "systemd"
+IMAGE_INITSCRIPTS ?= "systemd-compat-units"
+#
+# busybox, getty
+#
+IMAGE_LOGIN_MANAGER ?= "busybox"
+
+IMAGE_BOOT ?= "${IMAGE_INITSCRIPTS} \
+               ${IMAGE_DEV_MANAGER} \
+               ${IMAGE_INIT_MANAGER} \
+               ${IMAGE_LOGIN_MANAGER}"
+
+IMAGE_INSTALL += "${IMAGE_BOOT}"
+
+# some default locales
+IMAGE_LINGUAS ?= "de-de fr-fr en-gb en-us es-es it-it"
+
+# there are important missing I bet
+IMAGE_LINGUAS_FULL ?= " \
+    af-za \
+    ar-sa \
+    da-dk \
+    de-de \
+    el-gr \
+    en-gb \
+    en-us \
+    es-es \
+    fi-fi \
+    fr-fr \
+    he-il \
+    hi-in \
+    hu-hu \
+    it-it \
+    ja-jp \
+    ko-kr \
+    nn-no \
+    ku-tr \
+    pl-pl \
+    pt-pt \
+    ru-ru \
+    sv-se \
+    vi-vn \
+    zh-cn \
+"
+# broken?
+#    tr-tr