1 files changed, 20 insertions, 18 deletions

diff --git a/packages b/packages
index d933e59..4bbcb7c 100644
--- a/packages
+++ b/packages
@@ -25,18 +25,18 @@ CONFIG_CARDMON	core/applets/cardmon	cardmon.pro
         CONFIG_CHECKBOOK        noncore/apps/checkbookcheckbook.pro
         CONFIG_CITYTIME         core/settings/citytimecitytime.pro
         CONFIG_CLIPBOARDAPPLET  core/applets/clipboardappletclipboardapplet.pro
         CONFIG_CLOCKAPPLET      core/applets/clockappletclockapplet.pro
         CONFIG_CLOCK    noncore/tools/clockclock.pro
         CONFIG_CONFEDIT         noncore/apps/confeditconfedit.pro
 CONFIG_DAGGER noncore/apps/dagger dagger.pro
         CONFIG_DASHER   inputmethods/dasherdasher.pro
-        CONFIG_DATEBOOK         core/pim/datebookdatebook.pro
         CONFIG_DATEBOOK2        core/pim/datebook2datebook2.pro
+        CONFIG_DATEBOOK         core/pim/datebookdatebook.pro
         CONFIG_DECO_FLAT        noncore/decorations/flatflat.pro
         CONFIG_DECO_LIQUID      noncore/decorations/liquidliquid.pro
         CONFIG_DECO_POLISHED    noncore/decorations/polishedpolished.pro
         CONFIG_DICTIONARY       noncore/apps/dictionarydictionary.pro
 CONFIG_DOCTAB  noncore/settings/doctab doctab.pro
         CONFIG_DRAWPAD  noncore/graphics/drawpaddrawpad.pro
         CONFIG_DVORAK   inputmethods/dvorakdvorak.pro
         CONFIG_EMBEDDEDKONSOLE  core/apps/embeddedkonsoleembeddedkonsole.pro
@@ -77,19 +77,18 @@ CONFIG_LIBMAIL	noncore/unsupported/mail2/libmail	libmail.pro
 CONFIG_LIBMAILWRAPPER   noncore/net/mail/libmailwrapper  libmailwrapper.pro
         CONFIG_LIBMPEG3         core/multimedia/opieplayer/libmpeg3libmpeg3.pro
         CONFIG_LIBOPIE2CORE     libopie2/opiecoreopiecore.pro
         CONFIG_LIBOPIE2DB       libopie2/opiedbopiedb.pro
         CONFIG_LIBOPIE2EXAMPLES         libopie2/examplesexamples.pro
         CONFIG_LIBOPIE2MM       libopie2/opiemmopiemm.pro
         CONFIG_LIBOPIE2NET      libopie2/opienetopienet.pro
         CONFIG_LIBOPIE2PIM      libopie2/opiepimopiepim.pro
-CONFIG_PIMCONVERTER     noncore/tools/pimconverter converter.pro
-        CONFIG_LIBOPIE2UI       libopie2/opieuiopieui.pro
         CONFIG_LIBOPIE2SECURITYlibopie2/opiesecurity opiesecurity.pro
+        CONFIG_LIBOPIE2UI       libopie2/opieuiopieui.pro
         CONFIG_LIBOPIE  libopielibopie.pro
         CONFIG_LIBOPIE_PIM      libopie/pimpim.pro
         CONFIG_LIBOPIETOOTH     noncore/net/opietooth/liblib.pro
         CONFIG_LIBQPE   librarylibrary.pro
         CONFIG_LIBQPE-X11       x11/libqpe-x11libqpe-x11.pro
 CONFIG_LIBQRSYNC    rsync   rsync.pro
         CONFIG_LIBQTAUX         libqtauxlibqtaux.pro
         CONFIG_LIBSLCOMPAT      libslcompatlibslcompat.pro
