2 files changed, 6 insertions, 10 deletions
diff --git a/def-configs/opie b/def-configs/opie
index b6b824c..830fede 100644
--- a/def-configs/opie
+++ b/def-configs/opie
@@ -1,294 +1,292 @@
 #
 # Automatically generated make config: don't edit
 #
 
 #
 # Build Parameters
 #
 CONFIG_TARGET_X86=y
 # CONFIG_TARGET_SHARP is not set
 # CONFIG_TARGET_IPAQ is not set
 # CONFIG_OPTIMIZE is not set
 CONFIG_SPECFILE="qws/linux-generic-g++"
 # CONFIG_X11 is not set
 
 #
 # Non-core
 #
 
 #
 # unsupported
 #
 
 #
 # opiemail
 #
 CONFIG_CONVERTER=y
 
 #
 # ifaces
 #
 
 #
 # netsetup
 #
 CONFIG_DIALUP=y
 
 #
 # tools
 #
 CONFIG_REMOTE=y
 CONFIG_OPIE-SH=y
 CONFIG_FORMATTER=y
 CONFIG_CLOCK=y
 CONFIG_CALCULATOR=y
 
 #
 # calc2
 #
 
 #
 # todayplugins
 #
 
 #
 # stockticker
 #
 CONFIG_TODAY_STOCKTICKER=y
 CONFIG_TODAY_STOCKTICKERSUB=y
 CONFIG_TODAY_STOCKTICKERLIB=y
 CONFIG_TODAY_FORTUNE=y
 
 #
 # styles
 #
 CONFIG_THEME=y
 CONFIG_METAL=y
 CONFIG_LIQUID=y
 CONFIG_FRESH=y
 CONFIG_FLAT=y
 
 #
 # settings
 #
 CONFIG_USERMANAGER=y
 CONFIG_TABMANAGER=y
 CONFIG_SSHKEYS=y
 CONFIG_SOUND=y
 CONFIG_ROTATION=y
 CONFIG_NETSYSTEMTIME=y
 CONFIG_MEDIUMMOUNT=y
 CONFIG_LANGUAGE=y
 CONFIG_BACKUP=y
 CONFIG_APPSKEY=y
 CONFIG_APPEARANCE2=y
 
 #
 # appearance
 #
 
 #
 # net
 #
 
 #
 # opietooth
 #
 CONFIG_OPIEIRC=y
 CONFIG_OPIEFTP=y
-
-#
-# networksetup
-#
-CONFIG_INTERFACES=y
+CONFIG_NETWORKSETUP=y
+CONFIG_NETWORKSETUP-CORE=y
 CONFIG_WLAN=y
