1 files changed, 22 insertions, 10 deletions

diff --git a/packages b/packages
index f777bbb..87f18b4 100644
--- a/packages
+++ b/packages
@@ -3,2 +3,3 @@
         #CONFIG_BLUE-PIN        noncore/net/opietooth/blue-pinblue-pin.pro
+        #CONFIG_CALC2   noncore/tools/calc2calc2.pro
         #CONFIG_CALIBRATE       core/apps/calibratecalibrate.pro
@@ -9,3 +10,2 @@
         #CONFIG_EXAMPLE         exampleexample.pro
-        #CONFIG_TODAY_FORTUNE   noncore/todayplugins/fortunefortune.pro
         #CONFIG_GSMTOOL         noncore/comm/gsmtoolgsmtool.pro
@@ -17,11 +17,15 @@
         #CONFIG_LIBFLASH        core/multimedia/opieplayer/libflashlibflash.pro
+        #CONFIG_LIBOPIE_PIM     libopie/pimpim.pro
         #CONFIG_LIBQPE-X11      x11/libqpe-x11libqpe-x11.pro
+        #CONFIG_LIBSQL  libsqllibsql.pro
         #CONFIG_MANAGER         noncore/net/opietooth/managermanager.pro
         #CONFIG_MOBILEMSG       noncore/comm/mobilemsgmobilemsg.pro
+        #CONFIG_NETSETUP        noncore/unsupported/netsetupnetsetup.pro
         #CONFIG_OFILESELECTOR   libopie/ofileselectorofileselector.pro
         #CONFIG_OPIE-WRITE      noncore/apps/opie-writeopie-write.pro
+        #CONFIG_OPIEMAIL        noncore/unsupported/opiemailopiemail.pro
         #CONFIG_OPIEPLAYER2     noncore/multimedia/opieplayer2opieplayer2.pro
-        #CONFIG_PIM     libopie/pimpim.pro
         #CONFIG_POP3    noncore/unsupported/opiemail/ifaces/pop3pop3.pro
         #CONFIG_QUICKEXEC       quickexecquickexec.pro
+        #CONFIG_RESTARTAPPLET   core/applets/restartappletrestartapplet.pro
         #CONFIG_RESTARTAPPLET2  core/applets/restartapplet2restartapplet2.pro
@@ -35,2 +39,3 @@
         #CONFIG_TEST    noncore/apps/opie-console/testtest.pro
+        #CONFIG_TODAY_FORTUNE   noncore/todayplugins/fortunefortune.pro
         #CONFIG_UBROWSER        noncore/net/ubrowserubrowser.pro
@@ -44,2 +49,3 @@ CONFIG_AQPKG	noncore/apps/aqpkg	aqpkg.pro
         CONFIG_BACKUP   noncore/settings/backupbackup.pro
+        CONFIG_BATTERYAPPLET    core/applets/batteryappletbatteryapplet.pro
         CONFIG_BATTERYAPPLET-IPAQ       core/applets/batteryapplet-ipaqbatteryapplet-ipaq.pro
@@ -57,3 +63,5 @@ CONFIG_CONFEDIT	noncore/apps/confedit	confedit.pro
         CONFIG_DATEBOOK         core/pim/datebookdatebook.pro
-        CONFIG_TODAY_DATEBOOK   core/pim/today/plugins/datebookdatebook.pro
+        CONFIG_DECO_FLAT        noncore/decorations/flatflat.pro
+        CONFIG_DECO_LIQUID      noncore/decorations/liquidliquid.pro
+        CONFIG_DECO_POLISHED    noncore/decorations/polishedpolished.pro
         CONFIG_DRAWPAD  noncore/graphics/drawpaddrawpad.pro
@@ -63,3 +71,2 @@ CONFIG_FIFTEEN	noncore/games/fifteen	fifteen.pro
         CONFIG_FILEBROWSER      core/apps/filebrowserfilebrowser.pro
