17 files changed, 53 insertions, 168 deletions
diff --git a/lists/gnome b/lists/gnome
index 6f1d96e1f..dfe7a0d7d 100644
--- a/lists/gnome
+++ b/lists/gnome
@@ -1,17 +1,9 @@
 # /usr/share/live-helper/lists/gnome - package list for live-helper(7)
 
-# Minimal
-eject file sudo vim-tiny
+## LH: GNOME Desktop
+#<include> gnome-core
 
-# Standard
-console-common kbd locales
-
-# GNOME
-gdm gdm-themes gnome-desktop-environment gnome-cups-manager gnome-screensaver
+gdm-themes gnome-desktop-environment gnome-cups-manager gnome-screensaver
 gnome-themes-extras
-desktop-base
 
 rhythmbox synaptic
-
-xorg xresprobe discover menu
-alsa-base alsa-oss alsa-utils
diff --git a/lists/gnome-core b/lists/gnome-core
index fb39c1a4d..f4ccebcef 100644
--- a/lists/gnome-core
+++ b/lists/gnome-core
@@ -1,14 +1,7 @@
 # /usr/share/live-helper/lists/gnome-core - package list for live-helper(7)
 
-# Minimal
-eject file sudo vim-tiny
+## LH: GNOME Core
+#<include> standard-x11
 
-# Standard
-console-common kbd locales
-
-# GNOME Core
 gdm gnome-core
 desktop-base
-
-xorg xresprobe discover menu
-alsa-base alsa-oss alsa-utils
diff --git a/lists/gnome-full b/lists/gnome-full
index 799a78b3d..a74124764 100644
--- a/lists/gnome-full
+++ b/lists/gnome-full
@@ -1,14 +1,7 @@
 # /usr/share/live-helper/lists/gnome-full - package list for live-helper(7)
 
-# Minimal
-eject file sudo vim-tiny
+## LH: GNOME full
+#<include> gnome
 
-# Standard
-console-common kbd locales
-
-# GNOME Full
 gdm gnome
 desktop-base
-
-xorg xresprobe discover menu
-alsa-base alsa-oss alsa-utils
diff --git a/lists/gnome-junior b/lists/gnome-junior
index 6dfd17403..e7d8178b2 100644
--- a/lists/gnome-junior
+++ b/lists/gnome-junior
@@ -1,23 +1,7 @@
-# /usr/share/live-helper/lists/gnome - package list for live-helper(7)
+# /usr/share/live-helper/lists/gnome-junior - package list for live-helper(7)
 
-# Minimal
-eject file sudo vim-tiny
+## LH: Debian Junior (Gnome)
+#<include> gnome
+#<include> junior-pkgs
 
-# Standard
-console-common kbd locales
-
-# GNOME
-gdm gdm-themes gnome-desktop-environment gnome-cups-manager gnome-screensaver
-gnome-themes-extras
-desktop-base
-
-rhythmbox synaptic
-
-xorg xresprobe discover menu
-alsa-base alsa-oss alsa-utils
-
-# Debian Junior
-junior-sound junior-typing junior-internet junior-gnome junior-toys
-junior-games-net junior-games-sim junior-games-gl junior-puzzle junior-arcade
-junior-math junior-writing junior-games-card junior-programming junior-system
-junior-art junior-doc junior-games-text
+junior-gnome 
diff --git a/lists/gnustep b/lists/gnustep
index 1ebbaff08..a952fbe1f 100644
--- a/lists/gnustep
+++ b/lists/gnustep
@@ -1,15 +1,8 @@
 # /usr/share/live-helper/lists/gnustep - package list for live-helper(7)
 
-# Minimal
-eject file sudo vim-tiny
+## LH: GNUstep desktop
+#<include> standard-x11
 
-# Standard
-console-common kbd locales
-
-# X11
-xorg xresprobe discover menu
-
-# GNUstep
 wdm
 
 gnustep gnumail.app talksoup.app viewpdf.app wmaker gnustep-icons
