diff --git a/Makefile b/Makefile
index 366cfb8..d20b669 100755
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ CXX = g++
 endif
 
 ifndef CXXFLAGS
-CXXFLAGS = -fPIC -Wall -pedantic -O2 -I/usr/local/include -I/home/tomek/roboczy/winix -I/home/tomek/roboczy/ezc/src -I/home/tomek/roboczy/tito/src -L/usr/local/lib -DEZC_USE_WINIX_LOGGER -DEZC_HAS_SPECIAL_STREAM
+CXXFLAGS = -fPIC -Wall -pedantic -O2 -I/usr/local/include -I/home/tomek/roboczy/winix -I/home/tomek/roboczy/ezc/src -I/home/tomek/roboczy/tito/src -I/home/tomek/roboczy/pikotools -L/usr/local/lib -DEZC_USE_WINIX_LOGGER -DEZC_HAS_SPECIAL_STREAM
 endif
 
 export CXX
@@ -25,7 +25,8 @@ winix.so: FORCE
 	@cd templates    ; $(MAKE) -e
 	@cd ../ezc/src   ; $(MAKE) -e
 	@cd ../tito/src  ; $(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 -lfcgi -lpq -lz -lpthread -lfetch -Wl,-no-whole-archive
+	@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 -lpthread -lfetch -Wl,-no-whole-archive
 
 
 winix: FORCE
@@ -63,6 +64,7 @@ clean:
 	@cd plugins/export       ; $(MAKE) -e clean
 	@cd ../ezc/src           ; $(MAKE) -e clean
 	@cd ../tito/src          ; $(MAKE) -e clean
+	@cd ../pikotools         ; $(MAKE) -e clean
 	@cd main                 ; $(MAKE) -e clean
 	rm -f winix.so
 	rm -f winix
@@ -86,6 +88,7 @@ depend:
 	@cd plugins/export       ; $(MAKE) -e depend
 	@cd ../ezc/src           ; $(MAKE) -e depend
 	@cd ../tito/src          ; $(MAKE) -e depend
+	@cd ../pikotools         ; $(MAKE) -e depend
 	@cd main                 ; $(MAKE) -e depend
 
 
diff --git a/core/Makefile.dep b/core/Makefile.dep
index 30946f8..335fd86 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 confparser.h htmlfilter.h system.h dirs.h item.h
-app.o: 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 ../core/confparser.h ../db/dbitemquery.h
-app.o: ../core/item.h ../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 htmlfilter.h system.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 ../../ezc/src/utf8.h
+app.o: ../templates/localefilter.h ../../ezc/src/ezc.h
 app.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
 app.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h
 app.o: ../../ezc/src/stringconv.h ../notify/notifythread.h
@@ -43,42 +42,42 @@ app.o: acceptencodingparser.h acceptbaseparser.h plugin.h pluginmsg.h
 basethread.o: basethread.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 confparser.h error.h config.h
-compress.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h
-compress.o: misc.h session.h user.h plugindata.h rebus.h mount.h
-compress.o: ../templates/locale.h ../core/confparser.h
-config.o: config.h confparser.h htmlfilter.h log.h textstream.h
-config.o: logmanipulators.h slog.h cur.h request.h requesttypes.h item.h
-config.o: error.h ../templates/htmltextstream.h ../core/textstream.h misc.h
-config.o: session.h user.h plugindata.h rebus.h mount.h ../templates/locale.h
-config.o: ../core/confparser.h plugin.h pluginmsg.h system.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/utf8.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: ../notify/notifythread.h ../core/basethread.h synchro.h
-config.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h
-config.o: ugcontainer.h lastcontainer.h ../templates/misc.h
-config.o: ../templates/htmltextstream.h mounts.h mountparser.h crypt.h run.h
-config.o: users.h groups.h group.h loadavg.h image.h basethread.h
-config.o: 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/reload.h
-config.o: ../functions/rm.h ../functions/sort.h ../functions/specialdefault.h
+compress.o: request.h requesttypes.h item.h error.h config.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 htmlfilter.h log.h textstream.h logmanipulators.h slog.h
+config.o: cur.h request.h requesttypes.h item.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 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 ../notify/notifythread.h
+config.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h
+config.o: ../core/config.h ../core/users.h ugcontainer.h lastcontainer.h
+config.o: ../templates/misc.h ../templates/htmltextstream.h mounts.h
+config.o: mountparser.h crypt.h run.h users.h groups.h group.h loadavg.h
+config.o: image.h basethread.h threadmanager.h sessionmanager.h
+config.o: 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/reload.h ../functions/rm.h
+config.o: ../functions/sort.h ../functions/specialdefault.h
 config.o: ../functions/stat.h ../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
@@ -86,29 +85,25 @@ 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: ../core/sessionmanager.h
-confparser.o: confparser.h ../../ezc/src/utf8.h
-crypt.o: crypt.h run.h config.h confparser.h htmlfilter.h user.h
-crypt.o: ../../ezc/src/utf8.h misc.h item.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
-crypt.o: ../core/confparser.h
-dircontainer.o: dircontainer.h item.h confparser.h log.h textstream.h
-dircontainer.o: logmanipulators.h slog.h cur.h request.h requesttypes.h
-dircontainer.o: error.h config.h htmlfilter.h ../templates/htmltextstream.h
+crypt.o: crypt.h run.h config.h htmlfilter.h user.h misc.h item.h
+crypt.o: requesttypes.h log.h textstream.h logmanipulators.h slog.h cur.h
+crypt.o: request.h error.h ../templates/htmltextstream.h ../core/textstream.h
+crypt.o: session.h plugindata.h rebus.h mount.h ../templates/locale.h
+dircontainer.o: dircontainer.h item.h log.h textstream.h logmanipulators.h
+dircontainer.o: slog.h cur.h request.h requesttypes.h error.h config.h
+dircontainer.o: htmlfilter.h ../templates/htmltextstream.h
 dircontainer.o: ../core/textstream.h misc.h session.h user.h plugindata.h
-dircontainer.o: rebus.h mount.h ../templates/locale.h ../core/confparser.h
-dirs.o: dirs.h item.h confparser.h dircontainer.h ../db/db.h ../db/dbbase.h
-dirs.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h misc.h
-dirs.o: requesttypes.h ../core/error.h ../core/confparser.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
+dircontainer.o: rebus.h mount.h ../templates/locale.h
+dirs.o: dirs.h item.h dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+dirs.o: ../db/dbtextstream.h ../core/textstream.h misc.h requesttypes.h
+dirs.o: ../core/error.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: ../notify/notifypool.h ../templates/patterns.h ../templates/locale.h
-dirs.o: ../templates/localefilter.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
+dirs.o: ../templates/localefilter.h ../../ezc/src/ezc.h
 dirs.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
 dirs.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h
 dirs.o: ../../ezc/src/stringconv.h ../notify/notifythread.h
@@ -117,9 +112,8 @@ dirs.o: ../core/config.h ../core/users.h ugcontainer.h lastcontainer.h
 dirs.o: ../templates/misc.h ../templates/htmltextstream.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 confparser.h requesttypes.h ../core/error.h
-groups.o: ../core/confparser.h ../db/dbitemquery.h ../core/item.h
-groups.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
+groups.o: item.h requesttypes.h ../core/error.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
@@ -128,15 +122,14 @@ htmlfilter.o: htmlfilter.h
 httpsimpleparser.o: httpsimpleparser.h
 image.o: image.h basethread.h textstream.h ../db/db.h ../db/dbbase.h
 image.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h misc.h
-image.o: item.h confparser.h requesttypes.h ../core/error.h
-image.o: ../core/confparser.h ../db/dbitemquery.h ../core/item.h
-image.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
+image.o: item.h requesttypes.h ../core/error.h ../db/dbitemquery.h
+image.o: ../core/item.h ../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
-image.o: mount.h ../templates/locale.h ../core/config.h ../../ezc/src/utf8.h
-image.o: system.h dirs.h dircontainer.h ../notify/notify.h
-image.o: ../notify/notifypool.h ../templates/patterns.h ../templates/locale.h
+image.o: mount.h ../templates/locale.h ../core/config.h system.h dirs.h
+image.o: dircontainer.h ../notify/notify.h ../notify/notifypool.h
+image.o: ../templates/patterns.h ../templates/locale.h
 image.o: ../templates/localefilter.h ../../ezc/src/ezc.h
 image.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
 image.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h
@@ -165,33 +158,31 @@ 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: ../core/sessionmanager.h
-item.o: item.h confparser.h misc.h requesttypes.h crypt.h run.h config.h
-item.o: htmlfilter.h user.h
+item.o: item.h misc.h requesttypes.h crypt.h run.h config.h htmlfilter.h
+item.o: user.h
 lastcontainer.o: lastcontainer.h log.h textstream.h logmanipulators.h slog.h
-lastcontainer.o: cur.h request.h requesttypes.h item.h confparser.h error.h
-lastcontainer.o: config.h htmlfilter.h ../templates/htmltextstream.h
+lastcontainer.o: cur.h request.h requesttypes.h item.h error.h config.h
+lastcontainer.o: htmlfilter.h ../templates/htmltextstream.h
 lastcontainer.o: ../core/textstream.h misc.h session.h user.h plugindata.h
-lastcontainer.o: rebus.h mount.h ../templates/locale.h ../core/confparser.h
+lastcontainer.o: rebus.h mount.h ../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 confparser.h error.h config.h
-loadavg.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h
-loadavg.o: misc.h session.h user.h plugindata.h rebus.h mount.h
-loadavg.o: ../templates/locale.h ../core/confparser.h
+loadavg.o: request.h requesttypes.h item.h error.h config.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 confparser.h error.h config.h htmlfilter.h
+log.o: requesttypes.h item.h error.h config.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: ../core/confparser.h ../../ezc/src/utf8.h
-misc.o: misc.h item.h confparser.h requesttypes.h log.h textstream.h
-misc.o: logmanipulators.h slog.h cur.h request.h error.h config.h
-misc.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h
-misc.o: session.h user.h plugindata.h rebus.h mount.h ../templates/locale.h
-misc.o: ../core/confparser.h ../templates/templates.h ../../ezc/src/ezc.h
-misc.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
-misc.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h
-misc.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h
-misc.o: ../templates/patterncacher.h ../core/item.h
-misc.o: ../templates/indexpatterns.h ../templates/patterns.h
+misc.o: misc.h item.h requesttypes.h log.h textstream.h logmanipulators.h
+misc.o: slog.h cur.h request.h error.h config.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
+misc.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
+misc.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h
+misc.o: ../../ezc/src/stringconv.h ../templates/patterncacher.h
+misc.o: ../core/item.h ../templates/indexpatterns.h ../templates/patterns.h
 misc.o: ../templates/locale.h ../templates/changepatterns.h
 misc.o: ../templates/htmltextstream.h ../templates/localefilter.h
 misc.o: ../core/config.h ../core/cur.h ../core/system.h
@@ -199,11 +190,10 @@ 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 confparser.h requesttypes.h
-mountparser.o: mountparser.h mount.h item.h confparser.h dirs.h
-mountparser.o: 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 ../core/confparser.h
+mount.o: mount.h misc.h item.h requesttypes.h
+mountparser.o: mountparser.h mount.h item.h dirs.h dircontainer.h ../db/db.h
+mountparser.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+mountparser.o: ../core/textstream.h misc.h requesttypes.h ../core/error.h
 mountparser.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
 mountparser.o: ../core/user.h ../core/group.h ../core/dircontainer.h
 mountparser.o: ../core/ugcontainer.h log.h textstream.h logmanipulators.h
@@ -212,25 +202,24 @@ mountparser.o: ../templates/htmltextstream.h session.h user.h plugindata.h
 mountparser.o: rebus.h ../templates/locale.h ../notify/notify.h
 mountparser.o: ../notify/notifypool.h ../templates/patterns.h
 mountparser.o: ../templates/locale.h ../templates/localefilter.h
-mountparser.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h
-mountparser.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
-mountparser.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h
-mountparser.o: ../../ezc/src/stringconv.h ../notify/notifythread.h
-mountparser.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h
-mountparser.o: ../core/config.h ../core/users.h ugcontainer.h lastcontainer.h
-mountparser.o: ../templates/misc.h ../templates/htmltextstream.h
-mounts.o: mounts.h mount.h error.h dirs.h item.h confparser.h dircontainer.h
-mounts.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+mountparser.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h
+mountparser.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h
+mountparser.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h
+mountparser.o: ../notify/notifythread.h ../core/basethread.h synchro.h
+mountparser.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h
+mountparser.o: ugcontainer.h lastcontainer.h ../templates/misc.h
+mountparser.o: ../templates/htmltextstream.h
+mounts.o: mounts.h mount.h error.h dirs.h item.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: ../core/confparser.h ../db/dbitemquery.h ../core/item.h
-mounts.o: ../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/utf8.h ../../ezc/src/generator.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: ../notify/notifythread.h ../core/basethread.h synchro.h
@@ -259,17 +248,16 @@ mounts.o: ../templates/patterncacher.h ../templates/indexpatterns.h
 mounts.o: ../templates/patterns.h ../templates/changepatterns.h
 mounts.o: ../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 confparser.h error.h config.h
-plugin.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h
-plugin.o: misc.h session.h user.h plugindata.h rebus.h mount.h
-plugin.o: ../templates/locale.h ../core/confparser.h system.h dirs.h
-plugin.o: dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+plugin.o: cur.h request.h requesttypes.h item.h error.h config.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: dirs.h dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
 plugin.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h
 plugin.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
 plugin.o: ../core/dircontainer.h ../core/ugcontainer.h ../notify/notify.h
 plugin.o: ../notify/notifypool.h ../templates/patterns.h
 plugin.o: ../templates/locale.h ../templates/localefilter.h
-plugin.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h
+plugin.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h
 plugin.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h
 plugin.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h
 plugin.o: ../notify/notifythread.h ../core/basethread.h synchro.h
@@ -299,28 +287,27 @@ plugin.o: ../templates/patterns.h ../templates/changepatterns.h
 plugin.o: ../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: confparser.h error.h config.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
-plugindata.o: ../core/confparser.h system.h dirs.h dircontainer.h ../db/db.h
+plugindata.o: error.h config.h htmlfilter.h ../templates/htmltextstream.h
+plugindata.o: ../core/textstream.h misc.h session.h user.h rebus.h mount.h
+plugindata.o: ../templates/locale.h system.h dirs.h dircontainer.h ../db/db.h
 plugindata.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
 plugindata.o: ../core/error.h ../db/dbitemquery.h ../core/item.h
 plugindata.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
 plugindata.o: ../core/dircontainer.h ../core/ugcontainer.h ../notify/notify.h
 plugindata.o: ../notify/notifypool.h ../templates/patterns.h
 plugindata.o: ../templates/locale.h ../templates/localefilter.h
-plugindata.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h
-plugindata.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
-plugindata.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h
-plugindata.o: ../../ezc/src/stringconv.h ../notify/notifythread.h
-plugindata.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h
-plugindata.o: ../core/config.h ../core/users.h ugcontainer.h lastcontainer.h
-plugindata.o: ../templates/misc.h ../templates/htmltextstream.h mounts.h
-plugindata.o: mountparser.h crypt.h run.h users.h groups.h group.h loadavg.h
-plugindata.o: image.h basethread.h threadmanager.h sessionmanager.h
-plugindata.o: sessioncontainer.h ../functions/functions.h
-plugindata.o: ../functions/functionbase.h ../core/request.h ../core/system.h
-plugindata.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h
+plugindata.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h
+plugindata.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h
+plugindata.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h
+plugindata.o: ../notify/notifythread.h ../core/basethread.h synchro.h
+plugindata.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h
+plugindata.o: ugcontainer.h lastcontainer.h ../templates/misc.h
+plugindata.o: ../templates/htmltextstream.h mounts.h mountparser.h crypt.h
+plugindata.o: run.h users.h groups.h group.h loadavg.h image.h basethread.h
+plugindata.o: threadmanager.h sessionmanager.h sessioncontainer.h
+plugindata.o: ../functions/functions.h ../functions/functionbase.h
+plugindata.o: ../core/request.h ../core/system.h ../core/synchro.h
+plugindata.o: ../functions/functionparser.h ../core/cur.h
 plugindata.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
 plugindata.o: ../functions/privchanger.h ../functions/chown.h
 plugindata.o: ../functions/ckeditor.h ../functions/cp.h
@@ -340,52 +327,48 @@ plugindata.o: ../templates/templates.h ../templates/patterncacher.h
 plugindata.o: ../templates/indexpatterns.h ../templates/patterns.h
 plugindata.o: ../templates/changepatterns.h ../core/sessionmanager.h
 postmultiparser.o: postmultiparser.h error.h requesttypes.h config.h
-postmultiparser.o: confparser.h htmlfilter.h misc.h item.h log.h textstream.h
+postmultiparser.o: htmlfilter.h misc.h item.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 ../core/confparser.h
-postmultiparser.o: ../../ezc/src/utf8.h
+postmultiparser.o: ../templates/locale.h
 rebus.o: log.h textstream.h logmanipulators.h slog.h cur.h request.h
-rebus.o: requesttypes.h item.h confparser.h error.h config.h htmlfilter.h
+rebus.o: requesttypes.h item.h error.h config.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
-rebus.o: ../core/confparser.h
-request.o: request.h requesttypes.h item.h confparser.h error.h config.h
-request.o: htmlfilter.h textstream.h ../templates/htmltextstream.h
-request.o: ../core/textstream.h misc.h log.h logmanipulators.h slog.h cur.h
-request.o: session.h user.h plugindata.h rebus.h mount.h
-request.o: ../templates/locale.h ../core/confparser.h plugin.h pluginmsg.h
-request.o: system.h dirs.h dircontainer.h ../db/db.h ../db/dbbase.h
-request.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
+request.o: request.h requesttypes.h item.h error.h config.h htmlfilter.h
+request.o: textstream.h ../templates/htmltextstream.h ../core/textstream.h
+request.o: misc.h log.h logmanipulators.h slog.h cur.h session.h user.h
+request.o: plugindata.h rebus.h mount.h ../templates/locale.h plugin.h
+request.o: pluginmsg.h system.h dirs.h dircontainer.h ../db/db.h
+request.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
 request.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
 request.o: ../core/user.h ../core/group.h ../core/dircontainer.h
 request.o: ../core/ugcontainer.h ../notify/notify.h ../notify/notifypool.h
 request.o: ../templates/patterns.h ../templates/locale.h
 request.o: ../templates/localefilter.h ../../ezc/src/ezc.h
-request.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
-request.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h
-request.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h
-request.o: ../notify/notifythread.h ../core/basethread.h synchro.h
-request.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h
-request.o: ugcontainer.h lastcontainer.h ../templates/misc.h
-request.o: ../templates/htmltextstream.h mounts.h mountparser.h crypt.h run.h
-request.o: users.h groups.h group.h loadavg.h image.h basethread.h
-request.o: threadmanager.h sessionmanager.h sessioncontainer.h
-request.o: ../functions/functions.h ../functions/functionbase.h
-request.o: ../core/request.h ../core/system.h ../core/synchro.h
-request.o: ../functions/functionparser.h ../core/cur.h ../functions/adduser.h
-request.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h
-request.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h
-request.o: ../functions/default.h ../functions/download.h
-request.o: ../functions/emacs.h ../functions/env.h ../functions/last.h
-request.o: ../functions/login.h ../functions/logout.h ../functions/ln.h
-request.o: ../functions/ls.h ../functions/man.h ../functions/meta.h
-request.o: ../functions/mkdir.h ../functions/mv.h ../functions/nicedit.h
-request.o: ../functions/node.h ../functions/passwd.h ../functions/priv.h
-request.o: ../functions/reload.h ../functions/rm.h ../functions/sort.h
-request.o: ../functions/specialdefault.h ../functions/stat.h
-request.o: ../functions/subject.h ../functions/template.h
+request.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
+request.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h
+request.o: ../../ezc/src/stringconv.h ../notify/notifythread.h
+request.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h
+request.o: ../core/config.h ../core/users.h ugcontainer.h lastcontainer.h
+request.o: ../templates/misc.h ../templates/htmltextstream.h mounts.h
+request.o: mountparser.h crypt.h run.h users.h groups.h group.h loadavg.h
+request.o: image.h basethread.h threadmanager.h sessionmanager.h
+request.o: sessioncontainer.h ../functions/functions.h
+request.o: ../functions/functionbase.h ../core/request.h ../core/system.h
+request.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h
+request.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
+request.o: ../functions/privchanger.h ../functions/chown.h
+request.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h
+request.o: ../functions/download.h ../functions/emacs.h ../functions/env.h
+request.o: ../functions/last.h ../functions/login.h ../functions/logout.h
+request.o: ../functions/ln.h ../functions/ls.h ../functions/man.h
+request.o: ../functions/meta.h ../functions/mkdir.h ../functions/mv.h
+request.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h
+request.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h
+request.o: ../functions/sort.h ../functions/specialdefault.h
+request.o: ../functions/stat.h ../functions/subject.h ../functions/template.h
 request.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
 request.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h
 request.o: ../core/htmlfilter.h ../templates/templates.h
@@ -393,33 +376,31 @@ request.o: ../templates/patterncacher.h ../templates/indexpatterns.h
 request.o: ../templates/patterns.h ../templates/changepatterns.h
 request.o: ../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 confparser.h error.h config.h htmlfilter.h
+run.o: requesttypes.h item.h error.h config.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
-run.o: ../core/confparser.h
-session.o: session.h item.h confparser.h error.h user.h plugindata.h rebus.h
-session.o: textstream.h misc.h requesttypes.h
-sessioncontainer.o: sessioncontainer.h session.h item.h confparser.h error.h
-sessioncontainer.o: user.h plugindata.h rebus.h textstream.h cur.h request.h
+session.o: session.h item.h error.h user.h plugindata.h rebus.h textstream.h
+session.o: misc.h requesttypes.h
+sessioncontainer.o: sessioncontainer.h session.h item.h error.h user.h
+sessioncontainer.o: plugindata.h rebus.h textstream.h cur.h request.h
 sessioncontainer.o: requesttypes.h config.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 ../core/confparser.h
+sessioncontainer.o: ../templates/locale.h
 sessionmanager.o: sessionmanager.h sessioncontainer.h session.h item.h
-sessionmanager.o: confparser.h error.h user.h plugindata.h rebus.h
-sessionmanager.o: textstream.h cur.h request.h requesttypes.h config.h
-sessionmanager.o: htmlfilter.h ../templates/htmltextstream.h
-sessionmanager.o: ../core/textstream.h misc.h mount.h lastcontainer.h
-sessionmanager.o: system.h dirs.h dircontainer.h ../db/db.h ../db/dbbase.h
-sessionmanager.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
-sessionmanager.o: ../core/confparser.h ../db/dbitemquery.h ../core/item.h
-sessionmanager.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
-sessionmanager.o: ../core/dircontainer.h ../core/ugcontainer.h log.h
-sessionmanager.o: logmanipulators.h slog.h ../templates/locale.h
-sessionmanager.o: ../notify/notify.h ../notify/notifypool.h
-sessionmanager.o: ../templates/patterns.h ../templates/locale.h
-sessionmanager.o: ../templates/localefilter.h ../../ezc/src/ezc.h
-sessionmanager.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
+sessionmanager.o: error.h user.h plugindata.h rebus.h textstream.h cur.h
+sessionmanager.o: request.h requesttypes.h config.h htmlfilter.h
+sessionmanager.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
+sessionmanager.o: mount.h lastcontainer.h system.h dirs.h dircontainer.h
+sessionmanager.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h
+sessionmanager.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h
+sessionmanager.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h
+sessionmanager.o: ../core/group.h ../core/dircontainer.h
+sessionmanager.o: ../core/ugcontainer.h log.h logmanipulators.h slog.h
+sessionmanager.o: ../templates/locale.h ../notify/notify.h
+sessionmanager.o: ../notify/notifypool.h ../templates/patterns.h
+sessionmanager.o: ../templates/locale.h ../templates/localefilter.h
+sessionmanager.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h
 sessionmanager.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h
 sessionmanager.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h
 sessionmanager.o: ../notify/notifythread.h ../core/basethread.h synchro.h
@@ -452,21 +433,20 @@ sessionmanager.o: ../core/htmlfilter.h ../templates/templates.h
 sessionmanager.o: ../templates/patterncacher.h ../templates/indexpatterns.h
 sessionmanager.o: ../templates/patterns.h ../templates/changepatterns.h
 sessionmanager.o: ../core/sessionmanager.h
-sessionparser.o: sessionparser.h session.h item.h confparser.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 htmlfilter.h
+sessionparser.o: sessionparser.h session.h item.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 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 ../core/confparser.h
-slog.o: slog.h cur.h request.h requesttypes.h item.h confparser.h error.h
-slog.o: config.h htmlfilter.h textstream.h ../templates/htmltextstream.h
+sessionparser.o: ../templates/locale.h
+slog.o: slog.h cur.h request.h requesttypes.h item.h error.h config.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 ../core/confparser.h
+slog.o: mount.h logmanipulators.h ../templates/locale.h
 synchro.o: synchro.h
-system.o: system.h dirs.h item.h confparser.h dircontainer.h ../db/db.h
-system.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-system.o: ../core/textstream.h misc.h requesttypes.h ../core/error.h
-system.o: ../core/confparser.h ../db/dbitemquery.h ../core/item.h
+system.o: system.h 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 ../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
@@ -474,7 +454,7 @@ system.o: htmlfilter.h ../templates/htmltextstream.h session.h user.h
 system.o: plugindata.h rebus.h mount.h ../templates/locale.h
 system.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h
 system.o: ../templates/locale.h ../templates/localefilter.h
-system.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h
+system.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h
 system.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h
 system.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h
 system.o: ../notify/notifythread.h ../core/basethread.h synchro.h
@@ -502,11 +482,11 @@ system.o: ../functions/stat.h ../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 confparser.h requesttypes.h
+textstream.o: textstream.h misc.h item.h 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 confparser.h error.h config.h htmlfilter.h
+threadmanager.o: item.h error.h config.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 ../core/confparser.h
+threadmanager.o: ../templates/locale.h
 users.o: users.h
diff --git a/core/Makefile.o.dep b/core/Makefile.o.dep
index 250366d..fc6c4e5 100755
--- a/core/Makefile.o.dep
+++ b/core/Makefile.o.dep
@@ -1 +1 @@
-o = acceptbaseparser.o app.o basethread.o bbcodeparser.o compress.o config.o confparser.o crypt.o dircontainer.o dirs.o groups.o htmlfilter.o httpsimpleparser.o image.o item.o lastcontainer.o loadavg.o log.o misc.o mount.o mountparser.o mounts.o plugin.o plugindata.o postmultiparser.o rebus.o request.o run.o session.o sessioncontainer.o sessionmanager.o sessionparser.o slog.o synchro.o system.o textstream.o threadmanager.o users.o 
+o = acceptbaseparser.o app.o basethread.o bbcodeparser.o compress.o config.o crypt.o dircontainer.o dirs.o groups.o htmlfilter.o httpsimpleparser.o image.o item.o lastcontainer.o loadavg.o log.o misc.o mount.o mountparser.o mounts.o plugin.o plugindata.o postmultiparser.o rebus.o request.o run.o session.o sessioncontainer.o sessionmanager.o sessionparser.o slog.o synchro.o system.o textstream.o threadmanager.o users.o 
diff --git a/core/app.cpp b/core/app.cpp
index a35041b..d51041d 100755
--- a/core/app.cpp
+++ b/core/app.cpp
@@ -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.
  * 
  */
@@ -20,7 +20,7 @@
 #include "plugin.h"
 #include "misc.h"
 #include "functions/functions.h"
-#include "utf8.h"
+#include "utf8/utf8.h"
 
 
 
@@ -652,8 +652,8 @@ void App::SendHeadersStatic()
 		return;
 	}
 