@@ -105,26 +104,39 @@ CONFIG_MAILIT		noncore/unsupported/mailit		mailit.pro
 CONFIG_MAIN_TAB_EXAMPLE examples/main-tab       example.pro
         CONFIG_MEDIUMMOUNT      noncore/settings/mediummountmediummount.pro
         CONFIG_MEMORYAPPLET     noncore/applets/memoryappletmemoryapplet.pro
         CONFIG_METAL    noncore/styles/metalmetal.pro
         CONFIG_MINDBREAKER      noncore/games/mindbreakermindbreaker.pro
         CONFIG_MINESWEEP        noncore/games/minesweepminesweep.pro
         CONFIG_MOBILEMSG        noncore/comm/mobilemsgmobilemsg.pro
         CONFIG_MODPLUG  core/multimedia/opieplayer/modplugmodplug.pro
-CONFIG_MULTIAUTH_DUMMY  noncore/securityplugins/dummy   dummyplugin.pro
-CONFIG_MULTIAUTH_PIN    noncore/securityplugins/pin     pinplugin.pro
 CONFIG_MULTIAUTH_BLUEPING     noncore/securityplugins/blueping        bluepingplugin.pro
+CONFIG_MULTIAUTH_DUMMY  noncore/securityplugins/dummy   dummyplugin.pro
 CONFIG_MULTIAUTH_NOTICE noncore/securityplugins/notice  noticeplugin.pro
+CONFIG_MULTIAUTH_PIN    noncore/securityplugins/pin     pinplugin.pro
         CONFIG_MULTIKEYAPPLET core/applets/multikeyappletmultikeyapplet.pro
         CONFIG_MULTIKEY         inputmethods/multikeymultikey.pro
         CONFIG_NETSYSTEMTIME    noncore/settings/netsystemtimenetsystemtime.pro
         CONFIG_NETWORKAPPLET    noncore/applets/networkappletnetworkapplet.pro
         CONFIG_NETWORKSETUP     noncore/settings/networksettingsnetworksettings.pro
         CONFIG_NOTESAPPLET      noncore/applets/notesappletnotesapplet.pro
+        CONFIG_NS2BT    noncore/settings/networksettings2/bluetoothbluetooth.pro
+        CONFIG_NS2CABLE         noncore/settings/networksettings2/cablecable.pro
+        CONFIG_NS2CORE  noncore/settings/networksettings2/networksettings2networksettings2.pro
+        CONFIG_NS2IRDA  noncore/settings/networksettings2/irdairda.pro
+        CONFIG_NS2LANCARD       noncore/settings/networksettings2/lancardlancard.pro
+        CONFIG_NS2MODEM         noncore/settings/networksettings2/modemmodem.pro
+        CONFIG_NS2NETWORK       noncore/settings/networksettings2/networknetwork.pro
+        CONFIG_NS2      noncore/settings/networksettings2networksettings.pro
+        CONFIG_NS2PPP   noncore/settings/networksettings2/pppppp.pro
+        CONFIG_NS2PROFILE       noncore/settings/networksettings2/profileprofile.pro
+        CONFIG_NS2USB   noncore/settings/networksettings2/usbusb.pro
+        CONFIG_NS2VPN   noncore/settings/networksettings2/vpnvpn.pro
+        CONFIG_NS2WLAN  noncore/settings/networksettings2/wlanwlan.pro
         CONFIG_OAPP     core/apps/oappoapp.pro
         CONFIG_OBEX     core/obexobex.pro
         CONFIG_ODICT    noncore/apps/odictodict.pro
         CONFIG_OIPKG    noncore/unsupported/oipkgoipkg.pro
         CONFIG_OPIEALARM        core/opiealarmopiealarm.pro
         CONFIG_OPIE-CONSOLE     noncore/apps/opie-consoleopie-console.pro
         CONFIG_OPIE_EYE         noncore/graphics/opie-eyephunk_view.pro
         CONFIG_OPIE_EYE_SLAVE   noncore/graphics/opie-eye/slaveslave.pro
@@ -141,17 +153,19 @@ CONFIG_OPIE-SHEET	noncore/apps/opie-sheet	opie-sheet.pro
         CONFIG_OPIE-SH  noncore/tools/opie-shopie-sh.pro
         CONFIG_OPIETOOTH-APPLET         noncore/net/opietooth/appletapplet.pro
         CONFIG_OPIETOOTH-MANAGER        noncore/net/opietooth/managermanager.pro
         CONFIG_OPIE-WRITE       noncore/apps/opie-writeopie-write.pro
         CONFIG_OSEARCH  core/pim/osearchosearch.pro
         CONFIG_OXYGEN   noncore/apps/oxygenoxygen.pro
         CONFIG_PACKAGEMANAGER   noncore/settings/packagemanagerpackagemanager.pro
         CONFIG_PARASHOOT        noncore/games/parashootparashoot.pro