-        CONFIG_DECO_FLAT        noncore/decorations/flatflat.pro
         CONFIG_FLAT     noncore/styles/flatflat.pro
@@ -87,9 +94,8 @@ CONFIG_LIBMAIL	noncore/mail/libmail	libmail.pro
         CONFIG_LIBMPEG3         core/multimedia/opieplayer/libmpeg3libmpeg3.pro
-        CONFIG_LIBQPE   librarylibrary.pro
         CONFIG_LIBOPIE  libopielibopie.pro
+        CONFIG_LIBQPE   librarylibrary.pro
         CONFIG_LIGHT-AND-POWER  core/settings/light-and-powerlight-and-power.pro
-        CONFIG_DECO_LIQUID      noncore/decorations/liquidliquid.pro
         CONFIG_LIQUID   noncore/styles/liquidliquid.pro
         CONFIG_LOGOUTAPPLET     core/applets/logoutappletlogoutapplet.pro
-        CONFIG_TODAY_MAIL       core/pim/today/plugins/mailmail.pro
+        CONFIG_MAIL     noncore/mailmail.pro
         CONFIG_MEDIUMMOUNT      noncore/settings/mediummountmediummount.pro
@@ -106,2 +112,3 @@ CONFIG_OBEX	core/applets/obex	obex.pro
         CONFIG_OIPKG    core/apps/oipkgoipkg.pro
+        CONFIG_OPIE-CONSOLE     noncore/apps/opie-consoleopie-console.pro
         CONFIG_OPIE-LOGIN       core/opie-loginopie-login.pro
@@ -112,2 +119,3 @@ CONFIG_OPIEFTP	noncore/net/opieftp	opieftp.pro
         CONFIG_OPIEIRC  noncore/net/opieircopieirc.pro
+        CONFIG_OPIEPLAYER       core/multimedia/opieplayeropieplayer.pro
         CONFIG_OXYGEN   noncore/apps/oxygenoxygen.pro
@@ -115,3 +123,2 @@ CONFIG_PARASHOOT	noncore/games/parashoot	parashoot.pro
         CONFIG_PICKBOARD        inputmethods/pickboardpickboard.pro
-        CONFIG_DECO_POLISHED    noncore/decorations/polishedpolished.pro
         CONFIG_QASTEROIDS       noncore/games/qasteroidsqasteroids.pro
@@ -129,3 +136,2 @@ CONFIG_SOUND	noncore/settings/sound	sound.pro
         CONFIG_SSHKEYS  noncore/settings/sshkeyssshkeys.pro
-        CONFIG_TODAY_STOCKTICKERLIB     noncore/todayplugins/stockticker/stocktickerlibstocktickerlib.pro
         CONFIG_SUSPENDAPPLET    core/applets/suspendappletsuspendapplet.pro
@@ -138,4 +144,10 @@ CONFIG_THEME	noncore/styles/theme	theme.pro
         CONFIG_TICTAC   noncore/games/tictactictac.pro
-        CONFIG_TODO     core/pim/todotodo.pro
+        CONFIG_TODAY    core/pim/todaytoday.pro
+        CONFIG_TODAY_DATEBOOK   core/pim/today/plugins/datebookdatebook.pro
+        CONFIG_TODAY_MAIL       core/pim/today/plugins/mailmail.pro
+        CONFIG_TODAY_STOCKTICKER        noncore/todayplugins/stocktickerstockticker.pro
+        CONFIG_TODAY_STOCKTICKERLIB     noncore/todayplugins/stockticker/stocktickerlibstocktickerlib.pro
+        CONFIG_TODAY_STOCKTICKERSUB     noncore/todayplugins/stockticker/stocktickerstockticker.pro
         CONFIG_TODAY_TODOLIST   core/pim/today/plugins/todolisttodolist.pro
+        CONFIG_TODO     core/pim/todotodo.pro
         CONFIG_UNIKEYBOARD      inputmethods/unikeyboardunikeyboard.pro