3 files changed, 5 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index 15c9b5f..cfeff86 100644
--- a/Makefile
+++ b/Makefile
@@ -1,125 +1,125 @@
 hehindefault:  dynamic
 
 all: default docs
 
 LIBS=library libopie
 
 
 INPUTCOMPONENTS= inputmethods/keyboard inputmethods/pickboard \
         inputmethods/handwriting  inputmethods/unikeyboard \
         inputmethods/jumpx inputmethods/kjumpx \
         inputmethods/dvorak  inputmethods/multikey \
 
 APPLETS= core/applets/batteryapplet core/applets/batteryapplet-ipaq \
         core/applets/irdaapplet core/applets/volumeapplet \
         core/applets/clockapplet \
         core/applets/homeapplet core/applets/suspendapplet \
         core/applets/logoutapplet \
         core/applets/screenshotapplet core/applets/clipboardapplet \
         core/applets/cardmon core/applets/obex \
         core/applets/vmemo \
         noncore/net/networksetup/interfaces \
         noncore/net/networksetup/wlan \
         noncore/applets/wirelessapplet noncore/applets/notesapplet
 
 MAIL= noncore/mail/libmail noncore/mail/bend 
 
 PLAYER = core/multimedia/opieplayer/libmpeg3 \
         core/multimedia/opieplayer/libmad \
         core/multimedia/opieplayer/wavplugin \
         core/multimedia/opieplayer/modplug
 
         COMPONENTS=$(LOCALCOMPONENTS) $(INPUTCOMPONENTS) $(APPLETS) $(MAIL) $(PLAYER)
 
 
 PIMAPPS = core/pim/addressbook core/pim/datebook \
          core/pim/today core/pim/todo 
 
 TODAYPLUGINS = core/pim/today/plugins/datebook \
                 core/pim/today/plugins/todolist \
                 core/pim/today/plugins/mail \
                 noncore/todayplugins/stockticker/stockticker noncore/todayplugins/stockticker/stocktickerlib \
                 noncore/todayplugins/fortune \
                 noncore/todayplugins/weather
 
 
 COREAPPS = core/apps/filebrowser core/apps/helpbrowser \
         core/apps/textedit core/apps/embeddedkonsole \
         core/launcher  \
         core/opie-login \
         core/apps/oipkg core/apps/qcop
 
 COREMULTIMEDIA = core/multimedia/opieplayer
 
 CORESETTINGS = core/settings/light-and-power core/settings/security \
         noncore/settings/netsystemtime core/settings/citytime \
-        core/settings/launcher
+        core/settings/launcher core/settings/button
 
 NONCORESETTINGS  =noncore/settings/language noncore/settings/rotation \
         noncore/settings/appearance2 noncore/settings/sound \
         noncore/settings/mediummount \
-        noncore/settings/tabmanager noncore/settings/appskey \
+        noncore/settings/tabmanager \
         noncore/settings/sshkeys noncore/settings/usermanager \
         noncore/settings/backup
 
 NONCORETOOLS = noncore/tools/calculator noncore/tools/clock \
          noncore/tools/remote noncore/tools/opie-sh noncore/apps/advancedfm \
          noncore/tools/formatter
 
 NONCORESTYLES = noncore/styles/liquid noncore/styles/theme noncore/styles/metal \
         noncore/styles/flat noncore/styles/fresh
 
 NONCOREDECOS = noncore/decorations/liquid noncore/decorations/flat \
         noncore/decorations/polished
 
 GAMES = noncore/games/minesweep noncore/games/solitaire \
         noncore/games/tetrix noncore/games/wordgame \
         noncore/games/parashoot noncore/games/snake \
         noncore/games/mindbreaker \
         noncore/games/go noncore/games/qasteroids \
         noncore/games/fifteen noncore/games/tictac \
         noncore/games/kcheckers noncore/games/kpacman \
         noncore/games/kbill noncore/games/buzzword \
         noncore/games/bounce noncore/games/sfcave
 
 NONAPPS = noncore/apps/opie-sheet noncore/apps/tableviewer \
         noncore/apps/opie-reader noncore/apps/checkbook noncore/apps/oxygen \
          noncore/apps/sysinfo noncore/net/opieirc noncore/apps/aqpkg \
          noncore/apps/opie-console noncore/apps/opie-write
         
 NONNET = noncore/net/networksetup \
         noncore/net/ftplib noncore/net/opieftp \
         noncore/mail
 
 NONMULT = noncore/multimedia/showimg noncore/graphics/drawpad \
         noncore/graphics/qpdf noncore/apps/confedit
 
 
 NONCOMM = noncore/comm/keypebble
 
 PLUGINS = freetype
 
 APPS=$(LOCALAPPS) $(PIMAPPS)  $(COREAPPS)     \
         $(COREMULTIMEDIA) $(CORESETTINGS) \
         $(NONCORESETTINGS) $(NONCORETOOLS) $(NONCORESTYLES) \
         $(NONCOREDECOS) $(NONAPPS) $(NONNET) $(NONMULT) \
         $(NONCOMM) $(GAMES) $(TODAYPLUGINS) $(PLUGINS)
     
     
 
 NONTMAKEAPPS := core/opiealarm 
 
 DOCS = docs/src/opie-policy
 
 dynamic: $(APPS) $(NONTMAKEAPPS)
 
 docs: $(DOCS)
 
 $(COMPONENTS): $(LIBS)
 
 $(NONTMAKEAPPS) $(APPS): $(LIBS) $(COMPONENTS)
 
 $(LIBS) $(COMPONENTS) $(NONTMAKEAPPS) $(APPS) $(DOCS):
         $(MAKE) -C $@ -f Makefile
 
 showcomponents:
diff --git a/def-configs/opie b/def-configs/opie
index 830fede..2d67db0 100644
--- a/def-configs/opie
+++ b/def-configs/opie
@@ -19,129 +19,128 @@ CONFIG_SPECFILE="qws/linux-generic-g++"
 #
 # 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
 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
 
@@ -154,128 +153,129 @@ 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
+CONFIG_BUTTON-SETTINGS=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
diff --git a/packages b/packages
index 07c327f..715d254 100644
--- a/packages
+++ b/packages
@@ -1,117 +1,118 @@
         #CONFIG_APPLET  noncore/net/opietooth/appletapplet.pro
+        #CONFIG_APPSKEY         noncore/settings/appskeyappskey.pro
         #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
         #CONFIG_CONVERTER       noncore/unsupported/opiemail/converterconverter.pro
         #CONFIG_DIALUP  noncore/unsupported/netsetup/dialupdialup.pro
         #CONFIG_DICTIONARY      noncore/apps/dictionarydictionary.pro
         #CONFIG_EXAMPLE         exampleexample.pro
         #CONFIG_GSMTOOL         noncore/comm/gsmtoolgsmtool.pro
         #CONFIG_KEYVIEW         development/keyviewkeyview.pro
         #CONFIG_LAN     noncore/unsupported/netsetup/lanlan.pro
         #CONFIG_LIB     noncore/net/opietooth/liblib.pro
         #CONFIG_LIB     noncore/unsupported/opiemail/liblib.pro
         #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_NETMONAPPLET    noncore/unsupported/netmonappletnetmonapplet.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_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
         CONFIG_OCOPSERVER       x11/ipc/serverocopserver.pro
         #CONFIG_SIMPLE  noncore/tools/calc2/simplesimple.pro
         #CONFIG_SMTP    noncore/unsupported/opiemail/ifaces/smtpsmtp.pro
         #CONFIG_SPREADSHEET     noncore/unsupported/spreadsheetspreadsheet.pro
         #CONFIG_SYSTEMTIME      noncore/unsupported/systemtimesystemtime.pro
         #CONFIG_TEST    libsql/testtest.pro
         #CONFIG_TEST    noncore/apps/opie-console/testtest.pro
         #CONFIG_UBROWSER        noncore/net/ubrowserubrowser.pro
         #CONFIG_WELLENREITER    noncore/net/wellenreiterwellenreiter.pro
         #CONFIG_WLANSETUP       noncore/unsupported/wlansetupwlansetup.pro
         CONFIG_ADDRESSBOOK      core/pim/addressbookaddressbook.pro
         CONFIG_ADVANCEDFM       noncore/apps/advancedfmadvancedfm.pro
         CONFIG_APPEARANCE2      noncore/settings/appearance2appearance2.pro
-        CONFIG_APPSKEY  noncore/settings/appskeyappskey.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
         CONFIG_BOUNCE   noncore/games/bouncebounce.pro