+        CONFIG_PHASE    noncore/styles/phasephase.pro
         CONFIG_PICKBOARD        inputmethods/pickboardpickboard.pro
+CONFIG_PIMCONVERTER     noncore/tools/pimconverter converter.pro
         CONFIG_POWERCHORD       noncore/multimedia/powerchordpowerchord.pro
 CONFIG_PPP      noncore/settings/networksettings/ppp    ppp.pro
         CONFIG_PYQUICKLAUNCH-APPLET     noncore/applets/pyquicklaunchpyquicklaunch.pro
         CONFIG_PYQUICKLAUNCHER  noncore/tools/pyquicklauncherpyquicklauncher.pro
         CONFIG_PYTHON-EXAMPLESexamples/python bla.pro
         CONFIG_QASHMONEY        noncore/apps/qashmoneyqashmoney.pro
         CONFIG_QASTEROIDS       noncore/games/qasteroidsqasteroids.pro
         CONFIG_QCOP     core/apps/qcopqcop.pro
@@ -207,30 +221,18 @@ CONFIG_TONLEITER	noncore/multimedia/tonleiter	tonleiter.pro
         CONFIG_TRACKER  noncore/multimedia/trackertracker.pro
         CONFIG_UBROWSER         noncore/net/ubrowserubrowser.pro
         CONFIG_UNIKEYBOARD      inputmethods/unikeyboardunikeyboard.pro
         CONFIG_USERMANAGER      noncore/settings/usermanagerusermanager.pro
         CONFIG_VMEMO    core/applets/vmemovmemo.pro
         CONFIG_VOLUMEAPPLET     core/applets/volumeappletvolumeapplet.pro
         CONFIG_VTAPPLET         core/applets/vtappletvtapplet.pro
         CONFIG_WAVPLUGIN        core/multimedia/opieplayer/wavpluginwavplugin.pro
+        CONFIG_WEBSTYLE                 noncore/styles/webweb.pro
         CONFIG_WELLENREITER     noncore/net/wellenreiterwellenreiter.pro
         CONFIG_WIRELESSAPPLET   noncore/applets/wirelessappletwirelessapplet.pro
         CONFIG_WLAN     noncore/settings/networksettings/wlanwlan.pro
         CONFIG_WORDGAME         noncore/games/wordgamewordgame.pro
         CONFIG_YATZEE   noncore/games/oyatzeeoyatzee.pro
 CONFIG_ZKBAPPLET noncore/applets/zkbapplet zkbapplet.pro
         CONFIG_ZLINES           noncore/games/zlines    zlines.pro
         CONFIG_ZSAFEnoncore/apps/zsafe zsafe.pro
         CONFIG_ZSAME            noncore/games/zsame     zsame.pro
-        CONFIG_NS2CORE  noncore/settings/networksettings2/networksettings2networksettings2.pro
-        CONFIG_NS2      noncore/settings/networksettings2networksettings.pro
-        CONFIG_NS2PROFILE       noncore/settings/networksettings2/profileprofile.pro
-        CONFIG_NS2NETWORK       noncore/settings/networksettings2/networknetwork.pro
-        CONFIG_NS2LANCARD       noncore/settings/networksettings2/lancardlancard.pro
-        CONFIG_NS2WLAN  noncore/settings/networksettings2/wlanwlan.pro
-        CONFIG_NS2PPP   noncore/settings/networksettings2/pppppp.pro
-        CONFIG_NS2CABLE         noncore/settings/networksettings2/cablecable.pro
-        CONFIG_NS2IRDA  noncore/settings/networksettings2/irdairda.pro
-        CONFIG_NS2VPN   noncore/settings/networksettings2/vpnvpn.pro
-        CONFIG_NS2BT    noncore/settings/networksettings2/bluetoothbluetooth.pro
-        CONFIG_NS2MODEM         noncore/settings/networksettings2/modemmodem.pro
-        CONFIG_NS2USB   noncore/settings/networksettings2/usbusb.pro