3 files changed, 5 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index 15c9b5f..cfeff86 100644
--- a/Makefile
+++ b/Makefile
@@ -55,3 +55,3 @@ CORESETTINGS = core/settings/light-and-power core/settings/security \
         noncore/settings/netsystemtime core/settings/citytime \
-        core/settings/launcher
+        core/settings/launcher core/settings/button
 
@@ -60,3 +60,3 @@ NONCORESETTINGS  =noncore/settings/language noncore/settings/rotation \
         noncore/settings/mediummount \
-        noncore/settings/tabmanager noncore/settings/appskey \
+        noncore/settings/tabmanager \
         noncore/settings/sshkeys noncore/settings/usermanager \
diff --git a/def-configs/opie b/def-configs/opie
index 830fede..2d67db0 100644
--- a/def-configs/opie
+++ b/def-configs/opie
@@ -82,3 +82,2 @@ CONFIG_LANGUAGE=y
 CONFIG_BACKUP=y
-CONFIG_APPSKEY=y
 CONFIG_APPEARANCE2=y
@@ -217,2 +216,3 @@ CONFIG_LAUNCHER-SETTINGS=y
 CONFIG_CITYTIME=y
+CONFIG_BUTTON-SETTINGS=y
 
diff --git a/packages b/packages
index 07c327f..715d254 100644
--- a/packages
+++ b/packages
@@ -1,2 +1,3 @@
         #CONFIG_APPLET  noncore/net/opietooth/appletapplet.pro
+        #CONFIG_APPSKEY         noncore/settings/appskeyappskey.pro
         #CONFIG_BINARY  noncore/tools/calc2/binarybinary.pro
@@ -46,3 +47,2 @@ CONFIG_ADVANCEDFM	noncore/apps/advancedfm	advancedfm.pro
         CONFIG_APPEARANCE2      noncore/settings/appearance2appearance2.pro
-        CONFIG_APPSKEY  noncore/settings/appskeyappskey.pro
         CONFIG_AQPKG    noncore/apps/aqpkgaqpkg.pro
@@ -53,2 +53,3 @@ CONFIG_BEND	noncore/mail/bend	bend.pro
         CONFIG_BOUNCE   noncore/games/bouncebounce.pro
+        CONFIG_BUTTON-SETTINGS  core/settings/buttonbutton.pro
         CONFIG_BUZZWORD         noncore/games/buzzwordbuzzword.pro