1 files changed, 22 insertions, 10 deletions

diff --git a/packages b/packages
index f777bbb..87f18b4 100644
--- a/packages
+++ b/packages
@@ -2,4 +2,5 @@
         #CONFIG_BINARY  noncore/tools/calc2/binarybinary.pro
         #CONFIG_BLUE-PIN        noncore/net/opietooth/blue-pinblue-pin.pro
+        #CONFIG_CALC2   noncore/tools/calc2calc2.pro
         #CONFIG_CALIBRATE       core/apps/calibratecalibrate.pro
         #CONFIG_CHESS   noncore/games/chesschess.pro
@@ -8,5 +9,4 @@
         #CONFIG_DICTIONARY      noncore/apps/dictionarydictionary.pro
         #CONFIG_EXAMPLE         exampleexample.pro
-        #CONFIG_TODAY_FORTUNE   noncore/todayplugins/fortunefortune.pro
         #CONFIG_GSMTOOL         noncore/comm/gsmtoolgsmtool.pro
         #CONFIG_KEYVIEW         development/keyviewkeyview.pro
@@ -16,13 +16,17 @@
         #CONFIG_LIBFFMPEG       core/multimedia/opieplayer/libffmpeglibffmpeg.pro
         #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
         #CONFIG_SDMON   noncore/unsupported/sdmonsdmon.pro
@@ -34,4 +38,5 @@
         #CONFIG_TEST    libsql/testtest.pro
         #CONFIG_TEST    noncore/apps/opie-console/testtest.pro
+        #CONFIG_TODAY_FORTUNE   noncore/todayplugins/fortunefortune.pro
         #CONFIG_UBROWSER        noncore/net/ubrowserubrowser.pro
         #CONFIG_WELLENREITER    noncore/net/wellenreiterwellenreiter.pro
@@ -43,4 +48,5 @@ CONFIG_APPSKEY	noncore/settings/appskey	appskey.pro
         CONFIG_AQPKG    noncore/apps/aqpkgaqpkg.pro
         CONFIG_BACKUP   noncore/settings/backupbackup.pro
+        CONFIG_BATTERYAPPLET    core/applets/batteryappletbatteryapplet.pro
         CONFIG_BATTERYAPPLET-IPAQ       core/applets/batteryapplet-ipaqbatteryapplet-ipaq.pro
         CONFIG_BEND     noncore/mail/bendbend.pro
@@ -56,5 +62,7 @@ CONFIG_CLOCKAPPLET	core/applets/clockapplet	clockapplet.pro
         CONFIG_CONFEDIT         noncore/apps/confeditconfedit.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
         CONFIG_DVORAK   inputmethods/dvorakdvorak.pro
@@ -62,5 +70,4 @@ CONFIG_EMBEDDEDKONSOLE	core/apps/embeddedkonsole	embeddedkonsole.pro
         CONFIG_FIFTEEN  noncore/games/fifteenfifteen.pro
         CONFIG_FILEBROWSER      core/apps/filebrowserfilebrowser.pro
-        CONFIG_DECO_FLAT        noncore/decorations/flatflat.pro
         CONFIG_FLAT     noncore/styles/flatflat.pro
         CONFIG_FORMATTER        noncore/tools/formatterformatter.pro
@@ -86,11 +93,10 @@ CONFIG_LIBMAD	core/multimedia/opieplayer/libmad	libmad.pro
         CONFIG_LIBMAIL  noncore/mail/libmaillibmail.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
         CONFIG_METAL    noncore/styles/metalmetal.pro
@@ -105,4 +111,5 @@ CONFIG_NOTESAPPLET	noncore/applets/notesapplet	notesapplet.pro
         CONFIG_OBEX     core/applets/obexobex.pro
         CONFIG_OIPKG    core/apps/oipkgoipkg.pro
+        CONFIG_OPIE-CONSOLE     noncore/apps/opie-consoleopie-console.pro
         CONFIG_OPIE-LOGIN       core/opie-loginopie-login.pro
         CONFIG_OPIE-READER      noncore/apps/opie-readeropie-reader.pro
@@ -111,8 +118,8 @@ CONFIG_OPIE-SHEET	noncore/apps/opie-sheet	opie-sheet.pro
         CONFIG_OPIEFTP  noncore/net/opieftpopieftp.pro
         CONFIG_OPIEIRC  noncore/net/opieircopieirc.pro
+        CONFIG_OPIEPLAYER       core/multimedia/opieplayeropieplayer.pro
         CONFIG_OXYGEN   noncore/apps/oxygenoxygen.pro
         CONFIG_PARASHOOT        noncore/games/parashootparashoot.pro
         CONFIG_PICKBOARD        inputmethods/pickboardpickboard.pro
-        CONFIG_DECO_POLISHED    noncore/decorations/polishedpolished.pro
         CONFIG_QASTEROIDS       noncore/games/qasteroidsqasteroids.pro
         CONFIG_QCOP     core/apps/qcopqcop.pro
@@ -128,5 +135,4 @@ CONFIG_SOLITAIRE	noncore/games/solitaire	solitaire.pro
         CONFIG_SOUND    noncore/settings/soundsound.pro
         CONFIG_SSHKEYS  noncore/settings/sshkeyssshkeys.pro
-        CONFIG_TODAY_STOCKTICKERLIB     noncore/todayplugins/stockticker/stocktickerlibstocktickerlib.pro
         CONFIG_SUSPENDAPPLET    core/applets/suspendappletsuspendapplet.pro
         CONFIG_SYSINFO  noncore/apps/sysinfosysinfo.pro
@@ -137,6 +143,12 @@ CONFIG_TEXTEDIT	core/apps/textedit	textedit.pro
         CONFIG_THEME    noncore/styles/themetheme.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
         CONFIG_USERMANAGER      noncore/settings/usermanagerusermanager.pro