-	Ezc::WideToUTF8(config.http_header_send_file, sendh_t);
-	Ezc::WideToUTF8(config.static_dirs[index],    sendh_t2);
+	PT::WideToUTF8(config.http_header_send_file, sendh_t);
+	PT::WideToUTF8(config.static_dirs[index],    sendh_t2);
 
 	if( !SendHeadersStaticCreateResource() )
 	{
@@ -729,7 +729,7 @@ void App::SendHeadersRedirect()
 	if( !cur.request->redirect_url_encoded )
 		UrlEncode(cur.request->redirect_to, cur.request->aredirect_to);
 	else
-		Ezc::WideToUTF8(cur.request->redirect_to, cur.request->aredirect_to);
+		PT::WideToUTF8(cur.request->redirect_to, cur.request->aredirect_to);
 
 	FCGX_FPrintF(fcgi_request.out, "Location: %s\r\n", cur.request->aredirect_to.c_str());
 	log << log2 << "App: redirect to: " << cur.request->aredirect_to << logend;
@@ -738,8 +738,8 @@ void App::SendHeadersRedirect()
 
 void App::SendHeadersSendFile()
 {
-	Ezc::WideToUTF8(config.http_header_send_file, sendfilea);
-	Ezc::WideToUTF8(cur.request->x_sendfile, sendfile2a);
+	PT::WideToUTF8(config.http_header_send_file, sendfilea);
+	PT::WideToUTF8(cur.request->x_sendfile, sendfile2a);
 	FCGX_FPrintF(fcgi_request.out, "%s: %s\r\n", sendfilea.c_str(), sendfile2a.c_str());
 
 	FCGX_PutS("Status: 200 OK\r\n", fcgi_request.out);
@@ -837,7 +837,7 @@ void App::FilterCompressSend(bool compressing, int compress_encoding, const std:
 	}
 
 	if( config.utf8 )
-		Ezc::WideToUTF8(*source, source_a);
+		PT::WideToUTF8(*source, source_a);
 	else
 		AssignString(*source, source_a);
 
@@ -1271,8 +1271,8 @@ sigset_t set;
 	FCGX_ShutdownPending();
 
 	// here we don't have to use SSL version so we always use config.url_proto
-	Ezc::WideToUTF8(app->config.url_proto, app->url_to_fetch_on_exit);
-	Ezc::WideToUTF8(app->config.base_url, app->url_to_fetch_on_exit, false);
+	PT::WideToUTF8(app->config.url_proto, app->url_to_fetch_on_exit);
+	PT::WideToUTF8(app->config.base_url, app->url_to_fetch_on_exit, false);
 	app->Unlock();
 
 	// this thread will hang on this method
diff --git a/core/config.cpp b/core/config.cpp
index aff5b4e..224f525 100755
--- a/core/config.cpp
+++ b/core/config.cpp
@@ -2,7 +2,7 @@
  * This file is a part of Winix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008-2011, Tomasz Sowa
+ * Copyright (c) 2008-2012, Tomasz Sowa
  * All rights reserved.
  * 
  */
@@ -31,22 +31,22 @@ void Config::ShowError()
 	
 	switch( parser.status )
 	{
-		case ConfParser::no_space:
+		case PT::ConfParser::no_space:
 			log << log2 << "Config: space not set" << logend;
 			break;
 
-		case ConfParser::ok:
+		case PT::ConfParser::ok:
 			log << log2 << "Config: syntax ok" << logend;
 			break;
 		
-		case ConfParser::cant_open_file:
+		case PT::ConfParser::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 ConfParser::syntax_error:
+		case PT::ConfParser::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);
 
-	ConfParser::Status status = parser.Parse(config_file);
+	PT::ConfParser::Status status = parser.Parse(config_file);
 
-	if( status == ConfParser::ok )
+	if( status == PT::ConfParser::ok )
 	{
 		AssignValues(stdout_is_closed);
 		SetAdditionalVariables();
diff --git a/core/config.h b/core/config.h
index 266fd5c..718d546 100755
--- a/core/config.h
+++ b/core/config.h
@@ -2,7 +2,7 @@
  * This file is a part of Winix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008-2011, Tomasz Sowa
+ * Copyright (c) 2008-2012, Tomasz Sowa
  * All rights reserved.
  * 
  */
@@ -11,7 +11,7 @@
 #define headerfile_winix_core_config
 
 #include <string>
-#include "confparser.h"
+#include "confparser/confparser.h"
 #include "htmlfilter.h"
 
 
@@ -489,8 +489,8 @@ private:
 	void CheckLocale();
 	void CheckPasswd();
 
-	Space space;
-	ConfParser parser;
+	PT::Space space;
+	PT::ConfParser parser;
 
 	std::string default_str;
 	int  default_int;
diff --git a/core/crypt.cpp b/core/crypt.cpp
index 30fc070..d424fff 100755
--- a/core/crypt.cpp
+++ b/core/crypt.cpp
@@ -2,14 +2,14 @@
  * This file is a part of Winix
  * and is not publicly distributed
  * 
- * Copyright (c) 2011, Tomasz Sowa
+ * Copyright (c) 2011-2012, Tomasz Sowa
  * All rights reserved.
  * 
  */
 
 #include <cstring>
 #include "crypt.h"
-#include "utf8.h"
+#include "utf8/utf8.h"
 #include "misc.h"
 #include "log.h"
 
@@ -44,7 +44,7 @@ bool Crypt::Hash(int hash, const char * in, size_t inlen, std::string & out)
 		return false;
 
 	run.Clear();
-	Ezc::WideToUTF8(config->opensll_path, command);
+	PT::WideToUTF8(config->opensll_path, command);
 	run.Cmd(command);
 	run.Par("dgst");
 
@@ -87,7 +87,7 @@ bool Crypt::Hash(int hash, const std::string & in, std::string & out)
 
 bool Crypt::Hash(int hash, const wchar_t * in, size_t inlen, std::wstring & out)
 {
-	Ezc::WideToUTF8(in, inlen, bufina);
+	PT::WideToUTF8(in, inlen, bufina);
 	int res = Hash(hash, bufina.c_str(), bufina.size(), bufouta);
 	
 	// the output hash is not a UTF8 string
@@ -132,7 +132,7 @@ bool Crypt::RSA(bool encrypt, const char * keypath, const char * in, size_t inle
 		return false;
 
 	run.Clear();
-	Ezc::WideToUTF8(config->opensll_path, command);
+	PT::WideToUTF8(config->opensll_path, command);
 	run.Cmd(command);
 
 	run.Par("rsautl");
@@ -164,7 +164,7 @@ bool Crypt::RSA(bool encrypt, const std::string & keypath, const std::string & i
 
 bool Crypt::RSA(bool encrypt, const wchar_t * keypath, const char * in, size_t inlen, std::string & out)
 {
-	Ezc::WideToUTF8(keypath, keypatha);
+	PT::WideToUTF8(keypath, keypatha);
 	return RSA(encrypt, keypatha.c_str(), in, inlen, out);
 }
 
@@ -229,7 +229,7 @@ bool Crypt::PassCrypt(const std::wstring & path_to_rsa_private_key, UserPass & u
 
 	if( !path_to_rsa_private_key.empty() )
 	{
-		Ezc::WideToUTF8(up.pass, passa);
+		PT::WideToUTF8(up.pass, passa);
 
 		if( RSA(true, path_to_rsa_private_key, passa, up.pass_encrypted) )
 		{
diff --git a/core/image.cpp b/core/image.cpp
index 32c0a88..76104a9 100755
--- a/core/image.cpp
+++ b/core/image.cpp
@@ -2,14 +2,14 @@
  * 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.
  * 
  */
  
 #include <ctime>
 #include "image.h"
-#include "utf8.h"
+#include "utf8/utf8.h"
 #include "log.h"
 #include "system.h"
 #include "plugin.h"
@@ -144,7 +144,7 @@ bool end;
 
 void Image::Add(const std::wstring & in, TextStream<std::string> & out)
 {
-	Ezc::WideToUTF8(in, add_tempa);
+	PT::WideToUTF8(in, add_tempa);
 	out << add_tempa;
 }
 
@@ -226,7 +226,7 @@ bool Image::CreateInputFileName()
 {
 	if( system->MakeFilePath(item_work.file, src_path) )
 	{
-		Ezc::WideToUTF8(src_path, input_file_name);
+		PT::WideToUTF8(src_path, input_file_name);
 		return true;
 	}
 	else
@@ -242,7 +242,7 @@ void Image::CreateTmpFileName()
 {
 	stream_tmp_path.Clear();
 	stream_tmp_path << config->upload_dir << L"/tmp/image_" << std::time(0);
-	Ezc::WideToUTF8(stream_tmp_path.Str(), tmp_file_name);
+	PT::WideToUTF8(stream_tmp_path.Str(), tmp_file_name);
 }
 
 
@@ -387,8 +387,8 @@ void Image::CreateImage()
 
 void Image::CreateThumbnail()
 {
-	Ezc::WideToUTF8(item_work.source, sourcea);
-	Ezc::WideToUTF8(item_work.dst,    dsta);
+	PT::WideToUTF8(item_work.source, sourcea);
+	PT::WideToUTF8(item_work.dst,    dsta);
 
 	MagickWandGenesis();
 
diff --git a/core/item.h b/core/item.h
index 464fa7b..03965c4 100755
--- a/core/item.h
+++ b/core/item.h
@@ -2,7 +2,7 @@
  * This file is a part of Winix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008-2011, Tomasz Sowa
+ * Copyright (c) 2008-2012, Tomasz Sowa
  * All rights reserved.
  * 
  */
@@ -11,7 +11,7 @@
 #define headerfile_winix_core_item
 
 #include <string>
-#include "confparser.h"
+#include "confparser/space.h"
 
 
 #define WINIX_ITEM_FILETYPE_NONE		0
@@ -95,7 +95,7 @@ struct Item
 
 
 	// meta information
-	Space meta;
+	PT::Space meta;
 
 
 	// methods
diff --git a/core/log.cpp b/core/log.cpp
index 6f3fc71..e2024b4 100755
--- a/core/log.cpp
+++ b/core/log.cpp
@@ -2,7 +2,7 @@
  * This file is a part of Winix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008-2011, Tomasz Sowa
+ * Copyright (c) 2008-2012, Tomasz Sowa
  * All rights reserved.
  * 
  */
@@ -10,7 +10,7 @@
 #include "log.h"
 #include <ctime>
 #include <string.h>
-#include "utf8.h"
+#include "utf8/utf8.h"
 
 
 Log::Log()
@@ -310,7 +310,7 @@ void Log::SaveLog()
 		return;
 
 	if( log_stdout )
-		Ezc::WideToUTF8(buffer.Str(), std::cout);
+		PT::WideToUTF8(buffer.Str(), std::cout);
 
 	if( log_file.empty() )
 		return;
@@ -326,7 +326,7 @@ void Log::SaveLog()
 			return;
 	}
 
-	Ezc::WideToUTF8(buffer.Str(), file);
+	PT::WideToUTF8(buffer.Str(), file);
 	file.flush();
 }
 
diff --git a/core/misc.cpp b/core/misc.cpp
index e8bd3c5..afa9d82 100755
--- a/core/misc.cpp
+++ b/core/misc.cpp
@@ -2,7 +2,7 @@
  * This file is a part of Winix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008-2011, Tomasz Sowa
+ * Copyright (c) 2008-2012, Tomasz Sowa
  * All rights reserved.
  * 
  */
@@ -13,7 +13,7 @@
 #include "misc.h"
 #include "log.h"
 #include "templates/templates.h"
-#include "utf8.h"
+#include "utf8/utf8.h"
 
 
 
@@ -645,7 +645,7 @@ bool IsFile(const wchar_t * file)
 struct stat sb;
 static std::string afile;
 
-	Ezc::WideToUTF8(file, afile);
+	PT::WideToUTF8(file, afile);
 
 return (stat(afile.c_str(), &sb) == 0);
 }
@@ -663,7 +663,7 @@ static std::string adir;
 
 	if( !IsFile(dir) )
 	{
-		Ezc::WideToUTF8(dir, adir);
+		PT::WideToUTF8(dir, adir);
 
 		if( mkdir(adir.c_str(), priv) < 0 )
 		{
@@ -756,8 +756,8 @@ bool CopyFile(const wchar_t * src, const wchar_t * dst)
 static std::string asrc, adst;
 FILE * in, * out;
 
-	Ezc::WideToUTF8(src, asrc);
-	Ezc::WideToUTF8(dst, adst);
+	PT::WideToUTF8(src, asrc);
+	PT::WideToUTF8(dst, adst);
 
 	in = fopen(asrc.c_str(), "rb");
 
@@ -798,7 +798,7 @@ bool RemoveFile(const wchar_t * file)
 {
 static std::string afile;
 	
-	Ezc::WideToUTF8(file, afile);
+	PT::WideToUTF8(file, afile);
 
 return unlink(afile.c_str()) == 0;
 }
@@ -815,8 +815,8 @@ bool RenameFile(const wchar_t * from, const wchar_t * to)
 {
 static std::string afrom, ato;
 
-	Ezc::WideToUTF8(from, afrom);
-	Ezc::WideToUTF8(to, ato);
+	PT::WideToUTF8(from, afrom);
+	PT::WideToUTF8(to, ato);
 
 	return rename(afrom.c_str(), ato.c_str()) == 0;
 }
@@ -844,7 +844,7 @@ using namespace misc_private;
 	if( !get_file_content )
 		return false;
 
-	Ezc::UTF8ToWide(get_file_content, content);
+	PT::UTF8ToWide(get_file_content, content);
 	get_file_content.close();
 
 return true;
@@ -855,7 +855,7 @@ bool GetUTF8File(const wchar_t * file_path, std::wstring & content, bool clear_c
 {
 using namespace misc_private;
 
-	Ezc::WideToUTF8(file_path, get_file_content_ansi);
+	PT::WideToUTF8(file_path, get_file_content_ansi);
 	return GetUTF8File(get_file_content_ansi.c_str(), content, clear_content);
 }
 
@@ -1027,7 +1027,7 @@ void UrlEncode(const std::wstring & in, std::string & out, bool clear_out)
 {
 static std::string ain;
 
-	Ezc::WideToUTF8(in, ain);
+	PT::WideToUTF8(in, ain);
 	UrlEncode(ain, out, clear_out);
 }
 
@@ -1049,7 +1049,7 @@ void QEncodeAddChar(wchar_t c, std::string & out)
 
 		size_t len1 = sizeof(buf1) / sizeof(char);
 		size_t len2 = sizeof(buf2) / sizeof(char);
-		size_t len  = Ezc::IntToUTF8(int(c), buf1, len1);
+		size_t len  = PT::IntToUTF8(int(c), buf1, len1);
 
 		for(size_t i=0 ; i<len ; ++i)
 		{
diff --git a/core/postmultiparser.cpp b/core/postmultiparser.cpp
index 0f9cbd9..f0319dc 100755
--- a/core/postmultiparser.cpp
+++ b/core/postmultiparser.cpp
@@ -2,14 +2,14 @@
  * This file is a part of Winix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008-2011, Tomasz Sowa
+ * Copyright (c) 2008-2012, Tomasz Sowa
  * All rights reserved.
  * 
  */
 
 #include "postmultiparser.h"
 #include "log.h"
-#include "utf8.h"
+#include "utf8/utf8.h"
 
 
 
@@ -356,7 +356,7 @@ void PostMultiParser::ReadContent()
 void PostMultiParser::ConvStr(const std::string & src, std::wstring & dst)
 {
 	if( config->utf8 )
-		Ezc::UTF8ToWide(src, dst);
+		PT::UTF8ToWide(src, dst);
 	else
 		AssignString(src, dst);
 }
@@ -465,7 +465,7 @@ size_t buf_len = sizeof(buf)/sizeof(wchar_t);
 	tmp_filename_postfix += 1;
 
 	tmp_filename = buf;
-	Ezc::WideToUTF8(tmp_filename, atmp_filename);
+	PT::WideToUTF8(tmp_filename, atmp_filename);
 
 	tmp_file.open(atmp_filename.c_str(), std::ios_base::binary | std::ios_base::out);
 	// !! dodac ustawienie chmod config.upload_files_chmod dla tymczasowego pliku
diff --git a/core/postparser.h b/core/postparser.h
index f763a2e..faa6ea2 100755
--- a/core/postparser.h
+++ b/core/postparser.h
@@ -2,7 +2,7 @@
  * This file is a part of Winix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008-2011, Tomasz Sowa
+ * Copyright (c) 2008-2012, Tomasz Sowa
  * All rights reserved.
  * 
  */
@@ -15,7 +15,7 @@
 #include "httpsimpleparser.h"
 #include "requesttypes.h"
 #include "misc.h"
-#include "utf8.h"
+#include "utf8/utf8.h"
 #include "log.h"
 #include "config.h"
 
@@ -66,7 +66,7 @@ protected:
 	void ConvStr(const std::string & src, std::wstring & dst)
 	{
 		if( input_as_utf8 )
-			Ezc::UTF8ToWide(src, dst);
+			PT::UTF8ToWide(src, dst);
 		else
 			AssignString(src, dst);
 	}
diff --git a/core/textstream.h b/core/textstream.h
index f0465d2..096973e 100755
--- a/core/textstream.h
+++ b/core/textstream.h
@@ -12,7 +12,7 @@
 
 #include <string>
 #include "misc.h"
-#include "confparser.h"
+#include "confparser/space.h"
 
 
 /*
@@ -56,8 +56,8 @@ public:
 	TextStream & operator<<(unsigned long);
 	TextStream & operator<<(double);
 	TextStream & operator<<(const void *);// printing a pointer
-	TextStream & operator<<(const Space * space);
-	TextStream & operator<<(const Space & space);
+	TextStream & operator<<(const PT::Space * space);
+	TextStream & operator<<(const PT::Space & space);
 
 
 	TextStream & Write(const char * buf, size_t len);
@@ -307,7 +307,7 @@ TextStream<StringType> & TextStream<StringType>::write(const wchar_t * buf, size
 
 
 template<class StringType>
-TextStream<StringType> & TextStream<StringType>::operator<<(const Space * space)
+TextStream<StringType> & TextStream<StringType>::operator<<(const PT::Space * space)
 {
 	// !! check me pls
 	space->Serialize(*this, true, false);
@@ -317,7 +317,7 @@ TextStream<StringType> & TextStream<StringType>::operator<<(const Space * space)
 
 
 template<class StringType>
-TextStream<StringType> & TextStream<StringType>::operator<<(const Space & space)
+TextStream<StringType> & TextStream<StringType>::operator<<(const PT::Space & space)
 {
 	return operator<<(&space);
 }
diff --git a/core/user.h b/core/user.h
index 91735f4..f19804f 100755
--- a/core/user.h
+++ b/core/user.h
@@ -12,7 +12,7 @@
 
 #include <string>
 #include <vector>
-#include "confparser.h"
+#include "confparser/space.h"
 
 
 
@@ -45,11 +45,11 @@ struct User
 
 	// environment variables which can be set by this user
 	// use 'env' winix function
-	Space env;
+	PT::Space env;
 
 	// environment variables set only by an administrator
 	// an administrator can use 'env' winix function with 'a' parameter
-	Space aenv;
+	PT::Space aenv;
 
 
 
diff --git a/db/Makefile.dep b/db/Makefile.dep
index dd337fe..cf34c15 100755
--- a/db/Makefile.dep
+++ b/db/Makefile.dep
@@ -1,8 +1,7 @@
 # DO NOT DELETE
 
 db.o: db.h dbbase.h dbconn.h dbtextstream.h ../core/textstream.h
-db.o: ../core/misc.h ../core/item.h ../core/confparser.h
-db.o: ../core/requesttypes.h ../core/error.h ../core/confparser.h
+db.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.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
@@ -11,17 +10,14 @@ 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 ../core/confparser.h
-dbbase.o: ../core/requesttypes.h ../core/error.h ../core/confparser.h
-dbbase.o: ../core/log.h ../core/misc.h ../../ezc/src/utf8.h
+dbbase.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
+dbbase.o: ../core/error.h ../core/log.h ../core/misc.h
 dbconn.o: dbconn.h dbtextstream.h ../core/textstream.h ../core/misc.h
-dbconn.o: ../core/item.h ../core/confparser.h ../core/requesttypes.h
-dbconn.o: ../core/log.h ../core/error.h
+dbconn.o: ../core/item.h ../core/requesttypes.h ../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 ../core/confparser.h ../core/requesttypes.h
-dbitemcolumns.o: ../core/error.h ../core/confparser.h ../core/log.h
+dbitemcolumns.o: ../core/item.h ../core/requesttypes.h ../core/error.h
+dbitemcolumns.o: ../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 ../core/confparser.h ../core/requesttypes.h
-dbtextstream.o: ../../ezc/src/utf8.h
+dbtextstream.o: ../core/item.h ../core/requesttypes.h
diff --git a/db/db.cpp b/db/db.cpp
index 7dc2fe0..21a2eed 100755
--- a/db/db.cpp
+++ b/db/db.cpp
@@ -142,7 +142,7 @@ return DoCommand(query);
 }
 
 
-Error Db::ChangeUserEnv(long user_id, const Space & space)
+Error Db::ChangeUserEnv(long user_id, const PT::Space & space)
 {
 	query.Clear();
 	query << R("update core.user set(env) = (")
@@ -155,7 +155,7 @@ return DoCommand(query);
 }
 
 
-Error Db::ChangeUserAdminEnv(long user_id, const Space & space)
+Error Db::ChangeUserAdminEnv(long user_id, const PT::Space & space)
 {
 	query.Clear();
 	query << R("update core.user set(aenv) = (")
@@ -1262,7 +1262,7 @@ return EndTrans(result);
 
 
 
-Error Db::EditMetaById(const Space & meta, long id)
+Error Db::EditMetaById(const PT::Space & meta, long id)
 {
 	query.Clear();
 	query << R("update core.item set (meta) = (")
diff --git a/db/db.h b/db/db.h
index 9b61db4..4637df5 100755
--- a/db/db.h
+++ b/db/db.h
@@ -49,8 +49,8 @@ public:
 
 	// !! change name to: ChangeUserPass ?
 	Error ChangePass(const std::wstring & login, const std::wstring & password, const std::string & password_encrypted, int pass_type, bool pass_hash_salted);
-	Error ChangeUserEnv(long user_id, const Space & space);
-	Error ChangeUserAdminEnv(long user_id, const Space & space);
+	Error ChangeUserEnv(long user_id, const PT::Space & space);
+	Error ChangeUserAdminEnv(long user_id, const PT::Space & space);
 
 	Error AddItem(Item & item);
 	Error EditItemById(Item & item, bool with_url = true);
@@ -68,7 +68,7 @@ public:
 	Error EditParentUrlById(Item & item, long id);
 	Error EditFileById(const Item & item, long id); // file_path, file_fs, file_type
 	Error EditHasThumbById(bool has_thumb, long id);
-	Error EditMetaById(const Space & meta, long id);
+	Error EditMetaById(const PT::Space & meta, long id);
 
 	Error DelDirById(long id);
 	Error DelFileById(long file_id);
diff --git a/db/dbbase.cpp b/db/dbbase.cpp
index fe9a79d..e9ab6b7 100755
--- a/db/dbbase.cpp
+++ b/db/dbbase.cpp
@@ -14,7 +14,7 @@
 #include "core/log.h"
 #include "core/error.h"
 #include "core/misc.h"
-#include "utf8.h"
+#include "utf8/utf8.h"
 
 
 
@@ -145,7 +145,7 @@ const std::wstring & DbBase::AssertValueWide(PGresult * r, int row, int col)
 	const char * res = AssertValue(r, row, col);
 	static std::wstring temp_wide_value; // !! dac jako skladowa klasy (niestatyczna)
 
-	Ezc::UTF8ToWide(res, temp_wide_value);
+	PT::UTF8ToWide(res, temp_wide_value);
 	
 return temp_wide_value;
 }
@@ -169,7 +169,7 @@ void DbBase::AssertValueBin(PGresult * r, int row, int col, std::string & result
 void DbBase::AssertValueWide(PGresult * r, int row, int col, std::wstring & result)
 {
 	const char * res = AssertValue(r, row, col);
-	Ezc::UTF8ToWide(res, result);
+	PT::UTF8ToWide(res, result);
 }
 
 
@@ -210,7 +210,7 @@ tm DbBase::AssertValueTm(PGresult * r, int row, int col)
 }
 
 
-bool DbBase::AssertValueSpace(PGresult * r, int row, int col, Space & space, bool split_single)
+bool DbBase::AssertValueSpace(PGresult * r, int row, int col, PT::Space & space, bool split_single)
 {
 	const char * res = AssertValue(r, row, col);
 
@@ -219,13 +219,13 @@ bool DbBase::AssertValueSpace(PGresult * r, int row, int col, Space & space, boo
 	conf_parser.SetSpace(space);
 	space.Clear();
 
-	ConfParser::Status status = conf_parser.ParseString(res);
+	PT::ConfParser::Status status = conf_parser.ParseString(res);
 
-	if( status != ConfParser::ok )
+	if( status != PT::ConfParser::ok )
 	{
-		log << log1 << "Db: a problem with parsing a Space";
+		log << log1 << "Db: a problem with parsing a PT::Space";
 
-		if( status == ConfParser::syntax_error )
+		if( status == PT::ConfParser::syntax_error )
 			log << ", syntax error at line: " << conf_parser.line;
 
 		log << logend;
diff --git a/db/dbbase.h b/db/dbbase.h
index 16f6ac0..ebc3bda 100755
--- a/db/dbbase.h
+++ b/db/dbbase.h
@@ -16,7 +16,7 @@
 #include <vector>
 #include <string>
 #include "core/error.h"
-#include "core/confparser.h"
+#include "confparser/confparser.h"
 
 
 class DbBase
@@ -50,7 +50,7 @@ public:
 	static tm            AssertValueTm(PGresult * r, int row, int col);
 	
 	// non static assignments
-	bool AssertValueSpace(PGresult * r, int row, int col, Space & space, bool split_single = true);
+	bool AssertValueSpace(PGresult * r, int row, int col, PT::Space & space, bool split_single = true);
 
 	void ClearResult(PGresult * r);
 	long AssertCurrval(const char * table);
@@ -94,7 +94,7 @@ private:
 	static int  UnescapeBin(const char * str, size_t & i, size_t len);
 
 	DbTextStream bquery;
-	ConfParser   conf_parser;
+	PT::ConfParser conf_parser;
 
 };
 
diff --git a/db/dbitemquery.h b/db/dbitemquery.h
index c191f98..23edcae 100755
--- a/db/dbitemquery.h
+++ b/db/dbitemquery.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.
  * 
  */
@@ -33,7 +33,7 @@ struct DbItemQuery
 	bool sel_file;			// file_path, file_fs, file_type, has_thumb, hash, hash_type, file_size
 	bool sel_html_template;	// template
 	bool sel_sort_index;    // sort_index
-	bool sel_meta;			// meta Space
+	bool sel_meta;			// meta PT::Space
 
 	bool where_id;			//
 	bool where_parent_id;	//
diff --git a/db/dbtextstream.cpp b/db/dbtextstream.cpp
index d37a352..562fdde 100755
--- a/db/dbtextstream.cpp
+++ b/db/dbtextstream.cpp
@@ -8,7 +8,7 @@
  */
  
 #include "dbtextstream.h"
-#include "utf8.h"
+#include "utf8/utf8.h"
 
 
 DbTextStream::DbTextStream()
@@ -56,7 +56,7 @@ DbTextStream & DbTextStream::PutText(const std::string & str)
 
 DbTextStream & DbTextStream::PutText(const wchar_t * str)
 {
-	Ezc::WideToUTF8(str, buffer, false);
+	PT::WideToUTF8(str, buffer, false);
 	was_param = false;
 
 return *this;
@@ -256,7 +256,7 @@ DbTextStream & DbTextStream::ETextPutChar(wchar_t c)
 		buffer += "\\\'"; // don't use "''" because we use the method for PQconnectdb too
 	else
 	if( c != 0 )
-		Ezc::IntToUTF8(int(c), buffer, false);
+		PT::IntToUTF8(int(c), buffer, false);
 
 return *this;
 }
@@ -577,7 +577,7 @@ return buffer;
 
 
 
-DbTextStream & DbTextStream::operator<<(const Space * space)
+DbTextStream & DbTextStream::operator<<(const PT::Space * space)
 {
 	space_stream.Clear();
 	// !! IMPROVE ME
@@ -590,7 +590,7 @@ return *this;
 }
 
 
-DbTextStream & DbTextStream::operator<<(const Space & space)
+DbTextStream & DbTextStream::operator<<(const PT::Space & space)
 {
 	return operator<<(&space);
 }
diff --git a/db/dbtextstream.h b/db/dbtextstream.h
index 3a7b61a..4954bae 100755
--- a/db/dbtextstream.h
+++ b/db/dbtextstream.h
@@ -152,8 +152,8 @@ public:
 	DbTextStream & operator<<(const void *);
 	DbTextStream & operator<<(const tm & t);
 	DbTextStream & operator<<(const std::vector<long> & tabid);
-	DbTextStream & operator<<(const Space * space);
-	DbTextStream & operator<<(const Space & space);
+	DbTextStream & operator<<(const PT::Space * space);
+	DbTextStream & operator<<(const PT::Space & space);
 
 
 	static const char * ConvertTime(const tm & t);
diff --git a/functions/Makefile.dep b/functions/Makefile.dep
index 46c93a6..8ed1a83 100755
--- a/functions/Makefile.dep
+++ b/functions/Makefile.dep
@@ -1,28 +1,27 @@
 # DO NOT DELETE
 
-adduser.o: adduser.h functionbase.h ../core/item.h ../core/confparser.h
-adduser.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-adduser.o: ../core/textstream.h ../core/misc.h ../core/item.h
-adduser.o: ../core/requesttypes.h ../core/error.h ../core/confparser.h
-adduser.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
-adduser.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
-adduser.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
-adduser.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
-adduser.o: ../core/config.h ../core/htmlfilter.h
-adduser.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h
-adduser.o: ../core/plugindata.h ../core/rebus.h mount.h ../templates/locale.h
-adduser.o: ../core/request.h ../core/config.h ../core/system.h ../core/dirs.h
+adduser.o: adduser.h functionbase.h ../core/item.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 ../db/dbitemquery.h ../db/dbitemcolumns.h
+adduser.o: ../core/user.h ../core/group.h ../core/dircontainer.h
+adduser.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h
+adduser.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
+adduser.o: ../core/request.h ../core/error.h ../core/config.h
+adduser.o: ../core/htmlfilter.h ../templates/htmltextstream.h
+adduser.o: ../core/session.h ../core/user.h ../core/plugindata.h
+adduser.o: ../core/rebus.h mount.h ../templates/locale.h ../core/request.h
+adduser.o: ../core/config.h ../core/system.h ../core/dirs.h
 adduser.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h
 adduser.o: ../templates/patterns.h ../templates/locale.h
 adduser.o: ../templates/localefilter.h ../../ezc/src/ezc.h
-adduser.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
-adduser.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h
-adduser.o: cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h default.h
-adduser.o: download.h emacs.h env.h last.h login.h logout.h ln.h ls.h man.h
-adduser.o: meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h reload.h rm.h
-adduser.o: run.h sort.h specialdefault.h stat.h subject.h template.h
-adduser.o: tinymce.h uname.h upload.h uptime.h who.h vim.h
-adduser.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h
+adduser.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
+adduser.o: functionparser.h ../core/cur.h cat.h chmod.h privchanger.h chown.h
+adduser.o: ckeditor.h cp.h default.h download.h emacs.h env.h last.h login.h
+adduser.o: logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h
+adduser.o: passwd.h priv.h reload.h rm.h run.h sort.h specialdefault.h stat.h
+adduser.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h
+adduser.o: vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h
 adduser.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
 adduser.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
 adduser.o: ../core/lastcontainer.h ../templates/misc.h
@@ -31,10 +30,9 @@ adduser.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
 adduser.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
 adduser.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h
 adduser.o: ../core/slog.h
-cat.o: cat.h functionbase.h ../core/item.h ../core/confparser.h ../db/db.h
-cat.o: ../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 ../core/confparser.h
+cat.o: cat.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
+cat.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
+cat.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.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
@@ -45,24 +43,23 @@ cat.o: mount.h ../templates/locale.h ../core/request.h ../core/config.h
 cat.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
 cat.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h
 cat.o: ../templates/locale.h ../templates/localefilter.h ../../ezc/src/ezc.h
-cat.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h
-cat.o: functions.h functionparser.h ../core/cur.h adduser.h chmod.h
-cat.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h
-cat.o: env.h last.h login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h
-cat.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h sort.h
-cat.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h
-cat.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h
-cat.o: ../../ezc/src/stringconv.h ../notify/notifythread.h
-cat.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
-cat.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
-cat.o: ../templates/misc.h ../templates/htmltextstream.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 ../core/basethread.h
+cat.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
+cat.o: functionparser.h ../core/cur.h adduser.h chmod.h privchanger.h chown.h
+cat.o: ckeditor.h cp.h default.h download.h emacs.h env.h last.h login.h
+cat.o: logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h passwd.h
+cat.o: priv.h reload.h rm.h run.h sort.h specialdefault.h stat.h subject.h
+cat.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h
+cat.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h
+cat.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
+cat.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
+cat.o: ../core/lastcontainer.h ../templates/misc.h
+cat.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.h
+cat.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
+cat.o: ../core/loadavg.h ../core/image.h ../core/basethread.h
 cat.o: ../core/threadmanager.h ../core/synchro.h
-chmod.o: chmod.h functionbase.h ../core/item.h ../core/confparser.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 ../core/confparser.h
+chmod.o: chmod.h functionbase.h ../core/item.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: ../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
@@ -73,7 +70,7 @@ chmod.o: ../core/rebus.h mount.h ../templates/locale.h ../core/request.h
 chmod.o: ../core/config.h ../core/system.h ../core/dirs.h
 chmod.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h
 chmod.o: ../templates/patterns.h ../templates/locale.h
-chmod.o: ../templates/localefilter.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
+chmod.o: ../templates/localefilter.h ../../ezc/src/ezc.h
 chmod.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
 chmod.o: functionparser.h ../core/cur.h adduser.h cat.h chown.h privchanger.h
 chmod.o: ckeditor.h cp.h default.h download.h emacs.h env.h last.h login.h
@@ -88,10 +85,9 @@ chmod.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.h
 chmod.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
 chmod.o: ../core/loadavg.h ../core/image.h ../core/basethread.h
 chmod.o: ../core/threadmanager.h ../core/synchro.h
-chown.o: chown.h functionbase.h ../core/item.h ../core/confparser.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 ../core/confparser.h
+chown.o: chown.h functionbase.h ../core/item.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: ../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
@@ -102,7 +98,7 @@ chown.o: ../core/rebus.h mount.h ../templates/locale.h ../core/request.h
 chown.o: ../core/config.h ../core/system.h ../core/dirs.h
 chown.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h
 chown.o: ../templates/patterns.h ../templates/locale.h
-chown.o: ../templates/localefilter.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
+chown.o: ../templates/localefilter.h ../../ezc/src/ezc.h
 chown.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
 chown.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h
 chown.o: ckeditor.h cp.h default.h download.h emacs.h env.h last.h login.h
@@ -117,22 +113,21 @@ chown.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.h
 chown.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
 chown.o: ../core/loadavg.h ../core/image.h ../core/basethread.h
 chown.o: ../core/threadmanager.h ../core/synchro.h
-ckeditor.o: ckeditor.h functionbase.h ../core/item.h ../core/confparser.h
-ckeditor.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+ckeditor.o: ckeditor.h functionbase.h ../core/item.h ../db/db.h
+ckeditor.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
 ckeditor.o: ../core/textstream.h ../core/misc.h ../core/item.h
-ckeditor.o: ../core/requesttypes.h ../core/error.h ../core/confparser.h
-ckeditor.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
-ckeditor.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
-ckeditor.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
-ckeditor.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
-ckeditor.o: ../core/config.h ../core/htmlfilter.h
-ckeditor.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h
-ckeditor.o: ../core/plugindata.h ../core/rebus.h mount.h
-ckeditor.o: ../templates/locale.h ../core/request.h ../core/config.h
-ckeditor.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
-ckeditor.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h
-ckeditor.o: ../templates/locale.h ../templates/localefilter.h
-ckeditor.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h
+ckeditor.o: ../core/requesttypes.h ../core/error.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
+ckeditor.o: ../core/cur.h ../core/request.h ../core/error.h ../core/config.h
+ckeditor.o: ../core/htmlfilter.h ../templates/htmltextstream.h
+ckeditor.o: ../core/session.h ../core/user.h ../core/plugindata.h
+ckeditor.o: ../core/rebus.h mount.h ../templates/locale.h ../core/request.h
+ckeditor.o: ../core/config.h ../core/system.h ../core/dirs.h
+ckeditor.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h
+ckeditor.o: ../templates/patterns.h ../templates/locale.h
+ckeditor.o: ../templates/localefilter.h ../../ezc/src/ezc.h
 ckeditor.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
 ckeditor.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h
 ckeditor.o: privchanger.h chown.h cp.h default.h download.h emacs.h env.h
@@ -149,20 +144,19 @@ 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/basethread.h ../core/threadmanager.h
 ckeditor.o: ../core/synchro.h
-cp.o: cp.h functionbase.h ../core/item.h ../core/confparser.h ../db/db.h
-cp.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
-cp.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h
-cp.o: ../core/confparser.h ../db/dbitemquery.h ../db/dbitemcolumns.h
-cp.o: ../core/user.h ../core/group.h ../core/dircontainer.h
-cp.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h
-cp.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
-cp.o: ../core/request.h ../core/error.h ../core/config.h ../core/htmlfilter.h
-cp.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h
-cp.o: ../core/plugindata.h ../core/rebus.h mount.h ../templates/locale.h
-cp.o: ../core/request.h ../core/config.h ../core/system.h ../core/dirs.h
-cp.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h
-cp.o: ../templates/patterns.h ../templates/locale.h
-cp.o: ../templates/localefilter.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
+cp.o: cp.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
+cp.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h ../core/misc.h
+cp.o: ../core/item.h ../core/requesttypes.h ../core/error.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/dirs.h ../core/dircontainer.h
+cp.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h
+cp.o: ../templates/locale.h ../templates/localefilter.h ../../ezc/src/ezc.h
 cp.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
 cp.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h
 cp.o: chown.h ckeditor.h default.h download.h emacs.h env.h last.h login.h
@@ -183,52 +177,50 @@ cp.o: ../functions/functions.h ../templates/templates.h
 cp.o: ../templates/patterncacher.h ../templates/indexpatterns.h
 cp.o: ../templates/patterns.h ../templates/changepatterns.h
 cp.o: ../core/sessionmanager.h
-default.o: default.h functionbase.h ../core/item.h ../core/confparser.h
-default.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-default.o: ../core/textstream.h ../core/misc.h ../core/item.h
-default.o: ../core/requesttypes.h ../core/error.h ../core/confparser.h
-default.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
-default.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
-default.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
-default.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
-default.o: ../core/config.h ../core/htmlfilter.h
-default.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h
-default.o: ../core/plugindata.h ../core/rebus.h mount.h ../templates/locale.h
-default.o: ../core/request.h ../core/config.h ../core/system.h ../core/dirs.h
+default.o: default.h functionbase.h ../core/item.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 ../db/dbitemquery.h ../db/dbitemcolumns.h
+default.o: ../core/user.h ../core/group.h ../core/dircontainer.h
+default.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h
+default.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
+default.o: ../core/request.h ../core/error.h ../core/config.h
+default.o: ../core/htmlfilter.h ../templates/htmltextstream.h
+default.o: ../core/session.h ../core/user.h ../core/plugindata.h
+default.o: ../core/rebus.h mount.h ../templates/locale.h ../core/request.h
+default.o: ../core/config.h ../core/system.h ../core/dirs.h
 default.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h
 default.o: ../templates/patterns.h ../templates/locale.h
 default.o: ../templates/localefilter.h ../../ezc/src/ezc.h
-default.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
-default.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h
-default.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h
-default.o: download.h emacs.h env.h last.h login.h logout.h ln.h ls.h man.h
-default.o: meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h reload.h rm.h
-default.o: run.h sort.h specialdefault.h stat.h subject.h template.h
-default.o: tinymce.h uname.h upload.h uptime.h who.h vim.h
-default.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h
-default.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
-default.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
-default.o: ../core/lastcontainer.h ../templates/misc.h
-default.o: ../templates/htmltextstream.h ../core/mounts.h
+default.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
+default.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h
+default.o: privchanger.h chown.h ckeditor.h cp.h download.h emacs.h env.h
+default.o: last.h login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h
+default.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h sort.h
+default.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h
+default.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h
+default.o: ../../ezc/src/stringconv.h ../notify/notifythread.h
+default.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
+default.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
+default.o: ../templates/misc.h ../templates/htmltextstream.h ../core/mounts.h
 default.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
 default.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
 default.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h
-download.o: download.h functionbase.h ../core/item.h ../core/confparser.h
-download.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+download.o: download.h functionbase.h ../core/item.h ../db/db.h
+download.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
 download.o: ../core/textstream.h ../core/misc.h ../core/item.h
-download.o: ../core/requesttypes.h ../core/error.h ../core/confparser.h
-download.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
-download.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
-download.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
-download.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
-download.o: ../core/config.h ../core/htmlfilter.h
-download.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h
-download.o: ../core/plugindata.h ../core/rebus.h mount.h
-download.o: ../templates/locale.h ../core/request.h ../core/config.h
-download.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
-download.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h
-download.o: ../templates/locale.h ../templates/localefilter.h
-download.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h
+download.o: ../core/requesttypes.h ../core/error.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
+download.o: ../core/cur.h ../core/request.h ../core/error.h ../core/config.h
+download.o: ../core/htmlfilter.h ../templates/htmltextstream.h
+download.o: ../core/session.h ../core/user.h ../core/plugindata.h
+download.o: ../core/rebus.h mount.h ../templates/locale.h ../core/request.h
+download.o: ../core/config.h ../core/system.h ../core/dirs.h
+download.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h
+download.o: ../templates/patterns.h ../templates/locale.h
+download.o: ../templates/localefilter.h ../../ezc/src/ezc.h
 download.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
 download.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h
 download.o: privchanger.h chown.h ckeditor.h cp.h default.h emacs.h env.h
@@ -245,10 +237,9 @@ 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/basethread.h ../core/threadmanager.h
 download.o: ../core/synchro.h
-emacs.o: emacs.h functionbase.h ../core/item.h ../core/confparser.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 ../core/confparser.h
+emacs.o: emacs.h functionbase.h ../core/item.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: ../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
@@ -259,7 +250,7 @@ emacs.o: ../core/rebus.h mount.h ../templates/locale.h ../core/request.h
 emacs.o: ../core/config.h ../core/system.h ../core/dirs.h
 emacs.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h
 emacs.o: ../templates/patterns.h ../templates/locale.h
-emacs.o: ../templates/localefilter.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
+emacs.o: ../templates/localefilter.h ../../ezc/src/ezc.h
 emacs.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
 emacs.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h
 emacs.o: chown.h ckeditor.h cp.h default.h download.h env.h last.h login.h
@@ -277,10 +268,9 @@ 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: ../core/sessionmanager.h
-env.o: env.h functionbase.h ../core/item.h ../core/confparser.h ../db/db.h
-env.o: ../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 ../core/confparser.h
+env.o: env.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
+env.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
+env.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.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
@@ -291,13 +281,13 @@ env.o: mount.h ../templates/locale.h ../core/request.h ../core/config.h
 env.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
 env.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h
 env.o: ../templates/locale.h ../templates/localefilter.h ../../ezc/src/ezc.h
-env.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h
-env.o: functions.h functionparser.h ../core/cur.h adduser.h cat.h chmod.h
-env.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h
-env.o: last.h login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h
-env.o: node.h passwd.h priv.h reload.h rm.h run.h sort.h specialdefault.h
-env.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h who.h
-env.o: vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h
+env.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
+env.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h
+env.o: chown.h ckeditor.h cp.h default.h download.h emacs.h last.h login.h
+env.o: logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h passwd.h
+env.o: priv.h reload.h rm.h run.h sort.h specialdefault.h stat.h subject.h
+env.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h
+env.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h
 env.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
 env.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
 env.o: ../core/lastcontainer.h ../templates/misc.h
@@ -305,23 +295,22 @@ env.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.h
 env.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
 env.o: ../core/loadavg.h ../core/image.h ../core/basethread.h
 env.o: ../core/threadmanager.h ../core/synchro.h ../core/log.h
-functionbase.o: functionbase.h ../core/item.h ../core/confparser.h ../db/db.h
-functionbase.o: ../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 ../core/confparser.h
-functionbase.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
-functionbase.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
-functionbase.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
-functionbase.o: ../core/slog.h ../core/cur.h ../core/request.h
-functionbase.o: ../core/error.h ../core/config.h ../core/htmlfilter.h
-functionbase.o: ../templates/htmltextstream.h ../core/session.h
-functionbase.o: ../core/user.h ../core/plugindata.h ../core/rebus.h mount.h
-functionbase.o: ../templates/locale.h ../core/request.h ../core/config.h
-functionbase.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
-functionbase.o: ../notify/notify.h ../notify/notifypool.h
-functionbase.o: ../templates/patterns.h ../templates/locale.h
-functionbase.o: ../templates/localefilter.h ../../ezc/src/ezc.h
-functionbase.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
+functionbase.o: functionbase.h ../core/item.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 ../db/dbitemquery.h ../db/dbitemcolumns.h
+functionbase.o: ../core/user.h ../core/group.h ../core/dircontainer.h
+functionbase.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h
+functionbase.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
+functionbase.o: ../core/request.h ../core/error.h ../core/config.h
+functionbase.o: ../core/htmlfilter.h ../templates/htmltextstream.h
+functionbase.o: ../core/session.h ../core/user.h ../core/plugindata.h
+functionbase.o: ../core/rebus.h mount.h ../templates/locale.h
+functionbase.o: ../core/request.h ../core/config.h ../core/system.h
+functionbase.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h
+functionbase.o: ../notify/notifypool.h ../templates/patterns.h
+functionbase.o: ../templates/locale.h ../templates/localefilter.h
+functionbase.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h
 functionbase.o: ../../ezc/src/pattern.h functions.h functionparser.h
 functionbase.o: ../core/cur.h adduser.h cat.h chmod.h privchanger.h chown.h
 functionbase.o: ckeditor.h cp.h default.h download.h emacs.h env.h last.h
@@ -340,10 +329,9 @@ functionbase.o: ../core/loadavg.h ../core/image.h ../core/basethread.h
 functionbase.o: ../core/threadmanager.h ../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 ../core/confparser.h
-functionparser.o: ../core/error.h ../core/confparser.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/item.h ../core/requesttypes.h ../core/error.h
+functionparser.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
+functionparser.o: ../core/user.h ../core/group.h ../core/dircontainer.h
 functionparser.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h
 functionparser.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
 functionparser.o: ../core/request.h ../core/error.h ../core/config.h
@@ -355,43 +343,41 @@ functionparser.o: ../core/dircontainer.h ../notify/notify.h
 functionparser.o: ../notify/notifypool.h ../templates/locale.h
 functionparser.o: ../templates/patterns.h ../templates/locale.h
 functionparser.o: ../templates/localefilter.h ../../ezc/src/ezc.h
-functionparser.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
-functionparser.o: ../../ezc/src/pattern.h functions.h adduser.h cat.h chmod.h
-functionparser.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h
-functionparser.o: emacs.h env.h last.h login.h logout.h ln.h ls.h man.h
-functionparser.o: meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h
-functionparser.o: reload.h rm.h run.h sort.h specialdefault.h stat.h
-functionparser.o: subject.h template.h tinymce.h uname.h upload.h uptime.h
-functionparser.o: who.h vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h
-functionparser.o: ../notify/notifythread.h ../core/basethread.h
-functionparser.o: ../core/synchro.h ../notify/templatesnotify.h
-functionparser.o: ../core/users.h ../core/ugcontainer.h
-functionparser.o: ../core/lastcontainer.h ../templates/misc.h
-functionparser.o: ../templates/htmltextstream.h ../core/mounts.h
-functionparser.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
-functionparser.o: ../core/groups.h ../core/group.h ../core/loadavg.h
-functionparser.o: ../core/image.h ../core/basethread.h
+functionparser.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
+functionparser.o: functions.h adduser.h cat.h chmod.h privchanger.h chown.h
+functionparser.o: ckeditor.h cp.h default.h download.h emacs.h env.h last.h
+functionparser.o: login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h
+functionparser.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h sort.h
+functionparser.o: specialdefault.h stat.h subject.h template.h tinymce.h
+functionparser.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h
+functionparser.o: ../../ezc/src/stringconv.h ../notify/notifythread.h
+functionparser.o: ../core/basethread.h ../core/synchro.h
+functionparser.o: ../notify/templatesnotify.h ../core/users.h
+functionparser.o: ../core/ugcontainer.h ../core/lastcontainer.h
+functionparser.o: ../templates/misc.h ../templates/htmltextstream.h
+functionparser.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h
+functionparser.o: ../core/users.h ../core/groups.h ../core/group.h
+functionparser.o: ../core/loadavg.h ../core/image.h ../core/basethread.h
 functionparser.o: ../core/threadmanager.h ../core/synchro.h ../core/cur.h
 functionparser.o: ../core/log.h
-functions.o: functions.h functionbase.h ../core/item.h ../core/confparser.h
-functions.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+functions.o: functions.h functionbase.h ../core/item.h ../db/db.h
+functions.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
 functions.o: ../core/textstream.h ../core/misc.h ../core/item.h
-functions.o: ../core/requesttypes.h ../core/error.h ../core/confparser.h
-functions.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
-functions.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
-functions.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
-functions.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
-functions.o: ../core/config.h ../core/htmlfilter.h
-functions.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h
-functions.o: ../core/plugindata.h ../core/rebus.h mount.h
-functions.o: ../templates/locale.h ../core/request.h ../core/config.h
-functions.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
-functions.o: ../notify/notify.h ../notify/notifypool.h
+functions.o: ../core/requesttypes.h ../core/error.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
+functions.o: ../core/cur.h ../core/request.h ../core/error.h ../core/config.h
+functions.o: ../core/htmlfilter.h ../templates/htmltextstream.h
+functions.o: ../core/session.h ../core/user.h ../core/plugindata.h
+functions.o: ../core/rebus.h mount.h ../templates/locale.h ../core/request.h
+functions.o: ../core/config.h ../core/system.h ../core/dirs.h
+functions.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h
 functions.o: ../templates/patterns.h ../templates/locale.h
 functions.o: ../templates/localefilter.h ../../ezc/src/ezc.h
-functions.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
-functions.o: ../../ezc/src/pattern.h ../../ezc/src/stringconv.h
-functions.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
+functions.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
+functions.o: ../../ezc/src/stringconv.h ../notify/notifythread.h
+functions.o: ../core/basethread.h ../core/synchro.h
 functions.o: ../notify/templatesnotify.h ../core/users.h
 functions.o: ../core/ugcontainer.h ../core/lastcontainer.h
 functions.o: ../templates/misc.h ../templates/htmltextstream.h
@@ -411,10 +397,9 @@ 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: ../core/sessionmanager.h
-last.o: last.h functionbase.h ../core/item.h ../core/confparser.h ../db/db.h
-last.o: ../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 ../core/confparser.h
+last.o: last.h functionbase.h ../core/item.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: ../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
@@ -425,34 +410,33 @@ last.o: mount.h ../templates/locale.h ../core/request.h ../core/config.h
 last.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
 last.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h
 last.o: ../templates/locale.h ../templates/localefilter.h ../../ezc/src/ezc.h
-last.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
-last.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h
-last.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h
-last.o: default.h download.h emacs.h env.h login.h logout.h ln.h ls.h man.h
-last.o: meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h reload.h rm.h
-last.o: run.h sort.h specialdefault.h stat.h subject.h template.h tinymce.h
-last.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h
-last.o: ../../ezc/src/stringconv.h ../notify/notifythread.h
-last.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
-last.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
-last.o: ../templates/misc.h ../templates/htmltextstream.h ../core/mounts.h
-last.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
-last.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
-last.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h
-ln.o: ln.h functionbase.h ../core/item.h ../core/confparser.h ../db/db.h
-ln.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
-ln.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h
-ln.o: ../core/confparser.h ../db/dbitemquery.h ../db/dbitemcolumns.h
-ln.o: ../core/user.h ../core/group.h ../core/dircontainer.h
-ln.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h
-ln.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
-ln.o: ../core/request.h ../core/error.h ../core/config.h ../core/htmlfilter.h
-ln.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h
-ln.o: ../core/plugindata.h ../core/rebus.h mount.h ../templates/locale.h
-ln.o: ../core/request.h ../core/config.h ../core/system.h ../core/dirs.h
-ln.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h
-ln.o: ../templates/patterns.h ../templates/locale.h
-ln.o: ../templates/localefilter.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
+last.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
+last.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h
+last.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h login.h
+last.o: logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h
+last.o: passwd.h priv.h reload.h rm.h run.h sort.h specialdefault.h stat.h
+last.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h vim.h
+last.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h
+last.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
+last.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
+last.o: ../core/lastcontainer.h ../templates/misc.h
+last.o: ../templates/htmltextstream.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/basethread.h
+last.o: ../core/threadmanager.h ../core/synchro.h
+ln.o: ln.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
+ln.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h ../core/misc.h
+ln.o: ../core/item.h ../core/requesttypes.h ../core/error.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/dirs.h ../core/dircontainer.h
+ln.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h
+ln.o: ../templates/locale.h ../templates/localefilter.h ../../ezc/src/ezc.h
 ln.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
 ln.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h
 ln.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h last.h
@@ -468,10 +452,9 @@ ln.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
 ln.o: ../core/loadavg.h ../core/image.h ../core/basethread.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 ../core/confparser.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 ../core/confparser.h
+login.o: login.h functionbase.h ../core/item.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: ../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
@@ -482,7 +465,7 @@ login.o: ../core/rebus.h mount.h ../templates/locale.h ../core/request.h
 login.o: ../core/config.h ../core/system.h ../core/dirs.h
 login.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h
 login.o: ../templates/patterns.h ../templates/locale.h
-login.o: ../templates/localefilter.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
+login.o: ../templates/localefilter.h ../../ezc/src/ezc.h
 login.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
 login.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h
 login.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h last.h
@@ -502,49 +485,48 @@ login.o: ../core/sessioncontainer.h ../functions/functions.h
 login.o: ../templates/templates.h ../templates/patterncacher.h
 login.o: ../templates/indexpatterns.h ../templates/patterns.h
 login.o: ../templates/changepatterns.h ../core/sessionmanager.h
-logout.o: logout.h functionbase.h ../core/item.h ../core/confparser.h
-logout.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-logout.o: ../core/textstream.h ../core/misc.h ../core/item.h
-logout.o: ../core/requesttypes.h ../core/error.h ../core/confparser.h
-logout.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
-logout.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
-logout.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
-logout.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
-logout.o: ../core/config.h ../core/htmlfilter.h ../templates/htmltextstream.h
+logout.o: logout.h functionbase.h ../core/item.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 ../db/dbitemquery.h ../db/dbitemcolumns.h
+logout.o: ../core/user.h ../core/group.h ../core/dircontainer.h
+logout.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h
+logout.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
+logout.o: ../core/request.h ../core/error.h ../core/config.h
+logout.o: ../core/htmlfilter.h ../templates/htmltextstream.h
 logout.o: ../core/session.h ../core/user.h ../core/plugindata.h
 logout.o: ../core/rebus.h mount.h ../templates/locale.h ../core/request.h
 logout.o: ../core/config.h ../core/system.h ../core/dirs.h
 logout.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h
 logout.o: ../templates/patterns.h ../templates/locale.h
 logout.o: ../templates/localefilter.h ../../ezc/src/ezc.h
-logout.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
-logout.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h
-logout.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h
-logout.o: default.h download.h emacs.h env.h last.h login.h ln.h ls.h man.h
-logout.o: meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h reload.h rm.h
-logout.o: run.h sort.h specialdefault.h stat.h subject.h template.h tinymce.h
-logout.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h
-logout.o: ../../ezc/src/stringconv.h ../notify/notifythread.h
-logout.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
-logout.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
-logout.o: ../templates/misc.h ../templates/htmltextstream.h ../core/mounts.h
+logout.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
+logout.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h
+logout.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h
+logout.o: env.h last.h login.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h
+logout.o: node.h passwd.h priv.h reload.h rm.h run.h sort.h specialdefault.h
+logout.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h
+logout.o: who.h vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h
+logout.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
+logout.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
+logout.o: ../core/lastcontainer.h ../templates/misc.h
+logout.o: ../templates/htmltextstream.h ../core/mounts.h
 logout.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
 logout.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
 logout.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h
-ls.o: ls.h functionbase.h ../core/item.h ../core/confparser.h ../db/db.h
-ls.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
-ls.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h
-ls.o: ../core/confparser.h ../db/dbitemquery.h ../db/dbitemcolumns.h
-ls.o: ../core/user.h ../core/group.h ../core/dircontainer.h
-ls.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h
-ls.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
-ls.o: ../core/request.h ../core/error.h ../core/config.h ../core/htmlfilter.h
-ls.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h
-ls.o: ../core/plugindata.h ../core/rebus.h mount.h ../templates/locale.h
-ls.o: ../core/request.h ../core/config.h ../core/system.h ../core/dirs.h
-ls.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h
-ls.o: ../templates/patterns.h ../templates/locale.h
-ls.o: ../templates/localefilter.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
+ls.o: ls.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
+ls.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h ../core/misc.h
+ls.o: ../core/item.h ../core/requesttypes.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/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/dirs.h ../core/dircontainer.h
+ls.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h
+ls.o: ../templates/locale.h ../templates/localefilter.h ../../ezc/src/ezc.h
 ls.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
 ls.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h
 ls.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h last.h
@@ -559,10 +541,9 @@ ls.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.h
 ls.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
 ls.o: ../core/loadavg.h ../core/image.h ../core/basethread.h
 ls.o: ../core/threadmanager.h ../core/synchro.h
-man.o: man.h functionbase.h ../core/item.h ../core/confparser.h ../db/db.h
-man.o: ../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 ../core/confparser.h
+man.o: man.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
+man.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
+man.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.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
@@ -573,13 +554,13 @@ man.o: mount.h ../templates/locale.h ../core/request.h ../core/config.h
 man.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
 man.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h
 man.o: ../templates/locale.h ../templates/localefilter.h ../../ezc/src/ezc.h
-man.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h
-man.o: functions.h functionparser.h ../core/cur.h adduser.h cat.h chmod.h
-man.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h
-man.o: env.h last.h login.h logout.h ln.h ls.h meta.h mkdir.h mv.h nicedit.h
-man.o: node.h passwd.h priv.h reload.h rm.h run.h sort.h specialdefault.h
-man.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h who.h
-man.o: vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h
+man.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
+man.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h
+man.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h last.h
+man.o: login.h logout.h ln.h ls.h meta.h mkdir.h mv.h nicedit.h node.h
+man.o: passwd.h priv.h reload.h rm.h run.h sort.h specialdefault.h stat.h
+man.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h vim.h
+man.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h
 man.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
 man.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
 man.o: ../core/lastcontainer.h ../templates/misc.h
@@ -587,10 +568,9 @@ man.o: ../templates/htmltextstream.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/basethread.h
 man.o: ../core/threadmanager.h ../core/synchro.h
-meta.o: meta.h functionbase.h ../core/item.h ../core/confparser.h ../db/db.h
-meta.o: ../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 ../core/confparser.h
+meta.o: meta.h functionbase.h ../core/item.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: ../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
@@ -601,25 +581,23 @@ meta.o: mount.h ../templates/locale.h ../core/request.h ../core/config.h
 meta.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
 meta.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h
 meta.o: ../templates/locale.h ../templates/localefilter.h ../../ezc/src/ezc.h
-meta.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
-meta.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h
-meta.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h
-meta.o: default.h download.h emacs.h env.h last.h login.h logout.h ln.h ls.h
-meta.o: man.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h reload.h rm.h
-meta.o: run.h sort.h specialdefault.h stat.h subject.h template.h tinymce.h
-meta.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h
-meta.o: ../../ezc/src/stringconv.h ../notify/notifythread.h
-meta.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
-meta.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
-meta.o: ../templates/misc.h ../templates/htmltextstream.h ../core/mounts.h
-meta.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
-meta.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
-meta.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h
-meta.o: ../core/log.h
-mkdir.o: mkdir.h functionbase.h ../core/item.h ../core/confparser.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 ../core/confparser.h
+meta.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
+meta.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h
+meta.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h last.h
+meta.o: login.h logout.h ln.h ls.h man.h mkdir.h mv.h nicedit.h node.h
+meta.o: passwd.h priv.h reload.h rm.h run.h sort.h specialdefault.h stat.h
+meta.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h vim.h
+meta.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h
+meta.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
+meta.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
+meta.o: ../core/lastcontainer.h ../templates/misc.h
+meta.o: ../templates/htmltextstream.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/basethread.h
+meta.o: ../core/threadmanager.h ../core/synchro.h ../core/log.h
+mkdir.o: mkdir.h functionbase.h ../core/item.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: ../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
@@ -630,7 +608,7 @@ mkdir.o: ../core/rebus.h mount.h ../templates/locale.h ../core/request.h
 mkdir.o: ../core/config.h ../core/system.h ../core/dirs.h
 mkdir.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h
 mkdir.o: ../templates/patterns.h ../templates/locale.h
-mkdir.o: ../templates/localefilter.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
+mkdir.o: ../templates/localefilter.h ../../ezc/src/ezc.h
 mkdir.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
 mkdir.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h
 mkdir.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h last.h
@@ -645,10 +623,9 @@ mkdir.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.h
 mkdir.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
 mkdir.o: ../core/loadavg.h ../core/image.h ../core/basethread.h
 mkdir.o: ../core/threadmanager.h ../core/synchro.h
-mount.o: mount.h functionbase.h ../core/item.h ../core/confparser.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 ../core/confparser.h
+mount.o: mount.h functionbase.h ../core/item.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: ../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
@@ -659,7 +636,7 @@ mount.o: ../core/rebus.h ../templates/locale.h ../core/request.h
 mount.o: ../core/config.h ../core/system.h ../core/dirs.h
 mount.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h
 mount.o: ../templates/patterns.h ../templates/locale.h
-mount.o: ../templates/localefilter.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
+mount.o: ../templates/localefilter.h ../../ezc/src/ezc.h
 mount.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
 mount.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h
 mount.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h last.h
@@ -674,20 +651,19 @@ mount.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.h
 mount.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
 mount.o: ../core/loadavg.h ../core/image.h ../core/basethread.h
 mount.o: ../core/threadmanager.h ../core/synchro.h
-mv.o: mv.h functionbase.h ../core/item.h ../core/confparser.h ../db/db.h
-mv.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
-mv.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h
-mv.o: ../core/confparser.h ../db/dbitemquery.h ../db/dbitemcolumns.h
-mv.o: ../core/user.h ../core/group.h ../core/dircontainer.h
-mv.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h
-mv.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
-mv.o: ../core/request.h ../core/error.h ../core/config.h ../core/htmlfilter.h
-mv.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h
-mv.o: ../core/plugindata.h ../core/rebus.h mount.h ../templates/locale.h
-mv.o: ../core/request.h ../core/config.h ../core/system.h ../core/dirs.h
-mv.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h
-mv.o: ../templates/patterns.h ../templates/locale.h
-mv.o: ../templates/localefilter.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
+mv.o: mv.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
+mv.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h ../core/misc.h
+mv.o: ../core/item.h ../core/requesttypes.h ../core/error.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/dirs.h ../core/dircontainer.h
+mv.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h
+mv.o: ../templates/locale.h ../templates/localefilter.h ../../ezc/src/ezc.h
 mv.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
 mv.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h
 mv.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h last.h
@@ -707,29 +683,28 @@ mv.o: ../core/sessioncontainer.h ../functions/functions.h
 mv.o: ../templates/templates.h ../templates/patterncacher.h
 mv.o: ../templates/indexpatterns.h ../templates/patterns.h
 mv.o: ../templates/changepatterns.h ../core/sessionmanager.h
-nicedit.o: nicedit.h functionbase.h ../core/item.h ../core/confparser.h
-nicedit.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-nicedit.o: ../core/textstream.h ../core/misc.h ../core/item.h
-nicedit.o: ../core/requesttypes.h ../core/error.h ../core/confparser.h
-nicedit.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
-nicedit.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
-nicedit.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
-nicedit.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
-nicedit.o: ../core/config.h ../core/htmlfilter.h
-nicedit.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h
-nicedit.o: ../core/plugindata.h ../core/rebus.h mount.h ../templates/locale.h
-nicedit.o: ../core/request.h ../core/config.h ../core/system.h ../core/dirs.h
+nicedit.o: nicedit.h functionbase.h ../core/item.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 ../db/dbitemquery.h ../db/dbitemcolumns.h
+nicedit.o: ../core/user.h ../core/group.h ../core/dircontainer.h
+nicedit.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h
+nicedit.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
+nicedit.o: ../core/request.h ../core/error.h ../core/config.h
+nicedit.o: ../core/htmlfilter.h ../templates/htmltextstream.h
+nicedit.o: ../core/session.h ../core/user.h ../core/plugindata.h
+nicedit.o: ../core/rebus.h mount.h ../templates/locale.h ../core/request.h
+nicedit.o: ../core/config.h ../core/system.h ../core/dirs.h
 nicedit.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h
 nicedit.o: ../templates/patterns.h ../templates/locale.h
 nicedit.o: ../templates/localefilter.h ../../ezc/src/ezc.h
-nicedit.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
-nicedit.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h
-nicedit.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h
-nicedit.o: default.h download.h emacs.h env.h last.h login.h logout.h ln.h
-nicedit.o: ls.h man.h meta.h mkdir.h mv.h node.h passwd.h priv.h reload.h
-nicedit.o: rm.h run.h sort.h specialdefault.h stat.h subject.h template.h
-nicedit.o: tinymce.h uname.h upload.h uptime.h who.h vim.h
-nicedit.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h
+nicedit.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
+nicedit.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h
+nicedit.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h
+nicedit.o: env.h last.h login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h
+nicedit.o: node.h passwd.h priv.h reload.h rm.h run.h sort.h specialdefault.h
+nicedit.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h
+nicedit.o: who.h vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h
 nicedit.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
 nicedit.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
 nicedit.o: ../core/lastcontainer.h ../templates/misc.h
@@ -737,10 +712,9 @@ nicedit.o: ../templates/htmltextstream.h ../core/mounts.h
 nicedit.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
 nicedit.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
 nicedit.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h
-node.o: node.h functionbase.h ../core/item.h ../core/confparser.h ../db/db.h
-node.o: ../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 ../core/confparser.h
+node.o: node.h functionbase.h ../core/item.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: ../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
@@ -751,43 +725,42 @@ node.o: mount.h ../templates/locale.h ../core/request.h ../core/config.h
 node.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
 node.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h
 node.o: ../templates/locale.h ../templates/localefilter.h ../../ezc/src/ezc.h
-node.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
-node.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h
-node.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h
-node.o: default.h download.h emacs.h env.h last.h login.h logout.h ln.h ls.h
-node.o: man.h meta.h mkdir.h mv.h nicedit.h passwd.h priv.h reload.h rm.h
-node.o: run.h sort.h specialdefault.h stat.h subject.h template.h tinymce.h
-node.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h
-node.o: ../../ezc/src/stringconv.h ../notify/notifythread.h
-node.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
-node.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
-node.o: ../templates/misc.h ../templates/htmltextstream.h ../core/mounts.h
-node.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
-node.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
-node.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h
-passwd.o: passwd.h functionbase.h ../core/item.h ../core/confparser.h
-passwd.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-passwd.o: ../core/textstream.h ../core/misc.h ../core/item.h
-passwd.o: ../core/requesttypes.h ../core/error.h ../core/confparser.h
-passwd.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
-passwd.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
-passwd.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
-passwd.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
-passwd.o: ../core/config.h ../core/htmlfilter.h ../templates/htmltextstream.h
+node.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
+node.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h
+node.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h last.h
+node.o: login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h
+node.o: passwd.h priv.h reload.h rm.h run.h sort.h specialdefault.h stat.h
+node.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h vim.h
+node.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h
+node.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
+node.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
+node.o: ../core/lastcontainer.h ../templates/misc.h
+node.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.h
+node.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
+node.o: ../core/loadavg.h ../core/image.h ../core/basethread.h
+node.o: ../core/threadmanager.h ../core/synchro.h
+passwd.o: passwd.h functionbase.h ../core/item.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 ../db/dbitemquery.h ../db/dbitemcolumns.h
+passwd.o: ../core/user.h ../core/group.h ../core/dircontainer.h
+passwd.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h
+passwd.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
+passwd.o: ../core/request.h ../core/error.h ../core/config.h
+passwd.o: ../core/htmlfilter.h ../templates/htmltextstream.h
 passwd.o: ../core/session.h ../core/user.h ../core/plugindata.h
 passwd.o: ../core/rebus.h mount.h ../templates/locale.h ../core/request.h
 passwd.o: ../core/config.h ../core/system.h ../core/dirs.h
 passwd.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h
 passwd.o: ../templates/patterns.h ../templates/locale.h
 passwd.o: ../templates/localefilter.h ../../ezc/src/ezc.h
-passwd.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
-passwd.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h
-passwd.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h
-passwd.o: default.h download.h emacs.h env.h last.h login.h logout.h ln.h
-passwd.o: ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h priv.h reload.h
-passwd.o: rm.h run.h sort.h specialdefault.h stat.h subject.h template.h
-passwd.o: tinymce.h uname.h upload.h uptime.h who.h vim.h
-passwd.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h
+passwd.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
+passwd.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h
+passwd.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h
+passwd.o: env.h last.h login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h
+passwd.o: nicedit.h node.h priv.h reload.h rm.h run.h sort.h specialdefault.h
+passwd.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h
+passwd.o: who.h vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h
 passwd.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
 passwd.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
 passwd.o: ../core/lastcontainer.h ../templates/misc.h
@@ -796,10 +769,9 @@ passwd.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
 passwd.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
 passwd.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h
 passwd.o: ../core/slog.h ../functions/functions.h
-priv.o: priv.h functionbase.h ../core/item.h ../core/confparser.h ../db/db.h
-priv.o: ../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 ../core/confparser.h
+priv.o: priv.h functionbase.h ../core/item.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: ../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
@@ -810,37 +782,36 @@ priv.o: mount.h ../templates/locale.h ../core/request.h ../core/config.h
 priv.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
 priv.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h
 priv.o: ../templates/locale.h ../templates/localefilter.h ../../ezc/src/ezc.h
-priv.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
-priv.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h
-priv.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h
-priv.o: default.h download.h emacs.h env.h last.h login.h logout.h ln.h ls.h
-priv.o: man.h meta.h mkdir.h mv.h nicedit.h node.h passwd.h reload.h rm.h
-priv.o: run.h sort.h specialdefault.h stat.h subject.h template.h tinymce.h
-priv.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h
-priv.o: ../../ezc/src/stringconv.h ../notify/notifythread.h
-priv.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
-priv.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
-priv.o: ../templates/misc.h ../templates/htmltextstream.h ../core/mounts.h
-priv.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
-priv.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
-priv.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h
+priv.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
+priv.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h
+priv.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h last.h
+priv.o: login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h
+priv.o: passwd.h reload.h rm.h run.h sort.h specialdefault.h stat.h subject.h
+priv.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h
+priv.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h
+priv.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
+priv.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
+priv.o: ../core/lastcontainer.h ../templates/misc.h
+priv.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.h
+priv.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
+priv.o: ../core/loadavg.h ../core/image.h ../core/basethread.h
+priv.o: ../core/threadmanager.h ../core/synchro.h
 privchanger.o: privchanger.h ../core/request.h ../core/system.h
 privchanger.o: ../core/dirs.h ../core/item.h ../core/dircontainer.h
 privchanger.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
 privchanger.o: ../core/textstream.h ../core/misc.h ../core/requesttypes.h
-privchanger.o: ../core/confparser.h ../core/error.h ../core/confparser.h
-privchanger.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
-privchanger.o: ../core/user.h ../core/group.h ../core/dircontainer.h
-privchanger.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h
-privchanger.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
-privchanger.o: ../core/request.h ../core/error.h ../core/config.h
-privchanger.o: ../core/htmlfilter.h ../templates/htmltextstream.h
-privchanger.o: ../core/session.h ../core/user.h ../core/plugindata.h
-privchanger.o: ../core/rebus.h mount.h functionbase.h ../core/config.h
-privchanger.o: ../core/synchro.h ../notify/notify.h ../notify/notifypool.h
-privchanger.o: ../templates/locale.h ../templates/patterns.h
-privchanger.o: ../templates/locale.h ../templates/localefilter.h
-privchanger.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h
+privchanger.o: ../core/error.h ../db/dbitemquery.h ../core/item.h
+privchanger.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
+privchanger.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
+privchanger.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
+privchanger.o: ../core/cur.h ../core/request.h ../core/error.h
+privchanger.o: ../core/config.h ../core/htmlfilter.h
+privchanger.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h
+privchanger.o: ../core/plugindata.h ../core/rebus.h mount.h functionbase.h
+privchanger.o: ../core/config.h ../core/synchro.h ../notify/notify.h
+privchanger.o: ../notify/notifypool.h ../templates/locale.h
+privchanger.o: ../templates/patterns.h ../templates/locale.h
+privchanger.o: ../templates/localefilter.h ../../ezc/src/ezc.h
 privchanger.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
 privchanger.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h chown.h
 privchanger.o: ckeditor.h cp.h default.h download.h emacs.h env.h last.h
@@ -857,29 +828,28 @@ privchanger.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h
 privchanger.o: ../core/users.h ../core/groups.h ../core/group.h
 privchanger.o: ../core/loadavg.h ../core/image.h ../core/basethread.h
 privchanger.o: ../core/threadmanager.h
-reload.o: reload.h functionbase.h ../core/item.h ../core/confparser.h
-reload.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-reload.o: ../core/textstream.h ../core/misc.h ../core/item.h
-reload.o: ../core/requesttypes.h ../core/error.h ../core/confparser.h
-reload.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
-reload.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
-reload.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
-reload.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
-reload.o: ../core/config.h ../core/htmlfilter.h ../templates/htmltextstream.h
+reload.o: reload.h functionbase.h ../core/item.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 ../db/dbitemquery.h ../db/dbitemcolumns.h
+reload.o: ../core/user.h ../core/group.h ../core/dircontainer.h
+reload.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h
+reload.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
+reload.o: ../core/request.h ../core/error.h ../core/config.h
+reload.o: ../core/htmlfilter.h ../templates/htmltextstream.h
 reload.o: ../core/session.h ../core/user.h ../core/plugindata.h
 reload.o: ../core/rebus.h mount.h ../templates/locale.h ../core/request.h
 reload.o: ../core/config.h ../core/system.h ../core/dirs.h
 reload.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h
 reload.o: ../templates/patterns.h ../templates/locale.h
 reload.o: ../templates/localefilter.h ../../ezc/src/ezc.h
-reload.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
-reload.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h
-reload.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h
-reload.o: default.h download.h emacs.h env.h last.h login.h logout.h ln.h
-reload.o: ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h
-reload.o: rm.h run.h sort.h specialdefault.h stat.h subject.h template.h
-reload.o: tinymce.h uname.h upload.h uptime.h who.h vim.h
-reload.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h
+reload.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
+reload.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h
+reload.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h
+reload.o: env.h last.h login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h
+reload.o: nicedit.h node.h passwd.h priv.h rm.h run.h sort.h specialdefault.h
+reload.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h
+reload.o: who.h vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h
 reload.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
 reload.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
 reload.o: ../core/lastcontainer.h ../templates/misc.h
@@ -890,20 +860,19 @@ reload.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h
 reload.o: ../templates/templates.h ../templates/patterncacher.h
 reload.o: ../templates/indexpatterns.h ../templates/patterns.h
 reload.o: ../templates/changepatterns.h ../core/sessionmanager.h
-rm.o: rm.h functionbase.h ../core/item.h ../core/confparser.h ../db/db.h
-rm.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
-rm.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h
-rm.o: ../core/confparser.h ../db/dbitemquery.h ../db/dbitemcolumns.h
-rm.o: ../core/user.h ../core/group.h ../core/dircontainer.h
-rm.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h
-rm.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
-rm.o: ../core/request.h ../core/error.h ../core/config.h ../core/htmlfilter.h
-rm.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h
-rm.o: ../core/plugindata.h ../core/rebus.h mount.h ../templates/locale.h
-rm.o: ../core/request.h ../core/config.h ../core/system.h ../core/dirs.h
-rm.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h
-rm.o: ../templates/patterns.h ../templates/locale.h
-rm.o: ../templates/localefilter.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
+rm.o: rm.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
+rm.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h ../core/misc.h
+rm.o: ../core/item.h ../core/requesttypes.h ../core/error.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/dirs.h ../core/dircontainer.h
+rm.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h
+rm.o: ../templates/locale.h ../templates/localefilter.h ../../ezc/src/ezc.h
 rm.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
 rm.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h
 rm.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h last.h
@@ -923,10 +892,9 @@ rm.o: ../core/sessioncontainer.h ../functions/functions.h
 rm.o: ../templates/templates.h ../templates/patterncacher.h
 rm.o: ../templates/indexpatterns.h ../templates/patterns.h
 rm.o: ../templates/changepatterns.h ../core/sessionmanager.h ../core/misc.h
-run.o: run.h functionbase.h ../core/item.h ../core/confparser.h ../db/db.h
-run.o: ../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 ../core/confparser.h
+run.o: run.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
+run.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
+run.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.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
@@ -937,13 +905,13 @@ run.o: mount.h ../templates/locale.h ../core/request.h ../core/config.h
 run.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
 run.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h
 run.o: ../templates/locale.h ../templates/localefilter.h ../../ezc/src/ezc.h
-run.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h
-run.o: functions.h functionparser.h ../core/cur.h adduser.h cat.h chmod.h
-run.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h
-run.o: env.h last.h login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h
-run.o: nicedit.h node.h passwd.h priv.h reload.h rm.h sort.h specialdefault.h
-run.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h who.h
-run.o: vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h
+run.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
+run.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h
+run.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h last.h
+run.o: login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h
+run.o: passwd.h priv.h reload.h rm.h sort.h specialdefault.h stat.h subject.h
+run.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h
+run.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h
 run.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
 run.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
 run.o: ../core/lastcontainer.h ../templates/misc.h
@@ -951,10 +919,9 @@ run.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.h
 run.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
 run.o: ../core/loadavg.h ../core/image.h ../core/basethread.h
 run.o: ../core/threadmanager.h ../core/synchro.h
-sort.o: sort.h functionbase.h ../core/item.h ../core/confparser.h ../db/db.h
-sort.o: ../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 ../core/confparser.h
+sort.o: sort.h functionbase.h ../core/item.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: ../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
@@ -965,31 +932,29 @@ sort.o: mount.h ../templates/locale.h ../core/request.h ../core/config.h
 sort.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
 sort.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h
 sort.o: ../templates/locale.h ../templates/localefilter.h ../../ezc/src/ezc.h
-sort.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
-sort.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h
-sort.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h
-sort.o: default.h download.h emacs.h env.h last.h login.h logout.h ln.h ls.h
-sort.o: man.h meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h reload.h
-sort.o: rm.h run.h specialdefault.h stat.h subject.h template.h tinymce.h
-sort.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h
-sort.o: ../../ezc/src/stringconv.h ../notify/notifythread.h
-sort.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
-sort.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
-sort.o: ../templates/misc.h ../templates/htmltextstream.h ../core/mounts.h
-sort.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
-sort.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
-sort.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h
-sort.o: ../core/plugin.h ../core/pluginmsg.h ../core/system.h
-sort.o: ../core/sessionmanager.h ../core/sessioncontainer.h
-sort.o: ../functions/functions.h ../templates/templates.h
-sort.o: ../templates/patterncacher.h ../templates/indexpatterns.h
-sort.o: ../templates/patterns.h ../templates/changepatterns.h
-sort.o: ../core/sessionmanager.h
-specialdefault.o: specialdefault.h functionbase.h ../core/item.h
-specialdefault.o: ../core/confparser.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 ../core/confparser.h ../db/dbitemquery.h
+sort.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
+sort.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h
+sort.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h last.h
+sort.o: login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h
+sort.o: passwd.h priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h
+sort.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h
+sort.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h
+sort.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
+sort.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
+sort.o: ../core/lastcontainer.h ../templates/misc.h
+sort.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.h
+sort.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
+sort.o: ../core/loadavg.h ../core/image.h ../core/basethread.h
+sort.o: ../core/threadmanager.h ../core/synchro.h ../core/plugin.h
+sort.o: ../core/pluginmsg.h ../core/system.h ../core/sessionmanager.h
+sort.o: ../core/sessioncontainer.h ../functions/functions.h
+sort.o: ../templates/templates.h ../templates/patterncacher.h
+sort.o: ../templates/indexpatterns.h ../templates/patterns.h
+sort.o: ../templates/changepatterns.h ../core/sessionmanager.h
+specialdefault.o: specialdefault.h functionbase.h ../core/item.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 ../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
@@ -1002,27 +967,26 @@ specialdefault.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
 specialdefault.o: ../notify/notify.h ../notify/notifypool.h
 specialdefault.o: ../templates/patterns.h ../templates/locale.h
 specialdefault.o: ../templates/localefilter.h ../../ezc/src/ezc.h
-specialdefault.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
-specialdefault.o: ../../ezc/src/pattern.h functions.h functionparser.h
-specialdefault.o: ../core/cur.h adduser.h cat.h chmod.h privchanger.h chown.h
-specialdefault.o: ckeditor.h cp.h default.h download.h emacs.h env.h last.h
-specialdefault.o: login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h
-specialdefault.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h sort.h
-specialdefault.o: stat.h subject.h template.h tinymce.h uname.h upload.h
-specialdefault.o: uptime.h who.h vim.h ../core/htmlfilter.h
-specialdefault.o: ../../ezc/src/stringconv.h ../notify/notifythread.h
-specialdefault.o: ../core/basethread.h ../core/synchro.h
-specialdefault.o: ../notify/templatesnotify.h ../core/users.h
-specialdefault.o: ../core/ugcontainer.h ../core/lastcontainer.h
-specialdefault.o: ../templates/misc.h ../templates/htmltextstream.h
-specialdefault.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h
-specialdefault.o: ../core/users.h ../core/groups.h ../core/group.h
-specialdefault.o: ../core/loadavg.h ../core/image.h ../core/basethread.h
+specialdefault.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
+specialdefault.o: functions.h functionparser.h ../core/cur.h adduser.h cat.h
+specialdefault.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h
+specialdefault.o: download.h emacs.h env.h last.h login.h logout.h ln.h ls.h
+specialdefault.o: man.h meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h
+specialdefault.o: reload.h rm.h run.h sort.h stat.h subject.h template.h
+specialdefault.o: tinymce.h uname.h upload.h uptime.h who.h vim.h
+specialdefault.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h
+specialdefault.o: ../notify/notifythread.h ../core/basethread.h
+specialdefault.o: ../core/synchro.h ../notify/templatesnotify.h
+specialdefault.o: ../core/users.h ../core/ugcontainer.h
+specialdefault.o: ../core/lastcontainer.h ../templates/misc.h
+specialdefault.o: ../templates/htmltextstream.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/basethread.h
 specialdefault.o: ../core/threadmanager.h ../core/synchro.h
-stat.o: stat.h functionbase.h ../core/item.h ../core/confparser.h ../db/db.h
-stat.o: ../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 ../core/confparser.h
+stat.o: stat.h functionbase.h ../core/item.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: ../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
@@ -1033,66 +997,64 @@ stat.o: mount.h ../templates/locale.h ../core/request.h ../core/config.h
 stat.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
 stat.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h
 stat.o: ../templates/locale.h ../templates/localefilter.h ../../ezc/src/ezc.h
-stat.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
-stat.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h
-stat.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h
-stat.o: default.h download.h emacs.h env.h last.h login.h logout.h ln.h ls.h
-stat.o: man.h meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h reload.h
-stat.o: rm.h run.h sort.h specialdefault.h subject.h template.h tinymce.h
-stat.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h
-stat.o: ../../ezc/src/stringconv.h ../notify/notifythread.h
-stat.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
-stat.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
-stat.o: ../templates/misc.h ../templates/htmltextstream.h ../core/mounts.h
-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/basethread.h ../core/threadmanager.h ../core/synchro.h
-subject.o: subject.h functionbase.h ../core/item.h ../core/confparser.h
-subject.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-subject.o: ../core/textstream.h ../core/misc.h ../core/item.h
-subject.o: ../core/requesttypes.h ../core/error.h ../core/confparser.h
-subject.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
-subject.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
-subject.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
-subject.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
-subject.o: ../core/config.h ../core/htmlfilter.h
-subject.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h
-subject.o: ../core/plugindata.h ../core/rebus.h mount.h ../templates/locale.h
-subject.o: ../core/request.h ../core/config.h ../core/system.h ../core/dirs.h
+stat.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
+stat.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h
+stat.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h last.h
+stat.o: login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h
+stat.o: passwd.h priv.h reload.h rm.h run.h sort.h specialdefault.h subject.h
+stat.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h
+stat.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h
+stat.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
+stat.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
+stat.o: ../core/lastcontainer.h ../templates/misc.h
+stat.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.h
+stat.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
+stat.o: ../core/loadavg.h ../core/image.h ../core/basethread.h
+stat.o: ../core/threadmanager.h ../core/synchro.h
+subject.o: subject.h functionbase.h ../core/item.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 ../db/dbitemquery.h ../db/dbitemcolumns.h
+subject.o: ../core/user.h ../core/group.h ../core/dircontainer.h
+subject.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h
+subject.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
+subject.o: ../core/request.h ../core/error.h ../core/config.h
+subject.o: ../core/htmlfilter.h ../templates/htmltextstream.h
+subject.o: ../core/session.h ../core/user.h ../core/plugindata.h
+subject.o: ../core/rebus.h mount.h ../templates/locale.h ../core/request.h
+subject.o: ../core/config.h ../core/system.h ../core/dirs.h
 subject.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h
 subject.o: ../templates/patterns.h ../templates/locale.h
 subject.o: ../templates/localefilter.h ../../ezc/src/ezc.h
-subject.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
-subject.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h
-subject.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h
-subject.o: default.h download.h emacs.h env.h last.h login.h logout.h ln.h
-subject.o: ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h
-subject.o: reload.h rm.h run.h sort.h specialdefault.h stat.h template.h
-subject.o: tinymce.h uname.h upload.h uptime.h who.h vim.h
-subject.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h
-subject.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
-subject.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
-subject.o: ../core/lastcontainer.h ../templates/misc.h
-subject.o: ../templates/htmltextstream.h ../core/mounts.h
+subject.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
+subject.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h
+subject.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h
+subject.o: env.h last.h login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h
+subject.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h sort.h
+subject.o: specialdefault.h stat.h template.h tinymce.h uname.h upload.h
+subject.o: uptime.h who.h vim.h ../core/htmlfilter.h
+subject.o: ../../ezc/src/stringconv.h ../notify/notifythread.h
+subject.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
+subject.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
+subject.o: ../templates/misc.h ../templates/htmltextstream.h ../core/mounts.h
 subject.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
 subject.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
 subject.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h
-template.o: template.h functionbase.h ../core/item.h ../core/confparser.h
-template.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+template.o: template.h functionbase.h ../core/item.h ../db/db.h
+template.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
 template.o: ../core/textstream.h ../core/misc.h ../core/item.h
-template.o: ../core/requesttypes.h ../core/error.h ../core/confparser.h
-template.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
-template.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
-template.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
-template.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
-template.o: ../core/config.h ../core/htmlfilter.h
-template.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h
-template.o: ../core/plugindata.h ../core/rebus.h mount.h
-template.o: ../templates/locale.h ../core/request.h ../core/config.h
-template.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
-template.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h
-template.o: ../templates/locale.h ../templates/localefilter.h
-template.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h
+template.o: ../core/requesttypes.h ../core/error.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
+template.o: ../core/cur.h ../core/request.h ../core/error.h ../core/config.h
+template.o: ../core/htmlfilter.h ../templates/htmltextstream.h
+template.o: ../core/session.h ../core/user.h ../core/plugindata.h
+template.o: ../core/rebus.h mount.h ../templates/locale.h ../core/request.h
+template.o: ../core/config.h ../core/system.h ../core/dirs.h
+template.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h
+template.o: ../templates/patterns.h ../templates/locale.h
+template.o: ../templates/localefilter.h ../../ezc/src/ezc.h
 template.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
 template.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h
 template.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h
@@ -1109,40 +1071,38 @@ template.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
 template.o: ../core/groups.h ../core/group.h ../core/loadavg.h
 template.o: ../core/image.h ../core/basethread.h ../core/threadmanager.h
 template.o: ../core/synchro.h ../core/misc.h
-tinymce.o: tinymce.h functionbase.h ../core/item.h ../core/confparser.h
-tinymce.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-tinymce.o: ../core/textstream.h ../core/misc.h ../core/item.h
-tinymce.o: ../core/requesttypes.h ../core/error.h ../core/confparser.h
-tinymce.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
-tinymce.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
-tinymce.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
-tinymce.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
-tinymce.o: ../core/config.h ../core/htmlfilter.h
-tinymce.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h
-tinymce.o: ../core/plugindata.h ../core/rebus.h mount.h ../templates/locale.h
-tinymce.o: ../core/request.h ../core/config.h ../core/system.h ../core/dirs.h
+tinymce.o: tinymce.h functionbase.h ../core/item.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 ../db/dbitemquery.h ../db/dbitemcolumns.h
+tinymce.o: ../core/user.h ../core/group.h ../core/dircontainer.h
+tinymce.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h
+tinymce.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
+tinymce.o: ../core/request.h ../core/error.h ../core/config.h
+tinymce.o: ../core/htmlfilter.h ../templates/htmltextstream.h
+tinymce.o: ../core/session.h ../core/user.h ../core/plugindata.h
+tinymce.o: ../core/rebus.h mount.h ../templates/locale.h ../core/request.h
+tinymce.o: ../core/config.h ../core/system.h ../core/dirs.h
 tinymce.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h
 tinymce.o: ../templates/patterns.h ../templates/locale.h
 tinymce.o: ../templates/localefilter.h ../../ezc/src/ezc.h
-tinymce.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
-tinymce.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h
-tinymce.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h
-tinymce.o: default.h download.h emacs.h env.h last.h login.h logout.h ln.h
-tinymce.o: ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h
-tinymce.o: reload.h rm.h run.h sort.h specialdefault.h stat.h subject.h
-tinymce.o: template.h uname.h upload.h uptime.h who.h vim.h
-tinymce.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h
-tinymce.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
-tinymce.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
-tinymce.o: ../core/lastcontainer.h ../templates/misc.h
-tinymce.o: ../templates/htmltextstream.h ../core/mounts.h
+tinymce.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
+tinymce.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h
+tinymce.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h
+tinymce.o: env.h last.h login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h
+tinymce.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h sort.h
+tinymce.o: specialdefault.h stat.h subject.h template.h uname.h upload.h
+tinymce.o: uptime.h who.h vim.h ../core/htmlfilter.h
+tinymce.o: ../../ezc/src/stringconv.h ../notify/notifythread.h
+tinymce.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
+tinymce.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
+tinymce.o: ../templates/misc.h ../templates/htmltextstream.h ../core/mounts.h
 tinymce.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
 tinymce.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
 tinymce.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h
-uname.o: uname.h functionbase.h ../core/item.h ../core/confparser.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 ../core/confparser.h
+uname.o: uname.h functionbase.h ../core/item.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: ../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
@@ -1153,7 +1113,7 @@ uname.o: ../core/rebus.h mount.h ../templates/locale.h ../core/request.h
 uname.o: ../core/config.h ../core/system.h ../core/dirs.h
 uname.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h
 uname.o: ../templates/patterns.h ../templates/locale.h
-uname.o: ../templates/localefilter.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
+uname.o: ../templates/localefilter.h ../../ezc/src/ezc.h
 uname.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
 uname.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h
 uname.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h last.h
@@ -1168,33 +1128,32 @@ uname.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.h
 uname.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
 uname.o: ../core/loadavg.h ../core/image.h ../core/basethread.h
 uname.o: ../core/threadmanager.h ../core/synchro.h
-upload.o: upload.h functionbase.h ../core/item.h ../core/confparser.h
-upload.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-upload.o: ../core/textstream.h ../core/misc.h ../core/item.h
-upload.o: ../core/requesttypes.h ../core/error.h ../core/confparser.h
-upload.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
-upload.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
-upload.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
-upload.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
-upload.o: ../core/config.h ../core/htmlfilter.h ../templates/htmltextstream.h
+upload.o: upload.h functionbase.h ../core/item.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 ../db/dbitemquery.h ../db/dbitemcolumns.h
+upload.o: ../core/user.h ../core/group.h ../core/dircontainer.h
+upload.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h
+upload.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
+upload.o: ../core/request.h ../core/error.h ../core/config.h
+upload.o: ../core/htmlfilter.h ../templates/htmltextstream.h
 upload.o: ../core/session.h ../core/user.h ../core/plugindata.h
 upload.o: ../core/rebus.h mount.h ../templates/locale.h ../core/request.h
 upload.o: ../core/config.h ../core/system.h ../core/dirs.h
 upload.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h
 upload.o: ../templates/patterns.h ../templates/locale.h
 upload.o: ../templates/localefilter.h ../../ezc/src/ezc.h
-upload.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
-upload.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h
-upload.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h
-upload.o: default.h download.h emacs.h env.h last.h login.h logout.h ln.h
-upload.o: ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h
-upload.o: reload.h rm.h run.h sort.h specialdefault.h stat.h subject.h
-upload.o: template.h tinymce.h uname.h uptime.h who.h vim.h
-upload.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h
-upload.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
-upload.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
-upload.o: ../core/lastcontainer.h ../templates/misc.h
-upload.o: ../templates/htmltextstream.h ../core/mounts.h
+upload.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
+upload.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h
+upload.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h
+upload.o: env.h last.h login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h
+upload.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h sort.h
+upload.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h
+upload.o: uptime.h who.h vim.h ../core/htmlfilter.h
+upload.o: ../../ezc/src/stringconv.h ../notify/notifythread.h
+upload.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
+upload.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
+upload.o: ../templates/misc.h ../templates/htmltextstream.h ../core/mounts.h
 upload.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
 upload.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
 upload.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h
@@ -1204,40 +1163,38 @@ upload.o: ../core/sessioncontainer.h ../functions/functions.h
 upload.o: ../templates/templates.h ../templates/patterncacher.h
 upload.o: ../templates/indexpatterns.h ../templates/patterns.h
 upload.o: ../templates/changepatterns.h ../core/sessionmanager.h
-uptime.o: uptime.h functionbase.h ../core/item.h ../core/confparser.h
-uptime.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-uptime.o: ../core/textstream.h ../core/misc.h ../core/item.h
-uptime.o: ../core/requesttypes.h ../core/error.h ../core/confparser.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/textstream.h ../core/logmanipulators.h
-uptime.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
-uptime.o: ../core/config.h ../core/htmlfilter.h ../templates/htmltextstream.h
+uptime.o: uptime.h functionbase.h ../core/item.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 ../db/dbitemquery.h ../db/dbitemcolumns.h
+uptime.o: ../core/user.h ../core/group.h ../core/dircontainer.h
+uptime.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h
+uptime.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
+uptime.o: ../core/request.h ../core/error.h ../core/config.h
+uptime.o: ../core/htmlfilter.h ../templates/htmltextstream.h
 uptime.o: ../core/session.h ../core/user.h ../core/plugindata.h
 uptime.o: ../core/rebus.h mount.h ../templates/locale.h ../core/request.h
 uptime.o: ../core/config.h ../core/system.h ../core/dirs.h
 uptime.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h
 uptime.o: ../templates/patterns.h ../templates/locale.h
 uptime.o: ../templates/localefilter.h ../../ezc/src/ezc.h
-uptime.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
-uptime.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h
-uptime.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h
-uptime.o: default.h download.h emacs.h env.h last.h login.h logout.h ln.h
-uptime.o: ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h
-uptime.o: reload.h rm.h run.h sort.h specialdefault.h stat.h subject.h
-uptime.o: template.h tinymce.h uname.h upload.h who.h vim.h
-uptime.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h
-uptime.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
-uptime.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
-uptime.o: ../core/lastcontainer.h ../templates/misc.h
-uptime.o: ../templates/htmltextstream.h ../core/mounts.h
+uptime.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
+uptime.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h
+uptime.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h
+uptime.o: env.h last.h login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h
+uptime.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h sort.h
+uptime.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h
+uptime.o: upload.h who.h vim.h ../core/htmlfilter.h
+uptime.o: ../../ezc/src/stringconv.h ../notify/notifythread.h
+uptime.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
+uptime.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
+uptime.o: ../templates/misc.h ../templates/htmltextstream.h ../core/mounts.h
 uptime.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
 uptime.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
 uptime.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h
-vim.o: vim.h functionbase.h ../core/item.h ../core/confparser.h ../db/db.h
-vim.o: ../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 ../core/confparser.h
+vim.o: vim.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
+vim.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
+vim.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.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
@@ -1248,24 +1205,23 @@ vim.o: mount.h ../templates/locale.h ../core/request.h ../core/config.h
 vim.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
 vim.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h
 vim.o: ../templates/locale.h ../templates/localefilter.h ../../ezc/src/ezc.h
-vim.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h
-vim.o: functions.h functionparser.h ../core/cur.h adduser.h cat.h chmod.h
-vim.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h
-vim.o: env.h last.h login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h
-vim.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h sort.h
-vim.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h
-vim.o: upload.h uptime.h who.h ../core/htmlfilter.h
-vim.o: ../../ezc/src/stringconv.h ../notify/notifythread.h
-vim.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
-vim.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
-vim.o: ../templates/misc.h ../templates/htmltextstream.h ../core/mounts.h
-vim.o: ../core/mountparser.h ../core/crypt.h ../core/users.h ../core/groups.h
-vim.o: ../core/group.h ../core/loadavg.h ../core/image.h ../core/basethread.h
+vim.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
+vim.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h
+vim.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h last.h
+vim.o: login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h
+vim.o: passwd.h priv.h reload.h rm.h run.h sort.h specialdefault.h stat.h
+vim.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h
+vim.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h
+vim.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
+vim.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
+vim.o: ../core/lastcontainer.h ../templates/misc.h
+vim.o: ../templates/htmltextstream.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/basethread.h
 vim.o: ../core/threadmanager.h ../core/synchro.h
-who.o: who.h functionbase.h ../core/item.h ../core/confparser.h ../db/db.h
-who.o: ../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 ../core/confparser.h
+who.o: who.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
+who.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
+who.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.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
@@ -1276,17 +1232,17 @@ who.o: mount.h ../templates/locale.h ../core/request.h ../core/config.h
 who.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
 who.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h
 who.o: ../templates/locale.h ../templates/localefilter.h ../../ezc/src/ezc.h
-who.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h
-who.o: functions.h functionparser.h ../core/cur.h adduser.h cat.h chmod.h
-who.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h
-who.o: env.h last.h login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h
-who.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h sort.h
-who.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h
-who.o: upload.h uptime.h vim.h ../core/htmlfilter.h
-who.o: ../../ezc/src/stringconv.h ../notify/notifythread.h
-who.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
-who.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
-who.o: ../templates/misc.h ../templates/htmltextstream.h ../core/mounts.h
-who.o: ../core/mountparser.h ../core/crypt.h ../core/users.h ../core/groups.h
-who.o: ../core/group.h ../core/loadavg.h ../core/image.h ../core/basethread.h
+who.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
+who.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h
+who.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h last.h
+who.o: login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h
+who.o: passwd.h priv.h reload.h rm.h run.h sort.h specialdefault.h stat.h
+who.o: subject.h template.h tinymce.h uname.h upload.h uptime.h vim.h
+who.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h
+who.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
+who.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
+who.o: ../core/lastcontainer.h ../templates/misc.h
+who.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.h
+who.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
+who.o: ../core/loadavg.h ../core/image.h ../core/basethread.h
 who.o: ../core/threadmanager.h ../core/synchro.h
diff --git a/functions/env.cpp b/functions/env.cpp
index 9df4399..6ede9f5 100755
--- a/functions/env.cpp
+++ b/functions/env.cpp
@@ -49,7 +49,7 @@ bool Env::Parse(const std::wstring & env_str)
 	conf_parser.UTF8(config->utf8);
 	conf_parser.SplitSingle(true);
 
-return (conf_parser.ParseString(env_str) == ConfParser::ok);
+return (conf_parser.ParseString(env_str) == PT::ConfParser::ok);
 }
 
 
diff --git a/functions/env.h b/functions/env.h
index 3286b2b..2fce0ec 100755
--- a/functions/env.h
+++ b/functions/env.h
@@ -11,7 +11,7 @@
 #define headerfile_winix_functions_env
 
 #include "functionbase.h"
-#include "core/confparser.h"
+#include "confparser/confparser.h"
 
 
 namespace Fun
@@ -36,8 +36,8 @@ public:
 
 private:
 
-	ConfParser conf_parser;
-	Space space;
+	PT::ConfParser conf_parser;
+	PT::Space space;
 	User * puser;
 	size_t req_id;
 
diff --git a/functions/functionbase.h b/functions/functionbase.h
index f842e94..8ffca0a 100755
--- a/functions/functionbase.h
+++ b/functions/functionbase.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.
  * 
  */
@@ -19,7 +19,7 @@
 #include "core/system.h"
 #include "core/synchro.h"
 #include "notify/notify.h"
-#include "utf8.h"
+
 
 
 class Functions;
diff --git a/functions/functionparser.cpp b/functions/functionparser.cpp
index 822acc5..ea50cc4 100755
--- a/functions/functionparser.cpp
+++ b/functions/functionparser.cpp
@@ -2,7 +2,7 @@
  * This file is a part of Winix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008-2011, Tomasz Sowa
+ * Copyright (c) 2008-2012, Tomasz Sowa
  * All rights reserved.
  * 
  */
@@ -12,7 +12,7 @@
 #include "core/item.h"
 #include "core/error.h"
 #include "functions.h"
-#include "utf8.h"
+#include "utf8/utf8.h"
 
 
 
@@ -330,7 +330,7 @@ void FunctionParser::ToWide(const std::string & src, std::wstring & dst)
 	dst.clear();
 
 	if( utf8 )
-		Ezc::UTF8ToWide(src, dst, false);
+		PT::UTF8ToWide(src, dst, false);
 	else
 		AssignString(src, dst, false);
 }
diff --git a/functions/login.cpp b/functions/login.cpp
index ee2bd9f..64090d2 100755
--- a/functions/login.cpp
+++ b/functions/login.cpp
@@ -2,13 +2,13 @@
  * This file is a part of Winix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008-2011, Tomasz Sowa
+ * Copyright (c) 2008-2012, Tomasz Sowa
  * All rights reserved.
  * 
  */
  
 #include "login.h"
-#include "utf8.h"
+#include "utf8/utf8.h"
 #include "core/plugin.h"
 
 
@@ -40,7 +40,7 @@ bool Login::CheckPasswords(const std::wstring & password)
 	{
 		if( system->crypt.RSA(false, config->pass_rsa_private_key, up.pass_encrypted, pass_decrypted) )
 		{
-			Ezc::UTF8ToWide(pass_decrypted, up.pass);
+			PT::UTF8ToWide(pass_decrypted, up.pass);
 		}
 		else
 		{
diff --git a/functions/meta.cpp b/functions/meta.cpp
index f1d218a..ac1a8ad 100755
--- a/functions/meta.cpp
+++ b/functions/meta.cpp
@@ -2,7 +2,7 @@
  * This file is a part of Winix
  * and is not publicly distributed
  * 
- * Copyright (c) 2011, Tomasz Sowa
+ * Copyright (c) 2011-2012, Tomasz Sowa
  * All rights reserved.
  * 
  */
@@ -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) == ConfParser::ok )
+	if( conf_parser.ParseString(meta_str) == PT::ConfParser::ok )
 	{
 		if( db->EditMetaById(space, item.id) == WINIX_ERR_OK )
 		{
diff --git a/functions/meta.h b/functions/meta.h
index 18be040..3ae8ca2 100755
--- a/functions/meta.h
+++ b/functions/meta.h
@@ -2,7 +2,7 @@
  * This file is a part of Winix
  * and is not publicly distributed
  * 
- * Copyright (c) 2011, Tomasz Sowa
+ * Copyright (c) 2011-2012, Tomasz Sowa
  * All rights reserved.
  * 
  */
@@ -11,7 +11,7 @@
 #define headerfile_winix_functions_meta
 
 #include "functionbase.h"
-#include "core/confparser.h"
+#include "confparser/confparser.h"
 
 
 namespace Fun
@@ -30,8 +30,8 @@ public:
 
 private:
 
-	ConfParser conf_parser;
-	Space space;
+	PT::ConfParser conf_parser;
+	PT::Space space;
 };
 
 
diff --git a/functions/upload.cpp b/functions/upload.cpp
index 7226ad9..704c170 100755
--- a/functions/upload.cpp
+++ b/functions/upload.cpp
@@ -2,7 +2,7 @@
  * This file is a part of Winix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008-2011, Tomasz Sowa
+ * Copyright (c) 2008-2012, Tomasz Sowa
  * All rights reserved.
  * 
  */
@@ -16,7 +16,7 @@
 #include "core/plugin.h"
 #include "functions/functions.h"
 #include "templates/templates.h"
-#include "utf8.h"
+#include "utf8/utf8.h"
 
 
 
diff --git a/main/Makefile.dep b/main/Makefile.dep
index 8e3dc28..86ec244 100755
--- a/main/Makefile.dep
+++ b/main/Makefile.dep
@@ -1,25 +1,25 @@
 # DO NOT DELETE
 
 main.o: ../core/log.h ../core/textstream.h ../core/misc.h ../core/item.h
-main.o: ../core/confparser.h ../core/requesttypes.h ../core/logmanipulators.h
-main.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
-main.o: ../core/config.h ../core/htmlfilter.h ../templates/htmltextstream.h
+main.o: ../core/requesttypes.h ../core/logmanipulators.h ../core/slog.h
+main.o: ../core/cur.h ../core/request.h ../core/error.h ../core/config.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/confparser.h ../core/slog.h
-main.o: ../core/app.h ../core/system.h ../core/dirs.h ../core/dircontainer.h
-main.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-main.o: ../core/error.h ../db/dbitemquery.h ../core/item.h
-main.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
-main.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
-main.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h
-main.o: ../templates/locale.h ../templates/localefilter.h ../../ezc/src/ezc.h
-main.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
-main.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h
-main.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h
-main.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
-main.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h
-main.o: ../core/ugcontainer.h ../core/lastcontainer.h ../templates/misc.h
+main.o: ../templates/locale.h ../core/slog.h ../core/app.h ../core/system.h
+main.o: ../core/dirs.h ../core/dircontainer.h ../db/db.h ../db/dbbase.h
+main.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
+main.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
+main.o: ../core/user.h ../core/group.h ../core/dircontainer.h
+main.o: ../core/ugcontainer.h ../core/log.h ../notify/notify.h
+main.o: ../notify/notifypool.h ../templates/patterns.h ../templates/locale.h
+main.o: ../templates/localefilter.h ../../ezc/src/ezc.h
+main.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
+main.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h
+main.o: ../../ezc/src/stringconv.h ../notify/notifythread.h
+main.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
+main.o: ../core/config.h ../core/users.h ../core/ugcontainer.h
+main.o: ../core/lastcontainer.h ../templates/misc.h
 main.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.h
 main.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h
 main.o: ../core/group.h ../core/loadavg.h ../core/image.h
diff --git a/notify/Makefile.dep b/notify/Makefile.dep
index b06b6fc..c7647b4 100755
--- a/notify/Makefile.dep
+++ b/notify/Makefile.dep
@@ -1,66 +1,63 @@
 # DO NOT DELETE
 
-notify.o: notify.h notifypool.h ../templates/locale.h ../core/confparser.h
-notify.o: ../templates/patterns.h ../templates/locale.h
-notify.o: ../templates/localefilter.h ../../ezc/src/ezc.h
-notify.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
+notify.o: notify.h notifypool.h ../templates/locale.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 ../templates/misc.h
-notify.o: ../templates/htmltextstream.h ../core/textstream.h
-notify.o: ../core/confparser.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 ../templates/misc.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/dirs.h ../core/dircontainer.h ../notify/notify.h
-notify.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h
-notify.o: ../core/run.h ../core/users.h ../core/groups.h ../core/group.h
-notify.o: ../core/loadavg.h ../core/image.h ../core/basethread.h
-notify.o: ../core/threadmanager.h ../core/sessionmanager.h
-notify.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
-notify.o: ../core/request.h ../core/dirs.h ../core/plugin.h
-notify.o: ../core/pluginmsg.h ../core/sessionmanager.h
-notify.o: ../functions/functions.h ../functions/functionbase.h
-notify.o: ../core/synchro.h ../functions/functionparser.h
-notify.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
-notify.o: ../functions/privchanger.h ../functions/chown.h
-notify.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h
-notify.o: ../functions/download.h ../functions/emacs.h ../functions/env.h
-notify.o: ../functions/last.h ../functions/login.h ../functions/logout.h
-notify.o: ../functions/ln.h ../functions/ls.h ../functions/man.h
-notify.o: ../functions/meta.h ../functions/mkdir.h ../functions/mv.h
-notify.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h
-notify.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h
-notify.o: ../functions/sort.h ../functions/specialdefault.h
+notify.o: ../templates/htmltextstream.h ../core/textstream.h notifythread.h
+notify.o: ../core/basethread.h ../core/synchro.h templatesnotify.h
+notify.o: ../core/config.h ../core/htmlfilter.h ../core/users.h
+notify.o: ../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/misc.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/dirs.h ../core/dircontainer.h
+notify.o: ../notify/notify.h ../core/mounts.h ../core/mountparser.h
+notify.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h
+notify.o: ../core/group.h ../core/loadavg.h ../core/image.h
+notify.o: ../core/basethread.h ../core/threadmanager.h
+notify.o: ../core/sessionmanager.h ../core/sessioncontainer.h
+notify.o: ../core/system.h ../core/htmlfilter.h ../core/request.h
+notify.o: ../core/dirs.h ../core/plugin.h ../core/pluginmsg.h
+notify.o: ../core/sessionmanager.h ../functions/functions.h
+notify.o: ../functions/functionbase.h ../core/synchro.h
+notify.o: ../functions/functionparser.h ../functions/adduser.h
+notify.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h
+notify.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h
+notify.o: ../functions/default.h ../functions/download.h ../functions/emacs.h
+notify.o: ../functions/env.h ../functions/last.h ../functions/login.h
+notify.o: ../functions/logout.h ../functions/ln.h ../functions/ls.h
+notify.o: ../functions/man.h ../functions/meta.h ../functions/mkdir.h
+notify.o: ../functions/mv.h ../functions/nicedit.h ../functions/node.h
+notify.o: ../functions/passwd.h ../functions/priv.h ../functions/reload.h
+notify.o: ../functions/rm.h ../functions/sort.h ../functions/specialdefault.h
 notify.o: ../functions/stat.h ../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 ../core/confparser.h
+notifypool.o: notifypool.h ../templates/locale.h
 notifythread.o: notifythread.h ../core/basethread.h ../core/synchro.h
-notifythread.o: templatesnotify.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
+notifythread.o: templatesnotify.h ../../ezc/src/ezc.h
 notifythread.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
 notifythread.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
 notifythread.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
 notifythread.o: ../core/textstream.h ../templates/misc.h
 notifythread.o: ../templates/localefilter.h ../templates/locale.h
-notifythread.o: ../templates/htmltextstream.h ../core/confparser.h
-notifythread.o: notifypool.h ../templates/locale.h ../core/confparser.h
-notifythread.o: ../core/config.h ../core/htmlfilter.h ../core/users.h
-notifythread.o: ../core/user.h ../core/ugcontainer.h ../core/log.h
-notifythread.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
-notifythread.o: ../core/cur.h ../core/request.h ../core/requesttypes.h
-notifythread.o: ../core/error.h ../core/config.h
+notifythread.o: ../templates/htmltextstream.h notifypool.h
+notifythread.o: ../templates/locale.h ../core/config.h ../core/htmlfilter.h
+notifythread.o: ../core/users.h ../core/user.h ../core/ugcontainer.h
+notifythread.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
+notifythread.o: ../core/slog.h ../core/cur.h ../core/request.h
+notifythread.o: ../core/requesttypes.h ../core/error.h ../core/config.h
 notifythread.o: ../templates/htmltextstream.h ../core/session.h
 notifythread.o: ../core/plugindata.h ../core/rebus.h ../core/mount.h
 notifythread.o: ../core/lastcontainer.h ../db/db.h ../db/dbbase.h
@@ -68,35 +65,35 @@ notifythread.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
 notifythread.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
 notifythread.o: ../core/user.h ../core/group.h ../core/dircontainer.h
 notifythread.o: ../core/ugcontainer.h ../templates/patterns.h
-templatesnotify.o: templatesnotify.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
+templatesnotify.o: templatesnotify.h ../../ezc/src/ezc.h
 templatesnotify.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
 templatesnotify.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
 templatesnotify.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
 templatesnotify.o: ../core/textstream.h ../templates/misc.h
 templatesnotify.o: ../templates/localefilter.h ../templates/locale.h
-templatesnotify.o: ../templates/htmltextstream.h ../core/confparser.h
-templatesnotify.o: notifypool.h ../templates/locale.h ../core/confparser.h
-templatesnotify.o: ../core/plugin.h ../core/pluginmsg.h ../core/log.h
-templatesnotify.o: ../core/textstream.h ../core/logmanipulators.h
-templatesnotify.o: ../core/slog.h ../core/cur.h ../core/request.h
-templatesnotify.o: ../core/requesttypes.h ../core/error.h ../core/config.h
-templatesnotify.o: ../templates/htmltextstream.h ../core/session.h
-templatesnotify.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
-templatesnotify.o: ../core/mount.h ../core/system.h ../core/sessionmanager.h
-templatesnotify.o: ../core/synchro.h ../functions/functions.h
-templatesnotify.o: ../functions/functionbase.h ../core/item.h ../db/db.h
-templatesnotify.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-templatesnotify.o: ../core/error.h ../db/dbitemquery.h ../db/dbitemcolumns.h
-templatesnotify.o: ../core/user.h ../core/group.h ../core/dircontainer.h
-templatesnotify.o: ../core/ugcontainer.h ../core/request.h ../core/config.h
-templatesnotify.o: ../core/htmlfilter.h ../core/system.h ../core/dirs.h
-templatesnotify.o: ../core/dircontainer.h ../notify/notify.h ../core/mounts.h
-templatesnotify.o: ../core/mountparser.h ../core/crypt.h ../core/run.h
-templatesnotify.o: ../core/users.h ../core/groups.h ../core/group.h
-templatesnotify.o: ../core/ugcontainer.h ../core/loadavg.h ../core/image.h
-templatesnotify.o: ../core/basethread.h ../core/threadmanager.h
-templatesnotify.o: ../core/synchro.h ../functions/functionparser.h
-templatesnotify.o: ../core/cur.h ../functions/adduser.h ../functions/cat.h
+templatesnotify.o: ../templates/htmltextstream.h notifypool.h
+templatesnotify.o: ../templates/locale.h ../core/plugin.h ../core/pluginmsg.h
+templatesnotify.o: ../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
+templatesnotify.o: ../core/config.h ../templates/htmltextstream.h
+templatesnotify.o: ../core/session.h ../core/user.h ../core/plugindata.h
+templatesnotify.o: ../core/rebus.h ../core/mount.h ../core/system.h
+templatesnotify.o: ../core/sessionmanager.h ../core/synchro.h
+templatesnotify.o: ../functions/functions.h ../functions/functionbase.h
+templatesnotify.o: ../core/item.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+templatesnotify.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h
+templatesnotify.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
+templatesnotify.o: ../core/dircontainer.h ../core/ugcontainer.h
+templatesnotify.o: ../core/request.h ../core/config.h ../core/htmlfilter.h
+templatesnotify.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
+templatesnotify.o: ../notify/notify.h ../core/mounts.h ../core/mountparser.h
+templatesnotify.o: ../core/crypt.h ../core/run.h ../core/users.h
+templatesnotify.o: ../core/groups.h ../core/group.h ../core/ugcontainer.h
+templatesnotify.o: ../core/loadavg.h ../core/image.h ../core/basethread.h
+templatesnotify.o: ../core/threadmanager.h ../core/synchro.h
+templatesnotify.o: ../functions/functionparser.h ../core/cur.h
+templatesnotify.o: ../functions/adduser.h ../functions/cat.h
 templatesnotify.o: ../functions/chmod.h ../functions/privchanger.h
 templatesnotify.o: ../functions/chown.h ../functions/ckeditor.h
 templatesnotify.o: ../functions/cp.h ../functions/default.h
diff --git a/notify/notifythread.cpp b/notify/notifythread.cpp
index 6cef6ba..d2a46b5 100755
--- a/notify/notifythread.cpp
+++ b/notify/notifythread.cpp
@@ -2,7 +2,7 @@
  * This file is a part of Winix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008-2011, Tomasz Sowa
+ * Copyright (c) 2008-2012, Tomasz Sowa
  * All rights reserved.
  * 
  */
@@ -197,7 +197,7 @@ void NotifyThread::SendMail(const std::wstring & email, const std::wstring & mes
 	}
 	
 	sendmail_command = "sendmail ";
-	Ezc::WideToUTF8(email, sendmail_command, false);
+	PT::WideToUTF8(email, sendmail_command, false);
 	FILE * sendmail = popen(sendmail_command.c_str(), "w");
 	
 	if( !sendmail )
@@ -227,7 +227,7 @@ size_t len;
 		}
 		else
 		{
-			len = Ezc::IntToUTF8(int(message[i]), buf, sizeof(buf) / sizeof(char));
+			len = PT::IntToUTF8(int(message[i]), buf, sizeof(buf) / sizeof(char));
 
 			for(size_t a=0 ; a<len ; ++a)
 				fputc(buf[a], sendmail);
diff --git a/plugins/export/Makefile.dep b/plugins/export/Makefile.dep
index 9632e26..6babb48 100755
--- a/plugins/export/Makefile.dep
+++ b/plugins/export/Makefile.dep
@@ -2,21 +2,20 @@
 
 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: ../../core/confparser.h ../../core/requesttypes.h ../../core/error.h
-edb.o: ../../core/confparser.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
-edb.o: ../../core/ugcontainer.h ../../core/log.h ../../core/textstream.h
-edb.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h
-edb.o: ../../core/request.h ../../core/error.h ../../core/config.h
-edb.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h
-edb.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h
-edb.o: ../../core/rebus.h ../../core/mount.h ../../templates/locale.h
-edb.o: ../../notify/notify.h ../../notify/notifypool.h
-edb.o: ../../templates/patterns.h ../../templates/locale.h
-edb.o: ../../templates/localefilter.h ../../../ezc/src/ezc.h
-edb.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h
+edb.o: ../../core/requesttypes.h ../../core/error.h export.h
+edb.o: ../../core/dirs.h ../../core/dircontainer.h ../../db/db.h
+edb.o: ../../db/dbbase.h ../../db/dbitemquery.h ../../core/item.h
+edb.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
+edb.o: ../../core/dircontainer.h ../../core/ugcontainer.h ../../core/log.h
+edb.o: ../../core/textstream.h ../../core/logmanipulators.h ../../core/slog.h
+edb.o: ../../core/cur.h ../../core/request.h ../../core/error.h
+edb.o: ../../core/config.h ../../core/htmlfilter.h
+edb.o: ../../templates/htmltextstream.h ../../core/session.h
+edb.o: ../../core/user.h ../../core/plugindata.h ../../core/rebus.h
+edb.o: ../../core/mount.h ../../templates/locale.h ../../notify/notify.h
+edb.o: ../../notify/notifypool.h ../../templates/patterns.h
+edb.o: ../../templates/locale.h ../../templates/localefilter.h
+edb.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
 edb.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h
 edb.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
 edb.o: ../../notify/notifythread.h ../../core/basethread.h
@@ -25,23 +24,22 @@ edb.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h
 edb.o: ../../core/lastcontainer.h ../../templates/misc.h
 edb.o: ../../templates/htmltextstream.h ../../core/log.h
 exportinfo.o: ../../core/log.h exportinfo.h ../../core/system.h
-exportinfo.o: ../../core/dirs.h ../../core/item.h ../../core/confparser.h
-exportinfo.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
-exportinfo.o: ../../db/dbitemquery.h ../../core/item.h
-exportinfo.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
-exportinfo.o: ../../core/dircontainer.h ../../core/ugcontainer.h
-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 ../../core/htmlfilter.h
+exportinfo.o: ../../core/dirs.h ../../core/item.h ../../core/dircontainer.h
+exportinfo.o: ../../db/db.h ../../db/dbbase.h ../../db/dbitemquery.h
+exportinfo.o: ../../core/item.h ../../db/dbitemcolumns.h ../../core/user.h
+exportinfo.o: ../../core/group.h ../../core/dircontainer.h
+exportinfo.o: ../../core/ugcontainer.h ../../core/log.h
+exportinfo.o: ../../core/textstream.h ../../core/logmanipulators.h
+exportinfo.o: ../../core/slog.h ../../core/cur.h ../../core/request.h
+exportinfo.o: ../../core/requesttypes.h ../../core/error.h
+exportinfo.o: ../../core/config.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
-exportinfo.o: ../../templates/locale.h ../../core/confparser.h
-exportinfo.o: ../../notify/notify.h ../../notify/notifypool.h
-exportinfo.o: ../../templates/patterns.h ../../templates/locale.h
-exportinfo.o: ../../templates/localefilter.h ../../../ezc/src/ezc.h
-exportinfo.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h
+exportinfo.o: ../../templates/locale.h ../../notify/notify.h
+exportinfo.o: ../../notify/notifypool.h ../../templates/patterns.h
+exportinfo.o: ../../templates/locale.h ../../templates/localefilter.h
+exportinfo.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
 exportinfo.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h
 exportinfo.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
 exportinfo.o: ../../notify/notifythread.h ../../core/basethread.h
@@ -57,25 +55,23 @@ 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 ../../core/confparser.h
-exportthread.o: ../../core/requesttypes.h ../../../ezc/src/utf8.h
+exportthread.o: ../../core/item.h ../../core/requesttypes.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/confparser.h
-init.o: ../../core/error.h ../../core/config.h ../../core/htmlfilter.h
+init.o: ../../core/requesttypes.h ../../core/item.h ../../core/error.h
+init.o: ../../core/config.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
-init.o: ../../templates/locale.h ../../core/confparser.h ../../core/system.h
-init.o: ../../core/dirs.h ../../core/dircontainer.h ../../db/db.h
-init.o: ../../db/dbbase.h ../../db/dbitemquery.h ../../core/item.h
-init.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
-init.o: ../../core/dircontainer.h ../../core/ugcontainer.h
-init.o: ../../notify/notify.h ../../notify/notifypool.h
-init.o: ../../templates/patterns.h ../../templates/locale.h
-init.o: ../../templates/localefilter.h ../../../ezc/src/ezc.h
-init.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h
+init.o: ../../templates/locale.h ../../core/system.h ../../core/dirs.h
+init.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
+init.o: ../../db/dbitemquery.h ../../core/item.h ../../db/dbitemcolumns.h
+init.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h
+init.o: ../../core/ugcontainer.h ../../notify/notify.h
+init.o: ../../notify/notifypool.h ../../templates/patterns.h
+init.o: ../../templates/locale.h ../../templates/localefilter.h
+init.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
 init.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h
 init.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
 init.o: ../../notify/notifythread.h ../../core/basethread.h
diff --git a/plugins/export/exportinfo.cpp b/plugins/export/exportinfo.cpp
index 77fd7f3..f285727 100755
--- a/plugins/export/exportinfo.cpp
+++ b/plugins/export/exportinfo.cpp
@@ -2,7 +2,7 @@
  * This file is a part of Winix
  * and is not publicly distributed
  * 
- * Copyright (c) 2011, Tomasz Sowa
+ * Copyright (c) 2011-2012, Tomasz Sowa
  * All rights reserved.
  * 
  */
@@ -85,13 +85,13 @@ bool ExportInfo::DecodePass(Export & exp)
 {
 	if( exp.ftp_pass_type == 0 )
 	{
-		Ezc::UTF8ToWide(exp.ftp_pass_bin, exp.ftp_pass);
+		PT::UTF8ToWide(exp.ftp_pass_bin, exp.ftp_pass);
 	}
 	else
 	{
 		if( system->crypt.RSA(false, rsa_key, exp.ftp_pass_bin, pass_decrypted) )
 		{
-			Ezc::UTF8ToWide(pass_decrypted, exp.ftp_pass);
+			PT::UTF8ToWide(pass_decrypted, exp.ftp_pass);
 			system->crypt.ClearString(pass_decrypted);
 		}
 		else
@@ -293,7 +293,7 @@ void ExportInfo::AdditionalExport(const Item & item)
 }
 
 
-void ExportInfo::AdditionalExport(const Item & item, Space & meta)
+void ExportInfo::AdditionalExport(const Item & item, PT::Space & meta)
 {
 	if( meta.ListText(L"additional_export", additional_export) )
 	{
diff --git a/plugins/export/exportinfo.h b/plugins/export/exportinfo.h
index b31f990..d7d4701 100755
--- a/plugins/export/exportinfo.h
+++ b/plugins/export/exportinfo.h
@@ -2,7 +2,7 @@
  * This file is a part of Winix
  * and is not publicly distributed
  * 
- * Copyright (c) 2011, Tomasz Sowa
+ * Copyright (c) 2011-2012, Tomasz Sowa
  * All rights reserved.
  * 
  */
@@ -74,7 +74,7 @@ private:
 	bool SkipDir(long dir_id, std::wstring & dir);
 
 	void AdditionalExport(const Item & item);
-	void AdditionalExport(const Item & item, Space & meta);
+	void AdditionalExport(const Item & item, PT::Space & meta);
 	void AdditionalExport(const std::wstring & path);
 
 	bool HasRecurrenceId(long id);
diff --git a/plugins/export/exportthread.cpp b/plugins/export/exportthread.cpp
index c699e36..6fd0944 100755
--- a/plugins/export/exportthread.cpp
+++ b/plugins/export/exportthread.cpp
@@ -2,7 +2,7 @@
  * This file is a part of Winix
  * and is not publicly distributed
  * 
- * Copyright (c) 2011, Tomasz Sowa
+ * Copyright (c) 2011-2012, Tomasz Sowa
  * All rights reserved.
  * 
  */
@@ -14,7 +14,7 @@
 #include "exportthread.h"
 #include "core/log.h"
 #include "core/misc.h"
-#include "utf8.h"
+#include "utf8/utf8.h"
 
 
 
@@ -247,7 +247,7 @@ void ExportThread::Convert(const std::wstring & in, std::string & out, bool clea
 	Lock();
 
 	if( utf8 )
-		Ezc::WideToUTF8(in, out, clear);
+		PT::WideToUTF8(in, out, clear);
 	else
 		AssignString(in, out, clear);
 
diff --git a/plugins/gallery/Makefile.dep b/plugins/gallery/Makefile.dep
index 983ba2d..80b84cd 100755
--- a/plugins/gallery/Makefile.dep
+++ b/plugins/gallery/Makefile.dep
@@ -1,13 +1,12 @@
 # DO NOT DELETE
 
 gallery.o: gallery.h ../../functions/functionbase.h ../../core/item.h
-gallery.o: ../../core/confparser.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 ../../core/confparser.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
+gallery.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h
+gallery.o: ../../db/dbtextstream.h ../../core/textstream.h ../../core/misc.h
+gallery.o: ../../core/item.h ../../core/requesttypes.h ../../core/error.h
+gallery.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h ../../core/user.h
+gallery.o: ../../core/group.h ../../core/dircontainer.h
+gallery.o: ../../core/ugcontainer.h ../../core/log.h ../../core/textstream.h
 gallery.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h
 gallery.o: ../../core/request.h ../../core/error.h ../../core/config.h
 gallery.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h
@@ -17,28 +16,26 @@ gallery.o: ../../core/request.h ../../core/config.h ../../core/system.h
 gallery.o: ../../core/dirs.h ../../core/dircontainer.h ../../notify/notify.h
 gallery.o: ../../notify/notifypool.h ../../templates/patterns.h
 gallery.o: ../../templates/locale.h ../../templates/localefilter.h
-gallery.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.h
-gallery.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h
-gallery.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
-gallery.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h
-gallery.o: ../../core/basethread.h ../../core/synchro.h
-gallery.o: ../../notify/templatesnotify.h ../../core/users.h
-gallery.o: ../../core/ugcontainer.h ../../core/lastcontainer.h
-gallery.o: ../../templates/misc.h ../../templates/htmltextstream.h
-gallery.o: ../../core/mounts.h ../../core/mountparser.h ../../core/crypt.h
-gallery.o: ../../core/run.h ../../core/users.h ../../core/groups.h
-gallery.o: ../../core/group.h ../../core/loadavg.h ../../core/image.h
-gallery.o: ../../core/basethread.h ../../core/threadmanager.h
-gallery.o: ../../core/synchro.h galleryinfo.h
-galleryinfo.o: galleryinfo.h ../../core/item.h ../../core/confparser.h
+gallery.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
+gallery.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h
+gallery.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
+gallery.o: ../../notify/notifythread.h ../../core/basethread.h
+gallery.o: ../../core/synchro.h ../../notify/templatesnotify.h
+gallery.o: ../../core/users.h ../../core/ugcontainer.h
+gallery.o: ../../core/lastcontainer.h ../../templates/misc.h
+gallery.o: ../../templates/htmltextstream.h ../../core/mounts.h
+gallery.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h
+gallery.o: ../../core/users.h ../../core/groups.h ../../core/group.h
+gallery.o: ../../core/loadavg.h ../../core/image.h ../../core/basethread.h
+gallery.o: ../../core/threadmanager.h ../../core/synchro.h galleryinfo.h
+galleryinfo.o: galleryinfo.h ../../core/item.h
 init.o: gallery.h ../../functions/functionbase.h ../../core/item.h
-init.o: ../../core/confparser.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 ../../core/confparser.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
+init.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h
+init.o: ../../db/dbtextstream.h ../../core/textstream.h ../../core/misc.h
+init.o: ../../core/item.h ../../core/requesttypes.h ../../core/error.h
+init.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h ../../core/user.h
+init.o: ../../core/group.h ../../core/dircontainer.h ../../core/ugcontainer.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/error.h ../../core/config.h ../../core/htmlfilter.h
 init.o: ../../templates/htmltextstream.h ../../core/session.h
@@ -48,24 +45,23 @@ init.o: ../../core/config.h ../../core/system.h ../../core/dirs.h
 init.o: ../../core/dircontainer.h ../../notify/notify.h
 init.o: ../../notify/notifypool.h ../../templates/patterns.h
 init.o: ../../templates/locale.h ../../templates/localefilter.h
-init.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.h
-init.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h
-init.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
-init.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h
-init.o: ../../core/basethread.h ../../core/synchro.h
-init.o: ../../notify/templatesnotify.h ../../core/users.h
-init.o: ../../core/ugcontainer.h ../../core/lastcontainer.h
-init.o: ../../templates/misc.h ../../templates/htmltextstream.h
-init.o: ../../core/mounts.h ../../core/mountparser.h ../../core/crypt.h
-init.o: ../../core/run.h ../../core/users.h ../../core/groups.h
-init.o: ../../core/group.h ../../core/loadavg.h ../../core/image.h
-init.o: ../../core/basethread.h ../../core/threadmanager.h
-init.o: ../../core/synchro.h galleryinfo.h ../../core/log.h
-init.o: ../../core/plugin.h ../../core/pluginmsg.h ../../core/system.h
-init.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h
-init.o: ../../functions/functions.h ../../functions/functionbase.h
-init.o: ../../functions/functionparser.h ../../core/cur.h
-init.o: ../../functions/adduser.h ../../functions/cat.h
+init.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
+init.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h
+init.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
+init.o: ../../notify/notifythread.h ../../core/basethread.h
+init.o: ../../core/synchro.h ../../notify/templatesnotify.h
+init.o: ../../core/users.h ../../core/ugcontainer.h
+init.o: ../../core/lastcontainer.h ../../templates/misc.h
+init.o: ../../templates/htmltextstream.h ../../core/mounts.h
+init.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h
+init.o: ../../core/users.h ../../core/groups.h ../../core/group.h
+init.o: ../../core/loadavg.h ../../core/image.h ../../core/basethread.h
+init.o: ../../core/threadmanager.h ../../core/synchro.h galleryinfo.h
+init.o: ../../core/log.h ../../core/plugin.h ../../core/pluginmsg.h
+init.o: ../../core/system.h ../../core/sessionmanager.h
+init.o: ../../core/sessioncontainer.h ../../functions/functions.h
+init.o: ../../functions/functionbase.h ../../functions/functionparser.h
+init.o: ../../core/cur.h ../../functions/adduser.h ../../functions/cat.h
 init.o: ../../functions/chmod.h ../../functions/privchanger.h
 init.o: ../../functions/chown.h ../../functions/ckeditor.h
 init.o: ../../functions/cp.h ../../functions/default.h
@@ -85,11 +81,10 @@ init.o: ../../templates/templates.h ../../templates/patterncacher.h
 init.o: ../../templates/indexpatterns.h ../../templates/patterns.h
 init.o: ../../templates/changepatterns.h ../../core/sessionmanager.h
 templates.o: gallery.h ../../functions/functionbase.h ../../core/item.h
-templates.o: ../../core/confparser.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: ../../core/confparser.h ../../db/dbitemquery.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/item.h ../../core/requesttypes.h
+templates.o: ../../core/error.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
@@ -103,23 +98,23 @@ templates.o: ../../core/dirs.h ../../core/dircontainer.h
 templates.o: ../../notify/notify.h ../../notify/notifypool.h
 templates.o: ../../templates/patterns.h ../../templates/locale.h
 templates.o: ../../templates/localefilter.h ../../../ezc/src/ezc.h
-templates.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h
-templates.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h
-templates.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
-templates.o: ../../notify/notifythread.h ../../core/basethread.h
-templates.o: ../../core/synchro.h ../../notify/templatesnotify.h
-templates.o: ../../core/users.h ../../core/ugcontainer.h
-templates.o: ../../core/lastcontainer.h ../../templates/misc.h
-templates.o: ../../templates/htmltextstream.h ../../core/mounts.h
-templates.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h
-templates.o: ../../core/users.h ../../core/groups.h ../../core/group.h
-templates.o: ../../core/loadavg.h ../../core/image.h ../../core/basethread.h
-templates.o: ../../core/threadmanager.h ../../core/synchro.h galleryinfo.h
-templates.o: ../../core/misc.h ../../core/plugin.h ../../core/pluginmsg.h
-templates.o: ../../core/system.h ../../core/sessionmanager.h
-templates.o: ../../core/sessioncontainer.h ../../functions/functions.h
-templates.o: ../../functions/functionbase.h ../../functions/functionparser.h
-templates.o: ../../core/cur.h ../../functions/adduser.h ../../functions/cat.h
+templates.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h
+templates.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
+templates.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h
+templates.o: ../../core/basethread.h ../../core/synchro.h
+templates.o: ../../notify/templatesnotify.h ../../core/users.h
+templates.o: ../../core/ugcontainer.h ../../core/lastcontainer.h
+templates.o: ../../templates/misc.h ../../templates/htmltextstream.h
+templates.o: ../../core/mounts.h ../../core/mountparser.h ../../core/crypt.h
+templates.o: ../../core/run.h ../../core/users.h ../../core/groups.h
+templates.o: ../../core/group.h ../../core/loadavg.h ../../core/image.h
+templates.o: ../../core/basethread.h ../../core/threadmanager.h
+templates.o: ../../core/synchro.h galleryinfo.h ../../core/misc.h
+templates.o: ../../core/plugin.h ../../core/pluginmsg.h ../../core/system.h
+templates.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h
+templates.o: ../../functions/functions.h ../../functions/functionbase.h
+templates.o: ../../functions/functionparser.h ../../core/cur.h
+templates.o: ../../functions/adduser.h ../../functions/cat.h
 templates.o: ../../functions/chmod.h ../../functions/privchanger.h
 templates.o: ../../functions/chown.h ../../functions/ckeditor.h
 templates.o: ../../functions/cp.h ../../functions/default.h
diff --git a/plugins/group/Makefile.dep b/plugins/group/Makefile.dep
index e771aa0..3ee3dfe 100755
--- a/plugins/group/Makefile.dep
+++ b/plugins/group/Makefile.dep
@@ -1,11 +1,10 @@
 # DO NOT DELETE
 
-groupinfo.o: groupinfo.h groups.h ../../core/confparser.h ../../core/item.h
-groupinfo.o: ../../core/confparser.h ../../core/system.h ../../core/dirs.h
-groupinfo.o: ../../core/item.h ../../core/dircontainer.h ../../db/db.h
-groupinfo.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h
-groupinfo.o: ../../core/textstream.h ../../core/misc.h
-groupinfo.o: ../../core/requesttypes.h ../../core/error.h
+groupinfo.o: groupinfo.h groups.h ../../core/item.h ../../core/system.h
+groupinfo.o: ../../core/dirs.h ../../core/item.h ../../core/dircontainer.h
+groupinfo.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h
+groupinfo.o: ../../db/dbtextstream.h ../../core/textstream.h
+groupinfo.o: ../../core/misc.h ../../core/requesttypes.h ../../core/error.h
 groupinfo.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h
 groupinfo.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h
 groupinfo.o: ../../core/ugcontainer.h ../../core/log.h
@@ -18,37 +17,36 @@ groupinfo.o: ../../core/mount.h ../../templates/locale.h
 groupinfo.o: ../../notify/notify.h ../../notify/notifypool.h
 groupinfo.o: ../../templates/patterns.h ../../templates/locale.h
 groupinfo.o: ../../templates/localefilter.h ../../../ezc/src/ezc.h
-groupinfo.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h
-groupinfo.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h
-groupinfo.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
-groupinfo.o: ../../notify/notifythread.h ../../core/basethread.h
-groupinfo.o: ../../core/synchro.h ../../notify/templatesnotify.h
-groupinfo.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h
+groupinfo.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h
+groupinfo.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
+groupinfo.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h
+groupinfo.o: ../../core/basethread.h ../../core/synchro.h
+groupinfo.o: ../../notify/templatesnotify.h ../../core/config.h
+groupinfo.o: ../../core/users.h ../../core/ugcontainer.h
 groupinfo.o: ../../core/lastcontainer.h ../../templates/misc.h
 groupinfo.o: ../../templates/htmltextstream.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/basethread.h ../../core/threadmanager.h
 groupinfo.o: ../../core/log.h
-groups.o: groups.h ../../core/confparser.h ../../core/log.h
+groups.o: groups.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 ../../core/confparser.h ../../core/htmlfilter.h
+init.o: ../../core/config.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
-init.o: ../../templates/locale.h ../../core/confparser.h ../../core/system.h
-init.o: ../../core/dirs.h ../../core/dircontainer.h ../../db/db.h
-init.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h
-init.o: ../../core/error.h ../../db/dbitemquery.h ../../core/item.h
-init.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
-init.o: ../../core/dircontainer.h ../../core/ugcontainer.h
-init.o: ../../notify/notify.h ../../notify/notifypool.h
-init.o: ../../templates/patterns.h ../../templates/locale.h
-init.o: ../../templates/localefilter.h ../../../ezc/src/ezc.h
-init.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h
+init.o: ../../templates/locale.h ../../core/system.h ../../core/dirs.h
+init.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
+init.o: ../../db/dbconn.h ../../db/dbtextstream.h ../../core/error.h
+init.o: ../../db/dbitemquery.h ../../core/item.h ../../db/dbitemcolumns.h
+init.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h
+init.o: ../../core/ugcontainer.h ../../notify/notify.h
+init.o: ../../notify/notifypool.h ../../templates/patterns.h
+init.o: ../../templates/locale.h ../../templates/localefilter.h
+init.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
 init.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h
 init.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
 init.o: ../../notify/notifythread.h ../../core/basethread.h
@@ -84,12 +82,11 @@ init.o: ../../templates/indexpatterns.h ../../templates/patterns.h
 init.o: ../../templates/changepatterns.h ../../core/sessionmanager.h
 init.o: groupinfo.h
 templates.o: ../../templates/templates.h ../../../ezc/src/ezc.h
-templates.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h
-templates.o: ../../../ezc/src/pattern.h ../../core/item.h
-templates.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
-templates.o: ../../../ezc/src/stringconv.h ../../core/misc.h
-templates.o: ../../core/requesttypes.h ../../templates/patterncacher.h
-templates.o: ../../core/item.h ../../core/confparser.h
+templates.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h
+templates.o: ../../core/item.h ../../../ezc/src/functions.h
+templates.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
+templates.o: ../../core/misc.h ../../core/requesttypes.h
+templates.o: ../../templates/patterncacher.h ../../core/item.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
@@ -97,15 +94,15 @@ templates.o: ../../core/config.h ../../core/cur.h ../../core/system.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: ../../core/confparser.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/error.h ../../core/config.h
-templates.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h
-templates.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h
-templates.o: ../../core/rebus.h ../../core/mount.h ../../templates/locale.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/error.h ../../core/config.h ../../core/htmlfilter.h
+templates.o: ../../templates/htmltextstream.h ../../core/session.h
+templates.o: ../../core/user.h ../../core/plugindata.h ../../core/rebus.h
+templates.o: ../../core/mount.h ../../templates/locale.h
 templates.o: ../../notify/notify.h ../../notify/notifypool.h
 templates.o: ../../templates/patterns.h ../../notify/notifythread.h
 templates.o: ../../core/basethread.h ../../core/synchro.h
diff --git a/plugins/group/groupinfo.cpp b/plugins/group/groupinfo.cpp
index b1f8bea..9c31917 100755
--- a/plugins/group/groupinfo.cpp
+++ b/plugins/group/groupinfo.cpp
@@ -2,7 +2,7 @@
  * This file is a part of Winix
  * and is not publicly distributed
  * 
- * Copyright (c) 2011, Tomasz Sowa
+ * Copyright (c) 2011-2012, Tomasz Sowa
  * All rights reserved.
  * 
  */
@@ -50,11 +50,11 @@ Groups * GroupInfo::FindGroups(long dir_id)
 bool GroupInfo::ParseGroups(const std::wstring & str, Groups & groups)
 {
 	groups.Clear();
-	Space & space = *groups.GetSpace();
+	PT::Space & space = *groups.GetSpace();
 	conf_parser.SetSpace(space);
 	conf_parser.UTF8(config->utf8);
 
-	if( conf_parser.ParseString(str) == ConfParser::ok )
+	if( conf_parser.ParseString(str) == PT::ConfParser::ok )
 	{
 		groups.Reindex();
 	}
@@ -65,7 +65,7 @@ bool GroupInfo::ParseGroups(const std::wstring & str, Groups & groups)
 		groups.Clear();
 	}
 
-return conf_parser.status == ConfParser::ok;
+return conf_parser.status == PT::ConfParser::ok;
 }
 
 
diff --git a/plugins/group/groupinfo.h b/plugins/group/groupinfo.h
index 16efb96..aa3a0c1 100755
--- a/plugins/group/groupinfo.h
+++ b/plugins/group/groupinfo.h
@@ -2,7 +2,7 @@
  * This file is a part of Winix
  * and is not publicly distributed
  * 
- * Copyright (c) 2011, Tomasz Sowa
+ * Copyright (c) 2011-2012, Tomasz Sowa
  * All rights reserved.
  * 
  */
@@ -13,7 +13,7 @@
 #include <string>
 #include <vector>
 #include "groups.h"
-#include "core/confparser.h"
+#include "confparser/confparser.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;
 
-	ConfParser conf_parser;
+	PT::ConfParser conf_parser;
 	std::vector<Item*> config_dir_tab;
 	Item config_file;
 
diff --git a/plugins/group/groups.cpp b/plugins/group/groups.cpp
index 44289e8..d99d3d7 100755
--- a/plugins/group/groups.cpp
+++ b/plugins/group/groups.cpp
@@ -2,7 +2,7 @@
  * This file is a part of Winix
  * and is not publicly distributed
  * 
- * Copyright (c) 2011, Tomasz Sowa
+ * Copyright (c) 2011-2012, Tomasz Sowa
  * All rights reserved.
  * 
  */
@@ -17,7 +17,7 @@ namespace GroupItem
 
 
 
-Space * Groups::GetSpace()
+PT::Space * Groups::GetSpace()
 {
 	return &space;
 }
@@ -50,20 +50,20 @@ void Groups::Reindex()
 }
 
 
-void Groups::ReindexGroups(GroupIndex & group_index, Space & set)
+void Groups::ReindexGroups(GroupIndex & group_index, PT::Space & set)
 {
 size_t i, v;
 
 	// loop through all groups in the set
 	for( i=0 ; i < set.spaces.size() ; ++i )
 	{
-		Space & group = *set.spaces[i];
+		PT::Space & group = *set.spaces[i];
 		const std::wstring & key = group.Text(L"key", L"value");
 
 		// loop through all values in the group
 		for(v=0 ; v<group.spaces.size() ; )
 		{
-			Space::Table::iterator vali = group.spaces[v]->table.find(key);
+			PT::Space::Table::iterator vali = group.spaces[v]->table.find(key);
 
 			if( vali != group.spaces[v]->table.end() && vali->second.size() == 1 )
 			{
@@ -93,7 +93,7 @@ size_t i, v;
 }
 
 
-void Groups::SortValues(Space & group)
+void Groups::SortValues(PT::Space & group)
 {
 	sort_by  = group.Text(L"sort_by");
 	sort_asc = (group.Text(L"sort_asc", L"true") == L"true");
@@ -106,7 +106,7 @@ void Groups::SortValues(Space & group)
 }
 
 
-bool Groups::SortFunHelper::operator()(Space * sp1, Space * sp2)
+bool Groups::SortFunHelper::operator()(PT::Space * sp1, PT::Space * sp2)
 {
 	const std::wstring & val1 = sp1->Text(groups->sort_by, L"");
 	const std::wstring & val2 = sp2->Text(groups->sort_by, L"");
@@ -157,11 +157,11 @@ const std::wstring & Groups::GetOption(size_t seti, size_t groupi, size_t valuei
 {
 	if( seti < space.spaces.size() )
 	{
-		Space & groups = *space.spaces[seti];
+		PT::Space & groups = *space.spaces[seti];
 
 		if( groupi < groups.spaces.size() )
 		{
-			Space & value = *groups.spaces[groupi];
+			PT::Space & value = *groups.spaces[groupi];
 
 			if( valuei < value.spaces.size() )
 				return value.spaces[valuei]->Text(option);
@@ -183,7 +183,7 @@ size_t Groups::Size(size_t seti, size_t groupi)
 {
 	if( seti < space.spaces.size() )
 	{
-		Space & groups = *space.spaces[seti];
+		PT::Space & groups = *space.spaces[seti];
 
 		if( groupi < groups.spaces.size() )
 			return groups.spaces[groupi]->spaces.size();
diff --git a/plugins/group/groups.h b/plugins/group/groups.h
index a5104a0..233fec9 100755
--- a/plugins/group/groups.h
+++ b/plugins/group/groups.h
@@ -2,7 +2,7 @@
  * This file is a part of Winix
  * and is not publicly distributed
  * 
- * Copyright (c) 2011, Tomasz Sowa
+ * Copyright (c) 2011-2012, Tomasz Sowa
  * All rights reserved.
  * 
  */
@@ -13,7 +13,7 @@
 #include <map>
 #include <vector>
 #include <string>
-#include "core/confparser.h"
+#include "confparser/confparser.h"
 
 
 
@@ -29,7 +29,7 @@ public:
 		reading all space
 		(sets and groups)
 	*/
-	Space * GetSpace();
+	PT::Space * GetSpace();
 
 
 	/*
@@ -82,7 +82,7 @@ private:
 		# sets should have a unique name
 		# groups don't have a name
 	*/
-	Space space;
+	PT::Space space;
 
 
 	/*
@@ -108,20 +108,20 @@ private:
 
 	std::wstring sort_by;
 	bool sort_asc;
-	Space::Value sort_value;
+	PT::Space::Value sort_value;
 
 	struct SortFunHelper
 	{
 		Groups * groups;
 		SortFunHelper(Groups * pgroups) : groups(pgroups) {};
 		size_t SortValue(const std::wstring & val);
-		bool operator()(Space * sp1, Space * sp2);
+		bool operator()(PT::Space * sp1, PT::Space * sp2);
 	};
 
 
 
-	void ReindexGroups(GroupIndex & group_index, Space & set);
-	void SortValues(Space & group);
+	void ReindexGroups(GroupIndex & group_index, PT::Space & set);
+	void SortValues(PT::Space & group);
 };
 
 }
diff --git a/plugins/menu/Makefile.dep b/plugins/menu/Makefile.dep
index 8401e78..590745b 100755
--- a/plugins/menu/Makefile.dep
+++ b/plugins/menu/Makefile.dep
@@ -1,23 +1,22 @@
 # DO NOT DELETE
 
 init.o: ../../core/log.h ../../core/textstream.h ../../core/misc.h
-init.o: ../../core/item.h ../../core/confparser.h ../../core/requesttypes.h
+init.o: ../../core/item.h ../../core/requesttypes.h
 init.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h
 init.o: ../../core/request.h ../../core/error.h ../../core/config.h
 init.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h
 init.o: ../../core/textstream.h ../../core/session.h ../../core/user.h
 init.o: ../../core/plugindata.h ../../core/rebus.h ../../core/mount.h
-init.o: ../../templates/locale.h ../../core/confparser.h ../../core/plugin.h
-init.o: ../../core/pluginmsg.h ../../core/log.h ../../core/system.h
-init.o: ../../core/dirs.h ../../core/dircontainer.h ../../db/db.h
-init.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h
-init.o: ../../core/error.h ../../db/dbitemquery.h ../../core/item.h
-init.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
-init.o: ../../core/dircontainer.h ../../core/ugcontainer.h
-init.o: ../../notify/notify.h ../../notify/notifypool.h
-init.o: ../../templates/patterns.h ../../templates/locale.h
-init.o: ../../templates/localefilter.h ../../../ezc/src/ezc.h
-init.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h
+init.o: ../../templates/locale.h ../../core/plugin.h ../../core/pluginmsg.h
+init.o: ../../core/log.h ../../core/system.h ../../core/dirs.h
+init.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
+init.o: ../../db/dbconn.h ../../db/dbtextstream.h ../../core/error.h
+init.o: ../../db/dbitemquery.h ../../core/item.h ../../db/dbitemcolumns.h
+init.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h
+init.o: ../../core/ugcontainer.h ../../notify/notify.h
+init.o: ../../notify/notifypool.h ../../templates/patterns.h
+init.o: ../../templates/locale.h ../../templates/localefilter.h
+init.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
 init.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h
 init.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
 init.o: ../../notify/notifythread.h ../../core/basethread.h
@@ -53,9 +52,8 @@ init.o: ../../templates/templates.h ../../templates/patterncacher.h
 init.o: ../../templates/indexpatterns.h ../../templates/patterns.h
 init.o: ../../templates/changepatterns.h ../../core/sessionmanager.h
 templates.o: ../../templates/templates.h ../../../ezc/src/ezc.h
-templates.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h
-templates.o: ../../../ezc/src/pattern.h ../../core/item.h
-templates.o: ../../core/confparser.h ../../../ezc/src/functions.h
+templates.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h
+templates.o: ../../core/item.h ../../../ezc/src/functions.h
 templates.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
 templates.o: ../../core/misc.h ../../core/requesttypes.h
 templates.o: ../../templates/patterncacher.h ../../core/item.h
@@ -66,15 +64,14 @@ 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 ../../core/confparser.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 ../../core/plugin.h
-templates.o: ../../core/pluginmsg.h ../../core/plugindata.h
-templates.o: ../../core/config.h ../../core/htmlfilter.h ../../core/request.h
-templates.o: ../../core/error.h ../../core/textstream.h
-templates.o: ../../templates/htmltextstream.h ../../core/system.h
-templates.o: ../../core/dirs.h ../../core/dircontainer.h
+templates.o: ../../core/error.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/plugin.h ../../core/pluginmsg.h
+templates.o: ../../core/plugindata.h ../../core/config.h
+templates.o: ../../core/htmlfilter.h ../../core/request.h ../../core/error.h
+templates.o: ../../core/textstream.h ../../templates/htmltextstream.h
+templates.o: ../../core/system.h ../../core/dirs.h ../../core/dircontainer.h
 templates.o: ../../notify/notify.h ../../notify/notifypool.h
 templates.o: ../../templates/locale.h ../../templates/patterns.h
 templates.o: ../../notify/notifythread.h ../../core/basethread.h
diff --git a/plugins/stats/Makefile.dep b/plugins/stats/Makefile.dep
index 7dcf06d..03dea43 100755
--- a/plugins/stats/Makefile.dep
+++ b/plugins/stats/Makefile.dep
@@ -2,14 +2,14 @@
 
 bot.o: bot.h
 init.o: ../../core/log.h ../../core/textstream.h ../../core/misc.h
-init.o: ../../core/item.h ../../core/confparser.h ../../core/requesttypes.h
+init.o: ../../core/item.h ../../core/requesttypes.h
 init.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h
 init.o: ../../core/request.h ../../core/error.h ../../core/config.h
 init.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h
 init.o: ../../core/textstream.h ../../core/session.h ../../core/user.h
 init.o: ../../core/plugindata.h ../../core/rebus.h ../../core/mount.h
-init.o: ../../templates/locale.h ../../core/confparser.h ../../core/request.h
-init.o: ../../core/config.h ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h
+init.o: ../../templates/locale.h ../../core/request.h ../../core/config.h
+init.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h
 init.o: ../../db/dbtextstream.h ../../core/error.h ../../db/dbitemquery.h
 init.o: ../../core/item.h ../../db/dbitemcolumns.h ../../core/user.h
 init.o: ../../core/group.h ../../core/dircontainer.h ../../core/ugcontainer.h
@@ -18,23 +18,22 @@ init.o: ../../core/pluginmsg.h ../../core/system.h ../../core/dirs.h
 init.o: ../../core/dircontainer.h ../../notify/notify.h
 init.o: ../../notify/notifypool.h ../../templates/patterns.h
 init.o: ../../templates/locale.h ../../templates/localefilter.h
-init.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.h
-init.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h
-init.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
-init.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h
-init.o: ../../core/basethread.h ../../core/synchro.h
-init.o: ../../notify/templatesnotify.h ../../core/users.h
-init.o: ../../core/ugcontainer.h ../../core/lastcontainer.h
-init.o: ../../templates/misc.h ../../templates/htmltextstream.h
-init.o: ../../core/mounts.h ../../core/mountparser.h ../../core/crypt.h
-init.o: ../../core/run.h ../../core/users.h ../../core/groups.h
-init.o: ../../core/group.h ../../core/loadavg.h ../../core/image.h
-init.o: ../../core/basethread.h ../../core/threadmanager.h
-init.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h
-init.o: ../../functions/functions.h ../../functions/functionbase.h
-init.o: ../../core/system.h ../../core/synchro.h
-init.o: ../../functions/functionparser.h ../../core/cur.h
-init.o: ../../functions/adduser.h ../../functions/cat.h
+init.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
+init.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h
+init.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
+init.o: ../../notify/notifythread.h ../../core/basethread.h
+init.o: ../../core/synchro.h ../../notify/templatesnotify.h
+init.o: ../../core/users.h ../../core/ugcontainer.h
+init.o: ../../core/lastcontainer.h ../../templates/misc.h
+init.o: ../../templates/htmltextstream.h ../../core/mounts.h
+init.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h
+init.o: ../../core/users.h ../../core/groups.h ../../core/group.h
+init.o: ../../core/loadavg.h ../../core/image.h ../../core/basethread.h
+init.o: ../../core/threadmanager.h ../../core/sessionmanager.h
+init.o: ../../core/sessioncontainer.h ../../functions/functions.h
+init.o: ../../functions/functionbase.h ../../core/system.h
+init.o: ../../core/synchro.h ../../functions/functionparser.h
+init.o: ../../core/cur.h ../../functions/adduser.h ../../functions/cat.h
 init.o: ../../functions/chmod.h ../../functions/privchanger.h
 init.o: ../../functions/chown.h ../../functions/ckeditor.h
 init.o: ../../functions/cp.h ../../functions/default.h
@@ -55,38 +54,37 @@ init.o: ../../templates/indexpatterns.h ../../templates/patterns.h
 init.o: ../../templates/changepatterns.h ../../core/sessionmanager.h
 init.o: 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 ../../core/confparser.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 ../../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: ../../core/confparser.h ../../../ezc/src/utf8.h
+stats.o: ../../core/misc.h ../../core/item.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: ../../core/htmlfilter.h ../../templates/htmltextstream.h
+stats.o: ../../core/textstream.h ../../core/session.h ../../core/user.h
+stats.o: ../../core/plugindata.h ../../core/rebus.h ../../core/mount.h
+stats.o: ../../templates/locale.h
 templates.o: templates.h ../../core/plugin.h ../../core/pluginmsg.h
 templates.o: ../../core/log.h ../../core/plugindata.h ../../core/config.h
-templates.o: ../../core/confparser.h ../../core/htmlfilter.h
-templates.o: ../../core/request.h ../../core/requesttypes.h ../../core/item.h
-templates.o: ../../core/error.h ../../core/textstream.h ../../core/misc.h
+templates.o: ../../core/htmlfilter.h ../../core/request.h
+templates.o: ../../core/requesttypes.h ../../core/item.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/dirs.h ../../core/dircontainer.h
 templates.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h
 templates.o: ../../db/dbtextstream.h ../../core/error.h
-templates.o: ../../core/confparser.h ../../db/dbitemquery.h ../../core/item.h
+templates.o: ../../db/dbitemquery.h ../../core/item.h
 templates.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
 templates.o: ../../core/dircontainer.h ../../core/ugcontainer.h
 templates.o: ../../notify/notify.h ../../notify/notifypool.h
 templates.o: ../../templates/locale.h ../../templates/patterns.h
 templates.o: ../../templates/locale.h ../../templates/localefilter.h
-templates.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.h
-templates.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h
-templates.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
-templates.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h
-templates.o: ../../core/basethread.h ../../core/synchro.h
-templates.o: ../../notify/templatesnotify.h ../../core/config.h
-templates.o: ../../core/users.h ../../core/user.h ../../core/ugcontainer.h
-templates.o: ../../core/lastcontainer.h ../../core/cur.h ../../core/session.h
-templates.o: ../../core/rebus.h ../../core/mount.h ../../templates/misc.h
+templates.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
+templates.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h
+templates.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
+templates.o: ../../notify/notifythread.h ../../core/basethread.h
+templates.o: ../../core/synchro.h ../../notify/templatesnotify.h
+templates.o: ../../core/config.h ../../core/users.h ../../core/user.h
+templates.o: ../../core/ugcontainer.h ../../core/lastcontainer.h
+templates.o: ../../core/cur.h ../../core/session.h ../../core/rebus.h
+templates.o: ../../core/mount.h ../../templates/misc.h
 templates.o: ../../templates/htmltextstream.h ../../core/mounts.h
 templates.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h
 templates.o: ../../core/users.h ../../core/groups.h ../../core/group.h
diff --git a/plugins/stats/stats.cpp b/plugins/stats/stats.cpp
index 2b5613b..a49885e 100755
--- a/plugins/stats/stats.cpp
+++ b/plugins/stats/stats.cpp
@@ -2,7 +2,7 @@
  * This file is a part of Winix
  * and is not publicly distributed
  * 
- * Copyright (c) 2010, Tomasz Sowa
+ * Copyright (c) 2010-2012, Tomasz Sowa
  * All rights reserved.
  * 
  */
@@ -10,7 +10,7 @@
 #include <ctime>
 #include "stats.h"
 #include "core/log.h"
-#include "utf8.h"
+#include "utf8/utf8.h"
 
 
 namespace Stats
@@ -67,7 +67,7 @@ void Stats::ReadStats()
 	if( stats_file.empty() )
 		return;
 	
-	Ezc::WideToUTF8(stats_file, astats_file);
+	PT::WideToUTF8(stats_file, astats_file);
 	std::ifstream file(astats_file.c_str());
 
 	if( !file )
@@ -118,7 +118,7 @@ void Stats::SaveStats()
 	if( stats_file.empty() )
 		return;
 	
-	Ezc::WideToUTF8(stats_file, astats_file);
+	PT::WideToUTF8(stats_file, astats_file);
 	std::ofstream file(astats_file.c_str());
 
 	if( !file )
diff --git a/plugins/thread/Makefile.dep b/plugins/thread/Makefile.dep
index 772bf8c..6f71f55 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 ../../core/confparser.h ../../db/db.h
-createthread.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h
+createthread.o: ../../core/item.h ../../db/db.h ../../db/dbbase.h
+createthread.o: ../../db/dbconn.h ../../db/dbtextstream.h
 createthread.o: ../../core/textstream.h ../../core/misc.h ../../core/item.h
 createthread.o: ../../core/requesttypes.h ../../core/error.h
-createthread.o: ../../core/confparser.h ../../db/dbitemquery.h
-createthread.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
+createthread.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h
+createthread.o: ../../core/user.h ../../core/group.h
 createthread.o: ../../core/dircontainer.h ../../core/ugcontainer.h
 createthread.o: ../../core/log.h ../../core/textstream.h
 createthread.o: ../../core/logmanipulators.h ../../core/slog.h
@@ -20,21 +20,20 @@ createthread.o: ../../core/dirs.h ../../core/dircontainer.h
 createthread.o: ../../notify/notify.h ../../notify/notifypool.h
 createthread.o: ../../templates/patterns.h ../../templates/locale.h
 createthread.o: ../../templates/localefilter.h ../../../ezc/src/ezc.h
-createthread.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h
-createthread.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h
-createthread.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
-createthread.o: ../../notify/notifythread.h ../../core/basethread.h
-createthread.o: ../../core/synchro.h ../../notify/templatesnotify.h
-createthread.o: ../../core/users.h ../../core/ugcontainer.h
-createthread.o: ../../core/lastcontainer.h ../../templates/misc.h
-createthread.o: ../../templates/htmltextstream.h ../../core/mounts.h
-createthread.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h
-createthread.o: ../../core/users.h ../../core/groups.h ../../core/group.h
-createthread.o: ../../core/loadavg.h ../../core/image.h
-createthread.o: ../../core/basethread.h ../../core/threadmanager.h
-createthread.o: ../../core/synchro.h tdb.h thread.h ../../db/dbbase.h
-createthread.o: threadinfo.h ../../functions/functions.h
-createthread.o: ../../functions/functionbase.h
+createthread.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h
+createthread.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
+createthread.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h
+createthread.o: ../../core/basethread.h ../../core/synchro.h
+createthread.o: ../../notify/templatesnotify.h ../../core/users.h
+createthread.o: ../../core/ugcontainer.h ../../core/lastcontainer.h
+createthread.o: ../../templates/misc.h ../../templates/htmltextstream.h
+createthread.o: ../../core/mounts.h ../../core/mountparser.h
+createthread.o: ../../core/crypt.h ../../core/run.h ../../core/users.h
+createthread.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h
+createthread.o: ../../core/image.h ../../core/basethread.h
+createthread.o: ../../core/threadmanager.h ../../core/synchro.h tdb.h
+createthread.o: thread.h ../../db/dbbase.h threadinfo.h
+createthread.o: ../../functions/functions.h ../../functions/functionbase.h
 createthread.o: ../../functions/functionparser.h ../../core/cur.h
 createthread.o: ../../functions/adduser.h ../../functions/cat.h
 createthread.o: ../../functions/chmod.h ../../functions/privchanger.h
@@ -57,10 +56,9 @@ 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: ../../core/confparser.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: ../../core/confparser.h ../../db/dbitemquery.h
+funthread.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h
+funthread.o: ../../db/dbtextstream.h ../../core/textstream.h
+funthread.o: ../../core/misc.h ../../core/error.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
@@ -74,25 +72,24 @@ funthread.o: ../../core/dirs.h ../../core/dircontainer.h
 funthread.o: ../../notify/notify.h ../../notify/notifypool.h
 funthread.o: ../../templates/patterns.h ../../templates/locale.h
 funthread.o: ../../templates/localefilter.h ../../../ezc/src/ezc.h
-funthread.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h
-funthread.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h
-funthread.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
-funthread.o: ../../notify/notifythread.h ../../core/basethread.h
-funthread.o: ../../core/synchro.h ../../notify/templatesnotify.h
-funthread.o: ../../core/users.h ../../core/ugcontainer.h
-funthread.o: ../../core/lastcontainer.h ../../templates/misc.h
-funthread.o: ../../templates/htmltextstream.h ../../core/mounts.h
-funthread.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h
-funthread.o: ../../core/users.h ../../core/groups.h ../../core/group.h
-funthread.o: ../../core/loadavg.h ../../core/image.h ../../core/basethread.h
-funthread.o: ../../core/threadmanager.h ../../core/synchro.h tdb.h thread.h
-funthread.o: ../../db/dbbase.h threadinfo.h
+funthread.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h
+funthread.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
+funthread.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h
+funthread.o: ../../core/basethread.h ../../core/synchro.h
+funthread.o: ../../notify/templatesnotify.h ../../core/users.h
+funthread.o: ../../core/ugcontainer.h ../../core/lastcontainer.h
+funthread.o: ../../templates/misc.h ../../templates/htmltextstream.h
+funthread.o: ../../core/mounts.h ../../core/mountparser.h ../../core/crypt.h
+funthread.o: ../../core/run.h ../../core/users.h ../../core/groups.h
+funthread.o: ../../core/group.h ../../core/loadavg.h ../../core/image.h
+funthread.o: ../../core/basethread.h ../../core/threadmanager.h
+funthread.o: ../../core/synchro.h tdb.h thread.h ../../db/dbbase.h
+funthread.o: 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: ../../core/confparser.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/confparser.h ../../db/dbitemquery.h
+init.o: ../../functions/functionbase.h ../../core/item.h ../../db/db.h
+init.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h
+init.o: ../../core/textstream.h ../../core/misc.h ../../core/item.h
+init.o: ../../core/requesttypes.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
@@ -105,24 +102,24 @@ init.o: ../../core/config.h ../../core/system.h ../../core/dirs.h
 init.o: ../../core/dircontainer.h ../../notify/notify.h
 init.o: ../../notify/notifypool.h ../../templates/patterns.h
 init.o: ../../templates/locale.h ../../templates/localefilter.h
-init.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.h
-init.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h
-init.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
-init.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h
-init.o: ../../core/basethread.h ../../core/synchro.h
-init.o: ../../notify/templatesnotify.h ../../core/users.h
-init.o: ../../core/ugcontainer.h ../../core/lastcontainer.h
-init.o: ../../templates/misc.h ../../templates/htmltextstream.h
-init.o: ../../core/mounts.h ../../core/mountparser.h ../../core/crypt.h
-init.o: ../../core/run.h ../../core/users.h ../../core/groups.h
-init.o: ../../core/group.h ../../core/loadavg.h ../../core/image.h
-init.o: ../../core/basethread.h ../../core/threadmanager.h
-init.o: ../../core/synchro.h threadinfo.h funthread.h createthread.h
-init.o: showthreads.h ../../core/log.h ../../core/plugin.h pluginmsg.h
-init.o: ../../core/system.h ../../core/sessionmanager.h
-init.o: ../../core/sessioncontainer.h ../../functions/functions.h
-init.o: ../../functions/functionbase.h ../../functions/functionparser.h
-init.o: ../../core/cur.h ../../functions/adduser.h ../../functions/cat.h
+init.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
+init.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h
+init.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
+init.o: ../../notify/notifythread.h ../../core/basethread.h
+init.o: ../../core/synchro.h ../../notify/templatesnotify.h
+init.o: ../../core/users.h ../../core/ugcontainer.h
+init.o: ../../core/lastcontainer.h ../../templates/misc.h
+init.o: ../../templates/htmltextstream.h ../../core/mounts.h
+init.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h
+init.o: ../../core/users.h ../../core/groups.h ../../core/group.h
+init.o: ../../core/loadavg.h ../../core/image.h ../../core/basethread.h
+init.o: ../../core/threadmanager.h ../../core/synchro.h threadinfo.h
+init.o: funthread.h createthread.h showthreads.h ../../core/log.h
+init.o: ../../core/plugin.h pluginmsg.h ../../core/system.h
+init.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h
+init.o: ../../functions/functions.h ../../functions/functionbase.h
+init.o: ../../functions/functionparser.h ../../core/cur.h
+init.o: ../../functions/adduser.h ../../functions/cat.h
 init.o: ../../functions/chmod.h ../../functions/privchanger.h
 init.o: ../../functions/chown.h ../../functions/ckeditor.h
 init.o: ../../functions/cp.h ../../functions/default.h
@@ -143,38 +140,36 @@ init.o: ../../templates/indexpatterns.h ../../templates/patterns.h
 init.o: ../../templates/changepatterns.h ../../core/sessionmanager.h
 init.o: templates.h
 reply.o: reply.h ../../functions/functionbase.h ../../core/item.h
-reply.o: ../../core/confparser.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 ../../core/confparser.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
-reply.o: ../../core/slog.h ../../core/cur.h ../../core/request.h
-reply.o: ../../core/error.h ../../core/config.h ../../core/htmlfilter.h
-reply.o: ../../templates/htmltextstream.h ../../core/session.h
-reply.o: ../../core/user.h ../../core/plugindata.h ../../core/rebus.h
-reply.o: ../../core/mount.h ../../templates/locale.h ../../core/request.h
-reply.o: ../../core/config.h ../../core/system.h ../../core/dirs.h
-reply.o: ../../core/dircontainer.h ../../notify/notify.h
+reply.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h
+reply.o: ../../db/dbtextstream.h ../../core/textstream.h ../../core/misc.h
+reply.o: ../../core/item.h ../../core/requesttypes.h ../../core/error.h
+reply.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h ../../core/user.h
+reply.o: ../../core/group.h ../../core/dircontainer.h
+reply.o: ../../core/ugcontainer.h ../../core/log.h ../../core/textstream.h
+reply.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h
+reply.o: ../../core/request.h ../../core/error.h ../../core/config.h
+reply.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h
+reply.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h
+reply.o: ../../core/rebus.h ../../core/mount.h ../../templates/locale.h
+reply.o: ../../core/request.h ../../core/config.h ../../core/system.h
+reply.o: ../../core/dirs.h ../../core/dircontainer.h ../../notify/notify.h
 reply.o: ../../notify/notifypool.h ../../templates/patterns.h
 reply.o: ../../templates/locale.h ../../templates/localefilter.h
-reply.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.h
-reply.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h
-reply.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
-reply.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h
-reply.o: ../../core/basethread.h ../../core/synchro.h
-reply.o: ../../notify/templatesnotify.h ../../core/users.h
-reply.o: ../../core/ugcontainer.h ../../core/lastcontainer.h
-reply.o: ../../templates/misc.h ../../templates/htmltextstream.h
-reply.o: ../../core/mounts.h ../../core/mountparser.h ../../core/crypt.h
-reply.o: ../../core/run.h ../../core/users.h ../../core/groups.h
-reply.o: ../../core/group.h ../../core/loadavg.h ../../core/image.h
-reply.o: ../../core/basethread.h ../../core/threadmanager.h
-reply.o: ../../core/synchro.h tdb.h thread.h ../../db/dbbase.h threadinfo.h
-reply.o: ../../functions/functions.h ../../functions/functionbase.h
-reply.o: ../../functions/functionparser.h ../../core/cur.h
-reply.o: ../../functions/adduser.h ../../functions/cat.h
+reply.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
+reply.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h
+reply.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
+reply.o: ../../notify/notifythread.h ../../core/basethread.h
+reply.o: ../../core/synchro.h ../../notify/templatesnotify.h
+reply.o: ../../core/users.h ../../core/ugcontainer.h
+reply.o: ../../core/lastcontainer.h ../../templates/misc.h
+reply.o: ../../templates/htmltextstream.h ../../core/mounts.h
+reply.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h
+reply.o: ../../core/users.h ../../core/groups.h ../../core/group.h
+reply.o: ../../core/loadavg.h ../../core/image.h ../../core/basethread.h
+reply.o: ../../core/threadmanager.h ../../core/synchro.h tdb.h thread.h
+reply.o: ../../db/dbbase.h threadinfo.h ../../functions/functions.h
+reply.o: ../../functions/functionbase.h ../../functions/functionparser.h
+reply.o: ../../core/cur.h ../../functions/adduser.h ../../functions/cat.h
 reply.o: ../../functions/chmod.h ../../functions/privchanger.h
 reply.o: ../../functions/chown.h ../../functions/ckeditor.h
 reply.o: ../../functions/cp.h ../../functions/default.h
@@ -197,11 +192,10 @@ reply.o: ../../templates/patterncacher.h ../../templates/indexpatterns.h
 reply.o: ../../templates/patterns.h ../../templates/changepatterns.h
 reply.o: ../../core/sessionmanager.h
 showthreads.o: showthreads.h ../../functions/functionbase.h ../../core/item.h
-showthreads.o: ../../core/confparser.h ../../db/db.h ../../db/dbbase.h
-showthreads.o: ../../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: ../../core/confparser.h ../../db/dbitemquery.h
+showthreads.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h
+showthreads.o: ../../db/dbtextstream.h ../../core/textstream.h
+showthreads.o: ../../core/misc.h ../../core/item.h ../../core/requesttypes.h
+showthreads.o: ../../core/error.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
@@ -216,45 +210,43 @@ showthreads.o: ../../core/dirs.h ../../core/dircontainer.h
 showthreads.o: ../../notify/notify.h ../../notify/notifypool.h
 showthreads.o: ../../templates/patterns.h ../../templates/locale.h
 showthreads.o: ../../templates/localefilter.h ../../../ezc/src/ezc.h
-showthreads.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h
-showthreads.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h
-showthreads.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
-showthreads.o: ../../notify/notifythread.h ../../core/basethread.h
-showthreads.o: ../../core/synchro.h ../../notify/templatesnotify.h
-showthreads.o: ../../core/users.h ../../core/ugcontainer.h
-showthreads.o: ../../core/lastcontainer.h ../../templates/misc.h
-showthreads.o: ../../templates/htmltextstream.h ../../core/mounts.h
-showthreads.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h
-showthreads.o: ../../core/users.h ../../core/groups.h ../../core/group.h
-showthreads.o: ../../core/loadavg.h ../../core/image.h
-showthreads.o: ../../core/basethread.h ../../core/threadmanager.h
-showthreads.o: ../../core/synchro.h tdb.h thread.h ../../db/dbbase.h
-showthreads.o: threadinfo.h
+showthreads.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h
+showthreads.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
+showthreads.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h
+showthreads.o: ../../core/basethread.h ../../core/synchro.h
+showthreads.o: ../../notify/templatesnotify.h ../../core/users.h
+showthreads.o: ../../core/ugcontainer.h ../../core/lastcontainer.h
+showthreads.o: ../../templates/misc.h ../../templates/htmltextstream.h
+showthreads.o: ../../core/mounts.h ../../core/mountparser.h
+showthreads.o: ../../core/crypt.h ../../core/run.h ../../core/users.h
+showthreads.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h
+showthreads.o: ../../core/image.h ../../core/basethread.h
+showthreads.o: ../../core/threadmanager.h ../../core/synchro.h tdb.h thread.h
+showthreads.o: ../../db/dbbase.h threadinfo.h
 tdb.o: tdb.h thread.h ../../db/dbbase.h ../../core/error.h ../../core/log.h
-templates.o: threadinfo.h ../../core/item.h ../../core/confparser.h
-templates.o: ../../core/system.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: ../../core/confparser.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/error.h ../../core/config.h
-templates.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h
-templates.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h
-templates.o: ../../core/rebus.h ../../core/mount.h ../../templates/locale.h
+templates.o: threadinfo.h ../../core/item.h ../../core/system.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: ../../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/error.h ../../core/config.h ../../core/htmlfilter.h
+templates.o: ../../templates/htmltextstream.h ../../core/session.h
+templates.o: ../../core/user.h ../../core/plugindata.h ../../core/rebus.h
+templates.o: ../../core/mount.h ../../templates/locale.h
 templates.o: ../../notify/notify.h ../../notify/notifypool.h
 templates.o: ../../templates/patterns.h ../../templates/locale.h
 templates.o: ../../templates/localefilter.h ../../../ezc/src/ezc.h
-templates.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h
-templates.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h
-templates.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
-templates.o: ../../notify/notifythread.h ../../core/basethread.h
-templates.o: ../../core/synchro.h ../../notify/templatesnotify.h
-templates.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h
+templates.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h
+templates.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
+templates.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h
+templates.o: ../../core/basethread.h ../../core/synchro.h
+templates.o: ../../notify/templatesnotify.h ../../core/config.h
+templates.o: ../../core/users.h ../../core/ugcontainer.h
 templates.o: ../../core/lastcontainer.h ../../templates/misc.h
 templates.o: ../../templates/htmltextstream.h ../../core/mounts.h
 templates.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h
@@ -289,30 +281,29 @@ 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: ../../core/sessionmanager.h
-threadinfo.o: threadinfo.h ../../core/item.h ../../core/confparser.h
-threadinfo.o: ../../core/system.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: ../../core/confparser.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
-threadinfo.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h
-threadinfo.o: ../../core/request.h ../../core/error.h ../../core/config.h
-threadinfo.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h
-threadinfo.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h
-threadinfo.o: ../../core/rebus.h ../../core/mount.h ../../templates/locale.h
+threadinfo.o: threadinfo.h ../../core/item.h ../../core/system.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: ../../db/dbitemquery.h ../../db/dbitemcolumns.h
+threadinfo.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h
+threadinfo.o: ../../core/ugcontainer.h ../../core/log.h
+threadinfo.o: ../../core/textstream.h ../../core/logmanipulators.h
+threadinfo.o: ../../core/slog.h ../../core/cur.h ../../core/request.h
+threadinfo.o: ../../core/error.h ../../core/config.h ../../core/htmlfilter.h
+threadinfo.o: ../../templates/htmltextstream.h ../../core/session.h
+threadinfo.o: ../../core/user.h ../../core/plugindata.h ../../core/rebus.h
+threadinfo.o: ../../core/mount.h ../../templates/locale.h
 threadinfo.o: ../../notify/notify.h ../../notify/notifypool.h
 threadinfo.o: ../../templates/patterns.h ../../templates/locale.h
 threadinfo.o: ../../templates/localefilter.h ../../../ezc/src/ezc.h
-threadinfo.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h
-threadinfo.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h
-threadinfo.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
-threadinfo.o: ../../notify/notifythread.h ../../core/basethread.h
-threadinfo.o: ../../core/synchro.h ../../notify/templatesnotify.h
-threadinfo.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h
+threadinfo.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h
+threadinfo.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
+threadinfo.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h
+threadinfo.o: ../../core/basethread.h ../../core/synchro.h
+threadinfo.o: ../../notify/templatesnotify.h ../../core/config.h
+threadinfo.o: ../../core/users.h ../../core/ugcontainer.h
 threadinfo.o: ../../core/lastcontainer.h ../../templates/misc.h
 threadinfo.o: ../../templates/htmltextstream.h ../../core/mounts.h
 threadinfo.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h
diff --git a/plugins/ticket/Makefile.dep b/plugins/ticket/Makefile.dep
index fe54a54..894cf03 100755
--- a/plugins/ticket/Makefile.dep
+++ b/plugins/ticket/Makefile.dep
@@ -3,8 +3,7 @@
 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: ../../core/confparser.h ../../core/requesttypes.h
-createticket.o: ../../core/error.h ../../core/confparser.h
+createticket.o: ../../core/requesttypes.h ../../core/error.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
@@ -21,20 +20,20 @@ createticket.o: ../../core/dirs.h ../../core/dircontainer.h
 createticket.o: ../../notify/notify.h ../../notify/notifypool.h
 createticket.o: ../../templates/patterns.h ../../templates/locale.h
 createticket.o: ../../templates/localefilter.h ../../../ezc/src/ezc.h
-createticket.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h
-createticket.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h
-createticket.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
-createticket.o: ../../notify/notifythread.h ../../core/basethread.h
-createticket.o: ../../core/synchro.h ../../notify/templatesnotify.h
-createticket.o: ../../core/users.h ../../core/ugcontainer.h
-createticket.o: ../../core/lastcontainer.h ../../templates/misc.h
-createticket.o: ../../templates/htmltextstream.h ../../core/mounts.h
-createticket.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h
-createticket.o: ../../core/users.h ../../core/groups.h ../../core/group.h
-createticket.o: ../../core/loadavg.h ../../core/image.h
-createticket.o: ../../core/basethread.h ../../core/threadmanager.h
-createticket.o: ../../core/synchro.h ticketinfo.h ticketparser.h ticketconf.h
-createticket.o: ../../functions/functions.h ../../functions/functionbase.h
+createticket.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h
+createticket.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
+createticket.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h
+createticket.o: ../../core/basethread.h ../../core/synchro.h
+createticket.o: ../../notify/templatesnotify.h ../../core/users.h
+createticket.o: ../../core/ugcontainer.h ../../core/lastcontainer.h
+createticket.o: ../../templates/misc.h ../../templates/htmltextstream.h
+createticket.o: ../../core/mounts.h ../../core/mountparser.h
+createticket.o: ../../core/crypt.h ../../core/run.h ../../core/users.h
+createticket.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h
+createticket.o: ../../core/image.h ../../core/basethread.h
+createticket.o: ../../core/threadmanager.h ../../core/synchro.h ticketinfo.h
+createticket.o: ticketparser.h ticketconf.h ../../functions/functions.h
+createticket.o: ../../functions/functionbase.h
 createticket.o: ../../functions/functionparser.h ../../core/cur.h
 createticket.o: ../../functions/adduser.h ../../functions/cat.h
 createticket.o: ../../functions/chmod.h ../../functions/privchanger.h
@@ -58,29 +57,28 @@ createticket.o: ../../functions/vim.h ../../core/htmlfilter.h sessiondata.h
 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 ../../core/confparser.h
-editticket.o: ../../core/requesttypes.h ../../core/error.h
-editticket.o: ../../core/confparser.h ticketinfo.h ticketparser.h
-editticket.o: ticketconf.h ../../core/item.h ../../core/system.h
-editticket.o: ../../core/dirs.h ../../core/dircontainer.h ../../db/db.h
-editticket.o: ../../db/dbbase.h ../../db/dbitemquery.h
-editticket.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
-editticket.o: ../../core/dircontainer.h ../../core/ugcontainer.h
-editticket.o: ../../core/log.h ../../core/textstream.h
-editticket.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h
-editticket.o: ../../core/request.h ../../core/error.h ../../core/config.h
-editticket.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h
-editticket.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h
-editticket.o: ../../core/rebus.h ../../core/mount.h ../../templates/locale.h
+editticket.o: ../../core/misc.h ../../core/item.h ../../core/requesttypes.h
+editticket.o: ../../core/error.h ticketinfo.h ticketparser.h ticketconf.h
+editticket.o: ../../core/item.h ../../core/system.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
+editticket.o: ../../core/ugcontainer.h ../../core/log.h
+editticket.o: ../../core/textstream.h ../../core/logmanipulators.h
+editticket.o: ../../core/slog.h ../../core/cur.h ../../core/request.h
+editticket.o: ../../core/error.h ../../core/config.h ../../core/htmlfilter.h
+editticket.o: ../../templates/htmltextstream.h ../../core/session.h
+editticket.o: ../../core/user.h ../../core/plugindata.h ../../core/rebus.h
+editticket.o: ../../core/mount.h ../../templates/locale.h
 editticket.o: ../../notify/notify.h ../../notify/notifypool.h
 editticket.o: ../../templates/patterns.h ../../templates/locale.h
 editticket.o: ../../templates/localefilter.h ../../../ezc/src/ezc.h
-editticket.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h
-editticket.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h
-editticket.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
-editticket.o: ../../notify/notifythread.h ../../core/basethread.h
-editticket.o: ../../core/synchro.h ../../notify/templatesnotify.h
-editticket.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h
+editticket.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h
+editticket.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
+editticket.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h
+editticket.o: ../../core/basethread.h ../../core/synchro.h
+editticket.o: ../../notify/templatesnotify.h ../../core/config.h
+editticket.o: ../../core/users.h ../../core/ugcontainer.h
 editticket.o: ../../core/lastcontainer.h ../../templates/misc.h
 editticket.o: ../../templates/htmltextstream.h ../../core/mounts.h
 editticket.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h
@@ -112,9 +110,8 @@ editticket.o: ../../core/synchro.h sessiondata.h ../../core/plugindata.h
 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 ../../core/confparser.h
-funticket.o: ../../core/requesttypes.h ../../core/error.h
-funticket.o: ../../core/confparser.h ticketinfo.h ticketparser.h ticketconf.h
+funticket.o: ../../core/misc.h ../../core/item.h ../../core/requesttypes.h
+funticket.o: ../../core/error.h ticketinfo.h ticketparser.h ticketconf.h
 funticket.o: ../../core/item.h ../../core/system.h ../../core/dirs.h
 funticket.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
 funticket.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h
@@ -129,12 +126,12 @@ funticket.o: ../../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
-funticket.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h
-funticket.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h
-funticket.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
-funticket.o: ../../notify/notifythread.h ../../core/basethread.h
-funticket.o: ../../core/synchro.h ../../notify/templatesnotify.h
-funticket.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h
+funticket.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h
+funticket.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
+funticket.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h
+funticket.o: ../../core/basethread.h ../../core/synchro.h
+funticket.o: ../../notify/templatesnotify.h ../../core/config.h
+funticket.o: ../../core/users.h ../../core/ugcontainer.h
 funticket.o: ../../core/lastcontainer.h ../../templates/misc.h
 funticket.o: ../../templates/htmltextstream.h ../../core/mounts.h
 funticket.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h
@@ -170,22 +167,21 @@ funticket.o: ../../templates/patterns.h ../../templates/changepatterns.h
 funticket.o: ../../core/sessionmanager.h ../../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 ../../core/confparser.h ../../core/requesttypes.h
-init.o: ../../core/error.h ../../core/confparser.h funticket.h ticketinfo.h
-init.o: ticketparser.h ticketconf.h ../../core/item.h ../../core/system.h
-init.o: ../../core/dirs.h ../../core/dircontainer.h ../../db/db.h
-init.o: ../../db/dbbase.h ../../db/dbitemquery.h ../../db/dbitemcolumns.h
-init.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h
-init.o: ../../core/ugcontainer.h ../../core/log.h ../../core/textstream.h
-init.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h
-init.o: ../../core/request.h ../../core/error.h ../../core/config.h
-init.o: ../../core/htmlfilter.h ../../templates/htmltextstream.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: ../../notify/notify.h ../../notify/notifypool.h
-init.o: ../../templates/patterns.h ../../templates/locale.h
-init.o: ../../templates/localefilter.h ../../../ezc/src/ezc.h
-init.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h
+init.o: ../../core/item.h ../../core/requesttypes.h ../../core/error.h
+init.o: funticket.h ticketinfo.h ticketparser.h ticketconf.h
+init.o: ../../core/item.h ../../core/system.h ../../core/dirs.h
+init.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
+init.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h ../../core/user.h
+init.o: ../../core/group.h ../../core/dircontainer.h ../../core/ugcontainer.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/error.h ../../core/config.h ../../core/htmlfilter.h
+init.o: ../../templates/htmltextstream.h ../../core/session.h
+init.o: ../../core/user.h ../../core/plugindata.h ../../core/rebus.h
+init.o: ../../core/mount.h ../../templates/locale.h ../../notify/notify.h
+init.o: ../../notify/notifypool.h ../../templates/patterns.h
+init.o: ../../templates/locale.h ../../templates/localefilter.h
+init.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
 init.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h
 init.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
 init.o: ../../notify/notifythread.h ../../core/basethread.h
@@ -230,8 +226,7 @@ sessiondata.o: ../../functions/rm.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: ../../core/confparser.h ../../core/requesttypes.h
-showtickets.o: ../../core/error.h ../../core/confparser.h ticketinfo.h
+showtickets.o: ../../core/requesttypes.h ../../core/error.h ticketinfo.h
 showtickets.o: ticketparser.h ticketconf.h ../../core/item.h
 showtickets.o: ../../core/system.h ../../core/dirs.h
 showtickets.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
@@ -247,20 +242,19 @@ showtickets.o: ../../core/mount.h ../../templates/locale.h
 showtickets.o: ../../notify/notify.h ../../notify/notifypool.h
 showtickets.o: ../../templates/patterns.h ../../templates/locale.h
 showtickets.o: ../../templates/localefilter.h ../../../ezc/src/ezc.h
-showtickets.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h
-showtickets.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h
-showtickets.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
-showtickets.o: ../../notify/notifythread.h ../../core/basethread.h
-showtickets.o: ../../core/synchro.h ../../notify/templatesnotify.h
-showtickets.o: ../../core/config.h ../../core/users.h
-showtickets.o: ../../core/ugcontainer.h ../../core/lastcontainer.h
-showtickets.o: ../../templates/misc.h ../../templates/htmltextstream.h
-showtickets.o: ../../core/mounts.h ../../core/mountparser.h
-showtickets.o: ../../core/crypt.h ../../core/run.h ../../core/users.h
-showtickets.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h
-showtickets.o: ../../core/image.h ../../core/basethread.h
-showtickets.o: ../../core/threadmanager.h ../../functions/functions.h
-showtickets.o: ../../functions/functionbase.h
+showtickets.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h
+showtickets.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
+showtickets.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h
+showtickets.o: ../../core/basethread.h ../../core/synchro.h
+showtickets.o: ../../notify/templatesnotify.h ../../core/config.h
+showtickets.o: ../../core/users.h ../../core/ugcontainer.h
+showtickets.o: ../../core/lastcontainer.h ../../templates/misc.h
+showtickets.o: ../../templates/htmltextstream.h ../../core/mounts.h
+showtickets.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h
+showtickets.o: ../../core/users.h ../../core/groups.h ../../core/group.h
+showtickets.o: ../../core/loadavg.h ../../core/image.h
+showtickets.o: ../../core/basethread.h ../../core/threadmanager.h
+showtickets.o: ../../functions/functions.h ../../functions/functionbase.h
 showtickets.o: ../../functions/functionparser.h ../../core/cur.h
 showtickets.o: ../../functions/adduser.h ../../functions/cat.h
 showtickets.o: ../../functions/chmod.h ../../functions/privchanger.h
@@ -291,11 +285,10 @@ showtickets.o: ../../templates/indexpatterns.h ../../templates/patterns.h
 showtickets.o: ../../templates/changepatterns.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 ../../core/confparser.h ../../core/requesttypes.h
-tdb.o: ../../core/error.h ../../core/confparser.h ../../core/log.h
-templates.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.h
-templates.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h
-templates.o: ../../core/item.h ../../core/confparser.h
+tdb.o: ../../core/item.h ../../core/requesttypes.h ../../core/error.h
+tdb.o: ../../core/log.h
+templates.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
+templates.o: ../../../ezc/src/pattern.h ../../core/item.h
 templates.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
 templates.o: ../../../ezc/src/stringconv.h ticketinfo.h ticket.h
 templates.o: ticketparser.h ticketconf.h ../../core/item.h
@@ -310,13 +303,12 @@ templates.o: ../../core/error.h ../../core/config.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
-templates.o: ../../templates/locale.h ../../core/confparser.h
-templates.o: ../../notify/notify.h ../../notify/notifypool.h
-templates.o: ../../templates/patterns.h ../../templates/locale.h
-templates.o: ../../templates/localefilter.h ../../notify/notifythread.h
-templates.o: ../../core/basethread.h ../../core/synchro.h
-templates.o: ../../notify/templatesnotify.h ../../core/config.h
-templates.o: ../../core/users.h ../../core/ugcontainer.h
+templates.o: ../../templates/locale.h ../../notify/notify.h
+templates.o: ../../notify/notifypool.h ../../templates/patterns.h
+templates.o: ../../templates/locale.h ../../templates/localefilter.h
+templates.o: ../../notify/notifythread.h ../../core/basethread.h
+templates.o: ../../core/synchro.h ../../notify/templatesnotify.h
+templates.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h
 templates.o: ../../core/lastcontainer.h ../../templates/misc.h
 templates.o: ../../templates/htmltextstream.h ../../core/mounts.h
 templates.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h
@@ -357,23 +349,21 @@ templates.o: ../../plugins/thread/pluginmsg.h
 ticketconf.o: ticketconf.h
 ticketinfo.o: ticketinfo.h ticket.h ticketparser.h ticketconf.h
 ticketinfo.o: ../../core/item.h ../../core/system.h ../../core/dirs.h
-ticketinfo.o: ../../core/item.h ../../core/confparser.h
-ticketinfo.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
-ticketinfo.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h
-ticketinfo.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h
-ticketinfo.o: ../../core/ugcontainer.h ../../core/log.h
-ticketinfo.o: ../../core/textstream.h ../../core/logmanipulators.h
-ticketinfo.o: ../../core/slog.h ../../core/cur.h ../../core/request.h
-ticketinfo.o: ../../core/requesttypes.h ../../core/error.h
-ticketinfo.o: ../../core/config.h ../../core/htmlfilter.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
+ticketinfo.o: ../../core/dircontainer.h ../../core/ugcontainer.h
+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 ../../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
-ticketinfo.o: ../../templates/locale.h ../../core/confparser.h
-ticketinfo.o: ../../notify/notify.h ../../notify/notifypool.h
-ticketinfo.o: ../../templates/patterns.h ../../templates/locale.h
-ticketinfo.o: ../../templates/localefilter.h ../../../ezc/src/ezc.h
-ticketinfo.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h
+ticketinfo.o: ../../templates/locale.h ../../notify/notify.h
+ticketinfo.o: ../../notify/notifypool.h ../../templates/patterns.h
+ticketinfo.o: ../../templates/locale.h ../../templates/localefilter.h
+ticketinfo.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
 ticketinfo.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h
 ticketinfo.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
 ticketinfo.o: ../../notify/notifythread.h ../../core/basethread.h
diff --git a/templates/Makefile.dep b/templates/Makefile.dep
index 1183193..641ee94 100755
--- a/templates/Makefile.dep
+++ b/templates/Makefile.dep
@@ -1,11 +1,10 @@
 # DO NOT DELETE
 
-adduser.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
-adduser.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
-adduser.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
-adduser.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h
-adduser.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
-adduser.o: ../core/textstream.h ../core/confparser.h patterncacher.h
+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 misc.h localefilter.h locale.h
+adduser.o: htmltextstream.h ../core/textstream.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
@@ -27,18 +26,17 @@ adduser.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h
 adduser.o: ../core/image.h ../core/basethread.h ../core/threadmanager.h
 adduser.o: ../core/sessionmanager.h ../core/sessioncontainer.h
 adduser.o: ../core/system.h ../core/htmlfilter.h ../core/request.h
-changepatterns.o: changepatterns.h patterns.h locale.h ../core/confparser.h
-changepatterns.o: localefilter.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
-changepatterns.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
-changepatterns.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
-changepatterns.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h
-changepatterns.o: htmltextstream.h ../core/textstream.h ../core/confparser.h
-config.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
-config.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
-config.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
-config.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h
-config.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
-config.o: ../core/textstream.h ../core/confparser.h patterncacher.h
+changepatterns.o: changepatterns.h patterns.h locale.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 misc.h htmltextstream.h
+changepatterns.o: ../core/textstream.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 misc.h localefilter.h locale.h
+config.o: htmltextstream.h ../core/textstream.h patterncacher.h
 config.o: ../core/item.h indexpatterns.h patterns.h changepatterns.h
 config.o: ../core/config.h ../core/htmlfilter.h ../core/cur.h
 config.o: ../core/request.h ../core/requesttypes.h ../core/error.h
@@ -60,14 +58,13 @@ config.o: ../core/group.h ../core/loadavg.h ../core/image.h
 config.o: ../core/basethread.h ../core/threadmanager.h
 config.o: ../core/sessionmanager.h ../core/sessioncontainer.h
 config.o: ../core/system.h ../core/htmlfilter.h
-dir.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
-dir.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h ../../ezc/src/item.h
-dir.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
-dir.o: ../../ezc/src/stringconv.h misc.h localefilter.h locale.h
-dir.o: ../core/confparser.h htmltextstream.h ../core/textstream.h
-dir.o: ../core/confparser.h patterncacher.h ../core/item.h indexpatterns.h
-dir.o: patterns.h changepatterns.h ../core/config.h ../core/htmlfilter.h
-dir.o: ../core/cur.h ../core/request.h ../core/requesttypes.h ../core/error.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 misc.h
+dir.o: localefilter.h locale.h htmltextstream.h ../core/textstream.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
 dir.o: ../core/config.h ../core/textstream.h ../templates/htmltextstream.h
 dir.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
 dir.o: ../core/mount.h ../core/system.h ../core/dirs.h ../core/dircontainer.h
@@ -99,14 +96,13 @@ dir.o: ../functions/sort.h ../functions/specialdefault.h ../functions/stat.h
 dir.o: ../functions/subject.h ../functions/template.h ../functions/tinymce.h
 dir.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h
 dir.o: ../functions/who.h ../functions/vim.h
-doc.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
-doc.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h ../../ezc/src/item.h
-doc.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
-doc.o: ../../ezc/src/stringconv.h misc.h localefilter.h locale.h
-doc.o: ../core/confparser.h htmltextstream.h ../core/textstream.h
-doc.o: ../core/confparser.h patterncacher.h ../core/item.h indexpatterns.h
-doc.o: patterns.h changepatterns.h ../core/config.h ../core/htmlfilter.h
-doc.o: ../core/cur.h ../core/request.h ../core/requesttypes.h ../core/error.h
+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 misc.h
+doc.o: localefilter.h locale.h htmltextstream.h ../core/textstream.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
 doc.o: ../core/config.h ../core/textstream.h ../templates/htmltextstream.h
 doc.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
 doc.o: ../core/mount.h ../core/system.h ../core/dirs.h ../core/dircontainer.h
@@ -124,14 +120,13 @@ doc.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
 doc.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h
 doc.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
 doc.o: ../core/request.h ../core/misc.h
-env.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
-env.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h ../../ezc/src/item.h
-env.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
-env.o: ../../ezc/src/stringconv.h misc.h localefilter.h locale.h
-env.o: ../core/confparser.h htmltextstream.h ../core/textstream.h
-env.o: ../core/confparser.h patterncacher.h ../core/item.h indexpatterns.h
-env.o: patterns.h changepatterns.h ../core/config.h ../core/htmlfilter.h
-env.o: ../core/cur.h ../core/request.h ../core/requesttypes.h ../core/error.h
+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 misc.h
+env.o: localefilter.h locale.h htmltextstream.h ../core/textstream.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
 env.o: ../core/config.h ../core/textstream.h ../templates/htmltextstream.h
 env.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
 env.o: ../core/mount.h ../core/system.h ../core/dirs.h ../core/dircontainer.h
@@ -163,12 +158,11 @@ env.o: ../functions/sort.h ../functions/specialdefault.h ../functions/stat.h
 env.o: ../functions/subject.h ../functions/template.h ../functions/tinymce.h
 env.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h
 env.o: ../functions/who.h ../functions/vim.h
-filters.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
-filters.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
-filters.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
-filters.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h
-filters.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
-filters.o: ../core/textstream.h ../core/confparser.h patterncacher.h
+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 misc.h localefilter.h locale.h
+filters.o: htmltextstream.h ../core/textstream.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
@@ -191,26 +185,23 @@ filters.o: ../core/image.h ../core/basethread.h ../core/threadmanager.h
 filters.o: ../core/sessionmanager.h ../core/sessioncontainer.h
 filters.o: ../core/system.h ../core/htmlfilter.h ../core/misc.h
 htmltextstream.o: htmltextstream.h ../core/textstream.h misc.h localefilter.h
-htmltextstream.o: locale.h ../core/confparser.h ../../ezc/src/ezc.h
-htmltextstream.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
+htmltextstream.o: locale.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
 htmltextstream.o: ../../ezc/src/pattern.h ../../ezc/src/item.h
 htmltextstream.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
-htmltextstream.o: ../../ezc/src/stringconv.h ../core/confparser.h
-indexpatterns.o: indexpatterns.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
+htmltextstream.o: ../../ezc/src/stringconv.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: patterns.h locale.h ../core/confparser.h localefilter.h
-indexpatterns.o: misc.h htmltextstream.h ../core/textstream.h
-indexpatterns.o: ../core/confparser.h ../core/log.h ../core/textstream.h
+indexpatterns.o: patterns.h locale.h localefilter.h misc.h htmltextstream.h
+indexpatterns.o: ../core/textstream.h ../core/log.h ../core/textstream.h
 indexpatterns.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
 indexpatterns.o: ../templates/locale.h
-insert.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
-insert.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
-insert.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
-insert.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h
-insert.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
-insert.o: ../core/textstream.h ../core/confparser.h patterncacher.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 misc.h localefilter.h locale.h
+insert.o: htmltextstream.h ../core/textstream.h patterncacher.h
 insert.o: ../core/item.h indexpatterns.h patterns.h changepatterns.h
 insert.o: ../core/config.h ../core/htmlfilter.h ../core/cur.h
 insert.o: ../core/request.h ../core/requesttypes.h ../core/error.h
@@ -233,22 +224,21 @@ insert.o: ../core/basethread.h ../core/threadmanager.h
 insert.o: ../core/sessionmanager.h ../core/sessioncontainer.h
 insert.o: ../core/system.h ../core/htmlfilter.h ../core/request.h
 insert.o: ../core/misc.h
-item.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
-item.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
-item.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
+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 misc.h
-item.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
-item.o: ../core/textstream.h ../core/confparser.h patterncacher.h
-item.o: ../core/item.h indexpatterns.h patterns.h changepatterns.h
-item.o: ../core/config.h ../core/htmlfilter.h ../core/cur.h ../core/request.h
-item.o: ../core/requesttypes.h ../core/error.h ../core/config.h
-item.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h
-item.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h
-item.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h
-item.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
-item.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
-item.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
-item.o: ../core/log.h ../core/logmanipulators.h ../core/slog.h ../core/cur.h
+item.o: localefilter.h locale.h htmltextstream.h ../core/textstream.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
+item.o: ../core/config.h ../core/textstream.h ../templates/htmltextstream.h
+item.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
+item.o: ../core/mount.h ../core/system.h ../core/dirs.h
+item.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+item.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h
+item.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
+item.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
+item.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
 item.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h
 item.o: ../templates/patterns.h ../notify/notifythread.h ../core/basethread.h
 item.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h
@@ -259,22 +249,21 @@ item.o: ../core/image.h ../core/basethread.h ../core/threadmanager.h
 item.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
 item.o: ../core/htmlfilter.h ../core/request.h ../core/misc.h
 item.o: ../core/bbcodeparser.h
-last.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
-last.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
-last.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
+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 misc.h
-last.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
-last.o: ../core/textstream.h ../core/confparser.h patterncacher.h
-last.o: ../core/item.h indexpatterns.h patterns.h changepatterns.h
-last.o: ../core/config.h ../core/htmlfilter.h ../core/cur.h ../core/request.h
-last.o: ../core/requesttypes.h ../core/error.h ../core/config.h
-last.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h
-last.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h
-last.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h
-last.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.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/logmanipulators.h ../core/slog.h ../core/cur.h
+last.o: localefilter.h locale.h htmltextstream.h ../core/textstream.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
+last.o: ../core/config.h ../core/textstream.h ../templates/htmltextstream.h
+last.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
+last.o: ../core/mount.h ../core/system.h ../core/dirs.h
+last.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+last.o: ../db/dbtextstream.h ../core/error.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/logmanipulators.h ../core/slog.h ../core/cur.h
 last.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h
 last.o: ../templates/patterns.h ../notify/notifythread.h ../core/basethread.h
 last.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h
@@ -285,23 +274,20 @@ last.o: ../core/image.h ../core/basethread.h ../core/threadmanager.h
 last.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
 last.o: ../core/htmlfilter.h ../core/lastcontainer.h ../core/request.h
 last.o: ../core/misc.h
-locale.o: locale.h ../core/confparser.h ../core/log.h ../core/textstream.h
+locale.o: locale.h ../core/log.h ../core/textstream.h
 locale.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
-locale.o: ../templates/locale.h ../../ezc/src/utf8.h
-localefilter.o: localefilter.h locale.h ../core/confparser.h
-localefilter.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h
+locale.o: ../templates/locale.h
+localefilter.o: localefilter.h locale.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
 localefilter.o: ../core/misc.h ../core/requesttypes.h
-login.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
-login.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
-login.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
+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 misc.h
-login.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
-login.o: ../core/textstream.h ../core/confparser.h patterncacher.h
-login.o: ../core/item.h indexpatterns.h patterns.h changepatterns.h
-login.o: ../core/config.h ../core/htmlfilter.h ../core/cur.h
+login.o: localefilter.h locale.h htmltextstream.h ../core/textstream.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
 login.o: ../core/config.h ../core/textstream.h ../templates/htmltextstream.h
 login.o: ../core/session.h ../core/user.h ../core/plugindata.h
@@ -321,14 +307,13 @@ login.o: ../core/group.h ../core/loadavg.h ../core/image.h
 login.o: ../core/basethread.h ../core/threadmanager.h
 login.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
 login.o: ../core/htmlfilter.h
-ls.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
-ls.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h ../../ezc/src/item.h
-ls.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
-ls.o: ../../ezc/src/stringconv.h misc.h localefilter.h locale.h
-ls.o: ../core/confparser.h htmltextstream.h ../core/textstream.h
-ls.o: ../core/confparser.h patterncacher.h ../core/item.h indexpatterns.h
-ls.o: patterns.h changepatterns.h ../core/config.h ../core/htmlfilter.h
-ls.o: ../core/cur.h ../core/request.h ../core/requesttypes.h ../core/error.h
+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 misc.h
+ls.o: localefilter.h locale.h htmltextstream.h ../core/textstream.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/dirs.h ../core/dircontainer.h
@@ -346,14 +331,13 @@ ls.o: ../core/group.h ../core/loadavg.h ../core/image.h ../core/basethread.h
 ls.o: ../core/threadmanager.h ../core/sessionmanager.h
 ls.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
 ls.o: ../core/request.h
-man.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
-man.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h ../../ezc/src/item.h
-man.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
-man.o: ../../ezc/src/stringconv.h misc.h localefilter.h locale.h
-man.o: ../core/confparser.h htmltextstream.h ../core/textstream.h
-man.o: ../core/confparser.h patterncacher.h ../core/item.h indexpatterns.h
-man.o: patterns.h changepatterns.h ../core/config.h ../core/htmlfilter.h
-man.o: ../core/cur.h ../core/request.h ../core/requesttypes.h ../core/error.h
+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 misc.h
+man.o: localefilter.h locale.h htmltextstream.h ../core/textstream.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
 man.o: ../core/config.h ../core/textstream.h ../templates/htmltextstream.h
 man.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
 man.o: ../core/mount.h ../core/system.h ../core/dirs.h ../core/dircontainer.h
@@ -385,22 +369,21 @@ man.o: ../functions/rm.h ../functions/sort.h ../functions/specialdefault.h
 man.o: ../functions/stat.h ../functions/subject.h ../functions/template.h
 man.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
 man.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h
-misc.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
-misc.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
-misc.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
+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.h
-misc.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
-misc.o: ../core/textstream.h ../core/confparser.h patterncacher.h
-misc.o: ../core/item.h indexpatterns.h patterns.h changepatterns.h
-misc.o: ../core/config.h ../core/htmlfilter.h ../core/cur.h ../core/request.h
-misc.o: ../core/requesttypes.h ../core/error.h ../core/config.h
-misc.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h
-misc.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h
-misc.o: ../core/system.h ../core/dirs.h ../core/dircontainer.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
-misc.o: ../core/log.h ../core/logmanipulators.h ../core/slog.h ../core/cur.h
+misc.o: localefilter.h locale.h htmltextstream.h ../core/textstream.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
+misc.o: ../core/config.h ../core/textstream.h ../templates/htmltextstream.h
+misc.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
+misc.o: ../core/mount.h ../core/system.h ../core/dirs.h
+misc.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+misc.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h
+misc.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
+misc.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
+misc.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
 misc.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h
 misc.o: ../templates/patterns.h ../notify/notifythread.h ../core/basethread.h
 misc.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h
@@ -410,14 +393,12 @@ misc.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h
 misc.o: ../core/image.h ../core/basethread.h ../core/threadmanager.h
 misc.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
 misc.o: ../core/htmlfilter.h ../core/misc.h ../core/request.h
-mount.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
-mount.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
-mount.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
+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 misc.h
-mount.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
-mount.o: ../core/textstream.h ../core/confparser.h patterncacher.h
-mount.o: ../core/item.h indexpatterns.h patterns.h changepatterns.h
-mount.o: ../core/config.h ../core/htmlfilter.h ../core/cur.h
+mount.o: localefilter.h locale.h htmltextstream.h ../core/textstream.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
 mount.o: ../core/config.h ../core/textstream.h ../templates/htmltextstream.h
 mount.o: ../core/session.h ../core/user.h ../core/plugindata.h
@@ -437,39 +418,36 @@ mount.o: ../core/group.h ../core/loadavg.h ../core/image.h
 mount.o: ../core/basethread.h ../core/threadmanager.h
 mount.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
 mount.o: ../core/htmlfilter.h ../core/misc.h ../core/mounts.h
-patterncacher.o: patterncacher.h ../core/item.h ../core/confparser.h misc.h
-patterncacher.o: localefilter.h locale.h ../core/confparser.h
-patterncacher.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.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
-patterncacher.o: htmltextstream.h ../core/textstream.h ../core/log.h
-patterncacher.o: ../core/textstream.h ../core/logmanipulators.h
-patterncacher.o: ../core/slog.h ../core/cur.h ../templates/locale.h
-patterns.o: patterns.h locale.h ../core/confparser.h localefilter.h
-patterns.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h
+patterncacher.o: patterncacher.h ../core/item.h misc.h localefilter.h
+patterncacher.o: locale.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
+patterncacher.o: ../../ezc/src/pattern.h ../../ezc/src/item.h
+patterncacher.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
+patterncacher.o: ../../ezc/src/stringconv.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 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 misc.h
-patterns.o: htmltextstream.h ../core/textstream.h ../core/confparser.h
-patterns.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
-patterns.o: ../core/slog.h ../core/cur.h ../templates/locale.h
-priv.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
-priv.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
-priv.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
+patterns.o: htmltextstream.h ../core/textstream.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 misc.h
-priv.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
-priv.o: ../core/textstream.h ../core/confparser.h patterncacher.h
-priv.o: ../core/item.h indexpatterns.h patterns.h changepatterns.h
-priv.o: ../core/config.h ../core/htmlfilter.h ../core/cur.h ../core/request.h
-priv.o: ../core/requesttypes.h ../core/error.h ../core/config.h
-priv.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h
-priv.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h
-priv.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h
-priv.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.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/logmanipulators.h ../core/slog.h ../core/cur.h
+priv.o: localefilter.h locale.h htmltextstream.h ../core/textstream.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
+priv.o: ../core/config.h ../core/textstream.h ../templates/htmltextstream.h
+priv.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
+priv.o: ../core/mount.h ../core/system.h ../core/dirs.h
+priv.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+priv.o: ../db/dbtextstream.h ../core/error.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/logmanipulators.h ../core/slog.h ../core/cur.h
 priv.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h
 priv.o: ../templates/patterns.h ../notify/notifythread.h ../core/basethread.h
 priv.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h
@@ -495,13 +473,12 @@ priv.o: ../functions/subject.h ../functions/template.h ../functions/tinymce.h
 priv.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h
 priv.o: ../functions/who.h ../functions/vim.h
 rebus.o: ../core/request.h templates.h ../../ezc/src/ezc.h
-rebus.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
-rebus.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
+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 misc.h
-rebus.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
-rebus.o: ../core/textstream.h ../core/confparser.h patterncacher.h
-rebus.o: ../core/item.h indexpatterns.h patterns.h changepatterns.h
-rebus.o: ../core/config.h ../core/htmlfilter.h ../core/cur.h
+rebus.o: localefilter.h locale.h htmltextstream.h ../core/textstream.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
 rebus.o: ../core/config.h ../core/textstream.h ../templates/htmltextstream.h
 rebus.o: ../core/session.h ../core/user.h ../core/plugindata.h
@@ -523,45 +500,44 @@ rebus.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
 rebus.o: ../core/htmlfilter.h
 slog.o: ../core/slog.h ../core/cur.h ../core/logmanipulators.h
 slog.o: ../templates/locale.h templates.h ../../ezc/src/ezc.h
-slog.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
-slog.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
+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 misc.h
-slog.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
-slog.o: ../core/textstream.h ../core/confparser.h patterncacher.h
-slog.o: ../core/item.h indexpatterns.h patterns.h changepatterns.h
-slog.o: ../core/config.h ../core/htmlfilter.h ../core/cur.h ../core/request.h
-slog.o: ../core/requesttypes.h ../core/error.h ../core/config.h
-slog.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h
-slog.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h
-slog.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h
-slog.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
-slog.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
-slog.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
-slog.o: ../core/log.h ../core/slog.h ../notify/notify.h
-slog.o: ../notify/notifypool.h ../templates/patterns.h
-slog.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
-slog.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
-slog.o: ../core/lastcontainer.h ../templates/misc.h ../core/mounts.h
-slog.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h
-slog.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
-slog.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h
-slog.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
-stat.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
-stat.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
-stat.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
+slog.o: localefilter.h locale.h htmltextstream.h ../core/textstream.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
+slog.o: ../core/config.h ../core/textstream.h ../templates/htmltextstream.h
+slog.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
+slog.o: ../core/mount.h ../core/system.h ../core/dirs.h
+slog.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+slog.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h
+slog.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
+slog.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
+slog.o: ../core/slog.h ../notify/notify.h ../notify/notifypool.h
+slog.o: ../templates/patterns.h ../notify/notifythread.h ../core/basethread.h
+slog.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h
+slog.o: ../core/ugcontainer.h ../core/lastcontainer.h ../templates/misc.h
+slog.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/run.h
+slog.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h
+slog.o: ../core/image.h ../core/basethread.h ../core/threadmanager.h
+slog.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
+slog.o: ../core/htmlfilter.h
+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 misc.h
-stat.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
-stat.o: ../core/textstream.h ../core/confparser.h patterncacher.h
-stat.o: ../core/item.h indexpatterns.h patterns.h changepatterns.h
-stat.o: ../core/config.h ../core/htmlfilter.h ../core/cur.h ../core/request.h
-stat.o: ../core/requesttypes.h ../core/error.h ../core/config.h
-stat.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h
-stat.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h
-stat.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h
-stat.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.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/logmanipulators.h ../core/slog.h ../core/cur.h
+stat.o: localefilter.h locale.h htmltextstream.h ../core/textstream.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
+stat.o: ../core/config.h ../core/textstream.h ../templates/htmltextstream.h
+stat.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
+stat.o: ../core/mount.h ../core/system.h ../core/dirs.h
+stat.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+stat.o: ../db/dbtextstream.h ../core/error.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/logmanipulators.h ../core/slog.h ../core/cur.h
 stat.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h
 stat.o: ../templates/patterns.h ../notify/notifythread.h ../core/basethread.h
 stat.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h
@@ -571,14 +547,13 @@ stat.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h
 stat.o: ../core/image.h ../core/basethread.h ../core/threadmanager.h
 stat.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
 stat.o: ../core/htmlfilter.h ../core/request.h ../core/misc.h
-sys.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
-sys.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h ../../ezc/src/item.h
-sys.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
-sys.o: ../../ezc/src/stringconv.h misc.h localefilter.h locale.h
-sys.o: ../core/confparser.h htmltextstream.h ../core/textstream.h
-sys.o: ../core/confparser.h patterncacher.h ../core/item.h indexpatterns.h
-sys.o: patterns.h changepatterns.h ../core/config.h ../core/htmlfilter.h
-sys.o: ../core/cur.h ../core/request.h ../core/requesttypes.h ../core/error.h
+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 misc.h
+sys.o: localefilter.h locale.h htmltextstream.h ../core/textstream.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
 sys.o: ../core/config.h ../core/textstream.h ../templates/htmltextstream.h
 sys.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
 sys.o: ../core/mount.h ../core/system.h ../core/dirs.h ../core/dircontainer.h
@@ -612,12 +587,11 @@ sys.o: ../functions/stat.h ../functions/subject.h ../functions/template.h
 sys.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
 sys.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h
 sys.o: ../templates/templates.h
-template.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
-template.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
-template.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
-template.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h
-template.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
-template.o: ../core/textstream.h ../core/confparser.h patterncacher.h
+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 misc.h localefilter.h locale.h
+template.o: htmltextstream.h ../core/textstream.h patterncacher.h
 template.o: ../core/item.h indexpatterns.h patterns.h changepatterns.h
 template.o: ../core/config.h ../core/htmlfilter.h ../core/cur.h
 template.o: ../core/request.h ../core/requesttypes.h ../core/error.h
@@ -640,12 +614,11 @@ template.o: ../core/loadavg.h ../core/image.h ../core/basethread.h
 template.o: ../core/threadmanager.h ../core/sessionmanager.h
 template.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
 template.o: ../core/misc.h
-templates.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
-templates.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
-templates.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
-templates.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h
-templates.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
-templates.o: ../core/textstream.h ../core/confparser.h patterncacher.h
+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 misc.h localefilter.h locale.h
+templates.o: htmltextstream.h ../core/textstream.h patterncacher.h
 templates.o: ../core/item.h indexpatterns.h patterns.h changepatterns.h
 templates.o: ../core/config.h ../core/htmlfilter.h ../core/cur.h
 templates.o: ../core/request.h ../core/requesttypes.h ../core/error.h
@@ -688,13 +661,12 @@ templates.o: ../functions/template.h ../functions/tinymce.h
 templates.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h
 templates.o: ../functions/who.h ../functions/vim.h ../templates/templates.h
 upload.o: ../core/request.h templates.h ../../ezc/src/ezc.h
-upload.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
-upload.o: ../../ezc/src/pattern.h ../../ezc/src/item.h
-upload.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
-upload.o: ../../ezc/src/stringconv.h misc.h localefilter.h locale.h
-upload.o: ../core/confparser.h htmltextstream.h ../core/textstream.h
-upload.o: ../core/confparser.h patterncacher.h ../core/item.h indexpatterns.h
-upload.o: patterns.h changepatterns.h ../core/config.h ../core/htmlfilter.h
+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 misc.h
+upload.o: localefilter.h locale.h htmltextstream.h ../core/textstream.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
 upload.o: ../core/error.h ../core/config.h ../core/textstream.h
 upload.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h
@@ -714,12 +686,11 @@ upload.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
 upload.o: ../core/basethread.h ../core/threadmanager.h
 upload.o: ../core/sessionmanager.h ../core/sessioncontainer.h
 upload.o: ../core/system.h ../core/htmlfilter.h
-uptime.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
-uptime.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
-uptime.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
-uptime.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h
-uptime.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
-uptime.o: ../core/textstream.h ../core/confparser.h patterncacher.h
+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 misc.h localefilter.h locale.h
+uptime.o: htmltextstream.h ../core/textstream.h patterncacher.h
 uptime.o: ../core/item.h indexpatterns.h patterns.h changepatterns.h
 uptime.o: ../core/config.h ../core/htmlfilter.h ../core/cur.h
 uptime.o: ../core/request.h ../core/requesttypes.h ../core/error.h
@@ -741,22 +712,21 @@ uptime.o: ../core/group.h ../core/loadavg.h ../core/image.h
 uptime.o: ../core/basethread.h ../core/threadmanager.h
 uptime.o: ../core/sessionmanager.h ../core/sessioncontainer.h
 uptime.o: ../core/system.h ../core/htmlfilter.h
-user.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
-user.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
-user.o: ../../ezc/src/item.h ../../ezc/src/funinfo.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 misc.h
-user.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
-user.o: ../core/textstream.h ../core/confparser.h patterncacher.h
-user.o: ../core/item.h indexpatterns.h patterns.h changepatterns.h
-user.o: ../core/config.h ../core/htmlfilter.h ../core/cur.h ../core/request.h
-user.o: ../core/requesttypes.h ../core/error.h ../core/config.h
-user.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h
-user.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h
-user.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h
-user.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
-user.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
-user.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
-user.o: ../core/log.h ../core/logmanipulators.h ../core/slog.h ../core/cur.h
+user.o: localefilter.h locale.h htmltextstream.h ../core/textstream.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
+user.o: ../core/config.h ../core/textstream.h ../templates/htmltextstream.h
+user.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
+user.o: ../core/mount.h ../core/system.h ../core/dirs.h
+user.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+user.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h
+user.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
+user.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
+user.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
 user.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h
 user.o: ../templates/patterns.h ../notify/notifythread.h ../core/basethread.h
 user.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h
@@ -766,14 +736,13 @@ user.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h
 user.o: ../core/image.h ../core/basethread.h ../core/threadmanager.h
 user.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
 user.o: ../core/htmlfilter.h ../core/request.h ../core/misc.h
-who.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
-who.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h ../../ezc/src/item.h
-who.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
-who.o: ../../ezc/src/stringconv.h misc.h localefilter.h locale.h
-who.o: ../core/confparser.h htmltextstream.h ../core/textstream.h
-who.o: ../core/confparser.h patterncacher.h ../core/item.h indexpatterns.h
-who.o: patterns.h changepatterns.h ../core/config.h ../core/htmlfilter.h
-who.o: ../core/cur.h ../core/request.h ../core/requesttypes.h ../core/error.h
+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 misc.h
+who.o: localefilter.h locale.h htmltextstream.h ../core/textstream.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
 who.o: ../core/config.h ../core/textstream.h ../templates/htmltextstream.h
 who.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
 who.o: ../core/mount.h ../core/system.h ../core/dirs.h ../core/dircontainer.h
@@ -791,14 +760,12 @@ who.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
 who.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h
 who.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
 who.o: ../core/request.h ../core/misc.h
-winix.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
-winix.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
-winix.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
+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 misc.h
-winix.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
-winix.o: ../core/textstream.h ../core/confparser.h patterncacher.h
-winix.o: ../core/item.h indexpatterns.h patterns.h changepatterns.h
-winix.o: ../core/config.h ../core/htmlfilter.h ../core/cur.h
+winix.o: localefilter.h locale.h htmltextstream.h ../core/textstream.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
 winix.o: ../core/config.h ../core/textstream.h ../templates/htmltextstream.h
 winix.o: ../core/session.h ../core/user.h ../core/plugindata.h
diff --git a/templates/htmltextstream.cpp b/templates/htmltextstream.cpp
index 22d5a94..948d7ce 100755
--- a/templates/htmltextstream.cpp
+++ b/templates/htmltextstream.cpp
@@ -409,7 +409,7 @@ return *this;
 }
 
 
-HtmlTextStream & HtmlTextStream::operator<<(const Space * space)
+HtmlTextStream & HtmlTextStream::operator<<(const PT::Space * space)
 {
 	space_stream.Clear();
 	// !! IMPROVE ME
@@ -417,10 +417,12 @@ HtmlTextStream & HtmlTextStream::operator<<(const Space * space)
 	space->Serialize(space_stream, true, false);
 	operator<<(space_stream.Str());
 	space_stream.Clear();
+
+return *this;
 }
 
 
-HtmlTextStream & HtmlTextStream::operator<<(const Space & space)
+HtmlTextStream & HtmlTextStream::operator<<(const PT::Space & space)
 {
 	return operator<<(&space);
 }
diff --git a/templates/htmltextstream.h b/templates/htmltextstream.h
index 35027ec..fa3a40e 100755
--- a/templates/htmltextstream.h
+++ b/templates/htmltextstream.h
@@ -144,8 +144,8 @@ public:
 	HtmlTextStream & operator<<(double);
 	HtmlTextStream & operator<<(const void *);
 	HtmlTextStream & operator<<(const tm & t);
-	HtmlTextStream & operator<<(const Space * space);
-	HtmlTextStream & operator<<(const Space & space);
+	HtmlTextStream & operator<<(const PT::Space * space);
+	HtmlTextStream & operator<<(const PT::Space & space);
 
 private:
 
diff --git a/templates/locale.cpp b/templates/locale.cpp
index a4e5ad3..7ac011c 100755
--- a/templates/locale.cpp
+++ b/templates/locale.cpp
@@ -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.
  * 
  */
@@ -10,7 +10,7 @@
 #include <algorithm>
 #include "locale.h"
 #include "core/log.h"
-#include "utf8.h"
+#include "utf8/utf8.h"
 
 
 
@@ -72,7 +72,7 @@ bool read = false;
 	loc_parser.UTF8(input_as_utf8);
 	loc_parser.SetSpace(space);
 
-	if( loc_parser.Parse(file_name) == ConfParser::ok )
+	if( loc_parser.Parse(file_name) == PT::ConfParser::ok )
 	{
 		read = true;
 		AddLocale(lang);
@@ -86,14 +86,14 @@ return read;
 
 void Locale::AddLocale(size_t lang)
 {
-	Space::TableSingle::iterator i = space.table_single.begin();
+	PT::Space::TableSingle::iterator i = space.table_single.begin();
 
 	for( ; i != space.table_single.end() ; ++i)
 		loc_tab[lang][i->first] = i->second;
 
 
 	// lists
-	Space::Table::iterator i2 = space.table.begin();
+	PT::Space::Table::iterator i2 = space.table.begin();
 
 	for( ; i2 != space.table.end() ; ++i2)
 		loc_tab_multi[lang][i2->first] = i2->second;
@@ -130,7 +130,7 @@ bool read = false;
 	loc_parser.SplitSingle(true);
 	loc_parser.UTF8(input_as_utf8);
 
-	if( loc_parser.Parse(file_name) == ConfParser::ok )
+	if( loc_parser.Parse(file_name) == PT::ConfParser::ok )
 	{
 		read = true;
 		CreateSubstVector(subst_url,		space.table_single[L"url_original"], space.table_single[L"url_changeto"]);
@@ -171,7 +171,7 @@ void Locale::Read(const char * dir, const char * dir_def)
 {
 	for(size_t i=0 ; i<locale_files.size() ; ++i)
 	{
-		Ezc::WideToUTF8(locale_files[i], locale_filea);
+		PT::WideToUTF8(locale_files[i], locale_filea);
 		ReadFile(dir, dir_def, i, locale_filea.c_str());
 	}
 
@@ -190,7 +190,7 @@ void Locale::Read(const std::string & dir, const std::string & dir_def)
 
 void Locale::Read(const wchar_t * dir, const wchar_t * dir_def)
 {
-	Ezc::WideToUTF8(dir, adir1);
+	PT::WideToUTF8(dir, adir1);
 
 	if( !dir_def )
 	{
@@ -198,7 +198,7 @@ void Locale::Read(const wchar_t * dir, const wchar_t * dir_def)
 	}
 	else
 	{
-		Ezc::WideToUTF8(dir_def, adir2);
+		PT::WideToUTF8(dir_def, adir2);
 		Read(adir1.c_str(), adir2.c_str());
 	}
 }
@@ -276,7 +276,7 @@ bool Locale::IsKey(const std::wstring & key, size_t lang) const
 		return false;
 	
 	// looking in the 'lang' language
-	Space::TableSingle::const_iterator i = loc_tab[lang].find(key);
+	PT::Space::TableSingle::const_iterator i = loc_tab[lang].find(key);
 
 	if( i != loc_tab[lang].end() )
 		return true;
@@ -312,7 +312,7 @@ bool Locale::IsKeyLang(const std::wstring & key, size_t lang) const
 		return false;
 	
 	// looking in the 'lang' language
-	Space::TableSingle::const_iterator i = loc_tab[lang].find(key);
+	PT::Space::TableSingle::const_iterator i = loc_tab[lang].find(key);
 
 return i != loc_tab[lang].end();
 }
@@ -347,7 +347,7 @@ const std::wstring & Locale::Get(const std::wstring & key, size_t lang) const
 		return empty;
 	
 	// looking in the 'lang' language
-	Space::TableSingle::const_iterator i = loc_tab[lang].find(key);
+	PT::Space::TableSingle::const_iterator i = loc_tab[lang].find(key);
 
 	if( i != loc_tab[lang].end() )
 		return i->second;
@@ -384,7 +384,7 @@ bool Locale::IsKeyLangList(const std::wstring & key, size_t lang) const
 		return false;
 	
 	// looking in the 'lang' language
-	Space::Table::const_iterator i = loc_tab_multi[lang].find(key);
+	PT::Space::Table::const_iterator i = loc_tab_multi[lang].find(key);
 
 return i != loc_tab_multi[lang].end();
 }
@@ -402,7 +402,7 @@ const std::vector<std::wstring> & Locale::GetList(const std::wstring & key, size
 		return empty_list;
 	
 	// looking in the 'lang' language
-	Space::Table::const_iterator i = loc_tab_multi[lang].find(key);
+	PT::Space::Table::const_iterator i = loc_tab_multi[lang].find(key);
 
 	if( i != loc_tab_multi[lang].end() )
 		return i->second;
diff --git a/templates/locale.h b/templates/locale.h
index f5f84ae..37af169 100755
--- a/templates/locale.h
+++ b/templates/locale.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.
  * 
  */
@@ -12,7 +12,7 @@
 
 #include <vector>
 #include <string>
-#include "core/confparser.h"
+#include "confparser/confparser.h"
 
 
 
@@ -122,11 +122,11 @@ private:
 
 	// messages vector<via language>
 	// this table has the same size as locale_files (at least one item)
-	std::vector<Space::TableSingle> loc_tab;
+	std::vector<PT::Space::TableSingle> loc_tab;
 	
 	// messages vector<via language>
 	// this table has the same size as locale_files (at least one item)
-	std::vector<Space::Table> loc_tab_multi;
+	std::vector<PT::Space::Table> loc_tab_multi;
 
 	// vectors of characters substitution (sort by 'from')
 	std::vector<SubstItem> subst_url;
@@ -134,8 +134,8 @@ private:
 	std::vector<SubstItem> subst_capitallet;	// changing from capital to small
 
 
-	Space space;
-	ConfParser loc_parser;
+	PT::Space space;
+	PT::ConfParser loc_parser;
 	std::string locale_filea;
 	std::string file_name;
 	std::wstring key_str;