diff --git a/Makefile b/Makefile
index df1da37..8852483 100755
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ winix.so: FORCE
 	@cd ../ezc/src   ; $(MAKE) -e
 	@cd ../tito/src  ; $(MAKE) -e
 	@cd ../pikotools ; $(MAKE) -e
-	$(CXX) -shared -rdynamic -Wl,-whole-archive -o winix.so $(CXXFLAGS) core/*.o db/*.o functions/*.o templates/*.o notify/*.o ../ezc/src/ezc.a ../tito/src/tito.a ../pikotools/utf8/utf8.a ../pikotools/confparser/confparser.a ../pikotools/mainparser/mainparser.a -lfcgi -lpq -lz -lfetch -lpthread -Wl,-no-whole-archive
+	$(CXX) -shared -rdynamic -Wl,-whole-archive -o winix.so $(CXXFLAGS) core/*.o db/*.o functions/*.o templates/*.o notify/*.o ../ezc/src/ezc.a ../tito/src/tito.a ../pikotools/utf8/utf8.a ../pikotools/space/space.a ../pikotools/mainparser/mainparser.a -lfcgi -lpq -lz -lfetch -lpthread -Wl,-no-whole-archive
 
 
 winix: FORCE
diff --git a/core/Makefile.dep b/core/Makefile.dep
index 692bce9..25ea1fb 100755
--- a/core/Makefile.dep
+++ b/core/Makefile.dep
@@ -1,17 +1,16 @@
 # DO NOT DELETE
 
 acceptbaseparser.o: acceptbaseparser.h
-app.o: app.h config.h ../../pikotools/confparser/confparser.h
-app.o: ../../pikotools/confparser/space.h htmlfilter.h system.h job.h
-app.o: basethread.h synchro.h ../../pikotools/confparser/space.h dirs.h
-app.o: item.h dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
-app.o: ../db/dbtextstream.h ../core/textstream.h misc.h requesttypes.h
-app.o: ../core/error.h ../db/dbitemquery.h ../core/item.h
-app.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
-app.o: ../core/dircontainer.h ../core/ugcontainer.h log.h textstream.h
-app.o: logmanipulators.h slog.h cur.h request.h error.h
-app.o: ../templates/htmltextstream.h session.h user.h plugindata.h rebus.h
-app.o: mount.h ../templates/locale.h ../notify/notify.h
+app.o: app.h config.h ../../pikotools/space/spaceparser.h
+app.o: ../../pikotools/space/space.h htmlfilter.h system.h job.h basethread.h
+app.o: synchro.h ../../pikotools/space/space.h dirs.h item.h dircontainer.h
+app.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+app.o: ../core/textstream.h misc.h requesttypes.h ../core/error.h
+app.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
+app.o: ../core/user.h ../core/group.h ../core/dircontainer.h
+app.o: ../core/ugcontainer.h log.h textstream.h logmanipulators.h slog.h
+app.o: cur.h request.h error.h ../templates/htmltextstream.h session.h user.h
+app.o: plugindata.h rebus.h mount.h ../templates/locale.h ../notify/notify.h
 app.o: ../notify/notifypool.h ../templates/patterns.h ../templates/locale.h
 app.o: ../templates/localefilter.h ../../ezc/src/ezc.h
 app.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
@@ -47,79 +46,78 @@ app.o: acceptbaseparser.h plugin.h pluginmsg.h
 basethread.o: basethread.h synchro.h
 bbcodeparser.o: bbcodeparser.h htmlfilter.h
 compress.o: compress.h log.h textstream.h logmanipulators.h slog.h cur.h
-compress.o: request.h requesttypes.h item.h
-compress.o: ../../pikotools/confparser/space.h error.h config.h
-compress.o: ../../pikotools/confparser/confparser.h
-compress.o: ../../pikotools/confparser/space.h htmlfilter.h
+compress.o: request.h requesttypes.h item.h ../../pikotools/space/space.h
+compress.o: error.h config.h ../../pikotools/space/spaceparser.h
+compress.o: ../../pikotools/space/space.h htmlfilter.h
 compress.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
 compress.o: session.h user.h plugindata.h rebus.h mount.h
 compress.o: ../templates/locale.h
-config.o: config.h ../../pikotools/confparser/confparser.h
-config.o: ../../pikotools/confparser/space.h htmlfilter.h log.h textstream.h
+config.o: config.h ../../pikotools/space/spaceparser.h
+config.o: ../../pikotools/space/space.h htmlfilter.h log.h textstream.h
 config.o: logmanipulators.h slog.h cur.h request.h requesttypes.h item.h
-config.o: ../../pikotools/confparser/space.h error.h
-config.o: ../templates/htmltextstream.h ../core/textstream.h misc.h session.h
-config.o: user.h plugindata.h rebus.h mount.h ../templates/locale.h plugin.h
-config.o: pluginmsg.h system.h job.h basethread.h synchro.h dirs.h
-config.o: dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
-config.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h
-config.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
-config.o: ../core/dircontainer.h ../core/ugcontainer.h ../notify/notify.h
-config.o: ../notify/notifypool.h ../templates/patterns.h
-config.o: ../templates/locale.h ../templates/localefilter.h
-config.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h
-config.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h
-config.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h
-config.o: ../../pikotools/utf8/utf8.h ../notify/notifythread.h
-config.o: ../core/basethread.h ../notify/templatesnotify.h ../core/config.h
-config.o: ../core/users.h ugcontainer.h lastcontainer.h mounts.h
-config.o: mountparser.h crypt.h run.h users.h groups.h group.h loadavg.h
-config.o: image.h threadmanager.h sessionmanager.h sessioncontainer.h
-config.o: ../functions/functions.h ../functions/functionbase.h
-config.o: ../core/request.h ../core/system.h ../core/synchro.h
-config.o: ../functions/functionparser.h ../core/cur.h ../functions/adduser.h
-config.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h
-config.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h
-config.o: ../functions/default.h ../functions/download.h ../functions/emacs.h
-config.o: ../functions/env.h ../functions/last.h ../functions/login.h
-config.o: ../functions/logout.h ../functions/ln.h ../functions/ls.h
-config.o: ../functions/man.h ../functions/meta.h ../functions/mkdir.h
-config.o: ../functions/mv.h ../functions/nicedit.h ../functions/node.h
-config.o: ../functions/passwd.h ../functions/priv.h ../functions/pw.h
-config.o: ../functions/reload.h ../functions/rm.h ../functions/rmuser.h
-config.o: ../functions/sort.h ../functions/specialdefault.h
-config.o: ../functions/stat.h ../functions/subject.h ../functions/template.h
+config.o: ../../pikotools/space/space.h error.h ../templates/htmltextstream.h
+config.o: ../core/textstream.h misc.h session.h user.h plugindata.h rebus.h
+config.o: mount.h ../templates/locale.h plugin.h pluginmsg.h system.h job.h
+config.o: basethread.h synchro.h dirs.h dircontainer.h ../db/db.h
+config.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
+config.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
+config.o: ../core/user.h ../core/group.h ../core/dircontainer.h
+config.o: ../core/ugcontainer.h ../notify/notify.h ../notify/notifypool.h
+config.o: ../templates/patterns.h ../templates/locale.h
+config.o: ../templates/localefilter.h ../../ezc/src/ezc.h
+config.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
+config.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h
+config.o: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.h
+config.o: ../notify/notifythread.h ../core/basethread.h
+config.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h
+config.o: ugcontainer.h lastcontainer.h mounts.h mountparser.h crypt.h run.h
+config.o: users.h groups.h group.h loadavg.h image.h threadmanager.h
+config.o: sessionmanager.h sessioncontainer.h ../functions/functions.h
+config.o: ../functions/functionbase.h ../core/request.h ../core/system.h
+config.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h
+config.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
+config.o: ../functions/privchanger.h ../functions/chown.h
+config.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h
+config.o: ../functions/download.h ../functions/emacs.h ../functions/env.h
+config.o: ../functions/last.h ../functions/login.h ../functions/logout.h
+config.o: ../functions/ln.h ../functions/ls.h ../functions/man.h
+config.o: ../functions/meta.h ../functions/mkdir.h ../functions/mv.h
+config.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h
+config.o: ../functions/priv.h ../functions/pw.h ../functions/reload.h
+config.o: ../functions/rm.h ../functions/rmuser.h ../functions/sort.h
+config.o: ../functions/specialdefault.h ../functions/stat.h
+config.o: ../functions/subject.h ../functions/template.h
 config.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
 config.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h
 config.o: ../core/htmlfilter.h ../templates/templates.h
 config.o: ../templates/patterncacher.h ../templates/indexpatterns.h
 config.o: ../templates/patterns.h ../templates/changepatterns.h
 config.o: ../templates/htmltextstream.h ../core/sessionmanager.h
-crypt.o: crypt.h run.h config.h ../../pikotools/confparser/confparser.h
-crypt.o: ../../pikotools/confparser/space.h htmlfilter.h user.h
+crypt.o: crypt.h run.h config.h ../../pikotools/space/spaceparser.h
+crypt.o: ../../pikotools/space/space.h htmlfilter.h user.h
 crypt.o: ../../pikotools/utf8/utf8.h misc.h item.h
-crypt.o: ../../pikotools/confparser/space.h requesttypes.h log.h textstream.h
+crypt.o: ../../pikotools/space/space.h requesttypes.h log.h textstream.h
 crypt.o: logmanipulators.h slog.h cur.h request.h error.h
 crypt.o: ../templates/htmltextstream.h ../core/textstream.h session.h
 crypt.o: plugindata.h rebus.h mount.h ../templates/locale.h
-dircontainer.o: dircontainer.h item.h ../../pikotools/confparser/space.h
-dircontainer.o: log.h textstream.h logmanipulators.h slog.h cur.h request.h
+dircontainer.o: dircontainer.h item.h ../../pikotools/space/space.h log.h
+dircontainer.o: textstream.h logmanipulators.h slog.h cur.h request.h
 dircontainer.o: requesttypes.h error.h config.h
-dircontainer.o: ../../pikotools/confparser/confparser.h
-dircontainer.o: ../../pikotools/confparser/space.h htmlfilter.h
+dircontainer.o: ../../pikotools/space/spaceparser.h
+dircontainer.o: ../../pikotools/space/space.h htmlfilter.h
 dircontainer.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
 dircontainer.o: session.h user.h plugindata.h rebus.h mount.h
 dircontainer.o: ../templates/locale.h
-dirs.o: dirs.h item.h ../../pikotools/confparser/space.h dircontainer.h
-dirs.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+dirs.o: dirs.h item.h ../../pikotools/space/space.h dircontainer.h ../db/db.h
+dirs.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
 dirs.o: ../core/textstream.h misc.h requesttypes.h ../core/error.h
-dirs.o: ../../pikotools/confparser/confparser.h
-dirs.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h ../core/item.h
-dirs.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
-dirs.o: ../core/dircontainer.h ../core/ugcontainer.h log.h textstream.h
-dirs.o: logmanipulators.h slog.h cur.h request.h error.h config.h
-dirs.o: htmlfilter.h ../templates/htmltextstream.h session.h user.h
-dirs.o: plugindata.h rebus.h mount.h ../templates/locale.h ../notify/notify.h
+dirs.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+dirs.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
+dirs.o: ../core/user.h ../core/group.h ../core/dircontainer.h
+dirs.o: ../core/ugcontainer.h log.h textstream.h logmanipulators.h slog.h
+dirs.o: cur.h request.h error.h config.h htmlfilter.h
+dirs.o: ../templates/htmltextstream.h session.h user.h plugindata.h rebus.h
+dirs.o: mount.h ../templates/locale.h ../notify/notify.h
 dirs.o: ../notify/notifypool.h ../templates/patterns.h ../templates/locale.h
 dirs.o: ../templates/localefilter.h ../../ezc/src/ezc.h
 dirs.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
@@ -130,23 +128,22 @@ dirs.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h
 dirs.o: ugcontainer.h lastcontainer.h
 groups.o: groups.h group.h ugcontainer.h ../db/db.h ../db/dbbase.h
 groups.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h misc.h
-groups.o: item.h ../../pikotools/confparser/space.h requesttypes.h
-groups.o: ../core/error.h ../../pikotools/confparser/confparser.h
-groups.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
-groups.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
-groups.o: ../core/dircontainer.h ../core/ugcontainer.h log.h textstream.h
-groups.o: logmanipulators.h slog.h cur.h request.h error.h config.h
-groups.o: htmlfilter.h ../templates/htmltextstream.h session.h user.h
-groups.o: plugindata.h rebus.h mount.h ../templates/locale.h
+groups.o: item.h ../../pikotools/space/space.h requesttypes.h ../core/error.h
+groups.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+groups.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
+groups.o: ../core/user.h ../core/group.h ../core/dircontainer.h
+groups.o: ../core/ugcontainer.h log.h textstream.h logmanipulators.h slog.h
+groups.o: cur.h request.h error.h config.h htmlfilter.h
+groups.o: ../templates/htmltextstream.h session.h user.h plugindata.h rebus.h
+groups.o: mount.h ../templates/locale.h
 htmlfilter.o: htmlfilter.h
 httpsimpleparser.o: httpsimpleparser.h
 image.o: image.h basethread.h synchro.h textstream.h ../db/db.h
 image.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-image.o: ../core/textstream.h misc.h item.h
-image.o: ../../pikotools/confparser/space.h requesttypes.h ../core/error.h
-image.o: ../../pikotools/confparser/confparser.h
-image.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
-image.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
+image.o: ../core/textstream.h misc.h item.h ../../pikotools/space/space.h
+image.o: requesttypes.h ../core/error.h ../../pikotools/space/spaceparser.h
+image.o: ../../pikotools/space/space.h ../db/dbitemquery.h ../core/item.h
+image.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
 image.o: ../core/dircontainer.h ../core/ugcontainer.h log.h logmanipulators.h
 image.o: slog.h cur.h request.h error.h config.h htmlfilter.h
 image.o: ../templates/htmltextstream.h session.h user.h plugindata.h rebus.h
@@ -182,21 +179,21 @@ image.o: ../core/htmlfilter.h ../templates/templates.h
 image.o: ../templates/patterncacher.h ../templates/indexpatterns.h
 image.o: ../templates/patterns.h ../templates/changepatterns.h
 image.o: ../templates/htmltextstream.h ../core/sessionmanager.h
-item.o: item.h ../../pikotools/confparser/space.h misc.h requesttypes.h
-item.o: crypt.h run.h config.h ../../pikotools/confparser/confparser.h
-item.o: ../../pikotools/confparser/space.h htmlfilter.h user.h
-job.o: job.h basethread.h synchro.h ../../pikotools/confparser/space.h
-job.o: plugin.h pluginmsg.h log.h textstream.h logmanipulators.h slog.h cur.h
+item.o: item.h ../../pikotools/space/space.h misc.h requesttypes.h crypt.h
+item.o: run.h config.h ../../pikotools/space/spaceparser.h
+item.o: ../../pikotools/space/space.h htmlfilter.h user.h
+job.o: job.h basethread.h synchro.h ../../pikotools/space/space.h plugin.h
+job.o: pluginmsg.h log.h textstream.h logmanipulators.h slog.h cur.h
 job.o: request.h requesttypes.h item.h error.h config.h
-job.o: ../../pikotools/confparser/confparser.h
-job.o: ../../pikotools/confparser/space.h htmlfilter.h
-job.o: ../templates/htmltextstream.h ../core/textstream.h misc.h session.h
-job.o: user.h plugindata.h rebus.h mount.h ../templates/locale.h system.h
-job.o: dirs.h dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
-job.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h
-job.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
-job.o: ../core/dircontainer.h ../core/ugcontainer.h ../notify/notify.h
-job.o: ../notify/notifypool.h ../templates/patterns.h ../templates/locale.h
+job.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+job.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h misc.h
+job.o: session.h user.h plugindata.h rebus.h mount.h ../templates/locale.h
+job.o: system.h dirs.h dircontainer.h ../db/db.h ../db/dbbase.h
+job.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
+job.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
+job.o: ../core/user.h ../core/group.h ../core/dircontainer.h
+job.o: ../core/ugcontainer.h ../notify/notify.h ../notify/notifypool.h
+job.o: ../templates/patterns.h ../templates/locale.h
 job.o: ../templates/localefilter.h ../../ezc/src/ezc.h
 job.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
 job.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h
@@ -228,30 +225,29 @@ job.o: ../templates/changepatterns.h ../templates/htmltextstream.h
 job.o: ../core/sessionmanager.h
 lastcontainer.o: lastcontainer.h log.h textstream.h logmanipulators.h slog.h
 lastcontainer.o: cur.h request.h requesttypes.h item.h
-lastcontainer.o: ../../pikotools/confparser/space.h error.h config.h
-lastcontainer.o: ../../pikotools/confparser/confparser.h
-lastcontainer.o: ../../pikotools/confparser/space.h htmlfilter.h
+lastcontainer.o: ../../pikotools/space/space.h error.h config.h
+lastcontainer.o: ../../pikotools/space/spaceparser.h
+lastcontainer.o: ../../pikotools/space/space.h htmlfilter.h
 lastcontainer.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
 lastcontainer.o: session.h user.h plugindata.h rebus.h mount.h
 lastcontainer.o: ../templates/locale.h
 loadavg.o: loadavg.h log.h textstream.h logmanipulators.h slog.h cur.h
-loadavg.o: request.h requesttypes.h item.h ../../pikotools/confparser/space.h
-loadavg.o: error.h config.h ../../pikotools/confparser/confparser.h
-loadavg.o: ../../pikotools/confparser/space.h htmlfilter.h
+loadavg.o: request.h requesttypes.h item.h ../../pikotools/space/space.h
+loadavg.o: error.h config.h ../../pikotools/space/spaceparser.h
+loadavg.o: ../../pikotools/space/space.h htmlfilter.h
 loadavg.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
 loadavg.o: session.h user.h plugindata.h rebus.h mount.h
 loadavg.o: ../templates/locale.h
 log.o: log.h textstream.h logmanipulators.h slog.h cur.h request.h
-log.o: requesttypes.h item.h ../../pikotools/confparser/space.h error.h
-log.o: config.h ../../pikotools/confparser/confparser.h
-log.o: ../../pikotools/confparser/space.h htmlfilter.h
-log.o: ../templates/htmltextstream.h ../core/textstream.h misc.h session.h
-log.o: user.h plugindata.h rebus.h mount.h ../templates/locale.h
+log.o: requesttypes.h item.h ../../pikotools/space/space.h error.h config.h
+log.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+log.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h misc.h
+log.o: session.h user.h plugindata.h rebus.h mount.h ../templates/locale.h
 log.o: ../../pikotools/utf8/utf8.h
-misc.o: misc.h item.h ../../pikotools/confparser/space.h requesttypes.h log.h
+misc.o: misc.h item.h ../../pikotools/space/space.h requesttypes.h log.h
 misc.o: textstream.h logmanipulators.h slog.h cur.h request.h error.h
-misc.o: config.h ../../pikotools/confparser/confparser.h
-misc.o: ../../pikotools/confparser/space.h htmlfilter.h
+misc.o: config.h ../../pikotools/space/spaceparser.h
+misc.o: ../../pikotools/space/space.h htmlfilter.h
 misc.o: ../templates/htmltextstream.h ../core/textstream.h session.h user.h
 misc.o: plugindata.h rebus.h mount.h ../templates/locale.h
 misc.o: ../templates/templates.h ../../ezc/src/ezc.h
@@ -267,14 +263,13 @@ misc.o: ../core/sessionmanager.h ../core/htmlfilter.h ../db/db.h
 misc.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
 misc.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
 misc.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
-mount.o: mount.h misc.h item.h ../../pikotools/confparser/space.h
-mount.o: requesttypes.h
-mountparser.o: mountparser.h mount.h item.h
-mountparser.o: ../../pikotools/confparser/space.h dirs.h dircontainer.h
-mountparser.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-mountparser.o: ../core/textstream.h misc.h requesttypes.h ../core/error.h
-mountparser.o: ../../pikotools/confparser/confparser.h
-mountparser.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
+mount.o: mount.h misc.h item.h ../../pikotools/space/space.h requesttypes.h
+mountparser.o: mountparser.h mount.h item.h ../../pikotools/space/space.h
+mountparser.o: dirs.h dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+mountparser.o: ../db/dbtextstream.h ../core/textstream.h misc.h
+mountparser.o: requesttypes.h ../core/error.h
+mountparser.o: ../../pikotools/space/spaceparser.h
+mountparser.o: ../../pikotools/space/space.h ../db/dbitemquery.h
 mountparser.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h
 mountparser.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
 mountparser.o: log.h textstream.h logmanipulators.h slog.h cur.h request.h
@@ -290,27 +285,26 @@ mountparser.o: ../notify/notifythread.h ../core/basethread.h
 mountparser.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h
 mountparser.o: ugcontainer.h lastcontainer.h
 mounts.o: mounts.h mount.h error.h dirs.h item.h
-mounts.o: ../../pikotools/confparser/space.h dircontainer.h ../db/db.h
+mounts.o: ../../pikotools/space/space.h dircontainer.h ../db/db.h
 mounts.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
 mounts.o: ../core/textstream.h misc.h requesttypes.h ../core/error.h
-mounts.o: ../../pikotools/confparser/confparser.h
-mounts.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
-mounts.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
-mounts.o: ../core/dircontainer.h ../core/ugcontainer.h log.h textstream.h
-mounts.o: logmanipulators.h slog.h cur.h request.h config.h htmlfilter.h
-mounts.o: ../templates/htmltextstream.h session.h user.h plugindata.h rebus.h
-mounts.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h
-mounts.o: ../templates/patterns.h ../templates/locale.h
-mounts.o: ../templates/localefilter.h ../../ezc/src/ezc.h
-mounts.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
-mounts.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h
-mounts.o: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.h
-mounts.o: ../notify/notifythread.h ../core/basethread.h
-mounts.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h
-mounts.o: ugcontainer.h lastcontainer.h mountparser.h plugin.h pluginmsg.h
-mounts.o: system.h job.h basethread.h synchro.h crypt.h run.h users.h
-mounts.o: groups.h group.h loadavg.h image.h threadmanager.h sessionmanager.h
-mounts.o: sessioncontainer.h ../functions/functions.h
+mounts.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+mounts.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
+mounts.o: ../core/user.h ../core/group.h ../core/dircontainer.h
+mounts.o: ../core/ugcontainer.h log.h textstream.h logmanipulators.h slog.h
+mounts.o: cur.h request.h config.h htmlfilter.h ../templates/htmltextstream.h
+mounts.o: session.h user.h plugindata.h rebus.h ../templates/locale.h
+mounts.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h
+mounts.o: ../templates/locale.h ../templates/localefilter.h
+mounts.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h
+mounts.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h
+mounts.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h
+mounts.o: ../../pikotools/utf8/utf8.h ../notify/notifythread.h
+mounts.o: ../core/basethread.h ../notify/templatesnotify.h ../core/config.h
+mounts.o: ../core/users.h ugcontainer.h lastcontainer.h mountparser.h
+mounts.o: plugin.h pluginmsg.h system.h job.h basethread.h synchro.h crypt.h
+mounts.o: run.h users.h groups.h group.h loadavg.h image.h threadmanager.h
+mounts.o: sessionmanager.h sessioncontainer.h ../functions/functions.h
 mounts.o: ../functions/functionbase.h ../core/request.h ../core/system.h
 mounts.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h
 mounts.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
@@ -332,10 +326,9 @@ mounts.o: ../templates/patterncacher.h ../templates/indexpatterns.h
 mounts.o: ../templates/patterns.h ../templates/changepatterns.h
 mounts.o: ../templates/htmltextstream.h ../core/sessionmanager.h
 plugin.o: plugin.h pluginmsg.h log.h textstream.h logmanipulators.h slog.h
-plugin.o: cur.h request.h requesttypes.h item.h
-plugin.o: ../../pikotools/confparser/space.h error.h config.h
-plugin.o: ../../pikotools/confparser/confparser.h
-plugin.o: ../../pikotools/confparser/space.h htmlfilter.h
+plugin.o: cur.h request.h requesttypes.h item.h ../../pikotools/space/space.h
+plugin.o: error.h config.h ../../pikotools/space/spaceparser.h
+plugin.o: ../../pikotools/space/space.h htmlfilter.h
 plugin.o: ../templates/htmltextstream.h ../core/textstream.h misc.h session.h
 plugin.o: user.h plugindata.h rebus.h mount.h ../templates/locale.h system.h
 plugin.o: job.h basethread.h synchro.h dirs.h dircontainer.h ../db/db.h
@@ -375,9 +368,9 @@ plugin.o: ../templates/patterns.h ../templates/changepatterns.h
 plugin.o: ../templates/htmltextstream.h ../core/sessionmanager.h
 plugindata.o: plugindata.h plugin.h pluginmsg.h log.h textstream.h
 plugindata.o: logmanipulators.h slog.h cur.h request.h requesttypes.h item.h
-plugindata.o: ../../pikotools/confparser/space.h error.h config.h
-plugindata.o: ../../pikotools/confparser/confparser.h
-plugindata.o: ../../pikotools/confparser/space.h htmlfilter.h
+plugindata.o: ../../pikotools/space/space.h error.h config.h
+plugindata.o: ../../pikotools/space/spaceparser.h
+plugindata.o: ../../pikotools/space/space.h htmlfilter.h
 plugindata.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
 plugindata.o: session.h user.h rebus.h mount.h ../templates/locale.h system.h
 plugindata.o: job.h basethread.h synchro.h dirs.h dircontainer.h ../db/db.h
@@ -419,22 +412,22 @@ plugindata.o: ../templates/indexpatterns.h ../templates/patterns.h
 plugindata.o: ../templates/changepatterns.h ../templates/htmltextstream.h
 plugindata.o: ../core/sessionmanager.h
 postmultiparser.o: postmultiparser.h error.h requesttypes.h config.h
-postmultiparser.o: ../../pikotools/confparser/confparser.h
-postmultiparser.o: ../../pikotools/confparser/space.h htmlfilter.h misc.h
-postmultiparser.o: item.h ../../pikotools/confparser/space.h log.h
-postmultiparser.o: textstream.h logmanipulators.h slog.h cur.h request.h
+postmultiparser.o: ../../pikotools/space/spaceparser.h
+postmultiparser.o: ../../pikotools/space/space.h htmlfilter.h misc.h item.h
+postmultiparser.o: ../../pikotools/space/space.h log.h textstream.h
+postmultiparser.o: logmanipulators.h slog.h cur.h request.h
 postmultiparser.o: ../templates/htmltextstream.h ../core/textstream.h
 postmultiparser.o: session.h user.h plugindata.h rebus.h mount.h
 postmultiparser.o: ../templates/locale.h ../../pikotools/utf8/utf8.h
 rebus.o: log.h textstream.h logmanipulators.h slog.h cur.h request.h
-rebus.o: requesttypes.h item.h ../../pikotools/confparser/space.h error.h
-rebus.o: config.h ../../pikotools/confparser/confparser.h
-rebus.o: ../../pikotools/confparser/space.h htmlfilter.h
-rebus.o: ../templates/htmltextstream.h ../core/textstream.h misc.h session.h
-rebus.o: user.h plugindata.h rebus.h mount.h ../templates/locale.h
-request.o: request.h requesttypes.h item.h ../../pikotools/confparser/space.h
-request.o: error.h config.h ../../pikotools/confparser/confparser.h
-request.o: ../../pikotools/confparser/space.h htmlfilter.h textstream.h
+rebus.o: requesttypes.h item.h ../../pikotools/space/space.h error.h config.h
+rebus.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+rebus.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h
+rebus.o: misc.h session.h user.h plugindata.h rebus.h mount.h
+rebus.o: ../templates/locale.h
+request.o: request.h requesttypes.h item.h ../../pikotools/space/space.h
+request.o: error.h config.h ../../pikotools/space/spaceparser.h
+request.o: ../../pikotools/space/space.h htmlfilter.h textstream.h
 request.o: ../templates/htmltextstream.h ../core/textstream.h misc.h log.h
 request.o: logmanipulators.h slog.h cur.h session.h user.h plugindata.h
 request.o: rebus.h mount.h ../templates/locale.h plugin.h pluginmsg.h
@@ -475,28 +468,25 @@ request.o: ../templates/patterncacher.h ../templates/indexpatterns.h
 request.o: ../templates/patterns.h ../templates/changepatterns.h
 request.o: ../templates/htmltextstream.h ../core/sessionmanager.h
 run.o: run.h log.h textstream.h logmanipulators.h slog.h cur.h request.h
-run.o: requesttypes.h item.h ../../pikotools/confparser/space.h error.h
-run.o: config.h ../../pikotools/confparser/confparser.h
-run.o: ../../pikotools/confparser/space.h htmlfilter.h
-run.o: ../templates/htmltextstream.h ../core/textstream.h misc.h session.h
-run.o: user.h plugindata.h rebus.h mount.h ../templates/locale.h
-session.o: session.h item.h ../../pikotools/confparser/space.h error.h user.h
+run.o: requesttypes.h item.h ../../pikotools/space/space.h error.h config.h
+run.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+run.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h misc.h
+run.o: session.h user.h plugindata.h rebus.h mount.h ../templates/locale.h
+session.o: session.h item.h ../../pikotools/space/space.h error.h user.h
 session.o: plugindata.h rebus.h textstream.h misc.h requesttypes.h
 sessioncontainer.o: sessioncontainer.h session.h item.h
-sessioncontainer.o: ../../pikotools/confparser/space.h error.h user.h
-sessioncontainer.o: plugindata.h rebus.h textstream.h cur.h request.h
-sessioncontainer.o: requesttypes.h config.h
-sessioncontainer.o: ../../pikotools/confparser/confparser.h
-sessioncontainer.o: ../../pikotools/confparser/space.h htmlfilter.h
+sessioncontainer.o: ../../pikotools/space/space.h error.h user.h plugindata.h
+sessioncontainer.o: rebus.h textstream.h cur.h request.h requesttypes.h
+sessioncontainer.o: config.h ../../pikotools/space/spaceparser.h
+sessioncontainer.o: ../../pikotools/space/space.h htmlfilter.h
 sessioncontainer.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
 sessioncontainer.o: mount.h log.h logmanipulators.h slog.h
 sessioncontainer.o: ../templates/locale.h
 sessionmanager.o: sessionmanager.h sessioncontainer.h session.h item.h
-sessionmanager.o: ../../pikotools/confparser/space.h error.h user.h
-sessionmanager.o: plugindata.h rebus.h textstream.h cur.h request.h
-sessionmanager.o: requesttypes.h config.h
-sessionmanager.o: ../../pikotools/confparser/confparser.h
-sessionmanager.o: ../../pikotools/confparser/space.h htmlfilter.h
+sessionmanager.o: ../../pikotools/space/space.h error.h user.h plugindata.h
+sessionmanager.o: rebus.h textstream.h cur.h request.h requesttypes.h
+sessionmanager.o: config.h ../../pikotools/space/spaceparser.h
+sessionmanager.o: ../../pikotools/space/space.h htmlfilter.h
 sessionmanager.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
 sessionmanager.o: mount.h lastcontainer.h system.h job.h basethread.h
 sessionmanager.o: synchro.h dirs.h dircontainer.h ../db/db.h ../db/dbbase.h
@@ -541,29 +531,26 @@ sessionmanager.o: ../templates/indexpatterns.h ../templates/patterns.h
 sessionmanager.o: ../templates/changepatterns.h ../templates/htmltextstream.h
 sessionmanager.o: ../core/sessionmanager.h
 sessionparser.o: sessionparser.h session.h item.h
-sessionparser.o: ../../pikotools/confparser/space.h error.h user.h
-sessionparser.o: plugindata.h rebus.h textstream.h sessioncontainer.h cur.h
-sessionparser.o: request.h requesttypes.h config.h
-sessionparser.o: ../../pikotools/confparser/confparser.h
-sessionparser.o: ../../pikotools/confparser/space.h htmlfilter.h
+sessionparser.o: ../../pikotools/space/space.h error.h user.h plugindata.h
+sessionparser.o: rebus.h textstream.h sessioncontainer.h cur.h request.h
+sessionparser.o: requesttypes.h config.h ../../pikotools/space/spaceparser.h
+sessionparser.o: ../../pikotools/space/space.h htmlfilter.h
 sessionparser.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
 sessionparser.o: mount.h users.h log.h logmanipulators.h slog.h
 sessionparser.o: ../templates/locale.h
 slog.o: slog.h cur.h request.h requesttypes.h item.h
-slog.o: ../../pikotools/confparser/space.h error.h config.h
-slog.o: ../../pikotools/confparser/confparser.h
-slog.o: ../../pikotools/confparser/space.h htmlfilter.h textstream.h
-slog.o: ../templates/htmltextstream.h ../core/textstream.h misc.h session.h
-slog.o: user.h plugindata.h rebus.h mount.h logmanipulators.h
-slog.o: ../templates/locale.h
+slog.o: ../../pikotools/space/space.h error.h config.h
+slog.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+slog.o: htmlfilter.h textstream.h ../templates/htmltextstream.h
+slog.o: ../core/textstream.h misc.h session.h user.h plugindata.h rebus.h
+slog.o: mount.h logmanipulators.h ../templates/locale.h
 synchro.o: synchro.h
-system.o: system.h job.h basethread.h synchro.h
-system.o: ../../pikotools/confparser/space.h dirs.h item.h dircontainer.h
-system.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-system.o: ../core/textstream.h misc.h requesttypes.h ../core/error.h
-system.o: ../../pikotools/confparser/confparser.h
-system.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
-system.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
+system.o: system.h job.h basethread.h synchro.h ../../pikotools/space/space.h
+system.o: dirs.h item.h dircontainer.h ../db/db.h ../db/dbbase.h
+system.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h misc.h
+system.o: requesttypes.h ../core/error.h ../../pikotools/space/spaceparser.h
+system.o: ../../pikotools/space/space.h ../db/dbitemquery.h ../core/item.h
+system.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
 system.o: ../core/dircontainer.h ../core/ugcontainer.h log.h textstream.h
 system.o: logmanipulators.h slog.h cur.h request.h error.h config.h
 system.o: htmlfilter.h ../templates/htmltextstream.h session.h user.h
@@ -599,24 +586,23 @@ system.o: ../functions/subject.h ../functions/template.h
 system.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
 system.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h
 system.o: plugin.h pluginmsg.h sessionmanager.h sessioncontainer.h
-textstream.o: textstream.h misc.h item.h ../../pikotools/confparser/space.h
+textstream.o: textstream.h misc.h item.h ../../pikotools/space/space.h
 textstream.o: requesttypes.h
 threadmanager.o: threadmanager.h basethread.h synchro.h log.h textstream.h
 threadmanager.o: logmanipulators.h slog.h cur.h request.h requesttypes.h
-threadmanager.o: item.h ../../pikotools/confparser/space.h error.h config.h
-threadmanager.o: ../../pikotools/confparser/confparser.h
-threadmanager.o: ../../pikotools/confparser/space.h htmlfilter.h
+threadmanager.o: item.h ../../pikotools/space/space.h error.h config.h
+threadmanager.o: ../../pikotools/space/spaceparser.h
+threadmanager.o: ../../pikotools/space/space.h htmlfilter.h
 threadmanager.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
 threadmanager.o: session.h user.h plugindata.h rebus.h mount.h
 threadmanager.o: ../templates/locale.h
 users.o: users.h sessionmanager.h sessioncontainer.h session.h item.h
-users.o: ../../pikotools/confparser/space.h error.h user.h plugindata.h
-users.o: rebus.h textstream.h cur.h request.h requesttypes.h config.h
-users.o: ../../pikotools/confparser/confparser.h
-users.o: ../../pikotools/confparser/space.h htmlfilter.h
-users.o: ../templates/htmltextstream.h ../core/textstream.h misc.h mount.h
-users.o: lastcontainer.h system.h job.h basethread.h synchro.h dirs.h
-users.o: dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+users.o: ../../pikotools/space/space.h error.h user.h plugindata.h rebus.h
+users.o: textstream.h cur.h request.h requesttypes.h config.h
+users.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+users.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h
+users.o: misc.h mount.h lastcontainer.h system.h job.h basethread.h synchro.h
+users.o: dirs.h dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
 users.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h
 users.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
 users.o: ../core/dircontainer.h ../core/ugcontainer.h log.h logmanipulators.h
diff --git a/core/basethread.h b/core/basethread.h
index 89df0a9..10f3833 100755
--- a/core/basethread.h
+++ b/core/basethread.h
@@ -2,7 +2,7 @@
  * This file is a part of Winix
  * and is not publicly distributed
  * 
- * Copyright (c) 2010-2011, Tomasz Sowa
+ * Copyright (c) 2010-2012, Tomasz Sowa
  * All rights reserved.
  * 
  */
