Index: conf/distro/ely.conf
===================================================================
diff -u -r0b4c1a3520876af880e854b9db9e6b24af26ea89 -r384b338e3e21c87bcd761587e52fa982c622181f
--- conf/distro/ely.conf	(.../ely.conf)	(revision 0b4c1a3520876af880e854b9db9e6b24af26ea89)
+++ conf/distro/ely.conf	(.../ely.conf)	(revision 384b338e3e21c87bcd761587e52fa982c622181f)
@@ -34,9 +34,7 @@
 DISTRO_FEATURES:append = " cellular gstreamer pam ${MACHINE_DISTRO_FEATURES_ADD}"
 DISTRO_FEATURES:remove = "3g nfc nfs ptest zeroconf ${MACHINE_DISTRO_FEATURES_REMOVE}"
 
-GRAPHICAL_BACKEND = "${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', \
-                        bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', \
-                        bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', 'fb', d), d), d)}"
+GRAPHICAL_BACKEND = "fb"
 
 # Recovery initramfs image name.
 RECOVERY_INITRAMFS_IMAGE ?= "dey-image-recovery-initramfs"
Index: recipes-bsp/manufacturing/leahi-manufacturing_1.0.bb
===================================================================
diff -u -re4793c114b4ce6a4806244b744e4f8014d5a2981 -r384b338e3e21c87bcd761587e52fa982c622181f
--- recipes-bsp/manufacturing/leahi-manufacturing_1.0.bb	(.../leahi-manufacturing_1.0.bb)	(revision e4793c114b4ce6a4806244b744e4f8014d5a2981)
+++ recipes-bsp/manufacturing/leahi-manufacturing_1.0.bb	(.../leahi-manufacturing_1.0.bb)	(revision 384b338e3e21c87bcd761587e52fa982c622181f)
@@ -1,7 +1,7 @@
-DESCRIPTION = "Leahi manufacturing application"
+DESCRIPTION = "Leahi application"
 LICENSE = "CLOSED"
 
-# Leahi manufacturing repository including all needed binary and resources
+# Leahi repository including all needed binary and resources
 SRC_URI = "git://git@bitbucket.org/diality-cloud/leahi-manufacturing.git;protocol=ssh;branch=master"
 
 # always use the latest commit.
