2 files changed, 3 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 1aa15f8..ff5abe4 100644
--- a/Makefile
+++ b/Makefile
@@ -20,72 +20,71 @@ APPLETS= core/applets/batteryapplet core/applets/batteryapplet-ipaq \
        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 \
 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 \
-        core/settings/systemtime core/settings/citytime \
+        noncore/settings/netsystemtime core/settings/citytime \
        core/settings/launcher
 NONCORESETTINGS  =noncore/settings/language noncore/settings/rotation \
        noncore/settings/appearance2 noncore/settings/sound \
        noncore/settings/mediummount \
        noncore/settings/tabmanager noncore/settings/appskey \
-        noncore/settings/netsystemtime \
        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 
 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 
        
 NONNET = noncore/net/networksetup \
        noncore/net/opieftp \
        noncore/mail
diff --git a/Makefile.x11 b/Makefile.x11
index 8f37db5..4733e10 100644
--- a/Makefile.x11
+++ b/Makefile.x11
@@ -19,72 +19,72 @@ APPLETS= core/applets/batteryapplet core/applets/batteryapplet-ipaq \
        core/applets/cardmon core/applets/obex \
        core/applets/vmemo noncore/net/netsetup/dialup \
        noncore/net/netsetup/lan  \
        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 \
 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 \
-        core/settings/systemtime core/settings/citytime \
+        noncore/settings/netsystemtime core/settings/citytime \
        core/settings/launcher
 NONCORESETTINGS  =noncore/settings/language noncore/settings/rotation \
        noncore/settings/appearance2 noncore/settings/sound \
        noncore/settings/mediummount \
        noncore/settings/tabmanager noncore/settings/appskey \
-        noncore/settings/netsystemtime noncore/settings/wlansetup \
+        noncore/settings/wlansetup \
        noncore/settings/sshkeys noncore/settings/usermanager \
        noncore/apps/backup
 NONCORETOOLS = noncore/tools/calculator noncore/tools/clock \
         noncore/tools/remote noncore/tools/opie-sh noncore/apps/advancedfm
 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 
 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 \
        
 NONNET = noncore/net/netsetup noncore/net/opieftp \
        noncore/mail
 NONMULT = noncore/multimedia/showimg noncore/graphics/drawpad \
        noncore/graphics/qpdf noncore/apps/confedit