@@ -36,20 +36,19 @@ public:
 	// starting the second thread
 	bool StartThread();
 
+
+	// virtual methods which should/can be inherited by your class
+	// the methods will be called from the other thread
+
 	// wake up the second thread
 	// (if it waits for the signal)
 	// you should use it with: synchro->Lock() and Unlock()
 	// if the thread doesn't wait on a signal then nothing is done
-	void WakeUpThread();
+	virtual void WakeUpThread();
 
 	// waiting until the thread exits
 	// you should call WakeUpThread() before
-	void WaitForThread();
-
-	
-
-	// virtual methods which should/can be inherited by your class
-	// the methods will be called from the other thread
+	virtual void WaitForThread();
 
 	// initialize the thread
 	// (global objects are locked)
diff --git a/core/config.cpp b/core/config.cpp
index 68ce1c5..81d9710 100755
--- a/core/config.cpp
+++ b/core/config.cpp
@@ -31,22 +31,22 @@ void Config::ShowError()
 	
 	switch( parser.status )
 	{
-		case PT::ConfParser::no_space:
+		case PT::SpaceParser::no_space:
 			log << log2 << "Config: space not set" << logend;
 			break;
 
-		case PT::ConfParser::ok:
+		case PT::SpaceParser::ok:
 			log << log2 << "Config: syntax ok" << logend;
 			break;
 		
-		case PT::ConfParser::cant_open_file:
+		case PT::SpaceParser::cant_open_file:
 			if( errors_to_stdout )
 				std::cout << "Config: cant open a config file: " << config_file << std::endl;
 			
 			log	<< log1 << "Config: cant open a config file: " << config_file << logend;
 			break;
 
-		case PT::ConfParser::syntax_error:
+		case PT::SpaceParser::syntax_error:
 			if( errors_to_stdout )
 				std::cout << "Config: syntax error, line: " << parser.line << std::endl;
 			
@@ -76,9 +76,9 @@ bool Config::ReadConfig(bool errors_to_stdout_, bool stdout_is_closed)
 	parser.UTF8(true); // config is always read in UTF-8
 	parser.SetSpace(space);
 
-	PT::ConfParser::Status status = parser.Parse(config_file);
+	PT::SpaceParser::Status status = parser.Parse(config_file);
 
-	if( status == PT::ConfParser::ok )
+	if( status == PT::SpaceParser::ok )
 	{
 		AssignValues(stdout_is_closed);
 		SetAdditionalVariables();
diff --git a/core/config.h b/core/config.h
index bc26976..f58cdf2 100755
--- a/core/config.h
+++ b/core/config.h
@@ -11,7 +11,7 @@
 #define headerfile_winix_core_config
 
 #include <string>
-#include "confparser/confparser.h"
+#include "space/spaceparser.h"
 #include "htmlfilter.h"
 
 
@@ -515,7 +515,7 @@ private:
 	void CheckPasswd();
 
 	PT::Space space;
-	PT::ConfParser parser;
+	PT::SpaceParser parser;
 
 	std::string default_str;
 	int  default_int;
diff --git a/core/item.h b/core/item.h
index f23650e..6d00287 100755
--- a/core/item.h
+++ b/core/item.h
@@ -11,7 +11,7 @@
 #define headerfile_winix_core_item
 
 #include <string>
-#include "confparser/space.h"
+#include "space/space.h"
 
 
 #define WINIX_ITEM_FILETYPE_NONE		0
diff --git a/core/job.h b/core/job.h
index b70c3f3..8c68d91 100755
--- a/core/job.h
+++ b/core/job.h
@@ -13,7 +13,7 @@
 #include <vector>
 #include <queue>
 #include "basethread.h"
-#include "confparser/space.h"
+#include "space/space.h"
 
 
 
diff --git a/core/sessionmanager.cpp b/core/sessionmanager.cpp
index b81a175..4a4345c 100755
--- a/core/sessionmanager.cpp
+++ b/core/sessionmanager.cpp
@@ -199,6 +199,16 @@ void SessionManager::SetSession()
 }
 
 
+Session * SessionManager::FindSession(long id)
+{
+	SessionContainer::Iterator i = session_tab.FindById(id);
+
+	if( i != session_tab.End() )
+		return &*i;
+
+return 0;
+}
+
 
 SessionContainer::Iterator SessionManager::SessionBegin()
 {
diff --git a/core/sessionmanager.h b/core/sessionmanager.h
index 197402b..ec17a42 100755
--- a/core/sessionmanager.h
+++ b/core/sessionmanager.h
@@ -34,6 +34,9 @@ public:
 	void SetSystem(System * psystem);
 	void SetLastContainer(LastContainer * plast_container);
 
+	// can return a null pointer
+	Session * FindSession(long id);
+
 	void SetSession();
 	void DeleteSessions(); // deleting all sessions
 	bool ChangeSessionId(long old_id);
diff --git a/core/textstream.h b/core/textstream.h
index 806490d..e9b0619 100755
--- a/core/textstream.h
+++ b/core/textstream.h
@@ -13,7 +13,7 @@
 #include <string>
 #include <ctime>
 #include "misc.h"
-#include "confparser/space.h"
+#include "space/space.h"
 
 
 /*
diff --git a/core/user.h b/core/user.h
index ec01f90..39facd2 100755
--- a/core/user.h
+++ b/core/user.h
@@ -12,7 +12,7 @@
 
 #include <string>
 #include <vector>
-#include "confparser/space.h"
+#include "space/space.h"
 
 
 #define WINIX_ACCOUNT_MAX_LOGIN_SIZE		250
diff --git a/db/Makefile.dep b/db/Makefile.dep
index 48f6d70..2e83a07 100755
--- a/db/Makefile.dep
+++ b/db/Makefile.dep
@@ -1,33 +1,31 @@
 # DO NOT DELETE
 
 db.o: db.h dbbase.h dbconn.h dbtextstream.h ../core/textstream.h
-db.o: ../core/misc.h ../core/item.h ../../pikotools/confparser/space.h
+db.o: ../core/misc.h ../core/item.h ../../pikotools/space/space.h
 db.o: ../core/requesttypes.h ../core/error.h
-db.o: ../../pikotools/confparser/confparser.h
-db.o: ../../pikotools/confparser/space.h dbitemquery.h ../core/item.h
-db.o: dbitemcolumns.h ../core/user.h ../core/group.h ../core/dircontainer.h
-db.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h
-db.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
-db.o: ../core/request.h ../core/error.h ../core/config.h ../core/htmlfilter.h
-db.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h
-db.o: ../core/plugindata.h ../core/rebus.h ../core/mount.h
-db.o: ../templates/locale.h ../core/log.h ../core/misc.h
+db.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+db.o: dbitemquery.h ../core/item.h dbitemcolumns.h ../core/user.h
+db.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
+db.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
+db.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
+db.o: ../core/config.h ../core/htmlfilter.h ../templates/htmltextstream.h
+db.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
+db.o: ../core/mount.h ../templates/locale.h ../core/log.h ../core/misc.h
 dbbase.o: dbbase.h dbconn.h dbtextstream.h ../core/textstream.h
-dbbase.o: ../core/misc.h ../core/item.h ../../pikotools/confparser/space.h
+dbbase.o: ../core/misc.h ../core/item.h ../../pikotools/space/space.h
 dbbase.o: ../core/requesttypes.h ../core/error.h
-dbbase.o: ../../pikotools/confparser/confparser.h
-dbbase.o: ../../pikotools/confparser/space.h ../core/log.h ../core/misc.h
-dbbase.o: ../../pikotools/utf8/utf8.h
+dbbase.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+dbbase.o: ../core/log.h ../core/misc.h ../../pikotools/utf8/utf8.h
 dbconn.o: dbconn.h dbtextstream.h ../core/textstream.h ../core/misc.h
-dbconn.o: ../core/item.h ../../pikotools/confparser/space.h
-dbconn.o: ../core/requesttypes.h ../core/log.h ../core/error.h
+dbconn.o: ../core/item.h ../../pikotools/space/space.h ../core/requesttypes.h
+dbconn.o: ../core/log.h ../core/error.h
 dbitemcolumns.o: dbitemcolumns.h ../core/item.h dbbase.h dbconn.h
 dbitemcolumns.o: dbtextstream.h ../core/textstream.h ../core/misc.h
-dbitemcolumns.o: ../core/item.h ../../pikotools/confparser/space.h
+dbitemcolumns.o: ../core/item.h ../../pikotools/space/space.h
 dbitemcolumns.o: ../core/requesttypes.h ../core/error.h
-dbitemcolumns.o: ../../pikotools/confparser/confparser.h
-dbitemcolumns.o: ../../pikotools/confparser/space.h ../core/log.h
+dbitemcolumns.o: ../../pikotools/space/spaceparser.h
+dbitemcolumns.o: ../../pikotools/space/space.h ../core/log.h
 dbitemquery.o: dbitemquery.h ../core/item.h
 dbtextstream.o: dbtextstream.h ../core/textstream.h ../core/misc.h
-dbtextstream.o: ../core/item.h ../../pikotools/confparser/space.h
+dbtextstream.o: ../core/item.h ../../pikotools/space/space.h
 dbtextstream.o: ../core/requesttypes.h ../../pikotools/utf8/utf8.h
diff --git a/db/dbbase.cpp b/db/dbbase.cpp
index af4bbfd..deaedf9 100755
--- a/db/dbbase.cpp
+++ b/db/dbbase.cpp
@@ -232,13 +232,13 @@ bool DbBase::AssertValueSpace(PGresult * r, int row, int col, PT::Space & space,
 	conf_parser.SetSpace(space);
 	space.Clear();
 
-	PT::ConfParser::Status status = conf_parser.ParseString(res);
+	PT::SpaceParser::Status status = conf_parser.ParseString(res);
 
-	if( status != PT::ConfParser::ok )
+	if( status != PT::SpaceParser::ok )
 	{
 		log << log1 << "Db: a problem with parsing a PT::Space";
 
-		if( status == PT::ConfParser::syntax_error )
+		if( status == PT::SpaceParser::syntax_error )
 			log << ", syntax error at line: " << conf_parser.line;
 
 		log << logend;
diff --git a/db/dbbase.h b/db/dbbase.h
index 49de086..8e491da 100755
--- a/db/dbbase.h
+++ b/db/dbbase.h
@@ -16,7 +16,7 @@
 #include <vector>
 #include <string>
 #include "core/error.h"
-#include "confparser/confparser.h"
+#include "space/spaceparser.h"
 
 
 class DbBase
@@ -95,7 +95,7 @@ private:
 	static int  UnescapeBin(const char * str, size_t & i, size_t len);
 
 	DbTextStream bquery;
-	PT::ConfParser conf_parser;
+	PT::SpaceParser conf_parser;
 
 };
 
diff --git a/functions/Makefile.dep b/functions/Makefile.dep
index 921dd5e..0d24d30 100755
--- a/functions/Makefile.dep
+++ b/functions/Makefile.dep
@@ -1,11 +1,11 @@
 # DO NOT DELETE
 
 adduser.o: adduser.h functionbase.h ../core/item.h
-adduser.o: ../../pikotools/confparser/space.h ../db/db.h ../db/dbbase.h
+adduser.o: ../../pikotools/space/space.h ../db/db.h ../db/dbbase.h
 adduser.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
 adduser.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
-adduser.o: ../core/error.h ../../pikotools/confparser/confparser.h
-adduser.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
+adduser.o: ../core/error.h ../../pikotools/space/spaceparser.h
+adduser.o: ../../pikotools/space/space.h ../db/dbitemquery.h
 adduser.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
 adduser.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
 adduser.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
@@ -38,19 +38,18 @@ adduser.o: ../templates/templates.h ../templates/patterncacher.h
 adduser.o: ../templates/indexpatterns.h ../templates/patterns.h
 adduser.o: ../templates/changepatterns.h ../templates/htmltextstream.h
 adduser.o: ../core/sessionmanager.h ../core/misc.h
-cat.o: cat.h functionbase.h ../core/item.h ../../pikotools/confparser/space.h
+cat.o: cat.h functionbase.h ../core/item.h ../../pikotools/space/space.h
 cat.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
 cat.o: ../core/textstream.h ../core/misc.h ../core/item.h
 cat.o: ../core/requesttypes.h ../core/error.h
-cat.o: ../../pikotools/confparser/confparser.h
-cat.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
-cat.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
-cat.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
-cat.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
-cat.o: ../core/cur.h ../core/request.h ../core/error.h ../core/config.h
-cat.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h
-cat.o: ../core/user.h ../core/plugindata.h ../core/rebus.h mount.h
-cat.o: ../templates/locale.h ../core/request.h ../core/config.h
+cat.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+cat.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
+cat.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
+cat.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
+cat.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
+cat.o: ../core/config.h ../core/htmlfilter.h ../templates/htmltextstream.h
+cat.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
+cat.o: mount.h ../templates/locale.h ../core/request.h ../core/config.h
 cat.o: ../core/system.h ../core/job.h ../core/basethread.h ../core/synchro.h
 cat.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h
 cat.o: ../notify/notifypool.h ../templates/patterns.h ../templates/locale.h
@@ -68,20 +67,19 @@ cat.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h
 cat.o: ../core/mountparser.h ../core/crypt.h ../core/users.h ../core/groups.h
 cat.o: ../core/group.h ../core/loadavg.h ../core/image.h
 cat.o: ../core/threadmanager.h ../core/synchro.h
-chmod.o: chmod.h functionbase.h ../core/item.h
-chmod.o: ../../pikotools/confparser/space.h ../db/db.h ../db/dbbase.h
-chmod.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
-chmod.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h
-chmod.o: ../../pikotools/confparser/confparser.h
-chmod.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
-chmod.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
-chmod.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
-chmod.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
-chmod.o: ../core/cur.h ../core/request.h ../core/error.h ../core/config.h
-chmod.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h
-chmod.o: ../core/user.h ../core/plugindata.h ../core/rebus.h mount.h
-chmod.o: ../templates/locale.h ../core/request.h ../core/config.h
-chmod.o: ../core/system.h ../core/job.h ../core/basethread.h
+chmod.o: chmod.h functionbase.h ../core/item.h ../../pikotools/space/space.h
+chmod.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+chmod.o: ../core/textstream.h ../core/misc.h ../core/item.h
+chmod.o: ../core/requesttypes.h ../core/error.h
+chmod.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+chmod.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
+chmod.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
+chmod.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
+chmod.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
+chmod.o: ../core/config.h ../core/htmlfilter.h ../templates/htmltextstream.h
+chmod.o: ../core/session.h ../core/user.h ../core/plugindata.h
+chmod.o: ../core/rebus.h mount.h ../templates/locale.h ../core/request.h
+chmod.o: ../core/config.h ../core/system.h ../core/job.h ../core/basethread.h
 chmod.o: ../core/synchro.h ../core/dirs.h ../core/dircontainer.h
 chmod.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h
 chmod.o: ../templates/locale.h ../templates/localefilter.h
@@ -99,20 +97,19 @@ chmod.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h
 chmod.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
 chmod.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
 chmod.o: ../core/threadmanager.h ../core/synchro.h
-chown.o: chown.h functionbase.h ../core/item.h
-chown.o: ../../pikotools/confparser/space.h ../db/db.h ../db/dbbase.h
-chown.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
-chown.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h
-chown.o: ../../pikotools/confparser/confparser.h
-chown.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
-chown.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
-chown.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
-chown.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
-chown.o: ../core/cur.h ../core/request.h ../core/error.h ../core/config.h
-chown.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h
-chown.o: ../core/user.h ../core/plugindata.h ../core/rebus.h mount.h
-chown.o: ../templates/locale.h ../core/request.h ../core/config.h
-chown.o: ../core/system.h ../core/job.h ../core/basethread.h
+chown.o: chown.h functionbase.h ../core/item.h ../../pikotools/space/space.h
+chown.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+chown.o: ../core/textstream.h ../core/misc.h ../core/item.h
+chown.o: ../core/requesttypes.h ../core/error.h
+chown.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+chown.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
+chown.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
+chown.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
+chown.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
+chown.o: ../core/config.h ../core/htmlfilter.h ../templates/htmltextstream.h
+chown.o: ../core/session.h ../core/user.h ../core/plugindata.h
+chown.o: ../core/rebus.h mount.h ../templates/locale.h ../core/request.h
+chown.o: ../core/config.h ../core/system.h ../core/job.h ../core/basethread.h
 chown.o: ../core/synchro.h ../core/dirs.h ../core/dircontainer.h
 chown.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h
 chown.o: ../templates/locale.h ../templates/localefilter.h
@@ -131,11 +128,11 @@ chown.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
 chown.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
 chown.o: ../core/threadmanager.h ../core/synchro.h
 ckeditor.o: ckeditor.h functionbase.h ../core/item.h
-ckeditor.o: ../../pikotools/confparser/space.h ../db/db.h ../db/dbbase.h
+ckeditor.o: ../../pikotools/space/space.h ../db/db.h ../db/dbbase.h
 ckeditor.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
 ckeditor.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
-ckeditor.o: ../core/error.h ../../pikotools/confparser/confparser.h
-ckeditor.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
+ckeditor.o: ../core/error.h ../../pikotools/space/spaceparser.h
+ckeditor.o: ../../pikotools/space/space.h ../db/dbitemquery.h
 ckeditor.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
 ckeditor.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
 ckeditor.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
@@ -162,19 +159,18 @@ ckeditor.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h
 ckeditor.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
 ckeditor.o: ../core/groups.h ../core/group.h ../core/loadavg.h
 ckeditor.o: ../core/image.h ../core/threadmanager.h ../core/synchro.h
-cp.o: cp.h functionbase.h ../core/item.h ../../pikotools/confparser/space.h
+cp.o: cp.h functionbase.h ../core/item.h ../../pikotools/space/space.h
 cp.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
 cp.o: ../core/textstream.h ../core/misc.h ../core/item.h
 cp.o: ../core/requesttypes.h ../core/error.h
-cp.o: ../../pikotools/confparser/confparser.h
-cp.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
-cp.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
-cp.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
-cp.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
-cp.o: ../core/cur.h ../core/request.h ../core/error.h ../core/config.h
-cp.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h
-cp.o: ../core/user.h ../core/plugindata.h ../core/rebus.h mount.h
-cp.o: ../templates/locale.h ../core/request.h ../core/config.h
+cp.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+cp.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
+cp.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
+cp.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
+cp.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
+cp.o: ../core/config.h ../core/htmlfilter.h ../templates/htmltextstream.h
+cp.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
+cp.o: mount.h ../templates/locale.h ../core/request.h ../core/config.h
 cp.o: ../core/system.h ../core/job.h ../core/basethread.h ../core/synchro.h
 cp.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h
 cp.o: ../notify/notifypool.h ../templates/patterns.h ../templates/locale.h
@@ -199,11 +195,11 @@ cp.o: ../templates/patterncacher.h ../templates/indexpatterns.h
 cp.o: ../templates/patterns.h ../templates/changepatterns.h
 cp.o: ../templates/htmltextstream.h ../core/sessionmanager.h
 default.o: default.h functionbase.h ../core/item.h
-default.o: ../../pikotools/confparser/space.h ../db/db.h ../db/dbbase.h
+default.o: ../../pikotools/space/space.h ../db/db.h ../db/dbbase.h
 default.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
 default.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
-default.o: ../core/error.h ../../pikotools/confparser/confparser.h
-default.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
+default.o: ../core/error.h ../../pikotools/space/spaceparser.h
+default.o: ../../pikotools/space/space.h ../db/dbitemquery.h
 default.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
 default.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
 default.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
@@ -231,11 +227,11 @@ default.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
 default.o: ../core/loadavg.h ../core/image.h ../core/threadmanager.h
 default.o: ../core/synchro.h
 download.o: download.h functionbase.h ../core/item.h
-download.o: ../../pikotools/confparser/space.h ../db/db.h ../db/dbbase.h
+download.o: ../../pikotools/space/space.h ../db/db.h ../db/dbbase.h
 download.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
 download.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
-download.o: ../core/error.h ../../pikotools/confparser/confparser.h
-download.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
+download.o: ../core/error.h ../../pikotools/space/spaceparser.h
+download.o: ../../pikotools/space/space.h ../db/dbitemquery.h
 download.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
 download.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
 download.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
@@ -262,20 +258,19 @@ download.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h
 download.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
 download.o: ../core/groups.h ../core/group.h ../core/loadavg.h
 download.o: ../core/image.h ../core/threadmanager.h ../core/synchro.h
-emacs.o: emacs.h functionbase.h ../core/item.h
-emacs.o: ../../pikotools/confparser/space.h ../db/db.h ../db/dbbase.h
-emacs.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
-emacs.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h
-emacs.o: ../../pikotools/confparser/confparser.h
-emacs.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
-emacs.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
-emacs.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
-emacs.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
-emacs.o: ../core/cur.h ../core/request.h ../core/error.h ../core/config.h
-emacs.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h
-emacs.o: ../core/user.h ../core/plugindata.h ../core/rebus.h mount.h
-emacs.o: ../templates/locale.h ../core/request.h ../core/config.h
-emacs.o: ../core/system.h ../core/job.h ../core/basethread.h
+emacs.o: emacs.h functionbase.h ../core/item.h ../../pikotools/space/space.h
+emacs.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+emacs.o: ../core/textstream.h ../core/misc.h ../core/item.h
+emacs.o: ../core/requesttypes.h ../core/error.h
+emacs.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+emacs.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
+emacs.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
+emacs.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
+emacs.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
+emacs.o: ../core/config.h ../core/htmlfilter.h ../templates/htmltextstream.h
+emacs.o: ../core/session.h ../core/user.h ../core/plugindata.h
+emacs.o: ../core/rebus.h mount.h ../templates/locale.h ../core/request.h
+emacs.o: ../core/config.h ../core/system.h ../core/job.h ../core/basethread.h
 emacs.o: ../core/synchro.h ../core/dirs.h ../core/dircontainer.h
 emacs.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h
 emacs.o: ../templates/locale.h ../templates/localefilter.h
@@ -296,19 +291,18 @@ emacs.o: ../core/threadmanager.h ../core/synchro.h ../templates/templates.h
 emacs.o: ../templates/patterncacher.h ../templates/indexpatterns.h
 emacs.o: ../templates/patterns.h ../templates/changepatterns.h
 emacs.o: ../templates/htmltextstream.h ../core/sessionmanager.h
-env.o: env.h functionbase.h ../core/item.h ../../pikotools/confparser/space.h
+env.o: env.h functionbase.h ../core/item.h ../../pikotools/space/space.h
 env.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
 env.o: ../core/textstream.h ../core/misc.h ../core/item.h
 env.o: ../core/requesttypes.h ../core/error.h
-env.o: ../../pikotools/confparser/confparser.h
-env.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
-env.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
-env.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
-env.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
-env.o: ../core/cur.h ../core/request.h ../core/error.h ../core/config.h
-env.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h
-env.o: ../core/user.h ../core/plugindata.h ../core/rebus.h mount.h
-env.o: ../templates/locale.h ../core/request.h ../core/config.h
+env.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+env.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
+env.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
+env.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
+env.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
+env.o: ../core/config.h ../core/htmlfilter.h ../templates/htmltextstream.h
+env.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
+env.o: mount.h ../templates/locale.h ../core/request.h ../core/config.h
 env.o: ../core/system.h ../core/job.h ../core/basethread.h ../core/synchro.h
 env.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h
 env.o: ../notify/notifypool.h ../templates/patterns.h ../templates/locale.h
@@ -326,12 +320,12 @@ env.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h
 env.o: ../core/mountparser.h ../core/crypt.h ../core/users.h ../core/groups.h
 env.o: ../core/group.h ../core/loadavg.h ../core/image.h
 env.o: ../core/threadmanager.h ../core/synchro.h ../core/log.h
-functionbase.o: functionbase.h ../core/item.h
-functionbase.o: ../../pikotools/confparser/space.h ../db/db.h ../db/dbbase.h
-functionbase.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
-functionbase.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
-functionbase.o: ../core/error.h ../../pikotools/confparser/confparser.h
-functionbase.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
+functionbase.o: functionbase.h ../core/item.h ../../pikotools/space/space.h
+functionbase.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+functionbase.o: ../core/textstream.h ../core/misc.h ../core/item.h
+functionbase.o: ../core/requesttypes.h ../core/error.h
+functionbase.o: ../../pikotools/space/spaceparser.h
+functionbase.o: ../../pikotools/space/space.h ../db/dbitemquery.h
 functionbase.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
 functionbase.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
 functionbase.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
@@ -363,9 +357,9 @@ functionbase.o: ../core/synchro.h
 functionparser.o: functionparser.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
 functionparser.o: ../db/dbtextstream.h ../core/textstream.h ../core/misc.h
 functionparser.o: ../core/item.h ../core/requesttypes.h
-functionparser.o: ../../pikotools/confparser/space.h ../core/error.h
-functionparser.o: ../../pikotools/confparser/confparser.h
-functionparser.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
+functionparser.o: ../../pikotools/space/space.h ../core/error.h
+functionparser.o: ../../pikotools/space/spaceparser.h
+functionparser.o: ../../pikotools/space/space.h ../db/dbitemquery.h
 functionparser.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h
 functionparser.o: ../core/group.h ../core/dircontainer.h
 functionparser.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h
@@ -397,11 +391,11 @@ functionparser.o: ../core/groups.h ../core/group.h ../core/loadavg.h
 functionparser.o: ../core/image.h ../core/threadmanager.h ../core/synchro.h
 functionparser.o: ../core/cur.h ../core/log.h
 functions.o: functions.h functionbase.h ../core/item.h
-functions.o: ../../pikotools/confparser/space.h ../db/db.h ../db/dbbase.h
+functions.o: ../../pikotools/space/space.h ../db/db.h ../db/dbbase.h
 functions.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
 functions.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
-functions.o: ../core/error.h ../../pikotools/confparser/confparser.h
-functions.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
+functions.o: ../core/error.h ../../pikotools/space/spaceparser.h
+functions.o: ../../pikotools/space/space.h ../db/dbitemquery.h
 functions.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
 functions.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
 functions.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
@@ -435,19 +429,18 @@ functions.o: ../functions/functions.h ../templates/templates.h
 functions.o: ../templates/patterncacher.h ../templates/indexpatterns.h
 functions.o: ../templates/patterns.h ../templates/changepatterns.h
 functions.o: ../templates/htmltextstream.h ../core/sessionmanager.h
-last.o: last.h functionbase.h ../core/item.h
-last.o: ../../pikotools/confparser/space.h ../db/db.h ../db/dbbase.h
-last.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
-last.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h
-last.o: ../../pikotools/confparser/confparser.h
-last.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
-last.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
-last.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
-last.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
-last.o: ../core/cur.h ../core/request.h ../core/error.h ../core/config.h
-last.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h
-last.o: ../core/user.h ../core/plugindata.h ../core/rebus.h mount.h
-last.o: ../templates/locale.h ../core/request.h ../core/config.h
+last.o: last.h functionbase.h ../core/item.h ../../pikotools/space/space.h
+last.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+last.o: ../core/textstream.h ../core/misc.h ../core/item.h
+last.o: ../core/requesttypes.h ../core/error.h
+last.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+last.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
+last.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
+last.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
+last.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
+last.o: ../core/config.h ../core/htmlfilter.h ../templates/htmltextstream.h
+last.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
+last.o: mount.h ../templates/locale.h ../core/request.h ../core/config.h
 last.o: ../core/system.h ../core/job.h ../core/basethread.h ../core/synchro.h
 last.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h
 last.o: ../notify/notifypool.h ../templates/patterns.h ../templates/locale.h
@@ -466,19 +459,18 @@ last.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h
 last.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
 last.o: ../core/loadavg.h ../core/image.h ../core/threadmanager.h
 last.o: ../core/synchro.h
-ln.o: ln.h functionbase.h ../core/item.h ../../pikotools/confparser/space.h
+ln.o: ln.h functionbase.h ../core/item.h ../../pikotools/space/space.h
 ln.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
 ln.o: ../core/textstream.h ../core/misc.h ../core/item.h
 ln.o: ../core/requesttypes.h ../core/error.h
-ln.o: ../../pikotools/confparser/confparser.h
-ln.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
-ln.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
-ln.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
-ln.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
-ln.o: ../core/cur.h ../core/request.h ../core/error.h ../core/config.h
-ln.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h
-ln.o: ../core/user.h ../core/plugindata.h ../core/rebus.h mount.h
-ln.o: ../templates/locale.h ../core/request.h ../core/config.h
+ln.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+ln.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
+ln.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
+ln.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
+ln.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
+ln.o: ../core/config.h ../core/htmlfilter.h ../templates/htmltextstream.h
+ln.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
+ln.o: mount.h ../templates/locale.h ../core/request.h ../core/config.h
 ln.o: ../core/system.h ../core/job.h ../core/basethread.h ../core/synchro.h
 ln.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h
 ln.o: ../notify/notifypool.h ../templates/patterns.h ../templates/locale.h
@@ -497,20 +489,19 @@ ln.o: ../core/mountparser.h ../core/crypt.h ../core/users.h ../core/groups.h
 ln.o: ../core/group.h ../core/loadavg.h ../core/image.h
 ln.o: ../core/threadmanager.h ../core/synchro.h ../core/misc.h
 ln.o: ../functions/functions.h
-login.o: login.h functionbase.h ../core/item.h
-login.o: ../../pikotools/confparser/space.h ../db/db.h ../db/dbbase.h
-login.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
-login.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h
-login.o: ../../pikotools/confparser/confparser.h
-login.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
-login.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
-login.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
-login.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
-login.o: ../core/cur.h ../core/request.h ../core/error.h ../core/config.h
-login.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h
-login.o: ../core/user.h ../core/plugindata.h ../core/rebus.h mount.h
-login.o: ../templates/locale.h ../core/request.h ../core/config.h
-login.o: ../core/system.h ../core/job.h ../core/basethread.h
+login.o: login.h functionbase.h ../core/item.h ../../pikotools/space/space.h
+login.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+login.o: ../core/textstream.h ../core/misc.h ../core/item.h
+login.o: ../core/requesttypes.h ../core/error.h
+login.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+login.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
+login.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
+login.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
+login.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
+login.o: ../core/config.h ../core/htmlfilter.h ../templates/htmltextstream.h
+login.o: ../core/session.h ../core/user.h ../core/plugindata.h
+login.o: ../core/rebus.h mount.h ../templates/locale.h ../core/request.h
+login.o: ../core/config.h ../core/system.h ../core/job.h ../core/basethread.h
 login.o: ../core/synchro.h ../core/dirs.h ../core/dircontainer.h
 login.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h
 login.o: ../templates/locale.h ../templates/localefilter.h
@@ -529,11 +520,11 @@ login.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
 login.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
 login.o: ../core/threadmanager.h ../core/synchro.h
 logout.o: logout.h functionbase.h ../core/item.h
-logout.o: ../../pikotools/confparser/space.h ../db/db.h ../db/dbbase.h
+logout.o: ../../pikotools/space/space.h ../db/db.h ../db/dbbase.h
 logout.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
 logout.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
-logout.o: ../core/error.h ../../pikotools/confparser/confparser.h
-logout.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
+logout.o: ../core/error.h ../../pikotools/space/spaceparser.h
+logout.o: ../../pikotools/space/space.h ../db/dbitemquery.h
 logout.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
 logout.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
 logout.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
@@ -560,19 +551,18 @@ logout.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h
 logout.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
 logout.o: ../core/loadavg.h ../core/image.h ../core/threadmanager.h
 logout.o: ../core/synchro.h
-ls.o: ls.h functionbase.h ../core/item.h ../../pikotools/confparser/space.h
+ls.o: ls.h functionbase.h ../core/item.h ../../pikotools/space/space.h
 ls.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
 ls.o: ../core/textstream.h ../core/misc.h ../core/item.h
 ls.o: ../core/requesttypes.h ../core/error.h
-ls.o: ../../pikotools/confparser/confparser.h
-ls.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
-ls.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
-ls.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
-ls.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
-ls.o: ../core/cur.h ../core/request.h ../core/error.h ../core/config.h
-ls.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h
-ls.o: ../core/user.h ../core/plugindata.h ../core/rebus.h mount.h
-ls.o: ../templates/locale.h ../core/request.h ../core/config.h
+ls.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+ls.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
+ls.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
+ls.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
+ls.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
+ls.o: ../core/config.h ../core/htmlfilter.h ../templates/htmltextstream.h
+ls.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
+ls.o: mount.h ../templates/locale.h ../core/request.h ../core/config.h
 ls.o: ../core/system.h ../core/job.h ../core/basethread.h ../core/synchro.h
 ls.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h
 ls.o: ../notify/notifypool.h ../templates/patterns.h ../templates/locale.h
@@ -590,19 +580,18 @@ ls.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h
 ls.o: ../core/mountparser.h ../core/crypt.h ../core/users.h ../core/groups.h
 ls.o: ../core/group.h ../core/loadavg.h ../core/image.h
 ls.o: ../core/threadmanager.h ../core/synchro.h
-man.o: man.h functionbase.h ../core/item.h ../../pikotools/confparser/space.h
+man.o: man.h functionbase.h ../core/item.h ../../pikotools/space/space.h
 man.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
 man.o: ../core/textstream.h ../core/misc.h ../core/item.h
 man.o: ../core/requesttypes.h ../core/error.h
-man.o: ../../pikotools/confparser/confparser.h
-man.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
-man.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
-man.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
-man.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
-man.o: ../core/cur.h ../core/request.h ../core/error.h ../core/config.h
-man.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h
-man.o: ../core/user.h ../core/plugindata.h ../core/rebus.h mount.h
-man.o: ../templates/locale.h ../core/request.h ../core/config.h
+man.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+man.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
+man.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
+man.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
+man.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
+man.o: ../core/config.h ../core/htmlfilter.h ../templates/htmltextstream.h
+man.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
+man.o: mount.h ../templates/locale.h ../core/request.h ../core/config.h
 man.o: ../core/system.h ../core/job.h ../core/basethread.h ../core/synchro.h
 man.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h
 man.o: ../notify/notifypool.h ../templates/patterns.h ../templates/locale.h
@@ -621,19 +610,18 @@ man.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h
 man.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
 man.o: ../core/loadavg.h ../core/image.h ../core/threadmanager.h
 man.o: ../core/synchro.h
-meta.o: meta.h functionbase.h ../core/item.h
-meta.o: ../../pikotools/confparser/space.h ../db/db.h ../db/dbbase.h
-meta.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
-meta.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h
-meta.o: ../../pikotools/confparser/confparser.h
-meta.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
-meta.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
-meta.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
-meta.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
-meta.o: ../core/cur.h ../core/request.h ../core/error.h ../core/config.h
-meta.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h
-meta.o: ../core/user.h ../core/plugindata.h ../core/rebus.h mount.h
-meta.o: ../templates/locale.h ../core/request.h ../core/config.h
+meta.o: meta.h functionbase.h ../core/item.h ../../pikotools/space/space.h
+meta.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+meta.o: ../core/textstream.h ../core/misc.h ../core/item.h
+meta.o: ../core/requesttypes.h ../core/error.h
+meta.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+meta.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
+meta.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
+meta.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
+meta.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
+meta.o: ../core/config.h ../core/htmlfilter.h ../templates/htmltextstream.h
+meta.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
+meta.o: mount.h ../templates/locale.h ../core/request.h ../core/config.h
 meta.o: ../core/system.h ../core/job.h ../core/basethread.h ../core/synchro.h
 meta.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h
 meta.o: ../notify/notifypool.h ../templates/patterns.h ../templates/locale.h
@@ -652,20 +640,19 @@ meta.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h
 meta.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
 meta.o: ../core/loadavg.h ../core/image.h ../core/threadmanager.h
 meta.o: ../core/synchro.h ../core/log.h
-mkdir.o: mkdir.h functionbase.h ../core/item.h
-mkdir.o: ../../pikotools/confparser/space.h ../db/db.h ../db/dbbase.h
-mkdir.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
-mkdir.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h
-mkdir.o: ../../pikotools/confparser/confparser.h
-mkdir.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
-mkdir.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
-mkdir.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
-mkdir.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
-mkdir.o: ../core/cur.h ../core/request.h ../core/error.h ../core/config.h
-mkdir.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h
-mkdir.o: ../core/user.h ../core/plugindata.h ../core/rebus.h mount.h
-mkdir.o: ../templates/locale.h ../core/request.h ../core/config.h
-mkdir.o: ../core/system.h ../core/job.h ../core/basethread.h
+mkdir.o: mkdir.h functionbase.h ../core/item.h ../../pikotools/space/space.h
+mkdir.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+mkdir.o: ../core/textstream.h ../core/misc.h ../core/item.h
+mkdir.o: ../core/requesttypes.h ../core/error.h
+mkdir.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+mkdir.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
+mkdir.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
+mkdir.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
+mkdir.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
+mkdir.o: ../core/config.h ../core/htmlfilter.h ../templates/htmltextstream.h
+mkdir.o: ../core/session.h ../core/user.h ../core/plugindata.h
+mkdir.o: ../core/rebus.h mount.h ../templates/locale.h ../core/request.h
+mkdir.o: ../core/config.h ../core/system.h ../core/job.h ../core/basethread.h
 mkdir.o: ../core/synchro.h ../core/dirs.h ../core/dircontainer.h
 mkdir.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h
 mkdir.o: ../templates/locale.h ../templates/localefilter.h
@@ -689,20 +676,19 @@ mkdir.o: ../templates/templates.h ../templates/patterncacher.h
 mkdir.o: ../templates/indexpatterns.h ../templates/patterns.h
 mkdir.o: ../templates/changepatterns.h ../templates/htmltextstream.h
 mkdir.o: ../core/sessionmanager.h
-mount.o: mount.h functionbase.h ../core/item.h
-mount.o: ../../pikotools/confparser/space.h ../db/db.h ../db/dbbase.h
-mount.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
-mount.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h
-mount.o: ../../pikotools/confparser/confparser.h
-mount.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
-mount.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
-mount.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
-mount.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
-mount.o: ../core/cur.h ../core/request.h ../core/error.h ../core/config.h
-mount.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h
-mount.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
-mount.o: ../templates/locale.h ../core/request.h ../core/config.h
-mount.o: ../core/system.h ../core/job.h ../core/basethread.h
+mount.o: mount.h functionbase.h ../core/item.h ../../pikotools/space/space.h
+mount.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+mount.o: ../core/textstream.h ../core/misc.h ../core/item.h
+mount.o: ../core/requesttypes.h ../core/error.h
+mount.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+mount.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
+mount.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
+mount.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
+mount.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
+mount.o: ../core/config.h ../core/htmlfilter.h ../templates/htmltextstream.h
+mount.o: ../core/session.h ../core/user.h ../core/plugindata.h
+mount.o: ../core/rebus.h ../templates/locale.h ../core/request.h
+mount.o: ../core/config.h ../core/system.h ../core/job.h ../core/basethread.h
 mount.o: ../core/synchro.h ../core/dirs.h ../core/dircontainer.h
 mount.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h
 mount.o: ../templates/locale.h ../templates/localefilter.h
@@ -720,19 +706,18 @@ mount.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h
 mount.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
 mount.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
 mount.o: ../core/threadmanager.h ../core/synchro.h
-mv.o: mv.h functionbase.h ../core/item.h ../../pikotools/confparser/space.h
+mv.o: mv.h functionbase.h ../core/item.h ../../pikotools/space/space.h
 mv.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
 mv.o: ../core/textstream.h ../core/misc.h ../core/item.h
 mv.o: ../core/requesttypes.h ../core/error.h
-mv.o: ../../pikotools/confparser/confparser.h
-mv.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
-mv.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
-mv.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
-mv.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
-mv.o: ../core/cur.h ../core/request.h ../core/error.h ../core/config.h
-mv.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h
-mv.o: ../core/user.h ../core/plugindata.h ../core/rebus.h mount.h
-mv.o: ../templates/locale.h ../core/request.h ../core/config.h
+mv.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+mv.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
+mv.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
+mv.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
+mv.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
+mv.o: ../core/config.h ../core/htmlfilter.h ../templates/htmltextstream.h
+mv.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
+mv.o: mount.h ../templates/locale.h ../core/request.h ../core/config.h
 mv.o: ../core/system.h ../core/job.h ../core/basethread.h ../core/synchro.h
 mv.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h
 mv.o: ../notify/notifypool.h ../templates/patterns.h ../templates/locale.h
@@ -757,11 +742,11 @@ mv.o: ../templates/indexpatterns.h ../templates/patterns.h
 mv.o: ../templates/changepatterns.h ../templates/htmltextstream.h
 mv.o: ../core/sessionmanager.h
 nicedit.o: nicedit.h functionbase.h ../core/item.h
-nicedit.o: ../../pikotools/confparser/space.h ../db/db.h ../db/dbbase.h
+nicedit.o: ../../pikotools/space/space.h ../db/db.h ../db/dbbase.h
 nicedit.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
 nicedit.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
-nicedit.o: ../core/error.h ../../pikotools/confparser/confparser.h
-nicedit.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
+nicedit.o: ../core/error.h ../../pikotools/space/spaceparser.h
+nicedit.o: ../../pikotools/space/space.h ../db/dbitemquery.h
 nicedit.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
 nicedit.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
 nicedit.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
@@ -788,19 +773,18 @@ nicedit.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h
 nicedit.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
 nicedit.o: ../core/loadavg.h ../core/image.h ../core/threadmanager.h
 nicedit.o: ../core/synchro.h
-node.o: node.h functionbase.h ../core/item.h
-node.o: ../../pikotools/confparser/space.h ../db/db.h ../db/dbbase.h
-node.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
-node.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h
-node.o: ../../pikotools/confparser/confparser.h
-node.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
-node.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
-node.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
-node.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
-node.o: ../core/cur.h ../core/request.h ../core/error.h ../core/config.h
-node.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h
-node.o: ../core/user.h ../core/plugindata.h ../core/rebus.h mount.h
-node.o: ../templates/locale.h ../core/request.h ../core/config.h
+node.o: node.h functionbase.h ../core/item.h ../../pikotools/space/space.h
+node.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+node.o: ../core/textstream.h ../core/misc.h ../core/item.h
+node.o: ../core/requesttypes.h ../core/error.h
+node.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+node.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
+node.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
+node.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
+node.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
+node.o: ../core/config.h ../core/htmlfilter.h ../templates/htmltextstream.h
+node.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
+node.o: mount.h ../templates/locale.h ../core/request.h ../core/config.h
 node.o: ../core/system.h ../core/job.h ../core/basethread.h ../core/synchro.h
 node.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h
 node.o: ../notify/notifypool.h ../templates/patterns.h ../templates/locale.h
@@ -820,11 +804,11 @@ node.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
 node.o: ../core/loadavg.h ../core/image.h ../core/threadmanager.h
 node.o: ../core/synchro.h
 passwd.o: passwd.h functionbase.h ../core/item.h
-passwd.o: ../../pikotools/confparser/space.h ../db/db.h ../db/dbbase.h
+passwd.o: ../../pikotools/space/space.h ../db/db.h ../db/dbbase.h
 passwd.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
 passwd.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
-passwd.o: ../core/error.h ../../pikotools/confparser/confparser.h
-passwd.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
+passwd.o: ../core/error.h ../../pikotools/space/spaceparser.h
+passwd.o: ../../pikotools/space/space.h ../db/dbitemquery.h
 passwd.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
 passwd.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
 passwd.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
@@ -851,19 +835,18 @@ passwd.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h
 passwd.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
 passwd.o: ../core/loadavg.h ../core/image.h ../core/threadmanager.h
 passwd.o: ../core/synchro.h ../core/slog.h ../functions/functions.h
-priv.o: priv.h functionbase.h ../core/item.h
-priv.o: ../../pikotools/confparser/space.h ../db/db.h ../db/dbbase.h
-priv.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
-priv.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h
-priv.o: ../../pikotools/confparser/confparser.h
-priv.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
-priv.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
-priv.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
-priv.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
-priv.o: ../core/cur.h ../core/request.h ../core/error.h ../core/config.h
-priv.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h
-priv.o: ../core/user.h ../core/plugindata.h ../core/rebus.h mount.h
-priv.o: ../templates/locale.h ../core/request.h ../core/config.h
+priv.o: priv.h functionbase.h ../core/item.h ../../pikotools/space/space.h
+priv.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+priv.o: ../core/textstream.h ../core/misc.h ../core/item.h
+priv.o: ../core/requesttypes.h ../core/error.h
+priv.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+priv.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
+priv.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
+priv.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
+priv.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
+priv.o: ../core/config.h ../core/htmlfilter.h ../templates/htmltextstream.h
+priv.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
+priv.o: mount.h ../templates/locale.h ../core/request.h ../core/config.h
 priv.o: ../core/system.h ../core/job.h ../core/basethread.h ../core/synchro.h
 priv.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h
 priv.o: ../notify/notifypool.h ../templates/patterns.h ../templates/locale.h
@@ -883,12 +866,12 @@ priv.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
 priv.o: ../core/threadmanager.h ../core/synchro.h
 privchanger.o: privchanger.h ../core/request.h ../core/system.h ../core/job.h
 privchanger.o: ../core/basethread.h ../core/synchro.h
-privchanger.o: ../../pikotools/confparser/space.h ../core/dirs.h
-privchanger.o: ../core/item.h ../core/dircontainer.h ../db/db.h
-privchanger.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-privchanger.o: ../core/textstream.h ../core/misc.h ../core/requesttypes.h
-privchanger.o: ../core/error.h ../../pikotools/confparser/confparser.h
-privchanger.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
+privchanger.o: ../../pikotools/space/space.h ../core/dirs.h ../core/item.h
+privchanger.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h
+privchanger.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
+privchanger.o: ../core/misc.h ../core/requesttypes.h ../core/error.h
+privchanger.o: ../../pikotools/space/spaceparser.h
+privchanger.o: ../../pikotools/space/space.h ../db/dbitemquery.h
 privchanger.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h
 privchanger.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
 privchanger.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
@@ -914,19 +897,18 @@ privchanger.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h
 privchanger.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
 privchanger.o: ../core/groups.h ../core/group.h ../core/loadavg.h
 privchanger.o: ../core/image.h ../core/threadmanager.h
-pw.o: pw.h functionbase.h ../core/item.h ../../pikotools/confparser/space.h
+pw.o: pw.h functionbase.h ../core/item.h ../../pikotools/space/space.h
 pw.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
 pw.o: ../core/textstream.h ../core/misc.h ../core/item.h
 pw.o: ../core/requesttypes.h ../core/error.h
-pw.o: ../../pikotools/confparser/confparser.h
-pw.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
-pw.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
-pw.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
-pw.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
-pw.o: ../core/cur.h ../core/request.h ../core/error.h ../core/config.h
-pw.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h
-pw.o: ../core/user.h ../core/plugindata.h ../core/rebus.h mount.h
-pw.o: ../templates/locale.h ../core/request.h ../core/config.h
+pw.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+pw.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
+pw.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
+pw.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
+pw.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
+pw.o: ../core/config.h ../core/htmlfilter.h ../templates/htmltextstream.h
+pw.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
+pw.o: mount.h ../templates/locale.h ../core/request.h ../core/config.h
 pw.o: ../core/system.h ../core/job.h ../core/basethread.h ../core/synchro.h
 pw.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h
 pw.o: ../notify/notifypool.h ../templates/patterns.h ../templates/locale.h
@@ -946,11 +928,11 @@ pw.o: ../core/group.h ../core/loadavg.h ../core/image.h
 pw.o: ../core/threadmanager.h ../core/synchro.h ../core/log.h ../core/misc.h
 pw.o: ../functions/functions.h
 reload.o: reload.h functionbase.h ../core/item.h
-reload.o: ../../pikotools/confparser/space.h ../db/db.h ../db/dbbase.h
+reload.o: ../../pikotools/space/space.h ../db/db.h ../db/dbbase.h
 reload.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
 reload.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
-reload.o: ../core/error.h ../../pikotools/confparser/confparser.h
-reload.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
+reload.o: ../core/error.h ../../pikotools/space/spaceparser.h
+reload.o: ../../pikotools/space/space.h ../db/dbitemquery.h
 reload.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
 reload.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
 reload.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
@@ -980,19 +962,18 @@ reload.o: ../core/synchro.h ../templates/templates.h
 reload.o: ../templates/patterncacher.h ../templates/indexpatterns.h
 reload.o: ../templates/patterns.h ../templates/changepatterns.h
 reload.o: ../templates/htmltextstream.h ../core/sessionmanager.h
-rm.o: rm.h functionbase.h ../core/item.h ../../pikotools/confparser/space.h
+rm.o: rm.h functionbase.h ../core/item.h ../../pikotools/space/space.h
 rm.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
 rm.o: ../core/textstream.h ../core/misc.h ../core/item.h
 rm.o: ../core/requesttypes.h ../core/error.h
-rm.o: ../../pikotools/confparser/confparser.h
-rm.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
-rm.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
-rm.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
-rm.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
-rm.o: ../core/cur.h ../core/request.h ../core/error.h ../core/config.h
-rm.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h
-rm.o: ../core/user.h ../core/plugindata.h ../core/rebus.h mount.h
-rm.o: ../templates/locale.h ../core/request.h ../core/config.h
+rm.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+rm.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
+rm.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
+rm.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
+rm.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
+rm.o: ../core/config.h ../core/htmlfilter.h ../templates/htmltextstream.h
+rm.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
+rm.o: mount.h ../templates/locale.h ../core/request.h ../core/config.h
 rm.o: ../core/system.h ../core/job.h ../core/basethread.h ../core/synchro.h
 rm.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h
 rm.o: ../notify/notifypool.h ../templates/patterns.h ../templates/locale.h
@@ -1017,11 +998,11 @@ rm.o: ../templates/indexpatterns.h ../templates/patterns.h
 rm.o: ../templates/changepatterns.h ../templates/htmltextstream.h
 rm.o: ../core/sessionmanager.h ../core/misc.h
 rmuser.o: rmuser.h functionbase.h ../core/item.h
-rmuser.o: ../../pikotools/confparser/space.h ../db/db.h ../db/dbbase.h
+rmuser.o: ../../pikotools/space/space.h ../db/db.h ../db/dbbase.h
 rmuser.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
 rmuser.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
-rmuser.o: ../core/error.h ../../pikotools/confparser/confparser.h
-rmuser.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
+rmuser.o: ../core/error.h ../../pikotools/space/spaceparser.h
+rmuser.o: ../../pikotools/space/space.h ../db/dbitemquery.h
 rmuser.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
 rmuser.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
 rmuser.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
@@ -1054,19 +1035,18 @@ rmuser.o: ../templates/templates.h ../templates/patterncacher.h
 rmuser.o: ../templates/indexpatterns.h ../templates/patterns.h
 rmuser.o: ../templates/changepatterns.h ../templates/htmltextstream.h
 rmuser.o: ../core/sessionmanager.h
-run.o: run.h functionbase.h ../core/item.h ../../pikotools/confparser/space.h
+run.o: run.h functionbase.h ../core/item.h ../../pikotools/space/space.h
 run.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
 run.o: ../core/textstream.h ../core/misc.h ../core/item.h
 run.o: ../core/requesttypes.h ../core/error.h
-run.o: ../../pikotools/confparser/confparser.h
-run.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
-run.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
-run.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
-run.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
-run.o: ../core/cur.h ../core/request.h ../core/error.h ../core/config.h
-run.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h
-run.o: ../core/user.h ../core/plugindata.h ../core/rebus.h mount.h
-run.o: ../templates/locale.h ../core/request.h ../core/config.h
+run.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+run.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
+run.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
+run.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
+run.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
+run.o: ../core/config.h ../core/htmlfilter.h ../templates/htmltextstream.h
+run.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
+run.o: mount.h ../templates/locale.h ../core/request.h ../core/config.h
 run.o: ../core/system.h ../core/job.h ../core/basethread.h ../core/synchro.h
 run.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h
 run.o: ../notify/notifypool.h ../templates/patterns.h ../templates/locale.h
@@ -1084,19 +1064,18 @@ run.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h
 run.o: ../core/mountparser.h ../core/crypt.h ../core/users.h ../core/groups.h
 run.o: ../core/group.h ../core/loadavg.h ../core/image.h
 run.o: ../core/threadmanager.h ../core/synchro.h
-sort.o: sort.h functionbase.h ../core/item.h
-sort.o: ../../pikotools/confparser/space.h ../db/db.h ../db/dbbase.h
-sort.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
-sort.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h
-sort.o: ../../pikotools/confparser/confparser.h
-sort.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
-sort.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
-sort.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
-sort.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
-sort.o: ../core/cur.h ../core/request.h ../core/error.h ../core/config.h
-sort.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h
-sort.o: ../core/user.h ../core/plugindata.h ../core/rebus.h mount.h
-sort.o: ../templates/locale.h ../core/request.h ../core/config.h
+sort.o: sort.h functionbase.h ../core/item.h ../../pikotools/space/space.h
+sort.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+sort.o: ../core/textstream.h ../core/misc.h ../core/item.h
+sort.o: ../core/requesttypes.h ../core/error.h
+sort.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+sort.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
+sort.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
+sort.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
+sort.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
+sort.o: ../core/config.h ../core/htmlfilter.h ../templates/htmltextstream.h
+sort.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
+sort.o: mount.h ../templates/locale.h ../core/request.h ../core/config.h
 sort.o: ../core/system.h ../core/job.h ../core/basethread.h ../core/synchro.h
 sort.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h
 sort.o: ../notify/notifypool.h ../templates/patterns.h ../templates/locale.h
@@ -1121,12 +1100,11 @@ sort.o: ../templates/indexpatterns.h ../templates/patterns.h
 sort.o: ../templates/changepatterns.h ../templates/htmltextstream.h
 sort.o: ../core/sessionmanager.h
 specialdefault.o: specialdefault.h functionbase.h ../core/item.h
-specialdefault.o: ../../pikotools/confparser/space.h ../db/db.h
-specialdefault.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-specialdefault.o: ../core/textstream.h ../core/misc.h ../core/item.h
-specialdefault.o: ../core/requesttypes.h ../core/error.h
-specialdefault.o: ../../pikotools/confparser/confparser.h
-specialdefault.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
+specialdefault.o: ../../pikotools/space/space.h ../db/db.h ../db/dbbase.h
+specialdefault.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
+specialdefault.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
+specialdefault.o: ../core/error.h ../../pikotools/space/spaceparser.h
+specialdefault.o: ../../pikotools/space/space.h ../db/dbitemquery.h
 specialdefault.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
 specialdefault.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
 specialdefault.o: ../core/textstream.h ../core/logmanipulators.h
@@ -1155,19 +1133,18 @@ specialdefault.o: ../core/lastcontainer.h ../core/mounts.h
 specialdefault.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
 specialdefault.o: ../core/groups.h ../core/group.h ../core/loadavg.h
 specialdefault.o: ../core/image.h ../core/threadmanager.h ../core/synchro.h
-stat.o: stat.h functionbase.h ../core/item.h
-stat.o: ../../pikotools/confparser/space.h ../db/db.h ../db/dbbase.h
-stat.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
-stat.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h
-stat.o: ../../pikotools/confparser/confparser.h
-stat.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
-stat.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
-stat.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
-stat.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
-stat.o: ../core/cur.h ../core/request.h ../core/error.h ../core/config.h
-stat.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h
-stat.o: ../core/user.h ../core/plugindata.h ../core/rebus.h mount.h
-stat.o: ../templates/locale.h ../core/request.h ../core/config.h
+stat.o: stat.h functionbase.h ../core/item.h ../../pikotools/space/space.h
+stat.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+stat.o: ../core/textstream.h ../core/misc.h ../core/item.h
+stat.o: ../core/requesttypes.h ../core/error.h
+stat.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+stat.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
+stat.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
+stat.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
+stat.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
+stat.o: ../core/config.h ../core/htmlfilter.h ../templates/htmltextstream.h
+stat.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
+stat.o: mount.h ../templates/locale.h ../core/request.h ../core/config.h
 stat.o: ../core/system.h ../core/job.h ../core/basethread.h ../core/synchro.h
 stat.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h
 stat.o: ../notify/notifypool.h ../templates/patterns.h ../templates/locale.h
@@ -1186,11 +1163,11 @@ stat.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
 stat.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
 stat.o: ../core/threadmanager.h ../core/synchro.h
 subject.o: subject.h functionbase.h ../core/item.h
-subject.o: ../../pikotools/confparser/space.h ../db/db.h ../db/dbbase.h
+subject.o: ../../pikotools/space/space.h ../db/db.h ../db/dbbase.h
 subject.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
 subject.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
-subject.o: ../core/error.h ../../pikotools/confparser/confparser.h
-subject.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
+subject.o: ../core/error.h ../../pikotools/space/spaceparser.h
+subject.o: ../../pikotools/space/space.h ../db/dbitemquery.h
 subject.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
 subject.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
 subject.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
@@ -1218,11 +1195,11 @@ subject.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
 subject.o: ../core/loadavg.h ../core/image.h ../core/threadmanager.h
 subject.o: ../core/synchro.h
 template.o: template.h functionbase.h ../core/item.h
-template.o: ../../pikotools/confparser/space.h ../db/db.h ../db/dbbase.h
+template.o: ../../pikotools/space/space.h ../db/db.h ../db/dbbase.h
 template.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
 template.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
-template.o: ../core/error.h ../../pikotools/confparser/confparser.h
-template.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
+template.o: ../core/error.h ../../pikotools/space/spaceparser.h
+template.o: ../../pikotools/space/space.h ../db/dbitemquery.h
 template.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
 template.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
 template.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
@@ -1250,11 +1227,11 @@ template.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
 template.o: ../core/loadavg.h ../core/image.h ../core/threadmanager.h
 template.o: ../core/synchro.h ../core/misc.h
 tinymce.o: tinymce.h functionbase.h ../core/item.h
-tinymce.o: ../../pikotools/confparser/space.h ../db/db.h ../db/dbbase.h
+tinymce.o: ../../pikotools/space/space.h ../db/db.h ../db/dbbase.h
 tinymce.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
 tinymce.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
-tinymce.o: ../core/error.h ../../pikotools/confparser/confparser.h
-tinymce.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
+tinymce.o: ../core/error.h ../../pikotools/space/spaceparser.h
+tinymce.o: ../../pikotools/space/space.h ../db/dbitemquery.h
 tinymce.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
 tinymce.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
 tinymce.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
@@ -1281,20 +1258,19 @@ tinymce.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h
 tinymce.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
 tinymce.o: ../core/loadavg.h ../core/image.h ../core/threadmanager.h
 tinymce.o: ../core/synchro.h
-uname.o: uname.h functionbase.h ../core/item.h
-uname.o: ../../pikotools/confparser/space.h ../db/db.h ../db/dbbase.h
-uname.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
-uname.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h
-uname.o: ../../pikotools/confparser/confparser.h
-uname.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
-uname.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
-uname.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
-uname.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
-uname.o: ../core/cur.h ../core/request.h ../core/error.h ../core/config.h
-uname.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h
-uname.o: ../core/user.h ../core/plugindata.h ../core/rebus.h mount.h
-uname.o: ../templates/locale.h ../core/request.h ../core/config.h
-uname.o: ../core/system.h ../core/job.h ../core/basethread.h
+uname.o: uname.h functionbase.h ../core/item.h ../../pikotools/space/space.h
+uname.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+uname.o: ../core/textstream.h ../core/misc.h ../core/item.h
+uname.o: ../core/requesttypes.h ../core/error.h
+uname.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+uname.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
+uname.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
+uname.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
+uname.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
+uname.o: ../core/config.h ../core/htmlfilter.h ../templates/htmltextstream.h
+uname.o: ../core/session.h ../core/user.h ../core/plugindata.h
+uname.o: ../core/rebus.h mount.h ../templates/locale.h ../core/request.h
+uname.o: ../core/config.h ../core/system.h ../core/job.h ../core/basethread.h
 uname.o: ../core/synchro.h ../core/dirs.h ../core/dircontainer.h
 uname.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h
 uname.o: ../templates/locale.h ../templates/localefilter.h
@@ -1313,11 +1289,11 @@ uname.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
 uname.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
 uname.o: ../core/threadmanager.h ../core/synchro.h
 upload.o: upload.h functionbase.h ../core/item.h
-upload.o: ../../pikotools/confparser/space.h ../db/db.h ../db/dbbase.h
+upload.o: ../../pikotools/space/space.h ../db/db.h ../db/dbbase.h
 upload.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
 upload.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
-upload.o: ../core/error.h ../../pikotools/confparser/confparser.h
-upload.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
+upload.o: ../core/error.h ../../pikotools/space/spaceparser.h
+upload.o: ../../pikotools/space/space.h ../db/dbitemquery.h
 upload.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
 upload.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
 upload.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
@@ -1351,11 +1327,11 @@ upload.o: ../templates/indexpatterns.h ../templates/patterns.h
 upload.o: ../templates/changepatterns.h ../templates/htmltextstream.h
 upload.o: ../core/sessionmanager.h
 uptime.o: uptime.h functionbase.h ../core/item.h
-uptime.o: ../../pikotools/confparser/space.h ../db/db.h ../db/dbbase.h
+uptime.o: ../../pikotools/space/space.h ../db/db.h ../db/dbbase.h
 uptime.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
 uptime.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
-uptime.o: ../core/error.h ../../pikotools/confparser/confparser.h
-uptime.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
+uptime.o: ../core/error.h ../../pikotools/space/spaceparser.h
+uptime.o: ../../pikotools/space/space.h ../db/dbitemquery.h
 uptime.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
 uptime.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
 uptime.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
@@ -1382,19 +1358,18 @@ uptime.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h
 uptime.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
 uptime.o: ../core/loadavg.h ../core/image.h ../core/threadmanager.h
 uptime.o: ../core/synchro.h
-vim.o: vim.h functionbase.h ../core/item.h ../../pikotools/confparser/space.h
+vim.o: vim.h functionbase.h ../core/item.h ../../pikotools/space/space.h
 vim.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
 vim.o: ../core/textstream.h ../core/misc.h ../core/item.h
 vim.o: ../core/requesttypes.h ../core/error.h
-vim.o: ../../pikotools/confparser/confparser.h
-vim.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
-vim.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
-vim.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
-vim.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
-vim.o: ../core/cur.h ../core/request.h ../core/error.h ../core/config.h
-vim.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h
-vim.o: ../core/user.h ../core/plugindata.h ../core/rebus.h mount.h
-vim.o: ../templates/locale.h ../core/request.h ../core/config.h
+vim.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+vim.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
+vim.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
+vim.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
+vim.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
+vim.o: ../core/config.h ../core/htmlfilter.h ../templates/htmltextstream.h
+vim.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
+vim.o: mount.h ../templates/locale.h ../core/request.h ../core/config.h
 vim.o: ../core/system.h ../core/job.h ../core/basethread.h ../core/synchro.h
 vim.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h
 vim.o: ../notify/notifypool.h ../templates/patterns.h ../templates/locale.h
@@ -1413,19 +1388,18 @@ vim.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h
 vim.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
 vim.o: ../core/loadavg.h ../core/image.h ../core/threadmanager.h
 vim.o: ../core/synchro.h
-who.o: who.h functionbase.h ../core/item.h ../../pikotools/confparser/space.h
+who.o: who.h functionbase.h ../core/item.h ../../pikotools/space/space.h
 who.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
 who.o: ../core/textstream.h ../core/misc.h ../core/item.h
 who.o: ../core/requesttypes.h ../core/error.h
-who.o: ../../pikotools/confparser/confparser.h
-who.o: ../../pikotools/confparser/space.h ../db/dbitemquery.h
-who.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
-who.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
-who.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
-who.o: ../core/cur.h ../core/request.h ../core/error.h ../core/config.h
-who.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h
-who.o: ../core/user.h ../core/plugindata.h ../core/rebus.h mount.h
-who.o: ../templates/locale.h ../core/request.h ../core/config.h
+who.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+who.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
+who.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
+who.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
+who.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
+who.o: ../core/config.h ../core/htmlfilter.h ../templates/htmltextstream.h
+who.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
+who.o: mount.h ../templates/locale.h ../core/request.h ../core/config.h
 who.o: ../core/system.h ../core/job.h ../core/basethread.h ../core/synchro.h
 who.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h
 who.o: ../notify/notifypool.h ../templates/patterns.h ../templates/locale.h
diff --git a/functions/env.cpp b/functions/env.cpp
index 7ca5031..ebf5e09 100755
--- a/functions/env.cpp
+++ b/functions/env.cpp
@@ -50,7 +50,7 @@ bool Env::Parse(const std::wstring & env_str)
 	conf_parser.UTF8(config->utf8);
 	conf_parser.SplitSingle(true);
 
-return (conf_parser.ParseString(env_str) == PT::ConfParser::ok);
+return (conf_parser.ParseString(env_str) == PT::SpaceParser::ok);
 }
 
 
diff --git a/functions/env.h b/functions/env.h
index 2fce0ec..7d33fda 100755
--- a/functions/env.h
+++ b/functions/env.h
@@ -11,7 +11,7 @@
 #define headerfile_winix_functions_env
 
 #include "functionbase.h"
-#include "confparser/confparser.h"
+#include "space/spaceparser.h"
 
 
 namespace Fun
@@ -36,7 +36,7 @@ public:
 
 private:
 
-	PT::ConfParser conf_parser;
+	PT::SpaceParser conf_parser;
 	PT::Space space;
 	User * puser;
 	size_t req_id;
diff --git a/functions/meta.cpp b/functions/meta.cpp
index ac1a8ad..4ac054a 100755
--- a/functions/meta.cpp
+++ b/functions/meta.cpp
@@ -34,7 +34,7 @@ bool Meta::AddMetaInfo(Item & item, const std::wstring & meta_str)
 	conf_parser.UTF8(config->utf8);
 	conf_parser.SplitSingle(true);
 
-	if( conf_parser.ParseString(meta_str) == PT::ConfParser::ok )
+	if( conf_parser.ParseString(meta_str) == PT::SpaceParser::ok )
 	{
 		if( db->EditMetaById(space, item.id) == WINIX_ERR_OK )
 		{
diff --git a/functions/meta.h b/functions/meta.h
index 3ae8ca2..529088f 100755
--- a/functions/meta.h
+++ b/functions/meta.h
@@ -11,7 +11,7 @@
 #define headerfile_winix_functions_meta
 
 #include "functionbase.h"
-#include "confparser/confparser.h"
+#include "space/spaceparser.h"
 
 
 namespace Fun
@@ -30,7 +30,7 @@ public:
 
 private:
 
-	PT::ConfParser conf_parser;
+	PT::SpaceParser conf_parser;
 	PT::Space space;
 };
 
diff --git a/main/Makefile.dep b/main/Makefile.dep
index 9810d30..d266816 100755
--- a/main/Makefile.dep
+++ b/main/Makefile.dep
@@ -1,13 +1,13 @@
 # DO NOT DELETE
 
 main.o: ../core/log.h ../core/textstream.h ../core/misc.h ../core/item.h
-main.o: ../../pikotools/confparser/space.h ../core/requesttypes.h
+main.o: ../../pikotools/space/space.h ../core/requesttypes.h
 main.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
 main.o: ../core/request.h ../core/error.h ../core/config.h
-main.o: ../../pikotools/confparser/confparser.h
-main.o: ../../pikotools/confparser/space.h ../core/htmlfilter.h
-main.o: ../templates/htmltextstream.h ../core/textstream.h ../core/session.h
-main.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h
+main.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+main.o: ../core/htmlfilter.h ../templates/htmltextstream.h
+main.o: ../core/textstream.h ../core/session.h ../core/user.h
+main.o: ../core/plugindata.h ../core/rebus.h ../core/mount.h
 main.o: ../templates/locale.h ../core/slog.h ../core/app.h ../core/system.h
 main.o: ../core/job.h ../core/basethread.h ../core/synchro.h ../core/dirs.h
 main.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
diff --git a/notify/Makefile.dep b/notify/Makefile.dep
index 1bf641a..00647c1 100755
--- a/notify/Makefile.dep
+++ b/notify/Makefile.dep
@@ -1,30 +1,30 @@
 # DO NOT DELETE
 
 notify.o: notify.h notifypool.h ../templates/locale.h
-notify.o: ../../pikotools/confparser/confparser.h
-notify.o: ../../pikotools/confparser/space.h ../templates/patterns.h
-notify.o: ../templates/locale.h ../templates/localefilter.h
-notify.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h
-notify.o: ../../ezc/src/pattern.h ../../ezc/src/item.h
-notify.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
-notify.o: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.h
-notify.o: ../templates/misc.h ../templates/htmltextstream.h
-notify.o: ../core/textstream.h ../../pikotools/confparser/space.h
-notify.o: notifythread.h ../core/basethread.h ../core/synchro.h
-notify.o: templatesnotify.h ../core/config.h ../core/htmlfilter.h
-notify.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h
-notify.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
-notify.o: ../core/cur.h ../core/request.h ../core/requesttypes.h
-notify.o: ../core/error.h ../core/config.h ../templates/htmltextstream.h
-notify.o: ../core/session.h ../core/plugindata.h ../core/rebus.h
-notify.o: ../core/mount.h ../core/lastcontainer.h ../db/db.h ../db/dbbase.h
-notify.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
-notify.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
-notify.o: ../core/user.h ../core/group.h ../core/dircontainer.h
-notify.o: ../core/ugcontainer.h ../templates/templates.h
-notify.o: ../templates/patterncacher.h ../templates/indexpatterns.h
-notify.o: ../templates/patterns.h ../templates/changepatterns.h ../core/cur.h
-notify.o: ../core/system.h ../core/job.h ../core/basethread.h ../core/dirs.h
+notify.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+notify.o: ../templates/patterns.h ../templates/locale.h
+notify.o: ../templates/localefilter.h ../../ezc/src/ezc.h
+notify.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
+notify.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
+notify.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
+notify.o: ../../pikotools/utf8/utf8.h ../templates/misc.h
+notify.o: ../templates/htmltextstream.h ../core/textstream.h
+notify.o: ../../pikotools/space/space.h notifythread.h ../core/basethread.h
+notify.o: ../core/synchro.h templatesnotify.h ../core/config.h
+notify.o: ../core/htmlfilter.h ../core/users.h ../core/user.h
+notify.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h
+notify.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
+notify.o: ../core/request.h ../core/requesttypes.h ../core/error.h
+notify.o: ../core/config.h ../templates/htmltextstream.h ../core/session.h
+notify.o: ../core/plugindata.h ../core/rebus.h ../core/mount.h
+notify.o: ../core/lastcontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+notify.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h
+notify.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
+notify.o: ../core/dircontainer.h ../core/ugcontainer.h
+notify.o: ../templates/templates.h ../templates/patterncacher.h
+notify.o: ../templates/indexpatterns.h ../templates/patterns.h
+notify.o: ../templates/changepatterns.h ../core/cur.h ../core/system.h
+notify.o: ../core/job.h ../core/basethread.h ../core/dirs.h
 notify.o: ../core/dircontainer.h ../notify/notify.h ../core/mounts.h
 notify.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h
 notify.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
@@ -49,8 +49,8 @@ notify.o: ../functions/subject.h ../functions/template.h
 notify.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
 notify.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h
 notifypool.o: notifypool.h ../templates/locale.h
-notifypool.o: ../../pikotools/confparser/confparser.h
-notifypool.o: ../../pikotools/confparser/space.h
+notifypool.o: ../../pikotools/space/spaceparser.h
+notifypool.o: ../../pikotools/space/space.h
 notifythread.o: notifythread.h ../core/basethread.h ../core/synchro.h
 notifythread.o: templatesnotify.h ../../ezc/src/ezc.h
 notifythread.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
@@ -59,9 +59,9 @@ notifythread.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
 notifythread.o: ../../pikotools/utf8/utf8.h ../core/textstream.h
 notifythread.o: ../templates/misc.h ../templates/localefilter.h
 notifythread.o: ../templates/locale.h ../templates/htmltextstream.h
-notifythread.o: ../../pikotools/confparser/space.h notifypool.h
-notifythread.o: ../templates/locale.h ../../pikotools/confparser/confparser.h
-notifythread.o: ../../pikotools/confparser/space.h ../core/config.h
+notifythread.o: ../../pikotools/space/space.h notifypool.h
+notifythread.o: ../templates/locale.h ../../pikotools/space/spaceparser.h
+notifythread.o: ../../pikotools/space/space.h ../core/config.h
 notifythread.o: ../core/htmlfilter.h ../core/users.h ../core/user.h
 notifythread.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h
 notifythread.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
@@ -81,10 +81,9 @@ templatesnotify.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
 templatesnotify.o: ../../pikotools/utf8/utf8.h ../core/textstream.h
 templatesnotify.o: ../templates/misc.h ../templates/localefilter.h
 templatesnotify.o: ../templates/locale.h ../templates/htmltextstream.h
-templatesnotify.o: ../../pikotools/confparser/space.h notifypool.h
-templatesnotify.o: ../templates/locale.h
-templatesnotify.o: ../../pikotools/confparser/confparser.h
-templatesnotify.o: ../../pikotools/confparser/space.h ../core/plugin.h
+templatesnotify.o: ../../pikotools/space/space.h notifypool.h
+templatesnotify.o: ../templates/locale.h ../../pikotools/space/spaceparser.h
+templatesnotify.o: ../../pikotools/space/space.h ../core/plugin.h
 templatesnotify.o: ../core/pluginmsg.h ../core/log.h ../core/textstream.h
 templatesnotify.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
 templatesnotify.o: ../core/request.h ../core/requesttypes.h ../core/error.h
diff --git a/plugins/export/Makefile.dep b/plugins/export/Makefile.dep
index 5f68ac2..0af0100 100755
--- a/plugins/export/Makefile.dep
+++ b/plugins/export/Makefile.dep
@@ -2,9 +2,9 @@
 
 edb.o: edb.h ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h
 edb.o: ../../core/textstream.h ../../core/misc.h ../../core/item.h
-edb.o: ../../../pikotools/confparser/space.h ../../core/requesttypes.h
-edb.o: ../../core/error.h ../../../pikotools/confparser/confparser.h
-edb.o: ../../../pikotools/confparser/space.h export.h ../../core/dirs.h
+edb.o: ../../../pikotools/space/space.h ../../core/requesttypes.h
+edb.o: ../../core/error.h ../../../pikotools/space/spaceparser.h
+edb.o: ../../../pikotools/space/space.h export.h ../../core/dirs.h
 edb.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
 edb.o: ../../db/dbitemquery.h ../../core/item.h ../../db/dbitemcolumns.h
 edb.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h
@@ -26,7 +26,7 @@ edb.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h
 edb.o: ../../core/lastcontainer.h ../../core/log.h
 exportinfo.o: ../../core/log.h exportinfo.h ../../core/system.h
 exportinfo.o: ../../core/job.h ../../core/basethread.h ../../core/synchro.h
-exportinfo.o: ../../../pikotools/confparser/space.h ../../core/dirs.h
+exportinfo.o: ../../../pikotools/space/space.h ../../core/dirs.h
 exportinfo.o: ../../core/item.h ../../core/dircontainer.h ../../db/db.h
 exportinfo.o: ../../db/dbbase.h ../../db/dbitemquery.h ../../core/item.h
 exportinfo.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
@@ -35,8 +35,8 @@ exportinfo.o: ../../core/log.h ../../core/textstream.h
 exportinfo.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h
 exportinfo.o: ../../core/request.h ../../core/requesttypes.h
 exportinfo.o: ../../core/error.h ../../core/config.h
-exportinfo.o: ../../../pikotools/confparser/confparser.h
-exportinfo.o: ../../../pikotools/confparser/space.h ../../core/htmlfilter.h
+exportinfo.o: ../../../pikotools/space/spaceparser.h
+exportinfo.o: ../../../pikotools/space/space.h ../../core/htmlfilter.h
 exportinfo.o: ../../templates/htmltextstream.h ../../core/textstream.h
 exportinfo.o: ../../core/misc.h ../../core/session.h ../../core/user.h
 exportinfo.o: ../../core/plugindata.h ../../core/rebus.h ../../core/mount.h
@@ -58,15 +58,15 @@ exportinfo.o: ../../db/dbconn.h ../../db/dbtextstream.h ../../core/error.h
 exportinfo.o: ../../core/dirs.h message.h exportthread.h
 exportthread.o: exportthread.h ../../core/basethread.h ../../core/synchro.h
 exportthread.o: message.h ../../core/log.h ../../core/misc.h
-exportthread.o: ../../core/item.h ../../../pikotools/confparser/space.h
+exportthread.o: ../../core/item.h ../../../pikotools/space/space.h
 exportthread.o: ../../core/requesttypes.h ../../../pikotools/utf8/utf8.h
 init.o: ../../core/log.h ../../core/plugin.h ../../core/pluginmsg.h
 init.o: ../../core/log.h ../../core/textstream.h ../../core/logmanipulators.h
 init.o: ../../core/slog.h ../../core/cur.h ../../core/request.h
 init.o: ../../core/requesttypes.h ../../core/item.h
-init.o: ../../../pikotools/confparser/space.h ../../core/error.h
-init.o: ../../core/config.h ../../../pikotools/confparser/confparser.h
-init.o: ../../../pikotools/confparser/space.h ../../core/htmlfilter.h
+init.o: ../../../pikotools/space/space.h ../../core/error.h
+init.o: ../../core/config.h ../../../pikotools/space/spaceparser.h
+init.o: ../../../pikotools/space/space.h ../../core/htmlfilter.h
 init.o: ../../templates/htmltextstream.h ../../core/textstream.h
 init.o: ../../core/misc.h ../../core/session.h ../../core/user.h
 init.o: ../../core/plugindata.h ../../core/rebus.h ../../core/mount.h
diff --git a/plugins/gallery/Makefile.dep b/plugins/gallery/Makefile.dep
index 1ec036a..931e279 100755
--- a/plugins/gallery/Makefile.dep
+++ b/plugins/gallery/Makefile.dep
@@ -1,12 +1,11 @@
 # DO NOT DELETE
 
 gallery.o: gallery.h ../../functions/functionbase.h ../../core/item.h
-gallery.o: ../../../pikotools/confparser/space.h ../../db/db.h
-gallery.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h
-gallery.o: ../../core/textstream.h ../../core/misc.h ../../core/item.h
-gallery.o: ../../core/requesttypes.h ../../core/error.h
-gallery.o: ../../../pikotools/confparser/confparser.h
-gallery.o: ../../../pikotools/confparser/space.h ../../db/dbitemquery.h
+gallery.o: ../../../pikotools/space/space.h ../../db/db.h ../../db/dbbase.h
+gallery.o: ../../db/dbconn.h ../../db/dbtextstream.h ../../core/textstream.h
+gallery.o: ../../core/misc.h ../../core/item.h ../../core/requesttypes.h
+gallery.o: ../../core/error.h ../../../pikotools/space/spaceparser.h
+gallery.o: ../../../pikotools/space/space.h ../../db/dbitemquery.h
 gallery.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
 gallery.o: ../../core/dircontainer.h ../../core/ugcontainer.h
 gallery.o: ../../core/log.h ../../core/textstream.h
@@ -32,13 +31,13 @@ gallery.o: ../../core/users.h ../../core/groups.h ../../core/group.h
 gallery.o: ../../core/loadavg.h ../../core/image.h ../../core/threadmanager.h
 gallery.o: ../../core/synchro.h galleryinfo.h
 galleryinfo.o: galleryinfo.h ../../core/item.h
-galleryinfo.o: ../../../pikotools/confparser/space.h
+galleryinfo.o: ../../../pikotools/space/space.h
 init.o: gallery.h ../../functions/functionbase.h ../../core/item.h
-init.o: ../../../pikotools/confparser/space.h ../../db/db.h ../../db/dbbase.h
+init.o: ../../../pikotools/space/space.h ../../db/db.h ../../db/dbbase.h
 init.o: ../../db/dbconn.h ../../db/dbtextstream.h ../../core/textstream.h
 init.o: ../../core/misc.h ../../core/item.h ../../core/requesttypes.h
-init.o: ../../core/error.h ../../../pikotools/confparser/confparser.h
-init.o: ../../../pikotools/confparser/space.h ../../db/dbitemquery.h
+init.o: ../../core/error.h ../../../pikotools/space/spaceparser.h
+init.o: ../../../pikotools/space/space.h ../../db/dbitemquery.h
 init.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
 init.o: ../../core/dircontainer.h ../../core/ugcontainer.h ../../core/log.h
 init.o: ../../core/textstream.h ../../core/logmanipulators.h
@@ -89,12 +88,12 @@ init.o: ../../templates/indexpatterns.h ../../templates/patterns.h
 init.o: ../../templates/changepatterns.h ../../templates/htmltextstream.h
 init.o: ../../core/sessionmanager.h
 templates.o: gallery.h ../../functions/functionbase.h ../../core/item.h
-templates.o: ../../../pikotools/confparser/space.h ../../db/db.h
-templates.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h
+templates.o: ../../../pikotools/space/space.h ../../db/db.h ../../db/dbbase.h
+templates.o: ../../db/dbconn.h ../../db/dbtextstream.h
 templates.o: ../../core/textstream.h ../../core/misc.h ../../core/item.h
 templates.o: ../../core/requesttypes.h ../../core/error.h
-templates.o: ../../../pikotools/confparser/confparser.h
-templates.o: ../../../pikotools/confparser/space.h ../../db/dbitemquery.h
+templates.o: ../../../pikotools/space/spaceparser.h
+templates.o: ../../../pikotools/space/space.h ../../db/dbitemquery.h
 templates.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
 templates.o: ../../core/dircontainer.h ../../core/ugcontainer.h
 templates.o: ../../core/log.h ../../core/textstream.h
diff --git a/plugins/group/Makefile.dep b/plugins/group/Makefile.dep
index 9b6b239..82e6eff 100755
--- a/plugins/group/Makefile.dep
+++ b/plugins/group/Makefile.dep
@@ -1,8 +1,8 @@
 # DO NOT DELETE
 
-groupinfo.o: groupinfo.h groups.h ../../../pikotools/confparser/confparser.h
-groupinfo.o: ../../../pikotools/confparser/space.h ../../core/item.h
-groupinfo.o: ../../../pikotools/confparser/space.h ../../core/system.h
+groupinfo.o: groupinfo.h groups.h ../../../pikotools/space/spaceparser.h
+groupinfo.o: ../../../pikotools/space/space.h ../../core/item.h
+groupinfo.o: ../../../pikotools/space/space.h ../../core/system.h
 groupinfo.o: ../../core/job.h ../../core/basethread.h ../../core/synchro.h
 groupinfo.o: ../../core/dirs.h ../../core/item.h ../../core/dircontainer.h
 groupinfo.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h
@@ -30,16 +30,16 @@ groupinfo.o: ../../core/lastcontainer.h ../../core/mounts.h
 groupinfo.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h
 groupinfo.o: ../../core/users.h ../../core/loadavg.h ../../core/image.h
 groupinfo.o: ../../core/threadmanager.h ../../core/log.h
-groups.o: groups.h ../../../pikotools/confparser/confparser.h
-groups.o: ../../../pikotools/confparser/space.h ../../core/log.h
+groups.o: groups.h ../../../pikotools/space/spaceparser.h
+groups.o: ../../../pikotools/space/space.h ../../core/log.h
 init.o: ../../core/log.h ../../core/plugin.h ../../core/pluginmsg.h
 init.o: ../../core/log.h ../../core/textstream.h ../../core/logmanipulators.h
 init.o: ../../core/slog.h ../../core/cur.h ../../core/request.h
 init.o: ../../core/requesttypes.h ../../core/item.h ../../core/error.h
-init.o: ../../core/config.h ../../../pikotools/confparser/confparser.h
-init.o: ../../../pikotools/confparser/space.h ../../core/htmlfilter.h
+init.o: ../../core/config.h ../../../pikotools/space/spaceparser.h
+init.o: ../../../pikotools/space/space.h ../../core/htmlfilter.h
 init.o: ../../templates/htmltextstream.h ../../core/textstream.h
-init.o: ../../core/misc.h ../../../pikotools/confparser/space.h
+init.o: ../../core/misc.h ../../../pikotools/space/space.h
 init.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h
 init.o: ../../core/rebus.h ../../core/mount.h ../../templates/locale.h
 init.o: ../../core/system.h ../../core/job.h ../../core/basethread.h
@@ -91,7 +91,7 @@ templates.o: ../../core/item.h ../../../ezc/src/functions.h
 templates.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
 templates.o: ../../../pikotools/utf8/utf8.h ../../core/misc.h
 templates.o: ../../core/requesttypes.h ../../templates/patterncacher.h
-templates.o: ../../core/item.h ../../../pikotools/confparser/space.h
+templates.o: ../../core/item.h ../../../pikotools/space/space.h
 templates.o: ../../templates/indexpatterns.h ../../templates/patterns.h
 templates.o: ../../templates/locale.h ../../templates/changepatterns.h
 templates.o: ../../templates/htmltextstream.h ../../templates/localefilter.h
@@ -100,8 +100,8 @@ templates.o: ../../core/job.h ../../core/basethread.h ../../core/synchro.h
 templates.o: ../../core/dirs.h ../../core/dircontainer.h ../../db/db.h
 templates.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h
 templates.o: ../../core/textstream.h ../../core/error.h
-templates.o: ../../../pikotools/confparser/confparser.h
-templates.o: ../../../pikotools/confparser/space.h ../../db/dbitemquery.h
+templates.o: ../../../pikotools/space/spaceparser.h
+templates.o: ../../../pikotools/space/space.h ../../db/dbitemquery.h
 templates.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
 templates.o: ../../core/dircontainer.h ../../core/ugcontainer.h
 templates.o: ../../core/log.h ../../core/textstream.h
diff --git a/plugins/group/groupinfo.cpp b/plugins/group/groupinfo.cpp
index 9c31917..bb3b0ef 100755
--- a/plugins/group/groupinfo.cpp
+++ b/plugins/group/groupinfo.cpp
@@ -54,7 +54,7 @@ bool GroupInfo::ParseGroups(const std::wstring & str, Groups & groups)
 	conf_parser.SetSpace(space);
 	conf_parser.UTF8(config->utf8);
 
-	if( conf_parser.ParseString(str) == PT::ConfParser::ok )
+	if( conf_parser.ParseString(str) == PT::SpaceParser::ok )
 	{
 		groups.Reindex();
 	}
@@ -65,7 +65,7 @@ bool GroupInfo::ParseGroups(const std::wstring & str, Groups & groups)
 		groups.Clear();
 	}
 
-return conf_parser.status == PT::ConfParser::ok;
+return conf_parser.status == PT::SpaceParser::ok;
 }
 
 
diff --git a/plugins/group/groupinfo.h b/plugins/group/groupinfo.h
index aa3a0c1..4d31d77 100755
--- a/plugins/group/groupinfo.h
+++ b/plugins/group/groupinfo.h
@@ -13,7 +13,7 @@
 #include <string>
 #include <vector>
 #include "groups.h"
-#include "confparser/confparser.h"
+#include "space/spaceparser.h"
 #include "core/item.h"
 #include "core/system.h"
 #include "core/config.h"
@@ -67,7 +67,7 @@ private:
 	typedef std::map<long, GroupsWrapItem> GroupsWrap;
 	GroupsWrap groups_wrap;
 
-	PT::ConfParser conf_parser;
+	PT::SpaceParser conf_parser;
 	std::vector<Item*> config_dir_tab;
 	Item config_file;
 
diff --git a/plugins/group/groups.h b/plugins/group/groups.h
index 233fec9..6b1e700 100755
--- a/plugins/group/groups.h
+++ b/plugins/group/groups.h
@@ -13,7 +13,7 @@
 #include <map>
 #include <vector>
 #include <string>
-#include "confparser/confparser.h"
+#include "space/spaceparser.h"
 
 
 
diff --git a/plugins/menu/Makefile.dep b/plugins/menu/Makefile.dep
index 1463141..862bde5 100755
--- a/plugins/menu/Makefile.dep
+++ b/plugins/menu/Makefile.dep
@@ -1,12 +1,12 @@
 # DO NOT DELETE
 
-cache.o: cache.h ../../core/item.h ../../../pikotools/confparser/space.h
+cache.o: cache.h ../../core/item.h ../../../pikotools/space/space.h
 cache.o: ../../core/dirs.h ../../core/item.h ../../core/dircontainer.h
 cache.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h
 cache.o: ../../db/dbtextstream.h ../../core/textstream.h ../../core/misc.h
 cache.o: ../../core/requesttypes.h ../../core/error.h
-cache.o: ../../../pikotools/confparser/confparser.h
-cache.o: ../../../pikotools/confparser/space.h ../../db/dbitemquery.h
+cache.o: ../../../pikotools/space/spaceparser.h
+cache.o: ../../../pikotools/space/space.h ../../db/dbitemquery.h
 cache.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
 cache.o: ../../core/dircontainer.h ../../core/ugcontainer.h ../../core/log.h
 cache.o: ../../core/textstream.h ../../core/logmanipulators.h
@@ -28,10 +28,10 @@ cache.o: ../../core/lastcontainer.h ../../core/misc.h
 init.o: ../../core/log.h ../../core/textstream.h ../../core/logmanipulators.h
 init.o: ../../core/slog.h ../../core/cur.h ../../core/request.h
 init.o: ../../core/requesttypes.h ../../core/item.h ../../core/error.h
-init.o: ../../core/config.h ../../../pikotools/confparser/confparser.h
-init.o: ../../../pikotools/confparser/space.h ../../core/htmlfilter.h
+init.o: ../../core/config.h ../../../pikotools/space/spaceparser.h
+init.o: ../../../pikotools/space/space.h ../../core/htmlfilter.h
 init.o: ../../templates/htmltextstream.h ../../core/textstream.h
-init.o: ../../core/misc.h ../../../pikotools/confparser/space.h
+init.o: ../../core/misc.h ../../../pikotools/space/space.h
 init.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h
 init.o: ../../core/rebus.h ../../core/mount.h ../../templates/locale.h
 init.o: ../../core/plugin.h ../../core/pluginmsg.h ../../core/log.h
@@ -85,7 +85,7 @@ templates.o: ../../core/item.h ../../../ezc/src/functions.h
 templates.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
 templates.o: ../../../pikotools/utf8/utf8.h ../../core/misc.h
 templates.o: ../../core/requesttypes.h ../../templates/patterncacher.h
-templates.o: ../../core/item.h ../../../pikotools/confparser/space.h
+templates.o: ../../core/item.h ../../../pikotools/space/space.h
 templates.o: ../../templates/indexpatterns.h ../../templates/patterns.h
 templates.o: ../../templates/locale.h ../../templates/changepatterns.h
 templates.o: ../../templates/htmltextstream.h ../../templates/localefilter.h
@@ -93,8 +93,8 @@ templates.o: ../../core/config.h ../../core/cur.h ../../core/system.h
 templates.o: ../../core/sessionmanager.h ../../core/htmlfilter.h
 templates.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h
 templates.o: ../../db/dbtextstream.h ../../core/textstream.h
-templates.o: ../../core/error.h ../../../pikotools/confparser/confparser.h
-templates.o: ../../../pikotools/confparser/space.h ../../db/dbitemquery.h
+templates.o: ../../core/error.h ../../../pikotools/space/spaceparser.h
+templates.o: ../../../pikotools/space/space.h ../../db/dbitemquery.h
 templates.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
 templates.o: ../../core/dircontainer.h ../../core/ugcontainer.h
 templates.o: ../../core/log.h ../../core/textstream.h
diff --git a/plugins/stats/Makefile.dep b/plugins/stats/Makefile.dep
index 3f4c120..1dd4941 100755
--- a/plugins/stats/Makefile.dep
+++ b/plugins/stats/Makefile.dep
@@ -2,12 +2,12 @@
 
 bot.o: bot.h
 init.o: ../../core/log.h ../../core/textstream.h ../../core/misc.h
-init.o: ../../core/item.h ../../../pikotools/confparser/space.h
+init.o: ../../core/item.h ../../../pikotools/space/space.h
 init.o: ../../core/requesttypes.h ../../core/logmanipulators.h
 init.o: ../../core/slog.h ../../core/cur.h ../../core/request.h
 init.o: ../../core/error.h ../../core/config.h
-init.o: ../../../pikotools/confparser/confparser.h
-init.o: ../../../pikotools/confparser/space.h ../../core/htmlfilter.h
+init.o: ../../../pikotools/space/spaceparser.h
+init.o: ../../../pikotools/space/space.h ../../core/htmlfilter.h
 init.o: ../../templates/htmltextstream.h ../../core/textstream.h
 init.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h
 init.o: ../../core/rebus.h ../../core/mount.h ../../templates/locale.h
@@ -57,22 +57,22 @@ init.o: ../../templates/indexpatterns.h ../../templates/patterns.h
 init.o: ../../templates/changepatterns.h ../../templates/htmltextstream.h
 init.o: ../../core/sessionmanager.h statssession.h ../../core/plugindata.h
 stats.o: stats.h ../../core/config.h ../../core/log.h ../../core/textstream.h
-stats.o: ../../core/misc.h ../../core/item.h
-stats.o: ../../../pikotools/confparser/space.h ../../core/requesttypes.h
-stats.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h
-stats.o: ../../core/request.h ../../core/error.h ../../core/config.h
-stats.o: ../../../pikotools/confparser/confparser.h
-stats.o: ../../../pikotools/confparser/space.h ../../core/htmlfilter.h
+stats.o: ../../core/misc.h ../../core/item.h ../../../pikotools/space/space.h
+stats.o: ../../core/requesttypes.h ../../core/logmanipulators.h
+stats.o: ../../core/slog.h ../../core/cur.h ../../core/request.h
+stats.o: ../../core/error.h ../../core/config.h
+stats.o: ../../../pikotools/space/spaceparser.h
+stats.o: ../../../pikotools/space/space.h ../../core/htmlfilter.h
 stats.o: ../../templates/htmltextstream.h ../../core/textstream.h
 stats.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h
 stats.o: ../../core/rebus.h ../../core/mount.h ../../templates/locale.h
 stats.o: ../../../pikotools/utf8/utf8.h
 templates.o: templates.h ../../core/plugin.h ../../core/pluginmsg.h
 templates.o: ../../core/log.h ../../core/plugindata.h ../../core/config.h
-templates.o: ../../../pikotools/confparser/confparser.h
-templates.o: ../../../pikotools/confparser/space.h ../../core/htmlfilter.h
+templates.o: ../../../pikotools/space/spaceparser.h
+templates.o: ../../../pikotools/space/space.h ../../core/htmlfilter.h
 templates.o: ../../core/request.h ../../core/requesttypes.h ../../core/item.h
-templates.o: ../../../pikotools/confparser/space.h ../../core/error.h
+templates.o: ../../../pikotools/space/space.h ../../core/error.h
 templates.o: ../../core/textstream.h ../../core/misc.h
 templates.o: ../../templates/htmltextstream.h ../../core/textstream.h
 templates.o: ../../core/system.h ../../core/job.h ../../core/basethread.h
diff --git a/plugins/thread/Makefile.dep b/plugins/thread/Makefile.dep
index a9b8947..9d60f80 100755
--- a/plugins/thread/Makefile.dep
+++ b/plugins/thread/Makefile.dep
@@ -1,12 +1,12 @@
 # DO NOT DELETE
 
 createthread.o: createthread.h ../../functions/functionbase.h
-createthread.o: ../../core/item.h ../../../pikotools/confparser/space.h
+createthread.o: ../../core/item.h ../../../pikotools/space/space.h
 createthread.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h
 createthread.o: ../../db/dbtextstream.h ../../core/textstream.h
 createthread.o: ../../core/misc.h ../../core/item.h ../../core/requesttypes.h
-createthread.o: ../../core/error.h ../../../pikotools/confparser/confparser.h
-createthread.o: ../../../pikotools/confparser/space.h ../../db/dbitemquery.h
+createthread.o: ../../core/error.h ../../../pikotools/space/spaceparser.h
+createthread.o: ../../../pikotools/space/space.h ../../db/dbitemquery.h
 createthread.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
 createthread.o: ../../core/dircontainer.h ../../core/ugcontainer.h
 createthread.o: ../../core/log.h ../../core/textstream.h
@@ -58,11 +58,11 @@ createthread.o: ../../functions/uptime.h ../../functions/who.h
 createthread.o: ../../functions/vim.h ../../core/htmlfilter.h
 funthread.o: ../../core/misc.h ../../core/item.h ../../core/requesttypes.h
 funthread.o: funthread.h ../../functions/functionbase.h ../../core/item.h
-funthread.o: ../../../pikotools/confparser/space.h ../../db/db.h
-funthread.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h
+funthread.o: ../../../pikotools/space/space.h ../../db/db.h ../../db/dbbase.h
+funthread.o: ../../db/dbconn.h ../../db/dbtextstream.h
 funthread.o: ../../core/textstream.h ../../core/misc.h ../../core/error.h
-funthread.o: ../../../pikotools/confparser/confparser.h
-funthread.o: ../../../pikotools/confparser/space.h ../../db/dbitemquery.h
+funthread.o: ../../../pikotools/space/spaceparser.h
+funthread.o: ../../../pikotools/space/space.h ../../db/dbitemquery.h
 funthread.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
 funthread.o: ../../core/dircontainer.h ../../core/ugcontainer.h
 funthread.o: ../../core/log.h ../../core/textstream.h
@@ -90,11 +90,11 @@ funthread.o: ../../core/threadmanager.h ../../core/synchro.h tdb.h thread.h
 funthread.o: ../../db/dbbase.h threadinfo.h
 init.o: tdb.h thread.h ../../db/dbbase.h ../../core/error.h reply.h
 init.o: ../../functions/functionbase.h ../../core/item.h
-init.o: ../../../pikotools/confparser/space.h ../../db/db.h ../../db/dbbase.h
+init.o: ../../../pikotools/space/space.h ../../db/db.h ../../db/dbbase.h
 init.o: ../../db/dbconn.h ../../db/dbtextstream.h ../../core/textstream.h
 init.o: ../../core/misc.h ../../core/item.h ../../core/requesttypes.h
-init.o: ../../../pikotools/confparser/confparser.h
-init.o: ../../../pikotools/confparser/space.h ../../db/dbitemquery.h
+init.o: ../../../pikotools/space/spaceparser.h
+init.o: ../../../pikotools/space/space.h ../../db/dbitemquery.h
 init.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
 init.o: ../../core/dircontainer.h ../../core/ugcontainer.h ../../core/log.h
 init.o: ../../core/textstream.h ../../core/logmanipulators.h
@@ -145,12 +145,11 @@ init.o: ../../templates/indexpatterns.h ../../templates/patterns.h
 init.o: ../../templates/changepatterns.h ../../templates/htmltextstream.h
 init.o: ../../core/sessionmanager.h templates.h
 reply.o: reply.h ../../functions/functionbase.h ../../core/item.h
-reply.o: ../../../pikotools/confparser/space.h ../../db/db.h
-reply.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h
-reply.o: ../../core/textstream.h ../../core/misc.h ../../core/item.h
-reply.o: ../../core/requesttypes.h ../../core/error.h
-reply.o: ../../../pikotools/confparser/confparser.h
-reply.o: ../../../pikotools/confparser/space.h ../../db/dbitemquery.h
+reply.o: ../../../pikotools/space/space.h ../../db/db.h ../../db/dbbase.h
+reply.o: ../../db/dbconn.h ../../db/dbtextstream.h ../../core/textstream.h
+reply.o: ../../core/misc.h ../../core/item.h ../../core/requesttypes.h
+reply.o: ../../core/error.h ../../../pikotools/space/spaceparser.h
+reply.o: ../../../pikotools/space/space.h ../../db/dbitemquery.h
 reply.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
 reply.o: ../../core/dircontainer.h ../../core/ugcontainer.h ../../core/log.h
 reply.o: ../../core/textstream.h ../../core/logmanipulators.h
@@ -201,12 +200,12 @@ reply.o: ../../templates/patterncacher.h ../../templates/indexpatterns.h
 reply.o: ../../templates/patterns.h ../../templates/changepatterns.h
 reply.o: ../../templates/htmltextstream.h ../../core/sessionmanager.h
 showthreads.o: showthreads.h ../../functions/functionbase.h ../../core/item.h
-showthreads.o: ../../../pikotools/confparser/space.h ../../db/db.h
+showthreads.o: ../../../pikotools/space/space.h ../../db/db.h
 showthreads.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h
 showthreads.o: ../../core/textstream.h ../../core/misc.h ../../core/item.h
 showthreads.o: ../../core/requesttypes.h ../../core/error.h
-showthreads.o: ../../../pikotools/confparser/confparser.h
-showthreads.o: ../../../pikotools/confparser/space.h ../../db/dbitemquery.h
+showthreads.o: ../../../pikotools/space/spaceparser.h
+showthreads.o: ../../../pikotools/space/space.h ../../db/dbitemquery.h
 showthreads.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
 showthreads.o: ../../core/dircontainer.h ../../core/ugcontainer.h
 showthreads.o: ../../core/log.h ../../core/textstream.h
@@ -235,15 +234,15 @@ showthreads.o: ../../core/image.h ../../core/threadmanager.h
 showthreads.o: ../../core/synchro.h tdb.h thread.h ../../db/dbbase.h
 showthreads.o: threadinfo.h
 tdb.o: tdb.h thread.h ../../db/dbbase.h ../../core/error.h ../../core/log.h
-templates.o: threadinfo.h ../../core/item.h
-templates.o: ../../../pikotools/confparser/space.h ../../core/system.h
-templates.o: ../../core/job.h ../../core/basethread.h ../../core/synchro.h
-templates.o: ../../core/dirs.h ../../core/item.h ../../core/dircontainer.h
-templates.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h
-templates.o: ../../db/dbtextstream.h ../../core/textstream.h
-templates.o: ../../core/misc.h ../../core/requesttypes.h ../../core/error.h
-templates.o: ../../../pikotools/confparser/confparser.h
-templates.o: ../../../pikotools/confparser/space.h ../../db/dbitemquery.h
+templates.o: threadinfo.h ../../core/item.h ../../../pikotools/space/space.h
+templates.o: ../../core/system.h ../../core/job.h ../../core/basethread.h
+templates.o: ../../core/synchro.h ../../core/dirs.h ../../core/item.h
+templates.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
+templates.o: ../../db/dbconn.h ../../db/dbtextstream.h
+templates.o: ../../core/textstream.h ../../core/misc.h
+templates.o: ../../core/requesttypes.h ../../core/error.h
+templates.o: ../../../pikotools/space/spaceparser.h
+templates.o: ../../../pikotools/space/space.h ../../db/dbitemquery.h
 templates.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
 templates.o: ../../core/dircontainer.h ../../core/ugcontainer.h
 templates.o: ../../core/log.h ../../core/textstream.h
@@ -295,15 +294,15 @@ templates.o: ../../core/htmlfilter.h ../../templates/templates.h
 templates.o: ../../templates/patterncacher.h ../../templates/indexpatterns.h
 templates.o: ../../templates/patterns.h ../../templates/changepatterns.h
 templates.o: ../../templates/htmltextstream.h ../../core/sessionmanager.h
-threadinfo.o: threadinfo.h ../../core/item.h
-threadinfo.o: ../../../pikotools/confparser/space.h ../../core/system.h
-threadinfo.o: ../../core/job.h ../../core/basethread.h ../../core/synchro.h
-threadinfo.o: ../../core/dirs.h ../../core/item.h ../../core/dircontainer.h
-threadinfo.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h
-threadinfo.o: ../../db/dbtextstream.h ../../core/textstream.h
-threadinfo.o: ../../core/misc.h ../../core/requesttypes.h ../../core/error.h
-threadinfo.o: ../../../pikotools/confparser/confparser.h
-threadinfo.o: ../../../pikotools/confparser/space.h ../../db/dbitemquery.h
+threadinfo.o: threadinfo.h ../../core/item.h ../../../pikotools/space/space.h
+threadinfo.o: ../../core/system.h ../../core/job.h ../../core/basethread.h
+threadinfo.o: ../../core/synchro.h ../../core/dirs.h ../../core/item.h
+threadinfo.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
+threadinfo.o: ../../db/dbconn.h ../../db/dbtextstream.h
+threadinfo.o: ../../core/textstream.h ../../core/misc.h
+threadinfo.o: ../../core/requesttypes.h ../../core/error.h
+threadinfo.o: ../../../pikotools/space/spaceparser.h
+threadinfo.o: ../../../pikotools/space/space.h ../../db/dbitemquery.h
 threadinfo.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
 threadinfo.o: ../../core/dircontainer.h ../../core/ugcontainer.h
 threadinfo.o: ../../core/log.h ../../core/textstream.h
diff --git a/plugins/ticket/Makefile.dep b/plugins/ticket/Makefile.dep
index 6382aa4..62197db 100755
--- a/plugins/ticket/Makefile.dep
+++ b/plugins/ticket/Makefile.dep
@@ -3,10 +3,9 @@
 createticket.o: createticket.h tdb.h ticket.h ../../db/dbbase.h
 createticket.o: ../../db/dbconn.h ../../db/dbtextstream.h
 createticket.o: ../../core/textstream.h ../../core/misc.h ../../core/item.h
-createticket.o: ../../../pikotools/confparser/space.h
-createticket.o: ../../core/requesttypes.h ../../core/error.h
-createticket.o: ../../../pikotools/confparser/confparser.h
-createticket.o: ../../../pikotools/confparser/space.h
+createticket.o: ../../../pikotools/space/space.h ../../core/requesttypes.h
+createticket.o: ../../core/error.h ../../../pikotools/space/spaceparser.h
+createticket.o: ../../../pikotools/space/space.h
 createticket.o: ../../functions/functionbase.h ../../core/item.h
 createticket.o: ../../db/db.h ../../db/dbbase.h ../../db/dbitemquery.h
 createticket.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
@@ -61,11 +60,11 @@ createticket.o: ../../core/plugindata.h ../../functions/rm.h
 editticket.o: editticket.h tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.h
 editticket.o: ../../db/dbtextstream.h ../../core/textstream.h
 editticket.o: ../../core/misc.h ../../core/item.h
-editticket.o: ../../../pikotools/confparser/space.h ../../core/requesttypes.h
-editticket.o: ../../core/error.h ../../../pikotools/confparser/confparser.h
-editticket.o: ../../../pikotools/confparser/space.h ticketinfo.h
-editticket.o: ../../core/item.h ../../core/system.h ../../core/job.h
-editticket.o: ../../core/basethread.h ../../core/synchro.h ../../core/dirs.h
+editticket.o: ../../../pikotools/space/space.h ../../core/requesttypes.h
+editticket.o: ../../core/error.h ../../../pikotools/space/spaceparser.h
+editticket.o: ../../../pikotools/space/space.h ticketinfo.h ../../core/item.h
+editticket.o: ../../core/system.h ../../core/job.h ../../core/basethread.h
+editticket.o: ../../core/synchro.h ../../core/dirs.h
 editticket.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
 editticket.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h
 editticket.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h
@@ -117,21 +116,20 @@ editticket.o: ../../functions/rm.h
 funticket.o: funticket.h tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.h
 funticket.o: ../../db/dbtextstream.h ../../core/textstream.h
 funticket.o: ../../core/misc.h ../../core/item.h
-funticket.o: ../../../pikotools/confparser/space.h ../../core/requesttypes.h
-funticket.o: ../../core/error.h ../../../pikotools/confparser/confparser.h
-funticket.o: ../../../pikotools/confparser/space.h ticketinfo.h
-funticket.o: ../../core/item.h ../../core/system.h ../../core/job.h
-funticket.o: ../../core/basethread.h ../../core/synchro.h ../../core/dirs.h
-funticket.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
-funticket.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h
-funticket.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h
-funticket.o: ../../core/ugcontainer.h ../../core/log.h
-funticket.o: ../../core/textstream.h ../../core/logmanipulators.h
-funticket.o: ../../core/slog.h ../../core/cur.h ../../core/request.h
-funticket.o: ../../core/error.h ../../core/config.h ../../core/htmlfilter.h
-funticket.o: ../../templates/htmltextstream.h ../../core/session.h
-funticket.o: ../../core/user.h ../../core/plugindata.h ../../core/rebus.h
-funticket.o: ../../core/mount.h ../../templates/locale.h
+funticket.o: ../../../pikotools/space/space.h ../../core/requesttypes.h
+funticket.o: ../../core/error.h ../../../pikotools/space/spaceparser.h
+funticket.o: ../../../pikotools/space/space.h ticketinfo.h ../../core/item.h
+funticket.o: ../../core/system.h ../../core/job.h ../../core/basethread.h
+funticket.o: ../../core/synchro.h ../../core/dirs.h ../../core/dircontainer.h
+funticket.o: ../../db/db.h ../../db/dbbase.h ../../db/dbitemquery.h
+funticket.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
+funticket.o: ../../core/dircontainer.h ../../core/ugcontainer.h
+funticket.o: ../../core/log.h ../../core/textstream.h
+funticket.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h
+funticket.o: ../../core/request.h ../../core/error.h ../../core/config.h
+funticket.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h
+funticket.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h
+funticket.o: ../../core/rebus.h ../../core/mount.h ../../templates/locale.h
 funticket.o: ../../notify/notify.h ../../notify/notifypool.h
 funticket.o: ../../templates/patterns.h ../../templates/locale.h
 funticket.o: ../../templates/localefilter.h ../../../ezc/src/ezc.h
@@ -177,10 +175,10 @@ funticket.o: ../../templates/htmltextstream.h ../../core/sessionmanager.h
 funticket.o: ../../plugins/thread/pluginmsg.h
 init.o: tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.h
 init.o: ../../db/dbtextstream.h ../../core/textstream.h ../../core/misc.h
-init.o: ../../core/item.h ../../../pikotools/confparser/space.h
+init.o: ../../core/item.h ../../../pikotools/space/space.h
 init.o: ../../core/requesttypes.h ../../core/error.h
-init.o: ../../../pikotools/confparser/confparser.h
-init.o: ../../../pikotools/confparser/space.h funticket.h ticketinfo.h
+init.o: ../../../pikotools/space/spaceparser.h
+init.o: ../../../pikotools/space/space.h funticket.h ticketinfo.h
 init.o: ../../core/item.h ../../core/system.h ../../core/job.h
 init.o: ../../core/basethread.h ../../core/synchro.h ../../core/dirs.h
 init.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
@@ -235,14 +233,13 @@ init.o: sessiondata.h ../../core/plugindata.h ../../functions/rm.h
 init.o: ../../plugins/thread/showthreads.h ../../plugins/thread/threadinfo.h
 init.o: ../../plugins/thread/thread.h ../../plugins/thread/pluginmsg.h
 sessiondata.o: sessiondata.h ../../core/plugindata.h ticket.h
-sessiondata.o: ../../functions/rm.h ../../../pikotools/confparser/space.h
+sessiondata.o: ../../functions/rm.h ../../../pikotools/space/space.h
 showtickets.o: showtickets.h tdb.h ticket.h ../../db/dbbase.h
 showtickets.o: ../../db/dbconn.h ../../db/dbtextstream.h
 showtickets.o: ../../core/textstream.h ../../core/misc.h ../../core/item.h
-showtickets.o: ../../../pikotools/confparser/space.h
-showtickets.o: ../../core/requesttypes.h ../../core/error.h
-showtickets.o: ../../../pikotools/confparser/confparser.h
-showtickets.o: ../../../pikotools/confparser/space.h ticketinfo.h
+showtickets.o: ../../../pikotools/space/space.h ../../core/requesttypes.h
+showtickets.o: ../../core/error.h ../../../pikotools/space/spaceparser.h
+showtickets.o: ../../../pikotools/space/space.h ticketinfo.h
 showtickets.o: ../../core/item.h ../../core/system.h ../../core/job.h
 showtickets.o: ../../core/basethread.h ../../core/synchro.h ../../core/dirs.h
 showtickets.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
@@ -302,27 +299,26 @@ showtickets.o: ../../templates/changepatterns.h
 showtickets.o: ../../templates/htmltextstream.h ../../core/sessionmanager.h
 tdb.o: tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.h
 tdb.o: ../../db/dbtextstream.h ../../core/textstream.h ../../core/misc.h
-tdb.o: ../../core/item.h ../../../pikotools/confparser/space.h
+tdb.o: ../../core/item.h ../../../pikotools/space/space.h
 tdb.o: ../../core/requesttypes.h ../../core/error.h
-tdb.o: ../../../pikotools/confparser/confparser.h
-tdb.o: ../../../pikotools/confparser/space.h ../../core/log.h
+tdb.o: ../../../pikotools/space/spaceparser.h
+tdb.o: ../../../pikotools/space/space.h ../../core/log.h
 templates.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
 templates.o: ../../../ezc/src/pattern.h ../../core/item.h
-templates.o: ../../../pikotools/confparser/space.h
-templates.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
-templates.o: ../../../ezc/src/stringconv.h ../../../pikotools/utf8/utf8.h
-templates.o: ticketinfo.h ticket.h ../../core/item.h ../../core/system.h
-templates.o: ../../core/job.h ../../core/basethread.h ../../core/synchro.h
-templates.o: ../../core/dirs.h ../../core/dircontainer.h ../../db/db.h
-templates.o: ../../db/dbbase.h ../../db/dbitemquery.h
-templates.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
-templates.o: ../../core/dircontainer.h ../../core/ugcontainer.h
-templates.o: ../../core/log.h ../../core/textstream.h
-templates.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h
-templates.o: ../../core/request.h ../../core/requesttypes.h
-templates.o: ../../core/error.h ../../core/config.h
-templates.o: ../../../pikotools/confparser/confparser.h
-templates.o: ../../../pikotools/confparser/space.h ../../core/htmlfilter.h
+templates.o: ../../../pikotools/space/space.h ../../../ezc/src/functions.h
+templates.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
+templates.o: ../../../pikotools/utf8/utf8.h ticketinfo.h ticket.h
+templates.o: ../../core/item.h ../../core/system.h ../../core/job.h
+templates.o: ../../core/basethread.h ../../core/synchro.h ../../core/dirs.h
+templates.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
+templates.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h
+templates.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h
+templates.o: ../../core/ugcontainer.h ../../core/log.h
+templates.o: ../../core/textstream.h ../../core/logmanipulators.h
+templates.o: ../../core/slog.h ../../core/cur.h ../../core/request.h
+templates.o: ../../core/requesttypes.h ../../core/error.h ../../core/config.h
+templates.o: ../../../pikotools/space/spaceparser.h
+templates.o: ../../../pikotools/space/space.h ../../core/htmlfilter.h
 templates.o: ../../templates/htmltextstream.h ../../core/textstream.h
 templates.o: ../../core/misc.h ../../core/session.h ../../core/user.h
 templates.o: ../../core/plugindata.h ../../core/rebus.h ../../core/mount.h
@@ -372,7 +368,7 @@ templates.o: ../../plugins/thread/pluginmsg.h ../../templates/miscspace.h
 templates.o: ../../templates/templates.h
 ticketinfo.o: ticketinfo.h ticket.h ../../core/item.h ../../core/system.h
 ticketinfo.o: ../../core/job.h ../../core/basethread.h ../../core/synchro.h
-ticketinfo.o: ../../../pikotools/confparser/space.h ../../core/dirs.h
+ticketinfo.o: ../../../pikotools/space/space.h ../../core/dirs.h
 ticketinfo.o: ../../core/item.h ../../core/dircontainer.h ../../db/db.h
 ticketinfo.o: ../../db/dbbase.h ../../db/dbitemquery.h
 ticketinfo.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
@@ -381,8 +377,8 @@ ticketinfo.o: ../../core/log.h ../../core/textstream.h
 ticketinfo.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h
 ticketinfo.o: ../../core/request.h ../../core/requesttypes.h
 ticketinfo.o: ../../core/error.h ../../core/config.h
-ticketinfo.o: ../../../pikotools/confparser/confparser.h
-ticketinfo.o: ../../../pikotools/confparser/space.h ../../core/htmlfilter.h
+ticketinfo.o: ../../../pikotools/space/spaceparser.h
+ticketinfo.o: ../../../pikotools/space/space.h ../../core/htmlfilter.h
 ticketinfo.o: ../../templates/htmltextstream.h ../../core/textstream.h
 ticketinfo.o: ../../core/misc.h ../../core/session.h ../../core/user.h
 ticketinfo.o: ../../core/plugindata.h ../../core/rebus.h ../../core/mount.h
diff --git a/plugins/ticket/sessiondata.h b/plugins/ticket/sessiondata.h
index 5b81de9..228d104 100755
--- a/plugins/ticket/sessiondata.h
+++ b/plugins/ticket/sessiondata.h
@@ -16,7 +16,7 @@
 #include "core/plugindata.h"
 #include "ticket.h"
 #include "functions/rm.h"
-#include "confparser/space.h"
+#include "space/space.h"
 
 
 namespace Ticket
diff --git a/plugins/ticket/templates.cpp b/plugins/ticket/templates.cpp
index d831271..210a530 100755
--- a/plugins/ticket/templates.cpp
+++ b/plugins/ticket/templates.cpp
@@ -19,7 +19,7 @@
 #include "sessiondata.h"
 #include "plugins/thread/pluginmsg.h"
 #include "templates/miscspace.h"
-#include "confparser/space.h"
+#include "space/space.h"
 
 
 namespace Ticket
diff --git a/plugins/ticket/ticketinfo.cpp b/plugins/ticket/ticketinfo.cpp
index 05a8f67..a4a1a25 100755
--- a/plugins/ticket/ticketinfo.cpp
+++ b/plugins/ticket/ticketinfo.cpp
@@ -138,7 +138,7 @@ bool TicketInfo::ParseTicketConf(long mount_dir_id, const std::wstring & path)
 	conf_parser.SplitSingle(true);
 	conf_tab[mount_dir_id].conf.Clear();
 
-return (conf_parser.ParseString(config_file.content) == PT::ConfParser::ok);
+return (conf_parser.ParseString(config_file.content) == PT::SpaceParser::ok);
 }
 
 
diff --git a/plugins/ticket/ticketinfo.h b/plugins/ticket/ticketinfo.h
index 949eea4..5a5cd8a 100755
--- a/plugins/ticket/ticketinfo.h
+++ b/plugins/ticket/ticketinfo.h
@@ -18,7 +18,7 @@
 #include "functions/functions.h"
 #include "db/db.h"
 #include "tdb.h"
-#include "confparser/confparser.h"
+#include "space/spaceparser.h"
 
 
 
@@ -119,7 +119,7 @@ private:
 	std::wstring file_path;
 
 	// for reading config file
-	PT::ConfParser conf_parser;
+	PT::SpaceParser conf_parser;
 	std::vector<Item*> config_dir_tab;
 	Item config_file;
 
diff --git a/templates/Makefile.dep b/templates/Makefile.dep
index 5133835..501dd8d 100755
--- a/templates/Makefile.dep
+++ b/templates/Makefile.dep
@@ -4,13 +4,13 @@ adduser.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
 adduser.o: ../../ezc/src/pattern.h ../../ezc/src/item.h
 adduser.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
 adduser.o: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.h misc.h
-adduser.o: localefilter.h locale.h ../../pikotools/confparser/confparser.h
-adduser.o: ../../pikotools/confparser/space.h htmltextstream.h
-adduser.o: ../core/textstream.h ../../pikotools/confparser/space.h
-adduser.o: patterncacher.h ../core/item.h indexpatterns.h patterns.h
-adduser.o: changepatterns.h ../core/config.h ../core/htmlfilter.h
-adduser.o: ../core/cur.h ../core/request.h ../core/requesttypes.h
-adduser.o: ../core/error.h ../core/config.h ../core/textstream.h
+adduser.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
+adduser.o: ../../pikotools/space/space.h htmltextstream.h
+adduser.o: ../core/textstream.h ../../pikotools/space/space.h patterncacher.h
+adduser.o: ../core/item.h indexpatterns.h patterns.h changepatterns.h
+adduser.o: ../core/config.h ../core/htmlfilter.h ../core/cur.h
+adduser.o: ../core/request.h ../core/requesttypes.h ../core/error.h
+adduser.o: ../core/config.h ../core/textstream.h
 adduser.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h
 adduser.o: ../core/plugindata.h ../core/rebus.h ../core/mount.h
 adduser.o: ../core/system.h ../core/job.h ../core/basethread.h
@@ -30,49 +30,47 @@ adduser.o: ../core/threadmanager.h ../core/sessionmanager.h
 adduser.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
 adduser.o: ../core/request.h
 changepatterns.o: changepatterns.h patterns.h locale.h
-changepatterns.o: ../../pikotools/confparser/confparser.h
-changepatterns.o: ../../pikotools/confparser/space.h localefilter.h
+changepatterns.o: ../../pikotools/space/spaceparser.h
+changepatterns.o: ../../pikotools/space/space.h localefilter.h
 changepatterns.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h
 changepatterns.o: ../../ezc/src/pattern.h ../../ezc/src/item.h
 changepatterns.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
 changepatterns.o: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.h
 changepatterns.o: misc.h htmltextstream.h ../core/textstream.h
-changepatterns.o: ../../pikotools/confparser/space.h
+changepatterns.o: ../../pikotools/space/space.h
 config.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
 config.o: ../../ezc/src/pattern.h ../../ezc/src/item.h
 config.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
 config.o: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.h misc.h
-config.o: localefilter.h locale.h ../../pikotools/confparser/confparser.h
-config.o: ../../pikotools/confparser/space.h htmltextstream.h
-config.o: ../core/textstream.h ../../pikotools/confparser/space.h
-config.o: patterncacher.h ../core/item.h indexpatterns.h patterns.h
-config.o: changepatterns.h ../core/config.h ../core/htmlfilter.h
-config.o: ../core/cur.h ../core/request.h ../core/requesttypes.h
-config.o: ../core/error.h ../core/config.h ../core/textstream.h
-config.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h
-config.o: ../core/plugindata.h ../core/rebus.h ../core/mount.h
-config.o: ../core/system.h ../core/job.h ../core/basethread.h
-config.o: ../core/synchro.h ../core/dirs.h ../core/dircontainer.h ../db/db.h
-config.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
-config.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
-config.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
-config.o: ../core/log.h ../core/logmanipulators.h ../core/slog.h
-config.o: ../core/cur.h ../templates/locale.h ../notify/notify.h
-config.o: ../notify/notifypool.h ../templates/patterns.h
-config.o: ../notify/notifythread.h ../core/basethread.h
-config.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
-config.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h
-config.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h
-config.o: ../core/group.h ../core/loadavg.h ../core/image.h
+config.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
+config.o: ../../pikotools/space/space.h htmltextstream.h ../core/textstream.h
+config.o: ../../pikotools/space/space.h patterncacher.h ../core/item.h
+config.o: indexpatterns.h patterns.h changepatterns.h ../core/config.h
+config.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h
+config.o: ../core/requesttypes.h ../core/error.h ../core/config.h
+config.o: ../core/textstream.h ../templates/htmltextstream.h
+config.o: ../core/session.h ../core/user.h ../core/plugindata.h
+config.o: ../core/rebus.h ../core/mount.h ../core/system.h ../core/job.h
+config.o: ../core/basethread.h ../core/synchro.h ../core/dirs.h
+config.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+config.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h
+config.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
+config.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
+config.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
+config.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h
+config.o: ../templates/patterns.h ../notify/notifythread.h
+config.o: ../core/basethread.h ../notify/templatesnotify.h ../core/users.h
+config.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h
+config.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h
+config.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
 config.o: ../core/threadmanager.h ../core/sessionmanager.h
 config.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
 dir.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
 dir.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
 dir.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
 dir.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.h
-dir.o: ../../pikotools/confparser/confparser.h
-dir.o: ../../pikotools/confparser/space.h htmltextstream.h
-dir.o: ../core/textstream.h ../../pikotools/confparser/space.h
+dir.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+dir.o: htmltextstream.h ../core/textstream.h ../../pikotools/space/space.h
 dir.o: patterncacher.h ../core/item.h indexpatterns.h patterns.h
 dir.o: changepatterns.h ../core/config.h ../core/htmlfilter.h ../core/cur.h
 dir.o: ../core/request.h ../core/requesttypes.h ../core/error.h
@@ -112,9 +110,8 @@ doc.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
 doc.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
 doc.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
 doc.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.h
-doc.o: ../../pikotools/confparser/confparser.h
-doc.o: ../../pikotools/confparser/space.h htmltextstream.h
-doc.o: ../core/textstream.h ../../pikotools/confparser/space.h
+doc.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+doc.o: htmltextstream.h ../core/textstream.h ../../pikotools/space/space.h
 doc.o: patterncacher.h ../core/item.h indexpatterns.h patterns.h
 doc.o: changepatterns.h ../core/config.h ../core/htmlfilter.h ../core/cur.h
 doc.o: ../core/request.h ../core/requesttypes.h ../core/error.h
@@ -139,9 +136,8 @@ env.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
 env.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
 env.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
 env.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.h
-env.o: ../../pikotools/confparser/confparser.h
-env.o: ../../pikotools/confparser/space.h htmltextstream.h
-env.o: ../core/textstream.h ../../pikotools/confparser/space.h
+env.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+env.o: htmltextstream.h ../core/textstream.h ../../pikotools/space/space.h
 env.o: patterncacher.h ../core/item.h indexpatterns.h patterns.h
 env.o: changepatterns.h ../core/config.h ../core/htmlfilter.h ../core/cur.h
 env.o: ../core/request.h ../core/requesttypes.h ../core/error.h
@@ -181,13 +177,13 @@ filters.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
 filters.o: ../../ezc/src/pattern.h ../../ezc/src/item.h
 filters.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
 filters.o: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.h misc.h
-filters.o: localefilter.h locale.h ../../pikotools/confparser/confparser.h
-filters.o: ../../pikotools/confparser/space.h htmltextstream.h
-filters.o: ../core/textstream.h ../../pikotools/confparser/space.h
-filters.o: patterncacher.h ../core/item.h indexpatterns.h patterns.h
-filters.o: changepatterns.h ../core/config.h ../core/htmlfilter.h
-filters.o: ../core/cur.h ../core/request.h ../core/requesttypes.h
-filters.o: ../core/error.h ../core/config.h ../core/textstream.h
+filters.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
+filters.o: ../../pikotools/space/space.h htmltextstream.h
+filters.o: ../core/textstream.h ../../pikotools/space/space.h patterncacher.h
+filters.o: ../core/item.h indexpatterns.h patterns.h changepatterns.h
+filters.o: ../core/config.h ../core/htmlfilter.h ../core/cur.h
+filters.o: ../core/request.h ../core/requesttypes.h ../core/error.h
+filters.o: ../core/config.h ../core/textstream.h
 filters.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h
 filters.o: ../core/plugindata.h ../core/rebus.h ../core/mount.h
 filters.o: ../core/system.h ../core/job.h ../core/basethread.h
@@ -207,50 +203,48 @@ filters.o: ../core/threadmanager.h ../core/sessionmanager.h
 filters.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
 filters.o: ../core/misc.h
 htmltextstream.o: htmltextstream.h ../core/textstream.h misc.h localefilter.h
-htmltextstream.o: locale.h ../../pikotools/confparser/confparser.h
-htmltextstream.o: ../../pikotools/confparser/space.h ../../ezc/src/ezc.h
+htmltextstream.o: locale.h ../../pikotools/space/spaceparser.h
+htmltextstream.o: ../../pikotools/space/space.h ../../ezc/src/ezc.h
 htmltextstream.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
 htmltextstream.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
 htmltextstream.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
-htmltextstream.o: ../../pikotools/utf8/utf8.h
-htmltextstream.o: ../../pikotools/confparser/space.h
+htmltextstream.o: ../../pikotools/utf8/utf8.h ../../pikotools/space/space.h
 indexpatterns.o: indexpatterns.h ../../ezc/src/ezc.h
 indexpatterns.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
 indexpatterns.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
 indexpatterns.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
 indexpatterns.o: ../../pikotools/utf8/utf8.h patterns.h locale.h
-indexpatterns.o: ../../pikotools/confparser/confparser.h
-indexpatterns.o: ../../pikotools/confparser/space.h localefilter.h misc.h
+indexpatterns.o: ../../pikotools/space/spaceparser.h
+indexpatterns.o: ../../pikotools/space/space.h localefilter.h misc.h
 indexpatterns.o: htmltextstream.h ../core/textstream.h
-indexpatterns.o: ../../pikotools/confparser/space.h ../core/log.h
+indexpatterns.o: ../../pikotools/space/space.h ../core/log.h
 indexpatterns.o: ../core/textstream.h ../core/logmanipulators.h
 indexpatterns.o: ../core/slog.h ../core/cur.h ../templates/locale.h
 insert.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
 insert.o: ../../ezc/src/pattern.h ../../ezc/src/item.h
 insert.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
 insert.o: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.h misc.h
-insert.o: localefilter.h locale.h ../../pikotools/confparser/confparser.h
-insert.o: ../../pikotools/confparser/space.h htmltextstream.h
-insert.o: ../core/textstream.h ../../pikotools/confparser/space.h
-insert.o: patterncacher.h ../core/item.h indexpatterns.h patterns.h
-insert.o: changepatterns.h ../core/config.h ../core/htmlfilter.h
-insert.o: ../core/cur.h ../core/request.h ../core/requesttypes.h
-insert.o: ../core/error.h ../core/config.h ../core/textstream.h
-insert.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h
-insert.o: ../core/plugindata.h ../core/rebus.h ../core/mount.h
-insert.o: ../core/system.h ../core/job.h ../core/basethread.h
-insert.o: ../core/synchro.h ../core/dirs.h ../core/dircontainer.h ../db/db.h
-insert.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
-insert.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
-insert.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
-insert.o: ../core/log.h ../core/logmanipulators.h ../core/slog.h
-insert.o: ../core/cur.h ../templates/locale.h ../notify/notify.h
-insert.o: ../notify/notifypool.h ../templates/patterns.h
-insert.o: ../notify/notifythread.h ../core/basethread.h
-insert.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
-insert.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h
-insert.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h
-insert.o: ../core/group.h ../core/loadavg.h ../core/image.h
+insert.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
+insert.o: ../../pikotools/space/space.h htmltextstream.h ../core/textstream.h
+insert.o: ../../pikotools/space/space.h patterncacher.h ../core/item.h
+insert.o: indexpatterns.h patterns.h changepatterns.h ../core/config.h
+insert.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h
+insert.o: ../core/requesttypes.h ../core/error.h ../core/config.h
+insert.o: ../core/textstream.h ../templates/htmltextstream.h
+insert.o: ../core/session.h ../core/user.h ../core/plugindata.h
+insert.o: ../core/rebus.h ../core/mount.h ../core/system.h ../core/job.h
+insert.o: ../core/basethread.h ../core/synchro.h ../core/dirs.h
+insert.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+insert.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h
+insert.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
+insert.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
+insert.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
+insert.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h
+insert.o: ../templates/patterns.h ../notify/notifythread.h
+insert.o: ../core/basethread.h ../notify/templatesnotify.h ../core/users.h
+insert.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h
+insert.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h
+insert.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
 insert.o: ../core/threadmanager.h ../core/sessionmanager.h
 insert.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
 insert.o: ../core/request.h ../core/misc.h
@@ -258,9 +252,8 @@ item.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
 item.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
 item.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
 item.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.h
-item.o: ../../pikotools/confparser/confparser.h
-item.o: ../../pikotools/confparser/space.h htmltextstream.h
-item.o: ../core/textstream.h ../../pikotools/confparser/space.h
+item.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+item.o: htmltextstream.h ../core/textstream.h ../../pikotools/space/space.h
 item.o: patterncacher.h ../core/item.h indexpatterns.h patterns.h
 item.o: changepatterns.h ../core/config.h ../core/htmlfilter.h ../core/cur.h
 item.o: ../core/request.h ../core/requesttypes.h ../core/error.h
@@ -285,9 +278,8 @@ last.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
 last.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
 last.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
 last.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.h
-last.o: ../../pikotools/confparser/confparser.h
-last.o: ../../pikotools/confparser/space.h htmltextstream.h
-last.o: ../core/textstream.h ../../pikotools/confparser/space.h
+last.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+last.o: htmltextstream.h ../core/textstream.h ../../pikotools/space/space.h
 last.o: patterncacher.h ../core/item.h indexpatterns.h patterns.h
 last.o: changepatterns.h ../core/config.h ../core/htmlfilter.h ../core/cur.h
 last.o: ../core/request.h ../core/requesttypes.h ../core/error.h
@@ -308,13 +300,12 @@ last.o: ../core/group.h ../core/loadavg.h ../core/image.h
 last.o: ../core/threadmanager.h ../core/sessionmanager.h
 last.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
 last.o: ../core/lastcontainer.h ../core/request.h ../core/misc.h
-locale.o: locale.h ../../pikotools/confparser/confparser.h
-locale.o: ../../pikotools/confparser/space.h ../core/log.h
-locale.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
-locale.o: ../core/cur.h ../templates/locale.h ../../pikotools/utf8/utf8.h
-localefilter.o: localefilter.h locale.h
-localefilter.o: ../../pikotools/confparser/confparser.h
-localefilter.o: ../../pikotools/confparser/space.h ../../ezc/src/ezc.h
+locale.o: locale.h ../../pikotools/space/spaceparser.h
+locale.o: ../../pikotools/space/space.h ../core/log.h ../core/textstream.h
+locale.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
+locale.o: ../templates/locale.h ../../pikotools/utf8/utf8.h
+localefilter.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
+localefilter.o: ../../pikotools/space/space.h ../../ezc/src/ezc.h
 localefilter.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
 localefilter.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
 localefilter.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
@@ -324,9 +315,8 @@ login.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
 login.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
 login.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
 login.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.h
-login.o: ../../pikotools/confparser/confparser.h
-login.o: ../../pikotools/confparser/space.h htmltextstream.h
-login.o: ../core/textstream.h ../../pikotools/confparser/space.h
+login.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+login.o: htmltextstream.h ../core/textstream.h ../../pikotools/space/space.h
 login.o: patterncacher.h ../core/item.h indexpatterns.h patterns.h
 login.o: changepatterns.h ../core/config.h ../core/htmlfilter.h ../core/cur.h
 login.o: ../core/request.h ../core/requesttypes.h ../core/error.h
@@ -351,20 +341,19 @@ ls.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
 ls.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
 ls.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
 ls.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.h
-ls.o: ../../pikotools/confparser/confparser.h
-ls.o: ../../pikotools/confparser/space.h htmltextstream.h
-ls.o: ../core/textstream.h ../../pikotools/confparser/space.h patterncacher.h
-ls.o: ../core/item.h indexpatterns.h patterns.h changepatterns.h
-ls.o: ../core/config.h ../core/htmlfilter.h ../core/cur.h ../core/request.h
-ls.o: ../core/requesttypes.h ../core/error.h ../core/config.h
-ls.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h
-ls.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h
-ls.o: ../core/system.h ../core/job.h ../core/basethread.h ../core/synchro.h
-ls.o: ../core/dirs.h ../core/dircontainer.h ../db/db.h ../db/dbbase.h
-ls.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h
-ls.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
-ls.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
-ls.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
+ls.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+ls.o: htmltextstream.h ../core/textstream.h ../../pikotools/space/space.h
+ls.o: patterncacher.h ../core/item.h indexpatterns.h patterns.h
+ls.o: changepatterns.h ../core/config.h ../core/htmlfilter.h ../core/cur.h
+ls.o: ../core/request.h ../core/requesttypes.h ../core/error.h
+ls.o: ../core/config.h ../core/textstream.h ../templates/htmltextstream.h
+ls.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
+ls.o: ../core/mount.h ../core/system.h ../core/job.h ../core/basethread.h
+ls.o: ../core/synchro.h ../core/dirs.h ../core/dircontainer.h ../db/db.h
+ls.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
+ls.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
+ls.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
+ls.o: ../core/log.h ../core/logmanipulators.h ../core/slog.h ../core/cur.h
 ls.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h
 ls.o: ../templates/patterns.h ../notify/notifythread.h ../core/basethread.h
 ls.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
@@ -378,9 +367,8 @@ man.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
 man.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
 man.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
 man.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.h
-man.o: ../../pikotools/confparser/confparser.h
-man.o: ../../pikotools/confparser/space.h htmltextstream.h
-man.o: ../core/textstream.h ../../pikotools/confparser/space.h
+man.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+man.o: htmltextstream.h ../core/textstream.h ../../pikotools/space/space.h
 man.o: patterncacher.h ../core/item.h indexpatterns.h patterns.h
 man.o: changepatterns.h ../core/config.h ../core/htmlfilter.h ../core/cur.h
 man.o: ../core/request.h ../core/requesttypes.h ../core/error.h
@@ -420,9 +408,8 @@ misc.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
 misc.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
 misc.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
 misc.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.h
-misc.o: ../../pikotools/confparser/confparser.h
-misc.o: ../../pikotools/confparser/space.h htmltextstream.h
-misc.o: ../core/textstream.h ../../pikotools/confparser/space.h
+misc.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+misc.o: htmltextstream.h ../core/textstream.h ../../pikotools/space/space.h
 misc.o: patterncacher.h ../core/item.h indexpatterns.h patterns.h
 misc.o: changepatterns.h ../core/config.h ../core/htmlfilter.h ../core/cur.h
 misc.o: ../core/request.h ../core/requesttypes.h ../core/error.h
@@ -447,9 +434,9 @@ miscspace.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
 miscspace.o: ../../ezc/src/pattern.h ../../ezc/src/item.h
 miscspace.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
 miscspace.o: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.h misc.h
-miscspace.o: localefilter.h locale.h ../../pikotools/confparser/confparser.h
-miscspace.o: ../../pikotools/confparser/space.h htmltextstream.h
-miscspace.o: ../core/textstream.h ../../pikotools/confparser/space.h
+miscspace.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
+miscspace.o: ../../pikotools/space/space.h htmltextstream.h
+miscspace.o: ../core/textstream.h ../../pikotools/space/space.h
 miscspace.o: patterncacher.h ../core/item.h indexpatterns.h patterns.h
 miscspace.o: changepatterns.h ../core/config.h ../core/htmlfilter.h
 miscspace.o: ../core/cur.h ../core/request.h ../core/requesttypes.h
@@ -476,9 +463,8 @@ mount.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
 mount.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
 mount.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
 mount.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.h
-mount.o: ../../pikotools/confparser/confparser.h
-mount.o: ../../pikotools/confparser/space.h htmltextstream.h
-mount.o: ../core/textstream.h ../../pikotools/confparser/space.h
+mount.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+mount.o: htmltextstream.h ../core/textstream.h ../../pikotools/space/space.h
 mount.o: patterncacher.h ../core/item.h indexpatterns.h patterns.h
 mount.o: changepatterns.h ../core/config.h ../core/htmlfilter.h ../core/cur.h
 mount.o: ../core/request.h ../core/requesttypes.h ../core/error.h
@@ -500,10 +486,10 @@ mount.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
 mount.o: ../core/threadmanager.h ../core/sessionmanager.h
 mount.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
 mount.o: ../core/misc.h ../core/mounts.h
-patterncacher.o: patterncacher.h ../core/item.h
-patterncacher.o: ../../pikotools/confparser/space.h misc.h localefilter.h
-patterncacher.o: locale.h ../../pikotools/confparser/confparser.h
-patterncacher.o: ../../pikotools/confparser/space.h ../../ezc/src/ezc.h
+patterncacher.o: patterncacher.h ../core/item.h ../../pikotools/space/space.h
+patterncacher.o: misc.h localefilter.h locale.h
+patterncacher.o: ../../pikotools/space/spaceparser.h
+patterncacher.o: ../../pikotools/space/space.h ../../ezc/src/ezc.h
 patterncacher.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
 patterncacher.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
 patterncacher.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
@@ -511,23 +497,21 @@ patterncacher.o: ../../pikotools/utf8/utf8.h htmltextstream.h
 patterncacher.o: ../core/textstream.h ../core/log.h ../core/textstream.h
 patterncacher.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
 patterncacher.o: ../templates/locale.h
-patterns.o: patterns.h locale.h ../../pikotools/confparser/confparser.h
-patterns.o: ../../pikotools/confparser/space.h localefilter.h
-patterns.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h
-patterns.o: ../../ezc/src/pattern.h ../../ezc/src/item.h
-patterns.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
-patterns.o: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.h misc.h
-patterns.o: htmltextstream.h ../core/textstream.h
-patterns.o: ../../pikotools/confparser/space.h ../core/log.h
+patterns.o: patterns.h locale.h ../../pikotools/space/spaceparser.h
+patterns.o: ../../pikotools/space/space.h localefilter.h ../../ezc/src/ezc.h
+patterns.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
+patterns.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
+patterns.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
+patterns.o: ../../pikotools/utf8/utf8.h misc.h htmltextstream.h
+patterns.o: ../core/textstream.h ../../pikotools/space/space.h ../core/log.h
 patterns.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
 patterns.o: ../core/cur.h ../templates/locale.h
 priv.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
 priv.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
 priv.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
 priv.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.h
-priv.o: ../../pikotools/confparser/confparser.h
-priv.o: ../../pikotools/confparser/space.h htmltextstream.h
-priv.o: ../core/textstream.h ../../pikotools/confparser/space.h
+priv.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+priv.o: htmltextstream.h ../core/textstream.h ../../pikotools/space/space.h
 priv.o: patterncacher.h ../core/item.h indexpatterns.h patterns.h
 priv.o: changepatterns.h ../core/config.h ../core/htmlfilter.h ../core/cur.h
 priv.o: ../core/request.h ../core/requesttypes.h ../core/error.h
@@ -567,20 +551,19 @@ pw.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
 pw.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
 pw.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
 pw.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.h
-pw.o: ../../pikotools/confparser/confparser.h
-pw.o: ../../pikotools/confparser/space.h htmltextstream.h
-pw.o: ../core/textstream.h ../../pikotools/confparser/space.h patterncacher.h
-pw.o: ../core/item.h indexpatterns.h patterns.h changepatterns.h
-pw.o: ../core/config.h ../core/htmlfilter.h ../core/cur.h ../core/request.h
-pw.o: ../core/requesttypes.h ../core/error.h ../core/config.h
-pw.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h
-pw.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h
-pw.o: ../core/system.h ../core/job.h ../core/basethread.h ../core/synchro.h
-pw.o: ../core/dirs.h ../core/dircontainer.h ../db/db.h ../db/dbbase.h
-pw.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h
-pw.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
-pw.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
-pw.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
+pw.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+pw.o: htmltextstream.h ../core/textstream.h ../../pikotools/space/space.h
+pw.o: patterncacher.h ../core/item.h indexpatterns.h patterns.h
+pw.o: changepatterns.h ../core/config.h ../core/htmlfilter.h ../core/cur.h
+pw.o: ../core/request.h ../core/requesttypes.h ../core/error.h
+pw.o: ../core/config.h ../core/textstream.h ../templates/htmltextstream.h
+pw.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
+pw.o: ../core/mount.h ../core/system.h ../core/job.h ../core/basethread.h
+pw.o: ../core/synchro.h ../core/dirs.h ../core/dircontainer.h ../db/db.h
+pw.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
+pw.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
+pw.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
+pw.o: ../core/log.h ../core/logmanipulators.h ../core/slog.h ../core/cur.h
 pw.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h
 pw.o: ../templates/patterns.h ../notify/notifythread.h ../core/basethread.h
 pw.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
@@ -595,9 +578,8 @@ rebus.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
 rebus.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
 rebus.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
 rebus.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.h
-rebus.o: ../../pikotools/confparser/confparser.h
-rebus.o: ../../pikotools/confparser/space.h htmltextstream.h
-rebus.o: ../core/textstream.h ../../pikotools/confparser/space.h
+rebus.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+rebus.o: htmltextstream.h ../core/textstream.h ../../pikotools/space/space.h
 rebus.o: patterncacher.h ../core/item.h indexpatterns.h patterns.h
 rebus.o: changepatterns.h ../core/config.h ../core/htmlfilter.h ../core/cur.h
 rebus.o: ../core/request.h ../core/requesttypes.h ../core/error.h
@@ -624,9 +606,8 @@ slog.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
 slog.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
 slog.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
 slog.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.h
-slog.o: ../../pikotools/confparser/confparser.h
-slog.o: ../../pikotools/confparser/space.h htmltextstream.h
-slog.o: ../core/textstream.h ../../pikotools/confparser/space.h
+slog.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+slog.o: htmltextstream.h ../core/textstream.h ../../pikotools/space/space.h
 slog.o: patterncacher.h ../core/item.h indexpatterns.h patterns.h
 slog.o: changepatterns.h ../core/config.h ../core/htmlfilter.h ../core/cur.h
 slog.o: ../core/request.h ../core/requesttypes.h ../core/error.h
@@ -650,9 +631,8 @@ stat.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
 stat.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
 stat.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
 stat.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.h
-stat.o: ../../pikotools/confparser/confparser.h
-stat.o: ../../pikotools/confparser/space.h htmltextstream.h
-stat.o: ../core/textstream.h ../../pikotools/confparser/space.h
+stat.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+stat.o: htmltextstream.h ../core/textstream.h ../../pikotools/space/space.h
 stat.o: patterncacher.h ../core/item.h indexpatterns.h patterns.h
 stat.o: changepatterns.h ../core/config.h ../core/htmlfilter.h ../core/cur.h
 stat.o: ../core/request.h ../core/requesttypes.h ../core/error.h
@@ -677,9 +657,8 @@ sys.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
 sys.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
 sys.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
 sys.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.h
-sys.o: ../../pikotools/confparser/confparser.h
-sys.o: ../../pikotools/confparser/space.h htmltextstream.h
-sys.o: ../core/textstream.h ../../pikotools/confparser/space.h
+sys.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+sys.o: htmltextstream.h ../core/textstream.h ../../pikotools/space/space.h
 sys.o: patterncacher.h ../core/item.h indexpatterns.h patterns.h
 sys.o: changepatterns.h ../core/config.h ../core/htmlfilter.h ../core/cur.h
 sys.o: ../core/request.h ../core/requesttypes.h ../core/error.h
@@ -720,9 +699,9 @@ template.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
 template.o: ../../ezc/src/pattern.h ../../ezc/src/item.h
 template.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
 template.o: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.h misc.h
-template.o: localefilter.h locale.h ../../pikotools/confparser/confparser.h
-template.o: ../../pikotools/confparser/space.h htmltextstream.h
-template.o: ../core/textstream.h ../../pikotools/confparser/space.h
+template.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
+template.o: ../../pikotools/space/space.h htmltextstream.h
+template.o: ../core/textstream.h ../../pikotools/space/space.h
 template.o: patterncacher.h ../core/item.h indexpatterns.h patterns.h
 template.o: changepatterns.h ../core/config.h ../core/htmlfilter.h
 template.o: ../core/cur.h ../core/request.h ../core/requesttypes.h
@@ -749,9 +728,9 @@ templates.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
 templates.o: ../../ezc/src/pattern.h ../../ezc/src/item.h
 templates.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
 templates.o: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.h misc.h
-templates.o: localefilter.h locale.h ../../pikotools/confparser/confparser.h
-templates.o: ../../pikotools/confparser/space.h htmltextstream.h
-templates.o: ../core/textstream.h ../../pikotools/confparser/space.h
+templates.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
+templates.o: ../../pikotools/space/space.h htmltextstream.h
+templates.o: ../core/textstream.h ../../pikotools/space/space.h
 templates.o: patterncacher.h ../core/item.h indexpatterns.h patterns.h
 templates.o: changepatterns.h ../core/config.h ../core/htmlfilter.h
 templates.o: ../core/cur.h ../core/request.h ../core/requesttypes.h
@@ -798,9 +777,8 @@ upload.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
 upload.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
 upload.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
 upload.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.h
-upload.o: ../../pikotools/confparser/confparser.h
-upload.o: ../../pikotools/confparser/space.h htmltextstream.h
-upload.o: ../core/textstream.h ../../pikotools/confparser/space.h
+upload.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+upload.o: htmltextstream.h ../core/textstream.h ../../pikotools/space/space.h
 upload.o: patterncacher.h ../core/item.h indexpatterns.h patterns.h
 upload.o: changepatterns.h ../core/config.h ../core/htmlfilter.h
 upload.o: ../core/cur.h ../core/request.h ../core/requesttypes.h
@@ -826,37 +804,35 @@ uptime.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
 uptime.o: ../../ezc/src/pattern.h ../../ezc/src/item.h
 uptime.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
 uptime.o: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.h misc.h
-uptime.o: localefilter.h locale.h ../../pikotools/confparser/confparser.h
-uptime.o: ../../pikotools/confparser/space.h htmltextstream.h
-uptime.o: ../core/textstream.h ../../pikotools/confparser/space.h
-uptime.o: patterncacher.h ../core/item.h indexpatterns.h patterns.h
-uptime.o: changepatterns.h ../core/config.h ../core/htmlfilter.h
-uptime.o: ../core/cur.h ../core/request.h ../core/requesttypes.h
-uptime.o: ../core/error.h ../core/config.h ../core/textstream.h
-uptime.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h
-uptime.o: ../core/plugindata.h ../core/rebus.h ../core/mount.h
-uptime.o: ../core/system.h ../core/job.h ../core/basethread.h
-uptime.o: ../core/synchro.h ../core/dirs.h ../core/dircontainer.h ../db/db.h
-uptime.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
-uptime.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
-uptime.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
-uptime.o: ../core/log.h ../core/logmanipulators.h ../core/slog.h
-uptime.o: ../core/cur.h ../templates/locale.h ../notify/notify.h
-uptime.o: ../notify/notifypool.h ../templates/patterns.h
-uptime.o: ../notify/notifythread.h ../core/basethread.h
-uptime.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
-uptime.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h
-uptime.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h
-uptime.o: ../core/group.h ../core/loadavg.h ../core/image.h
+uptime.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
+uptime.o: ../../pikotools/space/space.h htmltextstream.h ../core/textstream.h
+uptime.o: ../../pikotools/space/space.h patterncacher.h ../core/item.h
+uptime.o: indexpatterns.h patterns.h changepatterns.h ../core/config.h
+uptime.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h
+uptime.o: ../core/requesttypes.h ../core/error.h ../core/config.h
+uptime.o: ../core/textstream.h ../templates/htmltextstream.h
+uptime.o: ../core/session.h ../core/user.h ../core/plugindata.h
+uptime.o: ../core/rebus.h ../core/mount.h ../core/system.h ../core/job.h
+uptime.o: ../core/basethread.h ../core/synchro.h ../core/dirs.h
+uptime.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+uptime.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h
+uptime.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
+uptime.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
+uptime.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
+uptime.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h
+uptime.o: ../templates/patterns.h ../notify/notifythread.h
+uptime.o: ../core/basethread.h ../notify/templatesnotify.h ../core/users.h
+uptime.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h
+uptime.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h
+uptime.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
 uptime.o: ../core/threadmanager.h ../core/sessionmanager.h
 uptime.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
 user.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
 user.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
 user.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
 user.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.h
-user.o: ../../pikotools/confparser/confparser.h
-user.o: ../../pikotools/confparser/space.h htmltextstream.h
-user.o: ../core/textstream.h ../../pikotools/confparser/space.h
+user.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+user.o: htmltextstream.h ../core/textstream.h ../../pikotools/space/space.h
 user.o: patterncacher.h ../core/item.h indexpatterns.h patterns.h
 user.o: changepatterns.h ../core/config.h ../core/htmlfilter.h ../core/cur.h
 user.o: ../core/request.h ../core/requesttypes.h ../core/error.h
@@ -881,9 +857,8 @@ who.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
 who.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
 who.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
 who.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.h
-who.o: ../../pikotools/confparser/confparser.h
-who.o: ../../pikotools/confparser/space.h htmltextstream.h
-who.o: ../core/textstream.h ../../pikotools/confparser/space.h
+who.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+who.o: htmltextstream.h ../core/textstream.h ../../pikotools/space/space.h
 who.o: patterncacher.h ../core/item.h indexpatterns.h patterns.h
 who.o: changepatterns.h ../core/config.h ../core/htmlfilter.h ../core/cur.h
 who.o: ../core/request.h ../core/requesttypes.h ../core/error.h
@@ -908,9 +883,8 @@ winix.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
 winix.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
 winix.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
 winix.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.h
-winix.o: ../../pikotools/confparser/confparser.h
-winix.o: ../../pikotools/confparser/space.h htmltextstream.h
-winix.o: ../core/textstream.h ../../pikotools/confparser/space.h
+winix.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+winix.o: htmltextstream.h ../core/textstream.h ../../pikotools/space/space.h
 winix.o: patterncacher.h ../core/item.h indexpatterns.h patterns.h
 winix.o: changepatterns.h ../core/config.h ../core/htmlfilter.h ../core/cur.h
 winix.o: ../core/request.h ../core/requesttypes.h ../core/error.h
diff --git a/templates/locale.cpp b/templates/locale.cpp
index 68d0f5b..f61734c 100755
--- a/templates/locale.cpp
+++ b/templates/locale.cpp
@@ -72,7 +72,7 @@ bool read = false;
 	loc_parser.UTF8(input_as_utf8);
 	loc_parser.SetSpace(space);
 
-	if( loc_parser.Parse(file_name) == PT::ConfParser::ok )
+	if( loc_parser.Parse(file_name) == PT::SpaceParser::ok )
 	{
 		read = true;
 		AddLocale(lang);
@@ -131,7 +131,7 @@ bool read = false;
 	loc_parser.SplitSingle(true);
 	loc_parser.UTF8(input_as_utf8);
 
-	if( loc_parser.Parse(file_name) == PT::ConfParser::ok )
+	if( loc_parser.Parse(file_name) == PT::SpaceParser::ok )
 	{
 		read = true;
 		CreateSubstVector(subst_url,		space.table_single[L"url_original"], space.table_single[L"url_changeto"]);
diff --git a/templates/locale.h b/templates/locale.h
index c6ddf71..fe3d6c5 100755
--- a/templates/locale.h
+++ b/templates/locale.h
@@ -12,7 +12,7 @@
 
 #include <vector>
 #include <string>
-#include "confparser/confparser.h"
+#include "space/spaceparser.h"
 
 
 
@@ -146,7 +146,7 @@ private:
 
 
 	PT::Space space;
-	PT::ConfParser loc_parser;
+	PT::SpaceParser loc_parser;
 	std::string locale_filea;
 	std::string file_name;
 	std::wstring key_str;