@@ -20,21 +20,25 @@
 # TODO
 # 1 - get files from git repository
 do_install() {
-    bbplain    " ---------- Leahi: Install manufacturing"
+    bbplain    " ---------- Leahi: Install "
     # build the required folders
-    install -d                              ${D}/opt/leahi/manufacturing/
-    install -d                              ${D}/opt/leahi/manufacturing/scripts/
+    install -d                              ${D}/opt/leahi/
+    install -d                              ${D}/opt/leahi/scripts/
+    install -d                              ${D}/opt/leahi/translations/
+    install -d                              ${D}/mnt/data/
 
     # installing the required files
-    install -m 0644 ${S}/leahi              ${D}/opt/leahi/manufacturing/
-    install -m 0644 ${S}/run.sh             ${D}/opt/leahi/manufacturing/
+    install -m 0644 ${S}/leahi              ${D}/opt/leahi/
+    install -m 0644 ${S}/run.sh             ${D}/opt/leahi/
     install -m 0644 ${S}/eglfs.json         ${D}/opt/leahi/eglfs.json
-    install -m 0644 ${S}/scripts/*.sh       ${D}/opt/leahi/manufacturing/scripts/
+    install -m 0644 ${S}/scripts/*.sh       ${D}/opt/leahi/scripts/
+    install -m 0644 ${S}/translations/*.qm  ${D}/opt/leahi/translations/
+    install -m 0644 ${S}/configurations     ${D}/mnt/data/
 
     # give the execution permission to owner
-    chmod 755 ${D}/opt/leahi/manufacturing/leahi
-    chmod 755 ${D}/opt/leahi/manufacturing/run.sh
-    chmod 755 ${D}/opt/leahi/manufacturing/scripts/*.sh
+    chmod 755 ${D}/opt/leahi/leahi
+    chmod 755 ${D}/opt/leahi/run.sh
+    chmod 755 ${D}/opt/leahi/scripts/*.sh
 
     # setting up the leahi service
     install -d ${D}${systemd_system_unitdir}
Index: recipes-core/images/ely-image-qt.bb
===================================================================
diff -u -re4793c114b4ce6a4806244b744e4f8014d5a2981 -r384b338e3e21c87bcd761587e52fa982c622181f
--- recipes-core/images/ely-image-qt.bb	(.../ely-image-qt.bb)	(revision e4793c114b4ce6a4806244b744e4f8014d5a2981)
+++ recipes-core/images/ely-image-qt.bb	(.../ely-image-qt.bb)	(revision 384b338e3e21c87bcd761587e52fa982c622181f)
@@ -11,42 +11,65 @@
 DISTRO_FEATURES:remove  = "x11 wayland vulcan weston"
 IMAGE_FEATURES:remove = "dey-qt"
 
+SOC_PACKAGES = ""
 # Add extra tools
-SOC_PACKAGES = "            \
-        sudo                \
-        fbset               \
-        tslib               \
-        tzdata              \
-        nano                \
-        htop                \
-        can-utils           \
-        util-linux-sfdisk   \
-        leahi-fonts         \
-        leahi-manufacturing \
+
+# user management
+SOC_PACKAGES += "               \
+        sudo                    \
 "
 
-SOC_PACKAGES:ccimx6 = "imx-gpu-viv-demos imx-gpu-viv-tools"
+# Touchscreen management
+# SOC_PACKAGES += "               \
+#         fbset                   \
+#         tslib                   \
+# "
 
-IMAGE_INSTALL = " \
-    packagegroup-dey-core \
+# Device settings
+SOC_PACKAGES += "               \
+        tzdata                  \
+        util-linux-sfdisk       \
+"
+
+# Leahi recipes
+SOC_PACKAGES += "               \
+        leahi-fonts             \
+        leahi-manufacturing     \
+"
+
+# Development and testing
+SOC_PACKAGES += "               \
+        nano                    \
+        htop                    \
+        can-utils               \
+"
+
+IMAGE_INSTALL = "               \
+    packagegroup-dey-core       \
     ${CORE_IMAGE_EXTRA_INSTALL} \
-    ${SOC_PACKAGES} \
+    ${SOC_PACKAGES}             \
 "
 
-IMAGE_FEATURES += " \
-    dey-network \
-    dey-${GRAPHICAL_CORE} \
-    eclipse-debug \
-    ssh-server-dropbear \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'gstreamer' , 'dey-gstreamer'   , '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland'   , 'weston'                  , \
-       bb.utils.contains('DISTRO_FEATURES', 'x11'       , 'x11-base x11-sato'       , \
-                                                                          '', d), d)} \
-    ${@bb.utils.contains('MACHINE_FEATURES', 'alsa'     , 'dey-audio'       , '', d)} \
-    ${@bb.utils.contains('MACHINE_FEATURES', 'bluetooth', 'dey-bluetooth'   , '', d)} \
-    ${@bb.utils.contains('MACHINE_FEATURES', 'wifi'     , 'dey-wireless'    , '', d)} \
+IMAGE_FEATURES += "             \
+    dey-network                 \
+    ssh-server-dropbear         \
 "
 
+IMAGE_FEATURES += "             \
+    dey-gstreamer               \
+    dey-audio                   \
+    dey-bluetooth               \
+    dey-wireless                \
+"
+
+IMAGE_INSTALL += "              \
+    qtserialbus                 \
+    qtconnectivity              \
+    qtquickcontrols2            \
+    qtvirtualkeyboard           \
+    qtgraphicaleffects          \
+"
+
 # SDK features (for toolchains generated from an image with populate_sdk)
 SDKIMAGE_FEATURES ?= "dev-pkgs dbg-pkgs staticdev-pkgs"
 
@@ -67,15 +90,5 @@
 export IMAGE_BASENAME = "${DEFAULT_IMAGE_BASENAME}"
 
 CORE_IMAGE_EXTRA_INSTALL += " \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'weston-xwayland', '', d)} \
     dey-examples-digiapix \
 "
-
-################################################################################
-IMAGE_INSTALL:append = "        \
-    qtserialbus                 \
-    qtconnectivity              \
-    qtquickcontrols2            \
-    qtvirtualkeyboard           \
-    qtgraphicaleffects          \
-"