diff --git a/pkgsel/Desktop/20-EFL.core.choice b/pkgsel/Desktop/20-EFL.core.choice
new file mode 100644
index 0000000..4215303
--- /dev/null
+++ b/pkgsel/Desktop/20-EFL.core.choice
@@ -0,0 +1,19 @@
+#Description: Enlightenment Foundation Libraries (Core Embedded)
+
+# packages we need to build EFL Core Embedded
+X pkgconfig
+X texinfo
+X zlib
+X libjpg
+X freetype
+
+# EFL Core Embedded
+#
+# http://enlightenment.sourceforge.net/Libraries/images/_images/efl.png
+#
+X edb
+X eet
+X evas
+X ecore
+X embryo
+X edje
diff --git a/pkgsel/Desktop/30-EFL.extra.choice b/pkgsel/Desktop/30-EFL.extra.choice
new file mode 100644
index 0000000..b366466
--- /dev/null
+++ b/pkgsel/Desktop/30-EFL.extra.choice
@@ -0,0 +1,10 @@
+#Description: Enlightenment Foundation Libraries (Extra Embedded) 
+#Imply: core
+
+# EFL Extra Embedded
+#
+# see: http://enlightenment.sourceforge.net/Libraries/images/_images/efl.png
+#
+X ewl
+X etox
+
diff --git a/pkgsel/Desktop/Desktop Enviroment/20-E17.minimal.choice b/pkgsel/Desktop/Desktop Enviroment/20-E17.minimal.choice
index 14cf877..ba85e2a 100644
--- a/pkgsel/Desktop/Desktop Enviroment/20-E17.minimal.choice	
+++ b/pkgsel/Desktop/Desktop Enviroment/20-E17.minimal.choice	
@@ -1,31 +1,10 @@
 #Description: Minimal Enlightenment DR17 Desktop
 #Dependencies: X!=none
+#Forced: EFL=extra
 
 # Enlightenment
 X e
 
-# packages we need to build minimal e17 support
-X pkgconfig
-X texinfo
-X zlib
-X libjpg
-X freetype
-
-# libs for our minimal e17 support
-# see: http://enlightenment.sourceforge.net/Libraries/images/_images/efl.png
-
-# EFL Core Embedded
-X edb
-X eet
-X evas
-X ecore
-X embryo
-X edje
-
-# EFL Extra Embedded
-X ewl
-X etox
-
 # Enlightenment Core Libraries
 X imlib2
 X imlib2_loaders
diff --git a/pkgsel/Desktop/Desktop Enviroment/30-E17.basic.choice b/pkgsel/Desktop/Desktop Enviroment/30-E17.basic.choice
index 7f473d3..350698c 100644
--- a/pkgsel/Desktop/Desktop Enviroment/30-E17.basic.choice	
+++ b/pkgsel/Desktop/Desktop Enviroment/30-E17.basic.choice	
@@ -1,5 +1,6 @@
 #Description: Basic Enlightenment DR17 Desktop
 #Dependencies: X!=none
+#Forced: EFL=extra
 #Imply: minimal
 
 # libraries