+CONFIG_INTERFACES=y
 
 #
 # multimedia
 #
 CONFIG_SHOWIMG=y
 CONFIG_OPIEMAIL2=y
 
 #
 # graphics
 #
 CONFIG_QPDF=y
 CONFIG_DRAWPAD=y
 
 #
 # games
 #
 CONFIG_WORDGAME=y
 CONFIG_TICTAC=y
 CONFIG_TETRIX=y
 CONFIG_SOLITAIRE=y
 CONFIG_SNAKE=y
 CONFIG_QASTEROIDS=y
 CONFIG_PARASHOOT=y
 CONFIG_MINESWEEP=y
 CONFIG_MINDBREAKER=y
 CONFIG_KPACMAN=y
 CONFIG_KCHECKERS=y
 CONFIG_KBILL=y
 CONFIG_GO=y
 CONFIG_FIFTEEN=y
 CONFIG_BUZZWORD=y
 CONFIG_BOUNCE=y
 
 #
 # decorations
 #
 CONFIG_DECO_POLISHED=y
 CONFIG_DECO_LIQUID=y
 CONFIG_DECO_FLAT=y
 
 #
 # comm
 #
 CONFIG_KEYPEBBLE=y
 
 #
 # apps
 #
 CONFIG_TABLEVIEWER=y
 CONFIG_SYSINFO=y
 CONFIG_OXYGEN=y
 CONFIG_OPIE-SHEET=y
 CONFIG_OPIE-READER=y
 
 #
 # opie-console
 #
 CONFIG_TEST=y
 
 #
 # test
 #
 CONFIG_CONFEDIT=y
 CONFIG_CHECKBOOK=y
 CONFIG_AQPKG=y
 CONFIG_ADVANCEDFM=y
 
 #
 # applets
 #
 CONFIG_WIRELESSAPPLET=y
 CONFIG_NOTESAPPLET=y
 
 #
 # libsql
 #
 CONFIG_LIBQPE=y
 CONFIG_LIBOPIE=y
 
 #
 # ofileselector
 #
 
 #
 # pim
 #
 
 #
 # inputmethods
 #
 CONFIG_UNIKEYBOARD=y
 CONFIG_PICKBOARD=y
 CONFIG_MULTIKEY=y
 CONFIG_KJUMPX=y
 CONFIG_KEYBOARD=y
 CONFIG_JUMPX=y
 CONFIG_HANDWRITING=y
 CONFIG_DVORAK=y
 CONFIG_FREETYPE=y
 
 #
 # development
 #
 
 #
 # Core
 #
 
 #
 # settings
 #
 CONFIG_SECURITY=y
 CONFIG_LIGHT-AND-POWER=y
 CONFIG_LAUNCHER-SETTINGS=y
 CONFIG_CITYTIME=y
 
 #
 # pim
 #
 CONFIG_TODO=y
 
 #
 # today
 #
 CONFIG_TODAY=y
 
 #
 # plugins
 #
 CONFIG_TODAY_TODOLIST=y
 CONFIG_TODAY_MAIL=y
 CONFIG_TODAY_DATEBOOK=y
 CONFIG_DATEBOOK=y
 CONFIG_ADDRESSBOOK=y
 CONFIG_OPIE-LOGIN=y
 
 #
 # multimedia
 #
 
 #
 # opieplayer
 #
 CONFIG_OPIEPLAYER=y
 CONFIG_LIBMAD=y
 CONFIG_LIBMPEG3=y
 CONFIG_MODPLUG=y
 CONFIG_WAVPLUGIN=y
 CONFIG_LAUNCHER=y
 
 #
 # apps
 #
 CONFIG_TEXTEDIT=y
 CONFIG_QCOP=y
 CONFIG_OIPKG=y
 CONFIG_HELPBROWSER=y
 CONFIG_FILEBROWSER=y
 CONFIG_EMBEDDEDKONSOLE=y
 
 #
 # applets
 #
 CONFIG_VOLUMEAPPLET=y
 CONFIG_VMEMO=y
 CONFIG_SUSPENDAPPLET=y
 CONFIG_SCREENSHOTAPPLET=y
 
 #
 # restartapplet2
 #
 
 #
 # restartapplet
 #
 CONFIG_RESTARTAPPLET=y
 CONFIG_OBEX=y
 CONFIG_NETMONAPPLET=y
 CONFIG_LOGOUTAPPLET=y
 CONFIG_IRDAAPPLET=y
 CONFIG_HOMEAPPLET=y
 CONFIG_CLOCKAPPLET=y
 CONFIG_CLIPBOARDAPPLET=y
 CONFIG_CARDMON=y
 CONFIG_BATTERYAPPLET-IPAQ=y
 
 #
 # batteryapplet
 #
 CONFIG_BATTERYAPPLET=y
diff --git a/def-configs/opie-x11 b/def-configs/opie-x11
index a419ed7..5ceb799 100644
--- a/def-configs/opie-x11
+++ b/def-configs/opie-x11
@@ -1,295 +1,293 @@
 #
 # Automatically generated make config: don't edit
 #
 
 #
 # Build Parameters
 #
 CONFIG_TARGET_X86=y
 # CONFIG_TARGET_SHARP is not set
 # CONFIG_TARGET_IPAQ is not set
 # CONFIG_OPTIMIZE is not set
 CONFIG_SPECFILE="linux-g++"
 CONFIG_X11=y
 CONFIG_LIBQPE-X11=y
 CONFIG_OCOPSERVER=y
 
 #
 # Non-core
 #
 
 #
 # unsupported
 #
 
 #
 # opiemail
 #
 CONFIG_CONVERTER=y
 
 #
 # ifaces
 #
 
 #
 # netsetup
 #
 CONFIG_DIALUP=y
 
 #
 # tools
 #
 CONFIG_REMOTE=y
 CONFIG_OPIE-SH=y
 CONFIG_FORMATTER=y
 CONFIG_CLOCK=y
 CONFIG_CALCULATOR=y
 
 #
 # calc2
 #
 
 #
 # todayplugins
 #
 
 #
 # stockticker
 #
 CONFIG_TODAY_STOCKTICKER=y
 CONFIG_TODAY_STOCKTICKERSUB=y
 CONFIG_TODAY_STOCKTICKERLIB=y
 CONFIG_TODAY_FORTUNE=y
 
 #
 # styles
 #
 CONFIG_THEME=y
 CONFIG_METAL=y
 CONFIG_LIQUID=y
 CONFIG_FRESH=y
 CONFIG_FLAT=y
 
 #
 # settings
 #
 CONFIG_USERMANAGER=y
 CONFIG_TABMANAGER=y
 CONFIG_SSHKEYS=y
 CONFIG_SOUND=y
 CONFIG_ROTATION=y
 CONFIG_NETSYSTEMTIME=y
 CONFIG_MEDIUMMOUNT=y
 CONFIG_LANGUAGE=y
 CONFIG_BACKUP=y
 CONFIG_APPSKEY=y
 CONFIG_APPEARANCE2=y
 
 #
 # appearance
 #
 
 #
 # net
 #
 
 #
 # opietooth
 #
 CONFIG_OPIEIRC=y
 CONFIG_OPIEFTP=y