diff --git a/lists/junior-pkgs b/lists/junior-pkgs
new file mode 100644
index 000000000..aced54385
--- /dev/null
+++ b/lists/junior-pkgs
@@ -0,0 +1,8 @@
+# /usr/share/live-helper/lists/junior-pkgs - package list for live-helper(7)
+
+## LH: Desktop agnostic packages for Debian Junior
+
+junior-sound junior-typing junior-internet junior-toys junior-games-net
+junior-games-sim junior-games-gl junior-puzzle junior-arcade junior-math
+junior-writing junior-games-card junior-programming junior-system junior-art
+junior-doc junior-games-text
diff --git a/lists/kde b/lists/kde
index 77f154f17..e8224d6c6 100644
--- a/lists/kde
+++ b/lists/kde
@@ -1,14 +1,7 @@
 # /usr/share/live-helper/lists/kde - package list for live-helper(7)
 
-# Minimal
-eject file sudo vim-tiny
+## LH: KDE
+#<include> kde-core
 
-# Standard
-console-common kbd locales
-
-# KDE
 kde kdm
 desktop-base
-
-xorg xresprobe discover menu
-alsa-base alsa-oss alsa-utils
diff --git a/lists/kde-core b/lists/kde-core
index d570cb6ac..349ca2c16 100644
--- a/lists/kde-core
+++ b/lists/kde-core
@@ -1,14 +1,7 @@
 # /usr/share/live-helper/lists/kde-core - package list for live-helper(7)
 
-# Minimal
-eject file sudo vim-tiny
+## LH: KDE Core
+#<include> standard-x11
 
-# Standard
-console-common kbd locales
-
-# KDE Core
 kde-core kdm
 desktop-base
-
-xorg xresprobe discover menu
-alsa-base alsa-oss alsa-utils
diff --git a/lists/kde-extra b/lists/kde-extra
index 3835387f3..a36bca110 100644
--- a/lists/kde-extra
+++ b/lists/kde-extra
@@ -1,20 +1,6 @@
 # /usr/share/live-helper/lists/kde-extra - package list for live-helper(7)
 
-# Minimal
-eject file sudo vim-tiny
+## LH: KDE Extra
+#<include> kde-full
 
-# Standard
-console-common kbd locales
-
-# KDE
-kde kdm
-desktop-base
-
-xorg xresprobe discover menu
-alsa-base alsa-oss alsa-utils
-
-# KDE Full
-koffice
-
-# KDE Extra
 kde-extras
diff --git a/lists/kde-full b/lists/kde-full
index 78076877f..de28ebbff 100644
--- a/lists/kde-full
+++ b/lists/kde-full
@@ -1,17 +1,6 @@
 # /usr/share/live-helper/lists/kde-full - package list for live-helper(7)
 
-# Minimal
-eject file sudo vim-tiny
+## LH: KDE Full
+#<include> kde
 
-# Standard
-console-common kbd locales
-
-# KDE
-kde kdm
-desktop-base
-
-xorg xresprobe discover menu
-alsa-base alsa-oss alsa-utils
-
-# KDE Full
 koffice
diff --git a/lists/kde-junior b/lists/kde-junior
index 7663c6179..559936eab 100644
--- a/lists/kde-junior
+++ b/lists/kde-junior
@@ -1,20 +1,7 @@
-# /usr/share/live-helper/lists/kde - package list for live-helper(7)
+# /usr/share/live-helper/lists/kde-junior - package list for live-helper(7)
 
-# Minimal
-eject file sudo vim-tiny
+## LH: KDE Junior
+#<include> kde
+#<include> junior-pkgs
 
