1 files changed, 30 insertions, 16 deletions
diff --git a/systems/genivi-demo-platform-x86_64-generic.morph b/systems/genivi-demo-platform-x86_64-generic.morph
index b06b12a8..6a338540 100644
--- a/systems/genivi-demo-platform-x86_64-generic.morph
+++ b/systems/genivi-demo-platform-x86_64-generic.morph
@@ -9,32 +9,46 @@ strata:
   morph: strata/core.morph
 - name: foundation
   morph: strata/foundation.morph
-- name: genivi-foundation
-  morph: strata/genivi-foundation.morph
 - name: bsp-x86_64-generic
   morph: strata/bsp-x86_64-generic.morph
 - name: connectivity
   morph: strata/connectivity.morph
+- name: connman-common
+  morph: strata/connman-common.morph
 - name: audio-bluetooth
   morph: strata/audio-bluetooth.morph
-- name: x-common
-  morph: strata/x-common.morph
-- name: x-generic
-  morph: strata/x-generic.morph
-- name: multimedia-gstreamer-0.10
-  morph: strata/multimedia-gstreamer-0.10.morph
+- name: libdrm-common
+  morph: strata/libdrm-common.morph
+- name: multimedia-common
+  morph: strata/multimedia-common.morph
+- name: multimedia-gstreamer
+  morph: strata/multimedia-gstreamer.morph
 - name: genivi
   morph: strata/genivi.morph
-- name: wayland-x86_64-generic
-  morph: strata/wayland-x86_64-generic.morph
-- name: genivi-wayland-x86_64-generic
-  morph: strata/genivi-wayland-x86_64-generic.morph
-- name: qt5-tools-jetson
-  morph: strata/qt5-tools-jetson.morph
+- name: wayland-generic
+  morph: strata/wayland-generic.morph
+- name: graphics-common
+  morph: strata/graphics-common.morph
+- name: input-common
+  morph: strata/input-common.morph
+- name: llvm-common
+  morph: strata/llvm-common.morph
+- name: mesa-common
+  morph: strata/mesa-common.morph
+- name: x-common
+  morph: strata/x-common.morph
+- name: weston-genivi
+  morph: strata/weston-genivi.morph
+- name: ruby
+  morph: strata/ruby.morph
+- name: qt5-tools
+  morph: strata/qt5-tools.morph
+- name: qt5-tools-qtmultimedia
+  morph: strata/qt5-tools-qtmultimedia.morph
+- name: qt5-tools-qtwebkit
+  morph: strata/qt5-tools-qtwebkit.morph
 - name: gtk2
   morph: strata/gtk2.morph
-- name: enlightenment
-  morph: strata/enlightenment.morph
 - name: genivi-demo-platform
   morph: strata/genivi-demo-platform.morph
 - name: tools