1 files changed, 20 insertions, 18 deletions

diff --git a/packages b/packages
index d933e59..4bbcb7c 100644
--- a/packages
+++ b/packages
@@ -31,6 +31,6 @@ CONFIG_CONFEDIT	noncore/apps/confedit	confedit.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
@@ -83,7 +83,6 @@ CONFIG_LIBOPIE2MM	libopie2/opiemm	opiemm.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
@@ -111,8 +110,8 @@ CONFIG_MINESWEEP	noncore/games/minesweep	minesweep.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
@@ -121,4 +120,17 @@ CONFIG_NETWORKAPPLET	noncore/applets/networkapplet	networkapplet.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
@@ -147,5 +159,7 @@ CONFIG_OXYGEN	noncore/apps/oxygen	oxygen.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
@@ -213,4 +227,5 @@ CONFIG_VOLUMEAPPLET	core/applets/volumeapplet	volumeapplet.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
@@ -222,15 +237,2 @@ 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