-
-#
-# networksetup
-#
-CONFIG_INTERFACES=y
+CONFIG_NETWORKSETUP=y
+CONFIG_NETWORKSETUP-CORE=y
 CONFIG_WLAN=y
+CONFIG_INTERFACES=y
 
 #
 # multimedia
 #
 CONFIG_SHOWIMG=y
 CONFIG_OPIEMAIL2=y
 
 #
 # graphics
 #
 CONFIG_QPDF=y
 CONFIG_DRAWPAD=y
 
 #
 # games
 #
 CONFIG_WORDGAME=y
 CONFIG_TICTAC=y
 CONFIG_TETRIX=y
 CONFIG_SOLITAIRE=y
 CONFIG_SNAKE=y
 CONFIG_QASTEROIDS=y
 CONFIG_PARASHOOT=y
 CONFIG_MINESWEEP=y
 CONFIG_MINDBREAKER=y
 CONFIG_KPACMAN=y
 CONFIG_KCHECKERS=y
 CONFIG_KBILL=y
 CONFIG_GO=y
 CONFIG_FIFTEEN=y
 CONFIG_BUZZWORD=y
 CONFIG_BOUNCE=y
 
 #
 # decorations
 #
 CONFIG_DECO_POLISHED=y
 CONFIG_DECO_LIQUID=y
 CONFIG_DECO_FLAT=y
 
 #
 # comm
 #
 CONFIG_KEYPEBBLE=y
 
 #
 # apps
 #
 CONFIG_TABLEVIEWER=y
 CONFIG_SYSINFO=y
 CONFIG_OXYGEN=y
 CONFIG_OPIE-SHEET=y
 CONFIG_OPIE-READER=y
 
 #
 # opie-console
 #
 CONFIG_TEST=y
 
 #
 # test
 #
 CONFIG_CONFEDIT=y
 CONFIG_CHECKBOOK=y
 CONFIG_AQPKG=y
 CONFIG_ADVANCEDFM=y
 
 #
 # applets
 #
 CONFIG_WIRELESSAPPLET=y
 CONFIG_NOTESAPPLET=y
 
 #
 # libsql
 #
 CONFIG_LIBOPIE=y
 
 #
 # ofileselector
 #
 
 #
 # pim
 #
 
 #
 # inputmethods
 #
 CONFIG_UNIKEYBOARD=y
 CONFIG_PICKBOARD=y
 CONFIG_MULTIKEY=y
 CONFIG_KJUMPX=y
 CONFIG_KEYBOARD=y
 CONFIG_JUMPX=y
 CONFIG_HANDWRITING=y
 CONFIG_DVORAK=y
 CONFIG_FREETYPE=y
 
 #
 # development
 #
 
 #
 # Core
 #
 
 #
 # settings
 #
 CONFIG_SECURITY=y
 CONFIG_LIGHT-AND-POWER=y
 CONFIG_LAUNCHER-SETTINGS=y
 CONFIG_CITYTIME=y
 
 #
 # pim
 #
 CONFIG_TODO=y
 
 #
 # today
 #
 CONFIG_TODAY=y
 
 #
 # plugins
 #
 CONFIG_TODAY_TODOLIST=y
 CONFIG_TODAY_MAIL=y
 CONFIG_TODAY_DATEBOOK=y
 CONFIG_DATEBOOK=y
 CONFIG_ADDRESSBOOK=y
 CONFIG_OPIE-LOGIN=y
 
 #
 # multimedia
 #
 
 #
 # opieplayer
 #
 CONFIG_OPIEPLAYER=y
 CONFIG_LIBMAD=y
 CONFIG_LIBMPEG3=y
 CONFIG_MODPLUG=y
 CONFIG_WAVPLUGIN=y
 CONFIG_LAUNCHER=y
 
 #
 # apps
 #
 CONFIG_TEXTEDIT=y
 CONFIG_QCOP=y
 CONFIG_OIPKG=y
 CONFIG_HELPBROWSER=y
 CONFIG_FILEBROWSER=y
 CONFIG_EMBEDDEDKONSOLE=y
 
 #
 # applets
 #
 CONFIG_VOLUMEAPPLET=y
 CONFIG_VMEMO=y
 CONFIG_SUSPENDAPPLET=y
 CONFIG_SCREENSHOTAPPLET=y
 
 #
 # restartapplet2
 #
 
 #
 # restartapplet
 #
 CONFIG_RESTARTAPPLET=y
 CONFIG_OBEX=y
 CONFIG_NETMONAPPLET=y
 CONFIG_LOGOUTAPPLET=y
 CONFIG_IRDAAPPLET=y
 CONFIG_HOMEAPPLET=y
 CONFIG_CLOCKAPPLET=y
 CONFIG_CLIPBOARDAPPLET=y
 CONFIG_CARDMON=y
 CONFIG_BATTERYAPPLET-IPAQ=y
 
 #
 # batteryapplet
 #
 CONFIG_BATTERYAPPLET=y