+        CONFIG_BUTTON-SETTINGS  core/settings/buttonbutton.pro
         CONFIG_BUZZWORD         noncore/games/buzzwordbuzzword.pro
         CONFIG_CALCULATOR       noncore/tools/calculatorcalculator.pro
         CONFIG_CARDMON  core/applets/cardmoncardmon.pro
         CONFIG_CHECKBOOK        noncore/apps/checkbookcheckbook.pro
         CONFIG_CITYTIME         core/settings/citytimecitytime.pro
         CONFIG_CLIPBOARDAPPLET  core/applets/clipboardappletclipboardapplet.pro
         CONFIG_CLOCK    noncore/tools/clockclock.pro
         CONFIG_CLOCKAPPLET      core/applets/clockappletclockapplet.pro
         CONFIG_CONFEDIT         noncore/apps/confeditconfedit.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_DRAWPAD  noncore/graphics/drawpaddrawpad.pro
         CONFIG_DVORAK   inputmethods/dvorakdvorak.pro
         CONFIG_EMBEDDEDKONSOLE  core/apps/embeddedkonsoleembeddedkonsole.pro
         CONFIG_FIFTEEN  noncore/games/fifteenfifteen.pro
         CONFIG_FILEBROWSER      core/apps/filebrowserfilebrowser.pro
         CONFIG_FLAT     noncore/styles/flatflat.pro
         CONFIG_FORMATTER        noncore/tools/formatterformatter.pro
         CONFIG_FREETYPE         freetypefreetype.pro
         CONFIG_FRESH    noncore/styles/freshfresh.pro
         CONFIG_GO       noncore/games/gogo.pro
         CONFIG_HANDWRITING      inputmethods/handwritinghandwriting.pro
         CONFIG_HELPBROWSER      core/apps/helpbrowserhelpbrowser.pro
         CONFIG_HOMEAPPLET       core/applets/homeapplethomeapplet.pro
         CONFIG_INTERFACES       noncore/net/networksetup/interfacesinterfaces.pro
         CONFIG_IRDAAPPLET       core/applets/irdaappletirdaapplet.pro
         CONFIG_JUMPX    inputmethods/jumpxjumpx.pro
         CONFIG_KBILL    noncore/games/kbillkbill.pro
         CONFIG_KCHECKERS        noncore/games/kcheckerskcheckers.pro
         CONFIG_KEYBOARD         inputmethods/keyboardkeyboard.pro
         CONFIG_KEYPEBBLE        noncore/comm/keypebblekeypebble.pro
         CONFIG_KJUMPX   inputmethods/kjumpxkjumpx.pro
         CONFIG_KPACMAN  noncore/games/kpacmankpacman.pro
         CONFIG_LANGUAGE         noncore/settings/languagelanguage.pro
         CONFIG_LAUNCHER_CORE    core/launcherlauncher.pro
         CONFIG_LAUNCHER-SETTINGS        core/settings/launcherlauncher.pro
         CONFIG_LIBMAD   core/multimedia/opieplayer/libmadlibmad.pro
         CONFIG_LIBMAIL  noncore/mail/libmaillibmail.pro
         CONFIG_LIBMPEG3         core/multimedia/opieplayer/libmpeg3libmpeg3.pro
         CONFIG_LIBOPIE  libopielibopie.pro
         CONFIG_LIBQPE   librarylibrary.pro
         CONFIG_LIGHT-AND-POWER  core/settings/light-and-powerlight-and-power.pro
         CONFIG_LIQUID   noncore/styles/liquidliquid.pro
         CONFIG_LOGOUTAPPLET     core/applets/logoutappletlogoutapplet.pro
         CONFIG_RUNAPPLET        core/applets/runappletrunapplet.pro
         CONFIG_MAIL     noncore/mailmail.pro
         CONFIG_MEDIUMMOUNT      noncore/settings/mediummountmediummount.pro
         CONFIG_METAL    noncore/styles/metalmetal.pro
         CONFIG_MINDBREAKER      noncore/games/mindbreakermindbreaker.pro
         CONFIG_MINESWEEP        noncore/games/minesweepminesweep.pro
         CONFIG_MODPLUG  core/multimedia/opieplayer/modplugmodplug.pro
         CONFIG_MULTIKEY         inputmethods/multikeymultikey.pro
         CONFIG_NETSYSTEMTIME    noncore/settings/netsystemtimenetsystemtime.pro
         CONFIG_NETWORKSETUP     noncore/net/networksetupnetworksetup.pro
         CONFIG_NOTESAPPLET      noncore/applets/notesappletnotesapplet.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
         CONFIG_OPIE-SH  noncore/tools/opie-shopie-sh.pro
         CONFIG_OPIE-SHEET       noncore/apps/opie-sheetopie-sheet.pro