-# Standard
-console-common kbd locales
-
-# KDE
-kde kdm
-desktop-base
-
-xorg xresprobe discover menu
-alsa-base alsa-oss alsa-utils
-
-# Debian Junior
-junior-sound junior-typing junior-internet junior-toys junior-games-net
-junior-games-sim junior-games-gl junior-puzzle junior-arcade junior-math
-junior-writing junior-games-card junior-programming junior-system junior-art
-junior-doc junior-games-text junior-kde
+junior-kde
diff --git a/lists/minimal b/lists/minimal
new file mode 100644
index 000000000..8d28f7214
--- /dev/null
+++ b/lists/minimal
@@ -0,0 +1,5 @@
+# /usr/share/live-helper/lists/minimal - package list for live-helper(7)
+
+## LH: Minimal
+
+eject file sudo vim-tiny
diff --git a/lists/rescue b/lists/rescue
index 0e8d1ba7a..9ff924633 100644
--- a/lists/rescue
+++ b/lists/rescue
@@ -1,15 +1,9 @@
 # /usr/share/live-helper/lists/rescue - package list for live-helper(7)
 
-# Minimal
-eject file sudo vim-tiny
-
-# Standard
-console-common kbd locales
-
-#####  Rescue
+## LH: Rescue
+#<include> standard
 
 ## System
-
 gnupg dash discover gawk grub htop lilo ltrace pstack screen strace units
 
 ## Editors
diff --git a/lists/standard b/lists/standard
index 364e661eb..03c984d96 100644
--- a/lists/standard
+++ b/lists/standard
@@ -1,7 +1,6 @@
 # /usr/share/live-helper/lists/standard - package list for live-helper(7)
 
-# Minimal
-eject file sudo vim-tiny
+## LH: Standard
+#<include> minimal
 
-# Standard
 console-common kbd locales
diff --git a/lists/standard-x11 b/lists/standard-x11
index cbd2f50d0..ce5eae3b0 100644
--- a/lists/standard-x11
+++ b/lists/standard-x11
@@ -1,11 +1,7 @@
 # /usr/share/live-helper/lists/standard-x11 - package list for live-helper(7)
 
-# Minimal
-eject file sudo vim-tiny
+## LH: Standard X11
+#<include> standard
 
-# Standard
-console-common kbd locales
-
-# X11
 xorg xresprobe discover menu
 alsa-base alsa-oss alsa-utils
diff --git a/lists/xfce b/lists/xfce
index fd805ff61..030799673 100644
--- a/lists/xfce
+++ b/lists/xfce
@@ -1,14 +1,7 @@
 # /usr/share/live-helper/lists/xfce - package list for live-helper(7)
 
-# Minimal
-eject file sudo vim-tiny
+## LH: Xfce
+#<include> standard-x11
 
-# Standard
-console-common kbd locales
-
-# Xfce
 xfce4 gdm
 desktop-base
-
-xorg xresprobe discover menu
-alsa-base alsa-oss alsa-utils
diff --git a/lists/xfce-junior b/lists/xfce-junior
index 1301735d4..93becb62b 100644
--- a/lists/xfce-junior
+++ b/lists/xfce-junior
@@ -1,20 +1,7 @@
-# /usr/share/live-helper/lists/xfce - package list for live-helper(7)
+# /usr/share/live-helper/lists/xfce-junior - package list for live-helper(7)
 
-# Minimal
-eject file sudo vim-tiny
+## LH: Xfce Debian Junior
+#<include> xfce
+#<include> junior-pkgs
 
-# Standard
-console-common kbd locales
-
-# Xfce
-xfce4 gdm
-desktop-base
-
-xorg xresprobe discover menu
-alsa-base alsa-oss alsa-utils
-
-# Debian Junior
-junior-sound junior-typing junior-internet junior-gnome junior-toys
-junior-games-net junior-games-sim junior-games-gl junior-puzzle junior-arcade
-junior-math junior-writing junior-games-card junior-programming junior-system
-junior-art junior-doc junior-games-text junior-kde
+junior-kde junior-gnome