diff --git a/codepot/DEBIAN/Makefile.am b/codepot/DEBIAN/Makefile.am
index 395adcf6..d0fdb862 100644
--- a/codepot/DEBIAN/Makefile.am
+++ b/codepot/DEBIAN/Makefile.am
@@ -1 +1,15 @@
-EXTRA_DIST = conffiles
+EXTRA_DIST = conffiles copyright changelog
+
+docdir=$(DOCDIR)
+doc_DATA = copyright changelog
+
+debdir=/DEBIAN
+deb_DATA = control conffiles
+deb_SCRIPTS = postinst postrm 
+
+install-data-hook:
+	gzip -9 -f $(DESTDIR)$(DOCDIR)/changelog
+
+uninstall-hook:
+	$(RM) -f $(DESTDIR)$(DOCDIR)/changelog.gz
+
diff --git a/codepot/DEBIAN/Makefile.in b/codepot/DEBIAN/Makefile.in
index 0caede1c..f73ed462 100644
--- a/codepot/DEBIAN/Makefile.in
+++ b/codepot/DEBIAN/Makefile.in
@@ -14,6 +14,8 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
@@ -43,8 +45,33 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/./config.h
 CONFIG_CLEAN_FILES = control postinst postrm
 CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(debdir)" "$(DESTDIR)$(debdir)" \
+	"$(DESTDIR)$(docdir)"
+SCRIPTS = $(deb_SCRIPTS)
 SOURCES =
 DIST_SOURCES =
+DATA = $(deb_DATA) $(doc_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -59,6 +86,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -70,6 +98,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
@@ -110,7 +139,7 @@ cfgdir = @cfgdir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 depotdir = @depotdir@
-docdir = @docdir@
+docdir = $(DOCDIR)
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host_alias = @host_alias@
@@ -139,7 +168,11 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 wwwdir = @wwwdir@
-EXTRA_DIST = conffiles
+EXTRA_DIST = conffiles copyright changelog
+doc_DATA = copyright changelog
+debdir = /DEBIAN
+deb_DATA = control conffiles
+deb_SCRIPTS = postinst postrm 
 all: all-am
 
 .SUFFIXES:
@@ -179,6 +212,80 @@ postinst: $(top_builddir)/config.status $(srcdir)/postinst.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 postrm: $(top_builddir)/config.status $(srcdir)/postrm.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+install-debSCRIPTS: $(deb_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	test -z "$(debdir)" || $(MKDIR_P) "$(DESTDIR)$(debdir)"
+	@list='$(deb_SCRIPTS)'; test -n "$(debdir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n' \
+	    -e 'h;s|.*|.|' \
+	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+	      if (++n[d] == $(am__install_max)) { \
+		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+	    else { print "f", d "/" $$4, $$1 } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	     test -z "$$files" || { \
+	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(debdir)$$dir'"; \
+	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(debdir)$$dir" || exit $$?; \
+	     } \
+	; done
+
+uninstall-debSCRIPTS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(deb_SCRIPTS)'; test -n "$(debdir)" || exit 0; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	       sed -e 's,.*/,,;$(transform)'`; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(debdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(debdir)" && rm -f $$files
+install-debDATA: $(deb_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(debdir)" || $(MKDIR_P) "$(DESTDIR)$(debdir)"
+	@list='$(deb_DATA)'; test -n "$(debdir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(debdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(debdir)" || exit $$?; \
+	done
+
+uninstall-debDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(deb_DATA)'; test -n "$(debdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(debdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(debdir)" && rm -f $$files
+install-docDATA: $(doc_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
+	@list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
+	done
+
+uninstall-docDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(docdir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -218,8 +325,11 @@ distdir: $(DISTFILES)
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(SCRIPTS) $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(debdir)" "$(DESTDIR)$(debdir)" "$(DESTDIR)$(docdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -265,8 +375,9 @@ info: info-am
 
 info-am:
 
-install-data-am:
-
+install-data-am: install-debDATA install-debSCRIPTS install-docDATA
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 install-dvi: install-dvi-am
 
 install-dvi-am:
@@ -309,21 +420,31 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am:
-
-.MAKE: install-am install-strip
+uninstall-am: uninstall-debDATA uninstall-debSCRIPTS uninstall-docDATA
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+.MAKE: install-am install-data-am install-strip uninstall-am
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
+	install install-am install-data install-data-am \
+	install-data-hook install-debDATA install-debSCRIPTS \
+	install-docDATA install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am uninstall uninstall-am uninstall-debDATA \
+	uninstall-debSCRIPTS uninstall-docDATA uninstall-hook
 
 
+install-data-hook:
+	gzip -9 -f $(DESTDIR)$(DOCDIR)/changelog
+
+uninstall-hook:
+	$(RM) -f $(DESTDIR)$(DOCDIR)/changelog.gz
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/codepot/DEBIAN/changelog b/codepot/DEBIAN/changelog
new file mode 100644
index 00000000..99b050b3
--- /dev/null
+++ b/codepot/DEBIAN/changelog
@@ -0,0 +1,6 @@
+codepot (0.1.0) karmic; urgency=low
+
+  * Initial release
+
+ -- Hyung-Hwan Chung <hyunghwan.chung@gmail.com>  Mon, 11 Mar 2010 13:00:00 +0900
+
diff --git a/codepot/DEBIAN/copyright b/codepot/DEBIAN/copyright
new file mode 100644
index 00000000..433a0fcd
--- /dev/null
+++ b/codepot/DEBIAN/copyright
@@ -0,0 +1,12 @@
+Codepot
+
+Copyright (C) 2010 Hyung-Hwan Chung <hyunghwan.chung@gmail.com>
+
+The entire code base may be distributed under the terms of the GNU General
+Public License (GPL), which appears immediately below.  Alternatively, all
+of the source code as any code derived from that code may instead be
+distributed under the GNU Lesser General Public License (LGPL), at the
+choice of the distributor. The complete text of the LGPL appears at the
+bottom of this file.
+
+See /usr/share/common-licenses/(GPL|LGPL)
diff --git a/codepot/Makefile.am b/codepot/Makefile.am
index df329022..f0e7213a 100644
--- a/codepot/Makefile.am
+++ b/codepot/Makefile.am
@@ -1,9 +1,9 @@
 ACLOCAL_AMFLAGS = -I ac/m4
 AUTOMAKE_OPTION = foreign
 
-SUBDIRS = etc src DEBIAN
+SUBDIRS = etc src 
 
-EXTRA_DIST = README mkmf.sh
+EXTRA_DIST = README mkmf.sh DEBIAN
 
 distclean-local:
 	$(RM) -r autom4te.cache config.h.in~ "$(PACKAGE)-$(VERSION)"
@@ -20,14 +20,10 @@ deb: dist-gzip
 		--with-cachedir=/var/cache/codepot
 	rm -rf "/var/tmp/$(PACKAGE)-$(VERSION)"
 	cd "$(PACKAGE)-$(VERSION)"; make install DESTDIR="/var/tmp/$(PACKAGE)-$(VERSION)"
-	mkdir -p "/var/tmp/$(PACKAGE)-$(VERSION)/DEBIAN"
-	cp "$(PACKAGE)-$(VERSION)/DEBIAN/control" "/var/tmp/$(PACKAGE)-$(VERSION)/DEBIAN/control"
-	cp "$(PACKAGE)-$(VERSION)/DEBIAN/postinst" "/var/tmp/$(PACKAGE)-$(VERSION)/DEBIAN/postinst"
-	cp "$(PACKAGE)-$(VERSION)/DEBIAN/postrm" "/var/tmp/$(PACKAGE)-$(VERSION)/DEBIAN/postrm"
-	cp "$(PACKAGE)-$(VERSION)/DEBIAN/conffiles" "/var/tmp/$(PACKAGE)-$(VERSION)/DEBIAN/conffiles"
-	chmod 0755 "/var/tmp/$(PACKAGE)-$(VERSION)/DEBIAN/postinst"
-	chmod 0755 "/var/tmp/$(PACKAGE)-$(VERSION)/DEBIAN/postrm"
+	cd "$(PACKAGE)-$(VERSION)/DEBIAN"; make install DESTDIR="/var/tmp/$(PACKAGE)-$(VERSION)"
+#	cd "/var/tmp/$(PACKAGE)-$(VERSION)"; find . -type f -a ! -path '*/DEBIAN/*' -exec md5sum {} \; > "/var/tmp/$(PACKAGE)-$(VERSION)/DEBIAN/md5sums"
 	fakeroot dpkg -b "/var/tmp/$(PACKAGE)-$(VERSION)"
 	$(RM) -r "/var/tmp/$(PACKAGE)-$(VERSION)"
 	$(RM) -r "$(PACKAGE)-$(VERSION)"
 	mv -f "/var/tmp/$(PACKAGE)-$(VERSION).deb" .
+
diff --git a/codepot/Makefile.in b/codepot/Makefile.in
index 817b0d17..fd5245c3 100644
--- a/codepot/Makefile.in
+++ b/codepot/Makefile.in
@@ -34,7 +34,8 @@ POST_UNINSTALL = :
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(top_srcdir)/configure ac/aux/install-sh ac/aux/missing
+	$(top_srcdir)/configure ac/aux/install-sh ac/aux/missing \
+	config.guess config.sub
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/ac/m4/as-ac-expand.m4 \
 	$(top_srcdir)/configure.ac
@@ -112,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -123,6 +125,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
@@ -194,8 +197,8 @@ top_srcdir = @top_srcdir@
 wwwdir = @wwwdir@
 ACLOCAL_AMFLAGS = -I ac/m4
 AUTOMAKE_OPTION = foreign
-SUBDIRS = etc src DEBIAN
-EXTRA_DIST = README mkmf.sh
+SUBDIRS = etc src 
+EXTRA_DIST = README mkmf.sh DEBIAN
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -696,13 +699,8 @@ deb: dist-gzip
 		--with-cachedir=/var/cache/codepot
 	rm -rf "/var/tmp/$(PACKAGE)-$(VERSION)"
 	cd "$(PACKAGE)-$(VERSION)"; make install DESTDIR="/var/tmp/$(PACKAGE)-$(VERSION)"
-	mkdir -p "/var/tmp/$(PACKAGE)-$(VERSION)/DEBIAN"
-	cp "$(PACKAGE)-$(VERSION)/DEBIAN/control" "/var/tmp/$(PACKAGE)-$(VERSION)/DEBIAN/control"
-	cp "$(PACKAGE)-$(VERSION)/DEBIAN/postinst" "/var/tmp/$(PACKAGE)-$(VERSION)/DEBIAN/postinst"
-	cp "$(PACKAGE)-$(VERSION)/DEBIAN/postrm" "/var/tmp/$(PACKAGE)-$(VERSION)/DEBIAN/postrm"
-	cp "$(PACKAGE)-$(VERSION)/DEBIAN/conffiles" "/var/tmp/$(PACKAGE)-$(VERSION)/DEBIAN/conffiles"
-	chmod 0755 "/var/tmp/$(PACKAGE)-$(VERSION)/DEBIAN/postinst"
-	chmod 0755 "/var/tmp/$(PACKAGE)-$(VERSION)/DEBIAN/postrm"
+	cd "$(PACKAGE)-$(VERSION)/DEBIAN"; make install DESTDIR="/var/tmp/$(PACKAGE)-$(VERSION)"
+#	cd "/var/tmp/$(PACKAGE)-$(VERSION)"; find . -type f -a ! -path '*/DEBIAN/*' -exec md5sum {} \; > "/var/tmp/$(PACKAGE)-$(VERSION)/DEBIAN/md5sums"
 	fakeroot dpkg -b "/var/tmp/$(PACKAGE)-$(VERSION)"
 	$(RM) -r "/var/tmp/$(PACKAGE)-$(VERSION)"
 	$(RM) -r "$(PACKAGE)-$(VERSION)"
diff --git a/codepot/configure b/codepot/configure
index 7ca8e299..f4932f4b 100755
--- a/codepot/configure
+++ b/codepot/configure
@@ -564,7 +564,9 @@ SBINDIR
 BINDIR
 LOCALSTATEDIR
 SYSCONFDIR
+DOCDIR
 DATADIR
+LIBEXECDIR
 LIBDIR
 PREFIX
 cachedir
@@ -2687,6 +2689,34 @@ cachedir=$cachedir
   exec_prefix=$exec_prefix_save
 
 
+  EXP_VAR=LIBEXECDIR
+  FROM_VAR=$libexecdir
+
+    prefix_save=$prefix
+  exec_prefix_save=$exec_prefix
+
+    if test "x$prefix" = "xNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+    if test "x$exec_prefix" = "xNONE"; then
+    exec_prefix=$prefix
+  fi
+
+  full_var="$FROM_VAR"
+    while true; do
+    new_full_var="`eval echo $full_var`"
+    if test "x$new_full_var" = "x$full_var"; then break; fi
+    full_var=$new_full_var
+  done
+
+    full_var=$new_full_var
+  LIBEXECDIR="$full_var"
+
+
+    prefix=$prefix_save
+  exec_prefix=$exec_prefix_save
+
+
   EXP_VAR=DATADIR
   FROM_VAR=$datadir
 
@@ -2715,6 +2745,34 @@ cachedir=$cachedir
   exec_prefix=$exec_prefix_save
 
 
+  EXP_VAR=DOCDIR
+  FROM_VAR=$docdir
+
+    prefix_save=$prefix
+  exec_prefix_save=$exec_prefix
+
+    if test "x$prefix" = "xNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+    if test "x$exec_prefix" = "xNONE"; then
+    exec_prefix=$prefix
+  fi
+
+  full_var="$FROM_VAR"
+    while true; do
+    new_full_var="`eval echo $full_var`"
+    if test "x$new_full_var" = "x$full_var"; then break; fi
+    full_var=$new_full_var
+  done
+
+    full_var=$new_full_var
+  DOCDIR="$full_var"
+
+
+    prefix=$prefix_save
+  exec_prefix=$exec_prefix_save
+
+
   EXP_VAR=SYSCONFDIR
   FROM_VAR=$sysconfdir
 
diff --git a/codepot/configure.ac b/codepot/configure.ac
index 0391cbd0..38f938e8 100644
--- a/codepot/configure.ac
+++ b/codepot/configure.ac
@@ -64,7 +64,9 @@ AC_SUBST(cachedir, $cachedir)
 
 AS_AC_EXPAND(PREFIX, $prefix)
 AS_AC_EXPAND(LIBDIR, $libdir)
+AS_AC_EXPAND(LIBEXECDIR, $libexecdir)
 AS_AC_EXPAND(DATADIR, $datadir)
+AS_AC_EXPAND(DOCDIR, $docdir)
 AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
 AS_AC_EXPAND(LOCALSTATEDIR, $localstatedir)
 AS_AC_EXPAND(BINDIR, $bindir)
diff --git a/codepot/etc/Makefile.in b/codepot/etc/Makefile.in
index cedecfdb..84920be8 100644
--- a/codepot/etc/Makefile.in
+++ b/codepot/etc/Makefile.in
@@ -85,6 +85,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -96,6 +97,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/etc/codepot.ini.in b/codepot/etc/codepot.ini.in
index 5cc2d70e..ed84904c 100644
--- a/codepot/etc/codepot.ini.in
+++ b/codepot/etc/codepot.ini.in
@@ -91,6 +91,11 @@ max_upload_size = "10000"
 ;------------------------------------------------------------------------------
 max_latest_projects = "10"
 
+;------------------------------------------------------------------------------
+; Maximum number of projects to show 
+;------------------------------------------------------------------------------
+max_projects_per_page = "50"
+
 ;------------------------------------------------------------------------------
 ; Maximum number of issues to show 
 ;------------------------------------------------------------------------------
diff --git a/codepot/etc/repo.sh b/codepot/etc/repo.sh
index eb95e228..f314a8d6 100755
--- a/codepot/etc/repo.sh
+++ b/codepot/etc/repo.sh
@@ -45,13 +45,13 @@ make_repo() {
 		chmod 0755 "${repodir}/post-commit"
 	#}
 
-	svnadmin create "${repodir}/${reponame}" && {
+	#svnadmin create "${repodir}/${reponame}" && { 
 		oldpwd="`pwd`"
 		cd "${repodir}/${reponame}/hooks"
 		ln -sf ../../start-commit start-commit
 		ln -sf ../../post-commit post-commit
 		cd "${oldpwd}"
-	}
+	#}
 
 	return 0;
 }
diff --git a/codepot/src/Makefile.in b/codepot/src/Makefile.in
index 7474927a..4b695568 100644
--- a/codepot/src/Makefile.in
+++ b/codepot/src/Makefile.in
@@ -123,6 +123,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -134,6 +135,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/codepot/Makefile.in b/codepot/src/codepot/Makefile.in
index f9ccd363..8bc01793 100644
--- a/codepot/src/codepot/Makefile.in
+++ b/codepot/src/codepot/Makefile.in
@@ -122,6 +122,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -133,6 +134,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/codepot/config/Makefile.in b/codepot/src/codepot/config/Makefile.in
index 2cc28752..0ac4f118 100644
--- a/codepot/src/codepot/config/Makefile.in
+++ b/codepot/src/codepot/config/Makefile.in
@@ -82,6 +82,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -93,6 +94,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/codepot/controllers/Makefile.in b/codepot/src/codepot/controllers/Makefile.in
index fbeaaaf6..21ef24c1 100644
--- a/codepot/src/codepot/controllers/Makefile.in
+++ b/codepot/src/codepot/controllers/Makefile.in
@@ -82,6 +82,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -93,6 +94,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/codepot/controllers/issue.php b/codepot/src/codepot/controllers/issue.php
index f3c82d21..b9e94e2f 100644
--- a/codepot/src/codepot/controllers/issue.php
+++ b/codepot/src/codepot/controllers/issue.php
@@ -8,30 +8,6 @@ class Issue extends Controller
 	var $VIEW_EDIT = 'issue_edit';
 	var $VIEW_DELETE = 'issue_delete';
 
-	var $TYPE_DEFECT       = 'defect';
-	var $TYPE_REQUEST      = 'request';
-	var $TYPE_OTHER        = 'other';
-
-	// a newly created issue is set to 'new'.
-	var $STATUS_NEW        = 'new';
-	var $STATUS_OTHER      = 'other';  // other to default
-
-	// the issue created is either accepted or rejected
-	var $STATUS_ACCEPTED   = 'accepted';
-	var $STATUS_REJECTED   = 'rejected'; 
-
-	// one accepted, it is worked on and be resolved eventually.
-	var $STATUS_STARTED    = 'started';
-	// the work can be stalled for various reasons during progress
-	var $STATUS_STALLED    = 'stalled'; 
-	var $STATUS_RESOLVED   = 'resolved';
-
-	var $PRIORITY_CRITICAL = 'critical';
-	var $PRIORITY_HIGH     = 'high';
-	var $PRIORITY_MEDIUM   = 'medium';
-	var $PRIORITY_LOW      = 'low';
-	var $PRIORITY_OTHER    = 'other';
-
 	function Issue ()
 	{
 		parent::Controller ();
@@ -42,6 +18,7 @@ class Issue extends Controller
 		$this->load->model (CODEPOT_LOGIN_MODEL, 'login');
 
 		$this->load->library ('Language', 'lang');
+		$this->load->library ('IssueHelper', 'issuehelper');
 		$this->lang->load ('common', CODEPOT_LANG);
 		$this->lang->load ('issue', CODEPOT_LANG);
 	}
@@ -150,9 +127,9 @@ class Issue extends Controller
 			{
 				$this->pagination->initialize ($pagecfg);
 				$data['page_links'] = $this->pagination->create_links ();
-				$data['issue_type_array'] = $this->_get_type_array();
-				$data['issue_status_array'] = $this->_get_status_array();
-				$data['issue_priority_array'] = $this->_get_priority_array();
+				$data['issue_type_array'] = $this->issuehelper->_get_type_array($this->lang);
+				$data['issue_status_array'] = $this->issuehelper->_get_status_array($this->lang);
+				$data['issue_priority_array'] = $this->issuehelper->_get_priority_array($this->lang);
 				$data['total_num_issues'] = $num_entries;
 				$data['project'] = $project;
 				$data['issues'] = $issues;
@@ -262,9 +239,9 @@ class Issue extends Controller
 			}
 			else
 			{
-				$data['issue_type_array'] = $this->_get_type_array();
-				$data['issue_status_array'] = $this->_get_status_array();
-				$data['issue_priority_array'] = $this->_get_priority_array();
+				$data['issue_type_array'] = $this->issuehelper->_get_type_array($this->lang);
+				$data['issue_status_array'] = $this->issuehelper->_get_status_array($this->lang);
+				$data['issue_priority_array'] = $this->issuehelper->_get_priority_array($this->lang);
 				$data['project'] = $project;
 				$data['issue'] = $issue;
 				$this->load->view ($this->VIEW_SHOW, $data);
@@ -307,8 +284,6 @@ class Issue extends Controller
 		}
 		else
 		{
-			{
-			}
 			$this->form_validation->set_rules (
 				'issue_projectid', 'project ID', 'required|alpha_dash|max_length[32]');
 			$this->form_validation->set_rules (
@@ -327,9 +302,9 @@ class Issue extends Controller
 			$data['mode'] = $mode;
 			$data['message'] = '';
 			$data['project'] = $project;
-			$data['issue_type_array'] = $this->_get_type_array();
-			$data['issue_status_array'] = $this->_get_status_array();
-			$data['issue_priority_array'] = $this->_get_priority_array();
+			$data['issue_type_array'] = $this->issuehelper->_get_type_array($this->lang);
+			$data['issue_status_array'] = $this->issuehelper->_get_status_array($this->lang);
+			$data['issue_priority_array'] = $this->issuehelper->_get_priority_array($this->lang);
 
 			if ($this->input->post('issue'))
 			{
@@ -395,10 +370,11 @@ class Issue extends Controller
 					$issue->id = $id;
 					$issue->summary = '';
 					$issue->description = '';
-					$issue->type = $this->TYPE_DEFECT;
-					$issue->status = $this->STATUS_NEW;
-					$issue->priority = $this->PRIORITY_OTHER;
-					$issue->owner = '';
+					$issue->type = $this->issuehelper->TYPE_DEFECT;
+					$issue->status = $this->issuehelper->STATUS_NEW;
+					$issue->priority = $this->issuehelper->PRIORITY_OTHER;
+					$members = explode (',', $project->members);
+					$issue->owner = (count($members) > 0)? $members[0]: '';
 
 					$data['issue'] = $issue;
 					$this->load->view ($this->VIEW_EDIT, $data);	
@@ -519,52 +495,4 @@ class Issue extends Controller
 		}
 	}
 
-	function _get_type_array ()
-	{
-		return array (
-			$this->TYPE_DEFECT  => 
-				$this->lang->line('ISSUE_TYPE_DEFECT'),
-			$this->TYPE_REQUEST => 
-				$this->lang->line('ISSUE_TYPE_REQUEST'),
-			$this->TYPE_OTHER   => 
-				$this->lang->line('ISSUE_TYPE_OTHER')
-		);
-	}
-
-	function _get_status_array ()
-	{
-		return array (
-			$this->STATUS_NEW       => 
-				$this->lang->line('ISSUE_STATUS_NEW'),
-			$this->STATUS_OTHER     => 
-				$this->lang->line('ISSUE_STATUS_OTHER'),
-			$this->STATUS_ACCEPTED  => 
-				$this->lang->line('ISSUE_STATUS_ACCEPTED'),
-			$this->STATUS_REJECTED  => 
-				$this->lang->line('ISSUE_STATUS_REJECTED'),
-			$this->STATUS_STARTED => 
-				$this->lang->line('ISSUE_STATUS_STARTED'),
-			$this->STATUS_STALLED   => 
-				$this->lang->line('ISSUE_STATUS_STALLED'),
-			$this->STATUS_RESOLVED  => 
-				$this->lang->line('ISSUE_STATUS_RESOLVED')
-		);
-	}
-
-	function _get_priority_array ()
-	{
-		return array (
-			$this->PRIORITY_CRITICAL => 
-				$this->lang->line('ISSUE_PRIORITY_CRITICAL'),
-			$this->PRIORITY_HIGH     => 
-				$this->lang->line('ISSUE_PRIORITY_HIGH'),
-			$this->PRIORITY_MEDIUM   => 
-				$this->lang->line('ISSUE_PRIORITY_MEDIUM'),
-			$this->PRIORITY_LOW      => 
-				$this->lang->line('ISSUE_PRIORITY_LOW'),
-			$this->PRIORITY_OTHER    => 
-				$this->lang->line('ISSUE_PRIORITY_OTHER')
-		);
-
-	}
 }
diff --git a/codepot/src/codepot/controllers/main.php b/codepot/src/codepot/controllers/main.php
index 35097e23..d0736e22 100644
--- a/codepot/src/codepot/controllers/main.php
+++ b/codepot/src/codepot/controllers/main.php
@@ -70,11 +70,11 @@ class Main extends Controller
 		redirect ('main/index');
 	}
 
-	function signout ($url = "")
+	function signout ($xurl = "")
 	{
 		$this->login->deauthenticate ();
-		if ($url != "") redirect ($this->converter->HexToAscii($url));
-		else redirect ('site/home');
+		$url = ($xurl != "")? $this->converter->HexToAscii($xurl): 'site/home';
+		redirect ($url);
 	}
 
 }
diff --git a/codepot/src/codepot/controllers/project.php b/codepot/src/codepot/controllers/project.php
index 3b4840d3..efad7a5f 100644
--- a/codepot/src/codepot/controllers/project.php
+++ b/codepot/src/codepot/controllers/project.php
@@ -6,6 +6,7 @@ class Project extends Controller
 	var $VIEW_HOME = 'project_home';
 	var $VIEW_EDIT = 'project_edit';
 	var $VIEW_DELETE = 'project_delete';
+	var $VIEW_CATALOG = 'project_catalog';
 	var $VIEW_LOG = 'log';
 
 	function Project ()
@@ -19,6 +20,94 @@ class Project extends Controller
 
 		$this->load->library ('Language', 'lang');
 		$this->lang->load ('common', CODEPOT_LANG);
+		$this->lang->load ('project', CODEPOT_LANG);
+	}
+
+	function catalog ($filter = '', $offset = '')
+	{
+		$this->load->model ('ProjectModel', 'projects');
+	
+		$login = $this->login->getUser ();
+		if (CODEPOT_SIGNIN_COMPULSORY && $login['id'] == '')
+			redirect ('main/signin');
+		$data['login'] = $login;
+
+		if ($filter == '')
+		{
+			$search->id = '';
+			$search->name = '';
+			$search->summary = '';
+		}
+		else
+		{
+			parse_str ($this->converter->HexToAscii($filter), $search);
+			if (!array_key_exists ('id', $search)) $search['id'] = '';
+			if (!array_key_exists ('name', $search)) $search['name'] = '';
+			if (!array_key_exists ('summary', $search)) $search['summary'] = '';
+
+			$search = (object) $search;
+		}
+
+		$data['search'] = $search;
+
+		$this->load->library ('pagination');
+
+
+		if ($filter == '' && $offset == '')
+		{
+			$offset = 0;
+			$pagecfg['base_url'] = site_url() . "/project/catalog/";
+			$pagecfg['uri_segment'] = 3;
+		}
+		else if ($filter != '' && $offset == '')
+		{
+			if (is_numeric($filter))
+			{
+				$offset = (integer) $filter;
+				$pagecfg['base_url'] = site_url() . "/project/catalog/";
+				$pagecfg['uri_segment'] = 3;
+			}
+			else
+			{
+				$offset = 0;
+				$pagecfg['base_url'] = site_url() . "/project/catalog/{$filter}/";
+				$pagecfg['uri_segment'] = 4;
+			}
+		}
+		else 
+		{
+			$offset = (integer) $offset;
+			$pagecfg['base_url'] = site_url() . "/project/catalog/{$filter}/";
+			$pagecfg['uri_segment'] = 4;
+		}
+
+		$num_entries = $this->projects->getNumEntries ($login['id'], $search);
+		if ($num_entries === FALSE)
+		{
+			$data['message'] = 'DATABASE ERROR';
+			$this->load->view ($this->VIEW_ERROR, $data);
+			return;
+		}
+
+		$pagecfg['total_rows'] = $num_entries;
+		$pagecfg['per_page'] = CODEPOT_MAX_PROJECTS_PER_PAGE;
+		$pagecfg['first_link'] = $this->lang->line('First');
+		$pagecfg['last_link'] = $this->lang->line('Last');
+
+		$projects = $this->projects->getEntries ($login['id'], $offset, $pagecfg['per_page'], $search);
+		if ($projects === FALSE)
+		{
+			$data['message'] = 'DATABASE ERROR';
+			$this->load->view ($this->VIEW_ERROR, $data);
+		}
+		else
+		{
+			$this->pagination->initialize ($pagecfg);
+			$data['page_links'] = $this->pagination->create_links ();
+			$data['total_num_projects'] = $num_entries;
+			$data['projects'] = $projects;
+			$this->load->view ($this->VIEW_CATALOG, $data);
+		}
 	}
 
 	function home ($projectid = "")
@@ -224,8 +313,8 @@ class Project extends Controller
 					else 
 					{
 						// the project has been deleted successfully.
-						// go back to the project list.	
-						redirect ('site/projectlist');
+						// go to the project catalog.	
+						redirect ('project/catalog');
 					}
 				}
 				else 
diff --git a/codepot/src/codepot/controllers/site.php b/codepot/src/codepot/controllers/site.php
index 923886d5..d8301394 100644
--- a/codepot/src/codepot/controllers/site.php
+++ b/codepot/src/codepot/controllers/site.php
@@ -9,7 +9,7 @@ class Site extends Controller
 	var $VIEW_DELETE = 'site_delete';
         var $VIEW_CATALOG = 'site_catalog';
 	var $VIEW_LOG = 'log';
-        var $VIEW_PROJECT_LIST = 'project_list';
+        var $VIEW_USER_HOME = 'user_home';
 
 	function Site ()
 	{
@@ -403,29 +403,44 @@ class Site extends Controller
 		$this->load->view ($this->VIEW_LOG, $data);
 	}
 
-	function projectlist ()
+	function userhome ()
 	{
 		$login = $this->login->getUser ();
 		if (CODEPOT_SIGNIN_COMPULSORY && $login['id'] == '')
 			redirect ('main/signin');
 
+		$this->load->library ('IssueHelper', 'issuehelper');
+		$this->lang->load ('issue', CODEPOT_LANG);
+
 		$this->load->model ('ProjectModel', 'projects');
+		$this->load->model ('IssueModel', 'issues');
 
-		$projects = $this->projects->getMyProjects ($login['id']);
-		$other_projects = $this->projects->getOtherProjects ($login['id']);
-
-		if ($projects === FALSE || $other_projects === FALSE)
+		if ($login['id'] == '')
 		{
-			$data['login'] = $login;
-			$data['message'] = 'DATABASE ERROR';
-			$this->load->view ($this->VIEW_ERROR, $data);
+			redirect ('site/home');
 		}
 		else
 		{
-			$data['login'] = $login;
-			$data['projects'] = $projects;
-			$data['other_projects'] = $other_projects;
-			$this->load->view ($this->VIEW_PROJECT_LIST, $data);
+			$projects = $this->projects->getMyProjects ($login['id']);
+
+			$issues = $this->issues->getMyIssues (
+				$login['id'], $this->issuehelper->_get_open_status_array($this->lang));
+			if ($projects === FALSE || $issues === FALSE)
+			{
+				$data['login'] = $login;
+				$data['message'] = 'DATABASE ERROR';
+				$this->load->view ($this->VIEW_ERROR, $data);
+			}
+			else
+			{
+				$data['login'] = $login;
+				$data['projects'] = $projects;
+				$data['issues'] = $issues;
+				$data['issue_type_array'] = $this->issuehelper->_get_type_array($this->lang);
+				$data['issue_status_array'] = $this->issuehelper->_get_status_array($this->lang);
+				$data['issue_priority_array'] = $this->issuehelper->_get_priority_array($this->lang);
+				$this->load->view ($this->VIEW_USER_HOME, $data);
+			}
 		}
 	}
 
diff --git a/codepot/src/codepot/controllers/wiki.php b/codepot/src/codepot/controllers/wiki.php
index a43affea..0c160967 100644
--- a/codepot/src/codepot/controllers/wiki.php
+++ b/codepot/src/codepot/controllers/wiki.php
@@ -213,7 +213,7 @@ class Wiki extends Controller
 
 				if ($this->form_validation->run())
 				{
-					if ($this->_is_reserved ($wiki->name, FALSE))
+					if ($this->wikihelper->_is_reserved ($wiki->name, FALSE))
 					{
 						$data['message'] = "RESERVED WIKI NAME - {$wiki->name}";
 						$data['wiki'] = $wiki;
@@ -324,7 +324,7 @@ class Wiki extends Controller
 			$data['message'] = "NO PERMISSION - $projectid";
 			$this->load->view ($this->VIEW_ERROR, $data);
 		}
-		else if ($this->_is_reserved ($name, FALSE))
+		else if ($this->wikihelper->_is_reserved ($name, FALSE))
 		{
 			$data['project'] = $project;
 			$data['message'] = "RESERVED WIKI PAGE - $name ";
diff --git a/codepot/src/codepot/errors/Makefile.in b/codepot/src/codepot/errors/Makefile.in
index ec3d83ab..5faba6bf 100644
--- a/codepot/src/codepot/errors/Makefile.in
+++ b/codepot/src/codepot/errors/Makefile.in
@@ -82,6 +82,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -93,6 +94,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/codepot/helpers/Makefile.in b/codepot/src/codepot/helpers/Makefile.in
index 57b235bf..e1548bb0 100644
--- a/codepot/src/codepot/helpers/Makefile.in
+++ b/codepot/src/codepot/helpers/Makefile.in
@@ -82,6 +82,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -93,6 +94,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/codepot/hooks/Makefile.in b/codepot/src/codepot/hooks/Makefile.in
index 9f916279..6e267f26 100644
--- a/codepot/src/codepot/hooks/Makefile.in
+++ b/codepot/src/codepot/hooks/Makefile.in
@@ -82,6 +82,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -93,6 +94,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/codepot/language/Makefile.in b/codepot/src/codepot/language/Makefile.in
index c9f3634e..ac20b623 100644
--- a/codepot/src/codepot/language/Makefile.in
+++ b/codepot/src/codepot/language/Makefile.in
@@ -98,6 +98,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -109,6 +110,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/codepot/language/english/Makefile.am b/codepot/src/codepot/language/english/Makefile.am
index 96af13a8..277de438 100644
--- a/codepot/src/codepot/language/english/Makefile.am
+++ b/codepot/src/codepot/language/english/Makefile.am
@@ -3,6 +3,7 @@ www_DATA =  \
 	common_lang.php \
 	issue_lang.php \
 	index.html \
+	project_lang.php \
 	site_lang.php
 
 EXTRA_DIST = $(www_DATA)
diff --git a/codepot/src/codepot/language/english/Makefile.in b/codepot/src/codepot/language/english/Makefile.in
index 5dbb3238..d2ab4823 100644
--- a/codepot/src/codepot/language/english/Makefile.in
+++ b/codepot/src/codepot/language/english/Makefile.in
@@ -82,6 +82,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -93,6 +94,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
@@ -166,6 +168,7 @@ www_DATA = \
 	common_lang.php \
 	issue_lang.php \
 	index.html \
+	project_lang.php \
 	site_lang.php
 
 EXTRA_DIST = $(www_DATA)
diff --git a/codepot/src/codepot/language/english/common_lang.php b/codepot/src/codepot/language/english/common_lang.php
index 6f5de9da..7e70a90e 100644
--- a/codepot/src/codepot/language/english/common_lang.php
+++ b/codepot/src/codepot/language/english/common_lang.php
@@ -40,6 +40,7 @@ $lang['MD5'] = 'MD5';
 $lang['Member'] = 'Member';
 $lang['Members'] = 'Members';
 $lang['Message'] = 'Message';
+$lang['My issues'] = 'My issues';
 $lang['My projects'] = 'My projects';
 $lang['Name'] = 'Name';
 $lang['New'] = 'New';
diff --git a/codepot/src/codepot/language/english/issue_lang.php b/codepot/src/codepot/language/english/issue_lang.php
index aa7780bf..aaa99418 100644
--- a/codepot/src/codepot/language/english/issue_lang.php
+++ b/codepot/src/codepot/language/english/issue_lang.php
@@ -17,8 +17,8 @@ $lang['ISSUE_PRIORITY_MEDIUM'] = 'Medium';
 $lang['ISSUE_PRIORITY_LOW'] = 'Low';
 $lang['ISSUE_PRIORITY_OTHER'] = 'Other';
 
+$lang['ISSUE_MSG_CHANGED_X_TO_Z'] = "Changed <span class='quoted'>%s</span> to <span class='quoted'>%s</span>";
 $lang['ISSUE_MSG_CHANGED_X_FROM_Y_TO_Z'] = "Changed <span class='quoted'>%s</span> from <span class='quoted'>%s</span> to <span class='quoted'>%s</span>";
 $lang['ISSUE_MSG_CONFIRM_UNDO'] = 'Are you sure to undo the last change?';
 $lang['ISSUE_MSG_TOTAL_NUM_ISSUES'] = 'Total %d issues';
-
 ?>
diff --git a/codepot/src/codepot/language/english/project_lang.php b/codepot/src/codepot/language/english/project_lang.php
new file mode 100644
index 00000000..0ffa897b
--- /dev/null
+++ b/codepot/src/codepot/language/english/project_lang.php
@@ -0,0 +1,3 @@
+<?php
+$lang['PROJECT_MSG_TOTAL_NUM_PROJECTS'] = 'Total %d projects';
+?>
diff --git a/codepot/src/codepot/language/indonesian/Makefile.in b/codepot/src/codepot/language/indonesian/Makefile.in
index c5e67805..aecb56f8 100644
--- a/codepot/src/codepot/language/indonesian/Makefile.in
+++ b/codepot/src/codepot/language/indonesian/Makefile.in
@@ -82,6 +82,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -93,6 +94,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/codepot/language/indonesian/common_lang.php b/codepot/src/codepot/language/indonesian/common_lang.php
index 4d52406b..112d4d8d 100644
--- a/codepot/src/codepot/language/indonesian/common_lang.php
+++ b/codepot/src/codepot/language/indonesian/common_lang.php
@@ -40,6 +40,7 @@ $lang['MD5'] = 'MD5';
 $lang['Member'] = 'Anggota';
 $lang['Members'] = 'Anggota';
 $lang['Message'] = 'Pesan';
+$lang['My issues'] = 'Issue saya';
 $lang['My projects'] = 'Proyek saya';
 $lang['Name'] = 'Nama';
 $lang['New'] = 'Baru';
diff --git a/codepot/src/codepot/language/korean/Makefile.am b/codepot/src/codepot/language/korean/Makefile.am
index 2961fad0..4407ba72 100644
--- a/codepot/src/codepot/language/korean/Makefile.am
+++ b/codepot/src/codepot/language/korean/Makefile.am
@@ -3,6 +3,7 @@ www_DATA =  \
 	common_lang.php \
 	issue_lang.php \
 	index.html \
+	project_lang.php \
 	site_lang.php 
 
 EXTRA_DIST = $(www_DATA)
diff --git a/codepot/src/codepot/language/korean/Makefile.in b/codepot/src/codepot/language/korean/Makefile.in
index 27220b90..aee213d6 100644
--- a/codepot/src/codepot/language/korean/Makefile.in
+++ b/codepot/src/codepot/language/korean/Makefile.in
@@ -82,6 +82,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -93,6 +94,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
@@ -166,6 +168,7 @@ www_DATA = \
 	common_lang.php \
 	issue_lang.php \
 	index.html \
+	project_lang.php \
 	site_lang.php 
 
 EXTRA_DIST = $(www_DATA)
diff --git a/codepot/src/codepot/language/korean/common_lang.php b/codepot/src/codepot/language/korean/common_lang.php
index 8739a2c5..5768489e 100644
--- a/codepot/src/codepot/language/korean/common_lang.php
+++ b/codepot/src/codepot/language/korean/common_lang.php
@@ -40,6 +40,7 @@ $lang['MD5'] = 'MD5';
 $lang['Member'] = '구성원';
 $lang['Members'] = '구성원';
 $lang['Message'] = '메시지';
+$lang['My issues'] = '내 이슈';
 $lang['My projects'] = '내 프로젝트';
 $lang['Name'] = '이름';
 $lang['New'] = '신규';
diff --git a/codepot/src/codepot/language/korean/issue_lang.php b/codepot/src/codepot/language/korean/issue_lang.php
index 2739301a..af0b6d98 100644
--- a/codepot/src/codepot/language/korean/issue_lang.php
+++ b/codepot/src/codepot/language/korean/issue_lang.php
@@ -17,9 +17,8 @@ $lang['ISSUE_PRIORITY_MEDIUM'] = '중간';
 $lang['ISSUE_PRIORITY_LOW'] = '낮음';
 $lang['ISSUE_PRIORITY_OTHER'] = '기타';
 
-
+$lang['ISSUE_MSG_CHANGED_X_TO_Z'] = "<span class='quoted'>%s</span>을/를 <span class='quoted'>%s</span>(으)로 변경";
 $lang['ISSUE_MSG_CHANGED_X_FROM_Y_TO_Z'] = "<span class='quoted'>%s</span>을/를 <span class='quoted'>%s</span>에서  <span class='quoted'>%s</span>(으)로 변경";
 $lang['ISSUE_MSG_CONFIRM_UNDO'] = '마지막 변경내용을 취소할까요?';
 $lang['ISSUE_MSG_TOTAL_NUM_ISSUES'] = '전체 이슈 %d개';
-
 ?>
diff --git a/codepot/src/codepot/language/korean/project_lang.php b/codepot/src/codepot/language/korean/project_lang.php
new file mode 100644
index 00000000..ed7057fe
--- /dev/null
+++ b/codepot/src/codepot/language/korean/project_lang.php
@@ -0,0 +1,3 @@
+<?php
+$lang['PROJECT_MSG_TOTAL_NUM_PROJECTS'] = '전체 프로젝트 %d개';
+?>
diff --git a/codepot/src/codepot/libraries/Makefile.am b/codepot/src/codepot/libraries/Makefile.am
index 6f523de8..3289591f 100644
--- a/codepot/src/codepot/libraries/Makefile.am
+++ b/codepot/src/codepot/libraries/Makefile.am
@@ -3,6 +3,7 @@ www_DATA =  \
 	converter.php \
 	index.html \
 	Lang_detect.php \
+	issuehelper.php \
 	wikihelper.php 
 
 EXTRA_DIST = $(www_DATA)
diff --git a/codepot/src/codepot/libraries/Makefile.in b/codepot/src/codepot/libraries/Makefile.in
index dfb5e6d5..0cf7d5cf 100644
--- a/codepot/src/codepot/libraries/Makefile.in
+++ b/codepot/src/codepot/libraries/Makefile.in
@@ -82,6 +82,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -93,6 +94,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
@@ -166,6 +168,7 @@ www_DATA = \
 	converter.php \
 	index.html \
 	Lang_detect.php \
+	issuehelper.php \
 	wikihelper.php 
 
 EXTRA_DIST = $(www_DATA)
diff --git a/codepot/src/codepot/libraries/issuehelper.php b/codepot/src/codepot/libraries/issuehelper.php
new file mode 100644
index 00000000..c230c66a
--- /dev/null
+++ b/codepot/src/codepot/libraries/issuehelper.php
@@ -0,0 +1,95 @@
+<?php
+class IssueHelper
+{
+	var $TYPE_DEFECT       = 'defect';
+	var $TYPE_REQUEST      = 'request';
+	var $TYPE_OTHER        = 'other';
+
+	// a newly created issue is set to 'new'.
+	var $STATUS_NEW        = 'new';
+	var $STATUS_OTHER      = 'other';  // other to default
+
+	// the issue created is either accepted or rejected
+	var $STATUS_ACCEPTED   = 'accepted';
+	var $STATUS_REJECTED   = 'rejected'; 
+
+	// one accepted, it is worked on and be resolved eventually.
+	var $STATUS_STARTED    = 'started';
+	// the work can be stalled for various reasons during progress
+	var $STATUS_STALLED    = 'stalled'; 
+	var $STATUS_RESOLVED   = 'resolved';
+
+	var $PRIORITY_CRITICAL = 'critical';
+	var $PRIORITY_HIGH     = 'high';
+	var $PRIORITY_MEDIUM   = 'medium';
+	var $PRIORITY_LOW      = 'low';
+	var $PRIORITY_OTHER    = 'other';
+
+	function IssueHelper ()
+	{
+	}
+
+	function _get_type_array ($lang)
+	{
+		return array (
+			$this->TYPE_DEFECT  => 
+				$lang->line('ISSUE_TYPE_DEFECT'),
+			$this->TYPE_REQUEST => 
+				$lang->line('ISSUE_TYPE_REQUEST'),
+			$this->TYPE_OTHER   => 
+				$lang->line('ISSUE_TYPE_OTHER')
+		);
+	}
+
+	function _get_status_array ($lang)
+	{
+		return array (
+			$this->STATUS_NEW       => 
+				$lang->line('ISSUE_STATUS_NEW'),
+			$this->STATUS_OTHER     => 
+				$lang->line('ISSUE_STATUS_OTHER'),
+			$this->STATUS_ACCEPTED  => 
+				$lang->line('ISSUE_STATUS_ACCEPTED'),
+			$this->STATUS_REJECTED  => 
+				$lang->line('ISSUE_STATUS_REJECTED'),
+			$this->STATUS_STARTED => 
+				$lang->line('ISSUE_STATUS_STARTED'),
+			$this->STATUS_STALLED   => 
+				$lang->line('ISSUE_STATUS_STALLED'),
+			$this->STATUS_RESOLVED  => 
+				$lang->line('ISSUE_STATUS_RESOLVED')
+		);
+	}
+
+	function _get_open_status_array ($lang)
+	{
+		return array (
+			$this->STATUS_NEW       => 
+				$lang->line('ISSUE_STATUS_NEW'),
+			$this->STATUS_ACCEPTED  => 
+				$lang->line('ISSUE_STATUS_ACCEPTED'),
+			$this->STATUS_STARTED => 
+				$lang->line('ISSUE_STATUS_STARTED'),
+			$this->STATUS_STALLED   => 
+				$lang->line('ISSUE_STATUS_STALLED')
+		);
+	}
+
+	function _get_priority_array ($lang)
+	{
+		return array (
+			$this->PRIORITY_CRITICAL => 
+				$lang->line('ISSUE_PRIORITY_CRITICAL'),
+			$this->PRIORITY_HIGH     => 
+				$lang->line('ISSUE_PRIORITY_HIGH'),
+			$this->PRIORITY_MEDIUM   => 
+				$lang->line('ISSUE_PRIORITY_MEDIUM'),
+			$this->PRIORITY_LOW      => 
+				$lang->line('ISSUE_PRIORITY_LOW'),
+			$this->PRIORITY_OTHER    => 
+				$lang->line('ISSUE_PRIORITY_OTHER')
+		);
+
+	}
+}
+?>
diff --git a/codepot/src/codepot/models/Makefile.in b/codepot/src/codepot/models/Makefile.in
index 0d7673eb..464884ed 100644
--- a/codepot/src/codepot/models/Makefile.in
+++ b/codepot/src/codepot/models/Makefile.in
@@ -82,6 +82,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -93,6 +94,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/codepot/models/issuemodel.php b/codepot/src/codepot/models/issuemodel.php
index 0fd2057d..a14f8be2 100644
--- a/codepot/src/codepot/models/issuemodel.php
+++ b/codepot/src/codepot/models/issuemodel.php
@@ -93,6 +93,30 @@ class IssueModel extends Model
 		return $query->result ();
 	}
 
+	function getMyIssues ($userid, $filter)
+	{
+		$this->db->trans_start ();
+		$this->db->where ('owner', $userid);
+
+		//$this->db->order_by ('id', 'desc');
+		if (is_array($filter))
+		{
+			$cond = '';
+			foreach ($filter as $k => $v)
+			{
+				if ($cond != '') $cond .= ' OR ';
+				$cond .= "status = '{$k}'";
+			}
+			if ($cond != '') $this->db->where ("($cond)");
+		}
+
+		$query = $this->db->get ('issue');
+		$this->db->trans_complete ();
+
+		if ($this->db->trans_status() === FALSE) return FALSE;
+		return $query->result ();
+	}
+
 	function create ($userid, $issue)
 	{
 		// TODO: check if userid can do this..
diff --git a/codepot/src/codepot/models/projectmodel.php b/codepot/src/codepot/models/projectmodel.php
index 78929edb..a7161bb1 100644
--- a/codepot/src/codepot/models/projectmodel.php
+++ b/codepot/src/codepot/models/projectmodel.php
@@ -48,6 +48,40 @@ class ProjectModel extends Model
 		return $result[0];
 	}
 
+	function getNumEntries ($userid, $search)
+	{
+		$this->db->trans_start ();
+
+		$this->db->select ('count(id) as count');
+		$this->db->order_by ('name', 'asc');
+		if ($search->id != '') $this->db->like ('id', $search->id);
+		if ($search->name != '') $this->db->like ('name', $search->name);
+		if ($search->summary != '') $this->db->like ('summary', $search->summary);
+		$query = $this->db->get ('project');
+		$result = $query->result();
+		
+		$num = empty($result)? 0: $result[0]->count;
+
+		$this->db->trans_complete ();
+		if ($this->db->trans_status() === FALSE) return FALSE;
+
+		return $num;
+	}
+
+	function getEntries ($userid, $offset, $limit, $search)
+	{
+		$this->db->trans_start ();
+		$this->db->order_by ('name', 'asc');
+		if ($search->id != '') $this->db->like ('id', $search->id);
+		if ($search->name != '') $this->db->like ('name', $search->name);
+		if ($search->summary != '') $this->db->like ('summary', $search->summary);
+		$query = $this->db->get ('project', $limit, $offset);
+		$this->db->trans_complete ();
+		if ($this->db->trans_status() === FALSE) return FALSE;
+		return $query->result ();
+	}
+
+
 	function create ($userid, $project, $api_base_url)
 	{
 		// TODO: check if userid can do this..
@@ -104,10 +138,18 @@ class ProjectModel extends Model
 
 			$cfgdir = CODEPOT_CFG_DIR;
 			$repodir = CODEPOT_SVNREPO_DIR;
+
+			if (@svn_repos_create ("{$repodir}/{$project->id}") === FALSE)
+			{
+				$this->db->trans_rollback ();
+				return FALSE;
+			}
+
 			$cmd = "'{$cfgdir}/repo.sh' make '{$repodir}' '{$project->id}' '{$cfgdir}' '{$api}'";
 			exec (escapeshellcmd($cmd), $output = array(), $retval);
 			if ($retval != 0) 
 			{
+				$this->deleteDirectory ("{$repodir}/{$project->id}");
 				$this->db->trans_rollback ();
 				return FALSE;
 			}
diff --git a/codepot/src/codepot/views/Makefile.am b/codepot/src/codepot/views/Makefile.am
index de4aed9a..13789b25 100644
--- a/codepot/src/codepot/views/Makefile.am
+++ b/codepot/src/codepot/views/Makefile.am
@@ -19,10 +19,10 @@ www_DATA =  \
 	issue_show.php \
 	log.php \
 	login.php \
+	project_catalog.php \
 	project_delete.php \
 	project_edit.php \
 	project_home.php \
-	project_list.php \
 	projectbar.php \
 	site_catalog.php \
 	site_edit.php \
@@ -30,6 +30,7 @@ www_DATA =  \
 	site_home.php \
 	site_show.php \
 	taskbar.php \
+	user_home.php \
 	wiki_delete.php \
 	wiki_edit.php \
 	wiki_home.php \
diff --git a/codepot/src/codepot/views/Makefile.in b/codepot/src/codepot/views/Makefile.in
index 0481462d..7245eb54 100644
--- a/codepot/src/codepot/views/Makefile.in
+++ b/codepot/src/codepot/views/Makefile.in
@@ -82,6 +82,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -93,6 +94,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
@@ -182,10 +184,10 @@ www_DATA = \
 	issue_show.php \
 	log.php \
 	login.php \
+	project_catalog.php \
 	project_delete.php \
 	project_edit.php \
 	project_home.php \
-	project_list.php \
 	projectbar.php \
 	site_catalog.php \
 	site_edit.php \
@@ -193,6 +195,7 @@ www_DATA = \
 	site_home.php \
 	site_show.php \
 	taskbar.php \
+	user_home.php \
 	wiki_delete.php \
 	wiki_edit.php \
 	wiki_home.php \
diff --git a/codepot/src/codepot/views/code_blame.php b/codepot/src/codepot/views/code_blame.php
index e60dd1ee..753dd1ea 100644
--- a/codepot/src/codepot/views/code_blame.php
+++ b/codepot/src/codepot/views/code_blame.php
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/common.css" />
-<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/project.css" />
+<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/code.css" />
 <script type="text/javascript" src="<?=base_url()?>/js/prettify/prettify.js"></script>
 <script type="text/javascript" src="<?=base_url()?>/js/prettify/lang-css.js"></script>
 <script type="text/javascript" src="<?=base_url()?>/js/prettify/lang-lisp.js"></script>
@@ -15,7 +15,7 @@
 
 <body onload="prettyPrint()">
 
-<div class="content" id="project_code_blame_content">
+<div class="content" id="code_blame_content">
 
 <!---------------------------------------------------------------------------->
 
@@ -37,9 +37,9 @@ $this->load->view (
 
 <!---------------------------------------------------------------------------->
 
-<div class="mainarea" id="project_code_blame_mainarea">
+<div class="mainarea" id="code_blame_mainarea">
 
-<div class="title" id="project_code_blame_mainarea_title">
+<div class="title" id="code_blame_mainarea_title">
 <?php
 	if ($revision <= 0)
 	{
@@ -85,9 +85,9 @@ $this->load->view (
 		print htmlspecialchars($file['fullpath']);
 	}
 ?>
-</div> <!-- project_code_blame_mainarea_title -->
+</div> <!-- code_blame_mainarea_title -->
 
-<div class="menu" id="project_code_blame_mainarea_menu">
+<div class="menu" id="code_blame_mainarea_menu">
 <?php
 $xpar = $this->converter->AsciiToHex ($headpath);
 
@@ -104,9 +104,9 @@ print ' | ';
 print anchor ("code/history/{$project->id}/{$xpar}", $this->lang->line('History'));
 
 ?>
-</div> <!-- project_code_blame_mainarea_menu -->
+</div> <!-- code_blame_mainarea_menu -->
 
-<div class="infostrip" id="project_code_blame_mainarea_infostrip">
+<div class="infostrip" id="code_blame_mainarea_infostrip">
 	<?=anchor ("code/file/{$project->id}/${xpar}/{$file['prev_rev']}", '<<')?> 
 	<?=$this->lang->line('Revision')?>: <?=$file['created_rev']?> 
 	<?=anchor ("code/file/{$project->id}/${xpar}/{$file['next_rev']}", '>>')?> |
@@ -115,14 +115,14 @@ print anchor ("code/history/{$project->id}/{$xpar}", $this->lang->line('History'
 	<?=$this->lang->line('Last updated on')?>: <?=$file['time']?>
 </div>
 
-<div id="project_code_blame_mainarea_result">
+<div id="code_blame_mainarea_result">
 
 <?php 
 	$fileext = substr(strrchr($file['name'], '.'), 1);
 	if ($fileext == "") $fileext = "html"
 ?>
 
-<pre class="prettyprint lang-<?=$fileext?>" id="project_code_blame_mainarea_result_pre">
+<pre class="prettyprint lang-<?=$fileext?>" id="code_blame_mainarea_result_pre">
 <?php
 
 	$content = $file['content'];
@@ -168,11 +168,11 @@ print anchor ("code/history/{$project->id}/{$xpar}", $this->lang->line('History'
 ?>
 </pre>
 
-<div id="project_code_blame_mainarea_result_info">
+<div id="code_blame_mainarea_result_info">
 <script language='javascript'>
 function toggle_logmsg()
 {
-	var x = document.getElementById ('project_code_blame_mainarea_result_info_logmsg');	
+	var x = document.getElementById ('code_blame_mainarea_result_info_logmsg');	
 	if (x) x.style.visibility = (x.style.visibility == 'visible')? 'hidden': 'visible';
 	return false;
 }
@@ -181,14 +181,14 @@ function toggle_logmsg()
 <div class="title">
 <a href='#' onClick='toggle_logmsg()'><?= $this->lang->line('Message') ?></a>
 </div>
-<pre id="project_code_blame_mainarea_result_info_logmsg" style="visibility: visible">
+<pre id="code_blame_mainarea_result_info_logmsg" style="visibility: visible">
 <?= $file['logmsg'] ?>
 </pre>
-</div> <!-- project_code_blame_mainarea_result_info -->
+</div> <!-- code_blame_mainarea_result_info -->
 
-</div> <!-- project_code_blame_mainarea_result -->
+</div> <!-- code_blame_mainarea_result -->
 
-</div> <!-- project_code_blame_mainarea -->
+</div> <!-- code_blame_mainarea -->
 
 <!---------------------------------------------------------------------------->
 
@@ -197,7 +197,7 @@ function toggle_logmsg()
 
 <!---------------------------------------------------------------------------->
 
-</div> <!--  project_code_blame_content -->
+</div> <!--  code_blame_content -->
 
 </body>
 
diff --git a/codepot/src/codepot/views/code_diff.php b/codepot/src/codepot/views/code_diff.php
index 23e9a17f..db09a27e 100644
--- a/codepot/src/codepot/views/code_diff.php
+++ b/codepot/src/codepot/views/code_diff.php
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/common.css" />
-<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/project.css" />
+<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/code.css" />
 <script type="text/javascript" src="<?=base_url()?>/js/prettify/prettify.js"></script>
 <script type="text/javascript" src="<?=base_url()?>/js/prettify/lang-css.js"></script>
 <script type="text/javascript" src="<?=base_url()?>/js/prettify/lang-lisp.js"></script>
@@ -15,7 +15,7 @@
 
 <body onload="prettyPrint()">
 
-<div class="content" id="project_code_diff_content">
+<div class="content" id="code_diff_content">
 
 <!---------------------------------------------------------------------------->
 
@@ -37,9 +37,9 @@ $this->load->view (
 
 <!---------------------------------------------------------------------------->
 
-<div class="mainarea" id="project_code_diff_mainarea">
+<div class="mainarea" id="code_diff_mainarea">
 
-<div class="title" id="project_code_diff_mainarea_title">
+<div class="title" id="code_diff_mainarea_title">
 <?php
 	if ($revision1 <= 0)
 	{
@@ -70,9 +70,9 @@ $this->load->view (
 		print anchor ($xpar, htmlspecialchars($exps[$i]));
 	}
 ?>
-</div> <!-- project_code_diff_mainarea_title -->
+</div> <!-- code_diff_mainarea_title -->
 
-<div class="menu" id="project_code_diff_mainarea_menu">
+<div class="menu" id="code_diff_mainarea_menu">
 <?php
 	$xpar = $this->converter->AsciiTohex ($headpath);
 	print anchor (
@@ -87,15 +87,15 @@ $this->load->view (
 		"code/history/{$project->id}/{$xpar}",
 		$this->lang->line('History'));
 ?>
-</div> <!-- project_code_diff_mainarea_menu -->
+</div> <!-- code_diff_mainarea_menu -->
 
 <?php 
 	$fileext = substr(strrchr($file['name'], '.'), 1);
 	if ($fileext == "") $fileext = "html"
 ?>
 
-<div id="project_code_diff_mainarea_result">
-<table id="project_code_diff_mainarea_result_table">
+<div id="code_diff_mainarea_result">
+<table id="code_diff_mainarea_result_table">
 <?php
 
 	/*
@@ -221,7 +221,7 @@ $this->load->view (
 </table>
 </div>
 
-</div> <!-- project_code_diff_mainarea -->
+</div> <!-- code_diff_mainarea -->
 
 
 <!---------------------------------------------------------------------------->
@@ -231,7 +231,7 @@ $this->load->view (
 
 <!---------------------------------------------------------------------------->
 
-</div> <!--  project_code_diff_content -->
+</div> <!-- code_diff_content -->
 
 </body>
 
diff --git a/codepot/src/codepot/views/code_file.php b/codepot/src/codepot/views/code_file.php
index 9445c8bc..b5bd537d 100644
--- a/codepot/src/codepot/views/code_file.php
+++ b/codepot/src/codepot/views/code_file.php
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/common.css" />
-<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/project.css" />
+<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/code.css" />
 <script type="text/javascript" src="<?=base_url()?>/js/prettify/prettify.js"></script>
 <script type="text/javascript" src="<?=base_url()?>/js/prettify/lang-css.js"></script>
 <script type="text/javascript" src="<?=base_url()?>/js/prettify/lang-lisp.js"></script>
@@ -15,7 +15,7 @@
 
 <body onload="prettyPrint()">
 
-<div class="content" id="project_code_file_content">
+<div class="content" id="code_file_content">
 
 <!---------------------------------------------------------------------------->
 
@@ -37,9 +37,9 @@ $this->load->view (
 
 <!---------------------------------------------------------------------------->
 
-<div class="mainarea" id="project_code_file_mainarea">
+<div class="mainarea" id="code_file_mainarea">
 
-<div class="title" id="project_code_file_mainarea_title">
+<div class="title" id="code_file_mainarea_title">
 <?php
 	if ($revision <= 0)
 	{
@@ -76,9 +76,9 @@ $this->load->view (
 		print htmlspecialchars($file['fullpath']);
 	}
 ?>
-</div> <!-- project_code_file_mainarea_title -->
+</div> <!-- code_file_mainarea_title -->
 
-<div class="menu" id="project_code_file_mainarea_menu">
+<div class="menu" id="code_file_mainarea_menu">
 <?php
 	$xpar = $this->converter->AsciiToHex ($headpath);
 
@@ -102,9 +102,9 @@ $this->load->view (
 		"code/history/{$project->id}/{$xpar}", 
 		$this->lang->line('History'));
 ?>
-</div> <!-- project_code_file_mainarea_menu -->
+</div> <!-- code_file_mainarea_menu -->
 
-<div class="infostrip" id="project_code_file_mainarea_infostrip">
+<div class="infostrip" id="code_file_mainarea_infostrip">
 	<?=anchor ("code/file/{$project->id}/${xpar}/{$file['prev_rev']}", '<<')?> 
 	<?=$this->lang->line('Revision')?>: <?=$file['created_rev']?> 
 	<?=anchor ("code/file/{$project->id}/${xpar}/{$file['next_rev']}", '>>')?> |
@@ -113,14 +113,14 @@ $this->load->view (
 	<?=$this->lang->line('Last updated on')?>: <?=$file['time']?> 
 </div>
 
-<div id="project_code_file_mainarea_result">
+<div id="code_file_mainarea_result">
 
 <?php 
 $fileext = substr(strrchr($file['name'], '.'), 1);
 if ($fileext == '') $fileext = "html"
 ?>
 
-<pre class="prettyprint lang-<?=$fileext?>" id="project_code_file_mainarea_result_pre">
+<pre class="prettyprint lang-<?=$fileext?>" id="code_file_mainarea_result_pre">
 <?php
 	// print htmlspecialchars($file['content']);
 
@@ -147,11 +147,11 @@ if ($fileext == '') $fileext = "html"
 </pre>
 
 
-<div id="project_code_file_mainarea_result_info">
+<div id="code_file_mainarea_result_info">
 <script language='javascript'>
 function toggle_logmsg()
 {
-	var x = document.getElementById ('project_code_file_mainarea_result_info_logmsg');	
+	var x = document.getElementById ('code_file_mainarea_result_info_logmsg');	
 	if (x) x.style.visibility = (x.style.visibility == 'visible')? 'hidden': 'visible';
 	return false;
 }
@@ -160,14 +160,14 @@ function toggle_logmsg()
 <div class="title">
 <a href='#' onClick='toggle_logmsg()'><?= $this->lang->line('Message') ?></a>
 </div>
-<pre id="project_code_file_mainarea_result_info_logmsg" style="visibility: visible">
+<pre id="code_file_mainarea_result_info_logmsg" style="visibility: visible">
 <?= $file['logmsg'] ?>
 </pre>
-</div> <!-- project_code_file_mainarea_result_info -->
+</div> <!-- code_file_mainarea_result_info -->
 
-</div> <!-- project_code_file_mainarea_result -->
+</div> <!-- code_file_mainarea_result -->
 
-</div> <!-- project_code_file_mainarea -->
+</div> <!-- code_file_mainarea -->
 
 
 <!---------------------------------------------------------------------------->
@@ -176,7 +176,7 @@ function toggle_logmsg()
 
 <!---------------------------------------------------------------------------->
 
-</div> <!--  project_code_file_content -->
+</div> <!--  code_file_content -->
 
 </body>
 
diff --git a/codepot/src/codepot/views/code_folder.php b/codepot/src/codepot/views/code_folder.php
index a406b0a2..230d4e18 100644
--- a/codepot/src/codepot/views/code_folder.php
+++ b/codepot/src/codepot/views/code_folder.php
@@ -3,13 +3,13 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/common.css" />
-<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/project.css" />
+<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/code.css" />
 <title><?=htmlspecialchars($project->name)?></title>
 </head>
 
 <body>
 
-<div class="content" id="project_code_folder_content">
+<div class="content" id="code_folder_content">
 
 <!---------------------------------------------------------------------------->
 
@@ -32,18 +32,18 @@ $this->load->view (
 <!---------------------------------------------------------------------------->
 
 
-<div class="sidebar" id="project_code_folder_sidebar">
-	<div class="box" id="project_code_folder_sidebar_info">
+<div class="sidebar" id="code_folder_sidebar">
+	<div class="box" id="code_folder_sidebar_info">
 		<div class="boxtitle"><?=$this->lang->line('Revision')?>: <?=$file['created_rev']?></div>
 		<pre><?=$file['logmsg']?></pre>
 	</div>
-</div> <!-- project_code_folder_sidebar -->
+</div> <!-- code_folder_sidebar -->
 
 
 <!---------------------------------------------------------------------------->
 
 
-<div class="mainarea" id="project_code_folder_mainarea">
+<div class="mainarea" id="code_folder_mainarea">
 
 <div class="title">
 <?php
@@ -104,7 +104,7 @@ $this->load->view (
 	}
 	else 
 	{
-		print '<div class="menu" id="project_code_folder_mainarea_menu">';
+		print '<div class="menu" id="code_folder_mainarea_menu">';
 		$xpar = $this->converter->AsciiTohex ($headpath);
 		if ($revision > 0 && $revision < $next_revision)
 		{
@@ -116,8 +116,8 @@ $this->load->view (
 
 		usort ($file['content'], 'comp_files');
 
-		print '<div id="project_code_folder_mainarea_result">';
-		print '<table id="project_code_folder_mainarea_result_table">';
+		print '<div id="code_folder_mainarea_result">';
+		print '<table id="code_folder_mainarea_result_table">';
 		print '<tr class="heading">';
 		print '<th>' . $this->lang->line('Name') . '</th>';
 		print '<th>' . $this->lang->line('Revision') . '</th>';
@@ -202,7 +202,7 @@ $this->load->view (
 	}
 ?>
 
-</div> <!-- project_code_folder_mainarea -->
+</div> <!-- code_folder_mainarea -->
 
 
 <!---------------------------------------------------------------------------->
@@ -211,7 +211,7 @@ $this->load->view (
 
 <!---------------------------------------------------------------------------->
 
-</div> <!--  project_code_folder_content -->
+</div> <!--  code_folder_content -->
 
 </body>
 
diff --git a/codepot/src/codepot/views/code_history.php b/codepot/src/codepot/views/code_history.php
index 644c27d1..616d6d86 100644
--- a/codepot/src/codepot/views/code_history.php
+++ b/codepot/src/codepot/views/code_history.php
@@ -3,13 +3,13 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/common.css" />
-<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/project.css" />
+<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/code.css" />
 <title><?=htmlspecialchars($project->name)?></title>
 </head>
 
 <body>
 
-<div class="content" id="project_code_history_content">
+<div class="content" id="code_history_content">
 
 <!---------------------------------------------------------------------------->
 
@@ -31,9 +31,9 @@ $this->load->view (
 
 <!---------------------------------------------------------------------------->
 
-<div class="mainarea" id="project_code_history_mainarea">
+<div class="mainarea" id="code_history_mainarea">
 
-<div class="title" id="project_code_history_mainarea_title">
+<div class="title" id="code_history_mainarea_title">
 <?php
 	if ($revision <= 0)
 	{
@@ -68,11 +68,11 @@ $this->load->view (
 ?>
 </div>
 
-<div class="menu" id="project_code_history_mainarea_menu">
-</div> <!-- project_code_history_mainarea_menu -->
+<div class="menu" id="code_history_mainarea_menu">
+</div> <!-- code_history_mainarea_menu -->
 
-<div id="project_code_history_mainarea_result">
-<table id="project_code_history_mainarea_result_table">
+<div id="code_history_mainarea_result">
+<table id="code_history_mainarea_result_table">
 <tr class='heading'>
 	<th><?=$this->lang->line('Revision')?></th>
 	<th><?=$this->lang->line('Author')?></th>
@@ -166,9 +166,9 @@ $this->load->view (
 	}
 ?>
 </table>
-</div> <!-- project_code_history_mainarea_body -->
+</div> <!-- code_history_mainarea_body -->
 
-</div> <!-- project_code_history_mainarea -->
+</div> <!-- code_history_mainarea -->
 
 
 <!---------------------------------------------------------------------------->
@@ -178,7 +178,7 @@ $this->load->view (
 
 <!---------------------------------------------------------------------------->
 
-</div> <!--  project_code_history_content -->
+</div> <!--  code_history_content -->
 
 </body>
 
diff --git a/codepot/src/codepot/views/code_revision.php b/codepot/src/codepot/views/code_revision.php
index 9bfb3de6..366f617c 100644
--- a/codepot/src/codepot/views/code_revision.php
+++ b/codepot/src/codepot/views/code_revision.php
@@ -3,13 +3,13 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/common.css" />
-<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/project.css" />
+<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/code.css" />
 <title><?=htmlspecialchars($project->name)?></title>
 </head>
 
 <body>
 
-<div class="content" id="project_code_revision_content">
+<div class="content" id="code_revision_content">
 
 <!---------------------------------------------------------------------------->
 
@@ -31,13 +31,13 @@ $this->load->view (
 
 <!---------------------------------------------------------------------------->
 
-<div class="mainarea" id="project_code_revision_mainarea">
+<div class="mainarea" id="code_revision_mainarea">
 
 <?php
 $history = $file['history'];
 ?>
 
-<div class="title" id="project_code_revision_mainarea_title">
+<div class="title" id="code_revision_mainarea_title">
 <?php
 	if ($revision <= 0)
 	{
@@ -76,7 +76,7 @@ $history = $file['history'];
 ?>
 </div>
 
-<div class="menu" id="project_code_revision_mainarea_menu">
+<div class="menu" id="code_revision_mainarea_menu">
 <?php
 	$xpar = $this->converter->AsciiToHex(($headpath == '')? '.': $headpath);
 	if ($revision > 0 && $revision < $next_revision)
@@ -86,9 +86,9 @@ $history = $file['history'];
 	}
 	print anchor ("code/history/{$project->id}/{$xpar}", $this->lang->line('History'));
 ?>
-</div> <!-- project_code_revision_mainarea_menu -->
+</div> <!-- code_revision_mainarea_menu -->
 
-<div class="infostrip" id="project_code_revision_mainarea_infostrip">
+<div class="infostrip" id="code_revision_mainarea_infostrip">
 	<?=anchor ("code/revision/{$project->id}/${xpar}/{$prev_revision}", '<<')?> 
 	<?=$this->lang->line('Revision')?>: <?=$history['rev']?> 
 	<?=anchor ("code/revision/{$project->id}/${xpar}/{$next_revision}", '>>')?> | 
@@ -97,15 +97,15 @@ $history = $file['history'];
 </div>
 
 
-<div id="project_code_revision_mainarea_result">
+<div id="code_revision_mainarea_result">
 
 <div class="title">Message</div>
-<pre id="project_code_revision_mainarea_result_msg">
+<pre id="code_revision_mainarea_result_msg">
 <?=htmlspecialchars($history['msg'])?>
 </pre>
 
 <div class="title">Files updated</div>
-<table id="project_code_revision_mainarea_result_table">
+<table id="code_revision_mainarea_result_table">
 <?php 
 	/*
 	print '<tr class="heading">';
@@ -139,9 +139,9 @@ $history = $file['history'];
 	}
 ?>
 </table>
-</div> <!-- project_code_revision_mainarea_body -->
+</div> <!-- code_revision_mainarea_body -->
 
-</div> <!-- project_code_revision_mainarea -->
+</div> <!-- code_revision_mainarea -->
 
 
 <!---------------------------------------------------------------------------->
@@ -151,7 +151,7 @@ $history = $file['history'];
 
 <!---------------------------------------------------------------------------->
 
-</div> <!--  project_code_revision_content -->
+</div> <!-- code_revision_content -->
 
 </body>
 
diff --git a/codepot/src/codepot/views/file_delete.php b/codepot/src/codepot/views/file_delete.php
index c03fc298..08ca044d 100644
--- a/codepot/src/codepot/views/file_delete.php
+++ b/codepot/src/codepot/views/file_delete.php
@@ -3,13 +3,13 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/common.css" />
-<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/project.css" />
+<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/file.css" />
 <title><title><?=htmlspecialchars($file->name)?></title></title>
 </head>
 
 <body>
 
-<div class="content" id="project_file_delete_content">
+<div class="content" id="file_delete_content">
 
 <!---------------------------------------------------------------------------->
 
@@ -66,7 +66,7 @@ $this->load->view (
 
 <!---------------------------------------------------------------------------->
 
-</div>  <!-- project_file_delete_content -->
+</div>  <!-- file_delete_content -->
 
 </body>
 
diff --git a/codepot/src/codepot/views/file_edit.php b/codepot/src/codepot/views/file_edit.php
index 3ff82b2f..adfedcff 100644
--- a/codepot/src/codepot/views/file_edit.php
+++ b/codepot/src/codepot/views/file_edit.php
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/common.css" />
-<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/project.css" />
+<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/file.css" />
 <title><?=htmlspecialchars($file->name)?></title>
 </head>
 
diff --git a/codepot/src/codepot/views/file_home.php b/codepot/src/codepot/views/file_home.php
index d77064ca..8da47d74 100644
--- a/codepot/src/codepot/views/file_home.php
+++ b/codepot/src/codepot/views/file_home.php
@@ -3,13 +3,13 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/common.css" />
-<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/project.css" />
+<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/file.css" />
 <title><?=htmlspecialchars($project->name)?></title>
 </head>
 
 <body>
 
-<div class="content" id="project_file_home_content">
+<div class="content" id="file_home_content">
 
 <!---------------------------------------------------------------------------->
 
@@ -33,10 +33,10 @@ $this->load->view (
 
 <!---------------------------------------------------------------------------->
 
-<div class="mainarea" id="project_file_home_mainarea">
+<div class="mainarea" id="file_home_mainarea">
 <div class="title"><?=$this->lang->line('Files')?></div>
 
-<div id="project_file_home_mainarea_result">
+<div id="file_home_mainarea_result">
 <?php
 if (empty($files))
 {
@@ -57,7 +57,7 @@ else
 
         usort ($files, 'comp_files');
 
-	print '<table id="project_file_home_mainarea_result_table">';
+	print '<table id="file_home_mainarea_result_table">';
 	print '<tr class="heading">';
 	print '<th>' . $this->lang->line('Tag') . '</th>';
 	print '<th>' . $this->lang->line('Name') . '</th>';
@@ -99,7 +99,7 @@ else
 }
 ?>
 </div>
-</div> <!-- project_file_home_mainarea -->
+</div> <!-- file_home_mainarea -->
 
 <!---------------------------------------------------------------------------->
 
@@ -107,7 +107,7 @@ else
 
 <!---------------------------------------------------------------------------->
 
-</div> <!-- project_file_home_content -->
+</div> <!-- file_home_content -->
 
 </body>
 </html>
diff --git a/codepot/src/codepot/views/file_show.php b/codepot/src/codepot/views/file_show.php
index c826f9af..60cb3c58 100644
--- a/codepot/src/codepot/views/file_show.php
+++ b/codepot/src/codepot/views/file_show.php
@@ -3,15 +3,15 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/common.css" />
-<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/project.css" />
+<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/file.css" />
 <script type="text/javascript" src="<?=base_url()?>/js/creole.js"></script>
 
 <script type="text/javascript">
 function render_wiki()
 {
 	creole_render_wiki (
-		"project_file_show_textpre", 
-		"project_file_show_textarea", 
+		"file_show_textpre", 
+		"file_show_textarea", 
 		"<?=site_url()?>/wiki/show/<?=$project->id?>/"
 	);
 }
@@ -22,7 +22,7 @@ function render_wiki()
 
 <body onLoad="render_wiki()">
 
-<div class="content" id="project_file_show_content">
+<div class="content" id="file_show_content">
 
 <!---------------------------------------------------------------------------->
 
@@ -49,7 +49,7 @@ $this->load->view (
 
 <!---------------------------------------------------------------------------->
 
-<div class="sidebar" id="project_file_show_sidebar">
+<div class="sidebar" id="file_show_sidebar">
 
 <div class="box">
 <ul>
@@ -68,16 +68,16 @@ $this->load->view (
 
 </div>
 
-<div class="mainarea" id="project_file_show_mainarea">
+<div class="mainarea" id="file_show_mainarea">
 <div class="title"><?=htmlspecialchars($file->name)?></div>
 
-<div id="project_file_show_textarea">
-<pre id="project_file_show_textpre" style="visibility: hidden">
+<div id="file_show_textarea">
+<pre id="file_show_textpre" style="visibility: hidden">
 <?php print htmlspecialchars($file->description); ?>
 </pre>
-</div> <!-- project_file_show_textarea -->
+</div> <!-- file_show_textarea -->
 
-</div> <!-- project_file_show_mainarea -->
+</div> <!-- file_show_mainarea -->
 
 
 <!---------------------------------------------------------------------------->
@@ -86,7 +86,7 @@ $this->load->view (
 
 <!---------------------------------------------------------------------------->
 
-</div> <!--  project_file_show_content -->
+</div> <!--  file_show_content -->
 
 </body>
 
diff --git a/codepot/src/codepot/views/issue_edit.php b/codepot/src/codepot/views/issue_edit.php
index af0782ab..1b073e3a 100644
--- a/codepot/src/codepot/views/issue_edit.php
+++ b/codepot/src/codepot/views/issue_edit.php
@@ -32,12 +32,12 @@ $this->load->view (
 
 <!---------------------------------------------------------------------------->
 
-<div class="mainarea" id="project_issue_edit_mainarea">
+<div class="mainarea" id="issue_edit_mainarea">
 
 <?php 
 	if ($message != "") 
 	{
-		print '<div id="project_issue_edit_message" class="form_message">';
+		print '<div id="issue_edit_message" class="form_message">';
 		print htmlspecialchars($message);
 		print '</div>'; 
 	}
@@ -53,7 +53,7 @@ $this->load->view (
 			<?=form_hidden('issue_owner', set_value('issue_owner', $issue->owner))?>
 		</div>
 
-		<div id='project_issue_edit_mainarea_type'>
+		<div id='issue_edit_mainarea_type'>
 		<?php
 		if ($mode == 'update')
 		{
@@ -72,7 +72,7 @@ $this->load->view (
 		?>
 		</div>
 
-		<div id='project_issue_edit_mainarea_summary'>
+		<div id='issue_edit_mainarea_summary'>
 			<div>
 				<?=form_label($this->lang->line('Summary').': ', 'issue_summary')?>
 				<?=form_error('issue_summary');?>
@@ -85,7 +85,7 @@ $this->load->view (
 			</div>
 		</div>
 
-		<div id='project_issue_edit_mainarea_description'>
+		<div id='issue_edit_mainarea_description'>
 			<div>
 				<?=form_label($this->lang->line('Description').': ', 'issue_description')?>
 				<?=form_error('issue_description');?>
@@ -104,7 +104,7 @@ $this->load->view (
 			</div>
 		</div>
 
-		<div id='project_issue_edit_mainarea_buttons'>
+		<div id='issue_edit_mainarea_buttons'>
 			<?php $caption = ($mode == 'update')? $this->lang->line('Update'): $this->lang->line('Create'); ?>
 			<?=form_submit('issue', $caption)?>
 		</div>
@@ -112,7 +112,7 @@ $this->load->view (
 	<?=form_fieldset_close()?>
 <?=form_close();?>
 
-</div> <!-- project_issue_edit_mainarea -->
+</div> <!-- issue_edit_mainarea -->
 
 <!---------------------------------------------------------------------------->
 
diff --git a/codepot/src/codepot/views/issue_home.php b/codepot/src/codepot/views/issue_home.php
index b054cff7..43db656c 100644
--- a/codepot/src/codepot/views/issue_home.php
+++ b/codepot/src/codepot/views/issue_home.php
@@ -22,15 +22,12 @@ function AsciiToHex (x) {
 }
 
 $(function () { 
-	$("#project_issue_home_mainarea_search_form").dialog ({
+	$("#issue_home_mainarea_search_form").dialog ({
 		title: '<?=$this->lang->line('Search')?>',
 		autoOpen: false,
 		modal: true,
 		width: '80%',
 		buttons: { 
-			'<?=$this->lang->line('Cancel')?>': function () { 
-				$(this).dialog('close'); 
-			},
 			'<?=$this->lang->line('OK')?>': function () { 
 				$(this).dialog('close'); 
 				var filter = AsciiToHex($('#issue_search_form').serialize());
@@ -38,15 +35,18 @@ $(function () {
 
 				$('body').append('<form id="magic_form" method="get" action="'+url+'"></form>');
 				$('#magic_form').submit();
+			},
+			'<?=$this->lang->line('Cancel')?>': function () { 
+				$(this).dialog('close'); 
 			}
 		},
 		close: function() {}
 	}); 
 
 
-	$("#project_issue_home_mainarea_search_button").button().click (
+	$("#issue_home_mainarea_search_button").button().click (
 		function () { 
-			$('#project_issue_home_mainarea_search_form').dialog('open'); 
+			$('#issue_home_mainarea_search_form').dialog('open'); 
 		}
 	);
 });
@@ -57,7 +57,7 @@ $(function () {
 
 <body>
 
-<div class="content" id="project_issue_home_content">
+<div class="content" id="issue_home_content">
 
 <!---------------------------------------------------------------------------->
 
@@ -73,7 +73,7 @@ $this->load->view (
 		'site' => NULL,
 		'pageid' => 'issue',
 		'ctxmenuitems' => array (
-			array ("issue/create/{$project->id}", $this->lang->line('New'), 'project_issue_home_new')
+			array ("issue/create/{$project->id}", $this->lang->line('New'), 'issue_home_new')
 		)
 	)
 ); 
@@ -81,15 +81,15 @@ $this->load->view (
 
 <!---------------------------------------------------------------------------->
 
-<div class="mainarea" id="project_issue_home_mainarea">
+<div class="mainarea" id="issue_home_mainarea">
 <div class="title"><?=$this->lang->line('Issues')?></div>
 
 <div class="infostrip">
 <?php printf ($this->lang->line('ISSUE_MSG_TOTAL_NUM_ISSUES'), $total_num_issues); ?> | 
-<a id="project_issue_home_mainarea_search_button" href='#'><?=$this->lang->line('Search')?></a>
+<a id="issue_home_mainarea_search_button" href='#'><?=$this->lang->line('Search')?></a>
 </div>
 
-<div id="project_issue_home_mainarea_search_form">
+<div id="issue_home_mainarea_search_form">
 	<?php
 		$issue_type_array[''] = $this->lang->line('All');
 		$issue_status_array[''] = $this->lang->line('All');
@@ -144,7 +144,7 @@ $this->load->view (
 </div>
 
 
-<div id="project_issue_home_mainarea_result">
+<div id="issue_home_mainarea_result">
 <?php
 if (empty($issues))
 {
@@ -152,14 +152,14 @@ if (empty($issues))
 }
 else
 {
-	print '<table id="project_issue_home_mainarea_result_table">';
+	print '<table id="issue_home_mainarea_result_table">';
 	print '<tr class="heading">';
-	print '<th class="project_issue_home_mainarea_result_table_id">' . $this->lang->line('ID') . '</th>';
-	print '<th class="project_issue_home_mainarea_result_table_type">' . $this->lang->line('Type') . '</th>';
-	print '<th class="project_issue_home_mainarea_result_table_status">' . $this->lang->line('Status') . '</th>';
-	print '<th class="project_issue_home_mainarea_result_table_priority">' . $this->lang->line('Priority') . '</th>';
-	print '<th class="project_issue_home_mainarea_result_table_owner">' . $this->lang->line('Owner') . '</th>';
-	print '<th class="project_issue_home_mainarea_result_table_summary">' . $this->lang->line('Summary') . '</th>';
+	print '<th class="id">' . $this->lang->line('ID') . '</th>';
+	print '<th class="type">' . $this->lang->line('Type') . '</th>';
+	print '<th class="status">' . $this->lang->line('Status') . '</th>';
+	print '<th class="priority">' . $this->lang->line('Priority') . '</th>';
+	print '<th class="owner">' . $this->lang->line('Owner') . '</th>';
+	print '<th class="summary">' . $this->lang->line('Summary') . '</th>';
 	print '</tr>';
 
 	foreach ($issues as $issue)
@@ -208,9 +208,9 @@ else
 	print '</table>';
 }
 ?>
-</div> <!-- project_issue_home_mainarea_result -->
+</div> <!-- issue_home_mainarea_result -->
 
-</div> <!-- project_issue_home_mainarea -->
+</div> <!-- issue_home_mainarea -->
 
 <!---------------------------------------------------------------------------->
 
@@ -219,7 +219,7 @@ else
 <!---------------------------------------------------------------------------->
 
 
-</div> <!-- project_issue_home_content -->
+</div> <!-- issue_home_content -->
 
 </body>
 </html>
diff --git a/codepot/src/codepot/views/issue_show.php b/codepot/src/codepot/views/issue_show.php
index 30ef8ac6..cb48868c 100644
--- a/codepot/src/codepot/views/issue_show.php
+++ b/codepot/src/codepot/views/issue_show.php
@@ -75,16 +75,13 @@ $(function () {
 	*/
 	/*$("#issue_change_owner").combobox();*/
 
-	$("#project_issue_show_mainarea_change_form").dialog (
+	$("#issue_show_mainarea_change_form").dialog (
 		{
 			title: '<?=$this->lang->line('Change')?>',
 			autoOpen: false,
 			modal: true,
 			width: '85%',
 			buttons: { 
-				'<?=$this->lang->line('Cancel')?>': function () { 
-					$(this).dialog('close'); 
-				},
 				'<?=$this->lang->line('OK')?>': function () { 
 					var comment = $('#issue_change_comment');
 					if (comment.val().trim().length <= 0)
@@ -98,33 +95,36 @@ $(function () {
 					{
 						$(this).dialog('close'); 
 						$('#issue_change').val ('change');
-						$('#project_issue_change_form').submit ();
+						$('#issue_change_form').submit ();
 					}
+				},
+				'<?=$this->lang->line('Cancel')?>': function () { 
+					$(this).dialog('close'); 
 				}
 			},
 			close: function() { }
 		} 
 	); 
 
-	$("#project_issue_show_mainarea_change_form_open").button().click (
+	$("#issue_show_mainarea_change_form_open").button().click (
 		function () { 
-			$('#project_issue_show_mainarea_change_form').dialog('open'); 
+			$('#issue_show_mainarea_change_form').dialog('open'); 
 		}
 	);
 
-	$("#project_issue_show_mainarea_undo_change_confirm").dialog (
+	$("#issue_show_mainarea_undo_change_confirm").dialog (
 		{
 			title: '<?=$this->lang->line('Undo')?>',
 			resizable: false,
 			autoOpen: false,
 			modal: true,
 			buttons: { 
-				'<?=$this->lang->line('Cancel')?>': function () { 
-					$(this).dialog('close'); 
-				},
 				'<?=$this->lang->line('OK')?>': function () { 
 					$('#issue_change').val ('undo');
-					$('#project_issue_change_form').submit ();
+					$('#issue_change_form').submit ();
+					$(this).dialog('close'); 
+				},
+				'<?=$this->lang->line('Cancel')?>': function () { 
 					$(this).dialog('close'); 
 				}
 			},
@@ -132,9 +132,9 @@ $(function () {
 		} 
 	);
 
-	$("#project_issue_show_mainarea_undo_change").button().click (
+	$("#issue_show_mainarea_undo_change").button().click (
 		function () { 
-			$('#project_issue_show_mainarea_undo_change_confirm').dialog('open'); 
+			$('#issue_show_mainarea_undo_change_confirm').dialog('open'); 
 		}
 	);
 
@@ -146,7 +146,7 @@ $(function () {
 
 <body onLoad="render_wiki()">
 
-<div class="content" id="project_issue_show_content">
+<div class="content" id="issue_show_content">
 
 <!---------------------------------------------------------------------------->
 
@@ -174,13 +174,13 @@ $this->load->view (
 <!---------------------------------------------------------------------------->
 
 
-<div class="mainarea" id="project_issue_show_mainarea">
+<div class="mainarea" id="issue_show_mainarea">
 <div class="title">
 	<?=$this->lang->line('Issue')?> <?=htmlspecialchars($issue->id)?>: 
 	<?=htmlspecialchars($issue->summary)?>
 </div>
 
-<div class="infostrip" id="project_issue_show_mainarea_infostrip">
+<div class="infostrip" id="issue_show_mainarea_infostrip">
 	<?php
 		print $this->lang->line('Type');
 		print ': '; 
@@ -213,20 +213,21 @@ $this->load->view (
 			print ' | ';
 		}
 	?>
-	<a id="project_issue_show_mainarea_change_form_open" href="#"><?=$this->lang->line('Change')?></a>
+	<a id="issue_show_mainarea_change_form_open" href="#"><?=$this->lang->line('Change')?></a>
 </div>
 
-<div id="project_issue_show_mainarea_description">
-<pre id="project_issue_show_mainarea_description_pre" style="visibility: hidden">
+<div id="issue_show_mainarea_description">
+<pre id="issue_show_mainarea_description_pre" style="visibility: hidden">
 <?php print htmlspecialchars($issue->description); ?>
 </pre>
-</div> <!-- project_issue_mainarea_description -->
+</div> <!-- issue_show_mainarea_description -->
 
-<div id="project_issue_show_mainarea_changes">
+<div id="issue_show_mainarea_changes">
 <?php
 	$commentno = 0;
 
-	$msgfmt_changed = $this->lang->line ('ISSUE_MSG_CHANGED_X_FROM_Y_TO_Z');
+	$msgfmt_changed_from_to = $this->lang->line ('ISSUE_MSG_CHANGED_X_FROM_Y_TO_Z');
+	$msgfmt_changed_to = $this->lang->line ('ISSUE_MSG_CHANGED_X_TO_Z');
 	$count = count($issue->changes);
 	if ($count > 1) 
 	{
@@ -234,13 +235,13 @@ $this->load->view (
 		print '<span class="title">';
 		print $this->lang->line('Change log');
 		print '</span>';
-		print '<a id="project_issue_show_mainarea_undo_change" href="#">';
+		print '<a id="issue_show_mainarea_undo_change" href="#">';
 		print $this->lang->line('Undo');
 		print '</a>';
 		print '</div>';
 	}
 
-	print '<table id="project_issue_show_mainarea_changes_table">';
+	print '<table id="issue_show_mainarea_changes_table">';
 	while ($count > 1)
 	{
 		$new = $issue->changes[--$count];
@@ -248,7 +249,7 @@ $this->load->view (
 
 		print "<tr>";
 		
-		print '<td class="project_issue_show_mainarea_changes_table_date">'; 
+		print '<td class="date">'; 
 		print '<span title="';
 		print date ('Y-m-d H:s:i', strtotime($new->updatedon));
 		print '">';
@@ -256,26 +257,26 @@ $this->load->view (
 		print '</span>';
 		print '</td>';
 
-		print '<td class="project_issue_show_mainarea_changes_table_updater">'; 
+		print '<td class="updater">'; 
 		print htmlspecialchars($new->updatedby);
 		print '</td>';
 
-		print '<td class="project_issue_show_mainarea_changes_table_details">';
+		print '<td class="details">';
 		if ($new->comment != "")
 		{
-			print "<div id='project_issue_show_mainarea_changes_comment_{$commentno}' class='project_issue_show_mainarea_changes_comment'>";
-			print "<pre id='project_issue_show_mainarea_changes_comment_pre_{$commentno}'>";
+			print "<div id='issue_show_mainarea_changes_comment_{$commentno}' class='issue_show_mainarea_changes_comment'>";
+			print "<pre id='issue_show_mainarea_changes_comment_pre_{$commentno}'>";
 			print htmlspecialchars($new->comment);
 			print '</pre>';	
 			print '</div>';
 			$commentno++;
 		}
 
-		print '<div class="project_issue_show_mainarea_changes_list">';
+		print '<div class="list">';
 		print '<ul>';
 		if ($new->type != $old->type)
 		{
-			printf ("<li>{$msgfmt_changed}</li>", 
+			printf ("<li>{$msgfmt_changed_from_to}</li>", 
 				strtolower($this->lang->line('Type')),
 				htmlspecialchars(
 					array_key_exists($old->type, $issue_type_array)? 
@@ -287,7 +288,7 @@ $this->load->view (
 
 		if ($new->status != $old->status)
 		{
-			printf ("<li>{$msgfmt_changed}</li>", 
+			printf ("<li>{$msgfmt_changed_from_to}</li>", 
 				strtolower($this->lang->line('Status')),
 				htmlspecialchars(
 					array_key_exists($old->status, $issue_status_array)? 
@@ -299,7 +300,7 @@ $this->load->view (
 
 		if ($new->priority != $old->priority)
 		{
-			printf ("<li>{$msgfmt_changed}</li>", 
+			printf ("<li>{$msgfmt_changed_from_to}</li>", 
 				strtolower($this->lang->line('Priority')),
 				htmlspecialchars(
 					array_key_exists($old->priority, $issue_priority_array)? 
@@ -311,9 +312,18 @@ $this->load->view (
 
 		if ($new->owner != $old->owner)
 		{
-			printf ("<li>{$msgfmt_changed}</li>", 
-				strtolower($this->lang->line('Owner')),
-				htmlspecialchars($old->owner), htmlspecialchars($new->owner));
+			if ($old->owner == '')
+			{
+				printf ("<li>{$msgfmt_changed_to}</li>", 
+					strtolower($this->lang->line('Owner')),
+					htmlspecialchars($new->owner));
+			}
+			else
+			{
+				printf ("<li>{$msgfmt_changed_from_to}</li>", 
+					strtolower($this->lang->line('Owner')),
+					htmlspecialchars($old->owner), htmlspecialchars($new->owner));
+			}
 		}
 		print '</ul>';
 		print '</div>';
@@ -326,9 +336,9 @@ $this->load->view (
 
 </div>
 
-<div id="project_issue_show_mainarea_change_form">
+<div id="issue_show_mainarea_change_form">
 
-	<?=form_open("issue/show/{$project->id}/{$hexid}/", 'id="project_issue_change_form"')?>
+	<?=form_open("issue/show/{$project->id}/{$hexid}/", 'id="issue_change_form"')?>
 
 		<input type='hidden' name='issue_change' id='issue_change' value='change' />
 
@@ -367,7 +377,22 @@ $this->load->view (
 			<?=form_label ($this->lang->line('Owner'),
 				'issue_change_owner')
 			?>
-			<?=form_input('issue_change_owner',
+
+			<?php
+			$tmp = explode (',', $project->members);
+			$owner_array = array ();
+			$found = FALSE;
+			foreach ($tmp as $t) 
+			{
+				if ($issue->owner == $t) $found = TRUE;
+				$owner_array[$t] = $t;
+			}
+			if ($found === FALSE) $owner_array[$issue->owner] = $issue->owner;
+			?>
+			
+			<?=form_dropdown (
+				'issue_change_owner', 
+				$owner_array,
 				set_value('issue_change_owner', $issue->owner),
 				'id="issue_change_owner"')
 			?>
@@ -387,14 +412,14 @@ $this->load->view (
 			?>
 		</div>
 	<?=form_close()?>
-</div> <!-- project_issue_show_change_form -->
+</div> <!-- issue_show_change_form -->
 
 
-<div id="project_issue_show_mainarea_undo_change_confirm">
+<div id="issue_show_mainarea_undo_change_confirm">
 	<?=$this->lang->line ('ISSUE_MSG_CONFIRM_UNDO')?>
 </div>
 
-</div> <!-- project_issue_show_mainarea -->
+</div> <!-- issue_show_mainarea -->
 
 <!---------------------------------------------------------------------------->
 
@@ -402,7 +427,7 @@ $this->load->view (
 
 <!---------------------------------------------------------------------------->
 
-</div> <!--  project_issue_show_content -->
+</div> <!--  issue_show_content -->
 
 <script type="text/javascript">
 function render_wiki()
@@ -410,8 +435,8 @@ function render_wiki()
 	<?php $creole_base = site_url() . "/wiki/show/{$project->id}/"; ?>
 
 	creole_render_wiki (
-		"project_issue_show_mainarea_description_pre", 
-		"project_issue_show_mainarea_description", 
+		"issue_show_mainarea_description_pre", 
+		"issue_show_mainarea_description", 
 		"<?=$creole_base?>"
 	);
 
@@ -421,9 +446,9 @@ function render_wiki()
 		for ($xxx = 0; $xxx < $commentno; $xxx++)
 		{
 			print "creole_render_wiki (
-					'project_issue_show_mainarea_changes_comment_pre_{$xxx}', 
-					'project_issue_show_mainarea_changes_comment_{$xxx}', 
-					'{$creole_base}');";
+				'issue_show_mainarea_changes_comment_pre_{$xxx}', 
+				'issue_show_mainarea_changes_comment_{$xxx}', 
+				'{$creole_base}');";
 		}
 	}
 	?>
diff --git a/codepot/src/codepot/views/login.php b/codepot/src/codepot/views/login.php
index b44d7487..8e944d81 100644
--- a/codepot/src/codepot/views/login.php
+++ b/codepot/src/codepot/views/login.php
@@ -17,7 +17,7 @@
 
 	<div class="boxa">
         <?= anchor ('site/home', $this->lang->line('Home')) ?>
-        <?= anchor ('site/projectlist', $this->lang->line('Projects')) ?>
+        <?= anchor ('project/catalog', $this->lang->line('Projects')) ?>
 	</div>
 </div>
 
diff --git a/codepot/src/codepot/views/project_catalog.php b/codepot/src/codepot/views/project_catalog.php
new file mode 100644
index 00000000..e1b2e956
--- /dev/null
+++ b/codepot/src/codepot/views/project_catalog.php
@@ -0,0 +1,196 @@
+<html>
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/common.css" />
+<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/project.css" />
+
+<script type="text/javascript" src="<?=base_url()?>/js/jquery.min.js"></script>
+<script type="text/javascript" src="<?=base_url()?>/js/jquery-ui.min.js"></script>
+<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/jquery-ui.css" />
+
+<script type="text/javascript">
+function AsciiToHex (x) {
+        var r="";
+	for(i=0; i<x.length; i++)
+	{
+		var tmp = x.charCodeAt(i).toString(16);
+		if (tmp.length == 1) r += "0";
+		r += tmp;
+	}
+	return r;
+}
+
+$(function () { 
+	$("#project_catalog_mainarea_search_form").dialog ({
+		title: '<?=$this->lang->line('Search')?>',
+		autoOpen: false,
+		modal: true,
+		width: '80%',
+		buttons: { 
+			'<?=$this->lang->line('OK')?>': function () { 
+				$(this).dialog('close'); 
+				var filter = AsciiToHex($('#project_search_form').serialize());
+				var url='<?=site_url()?>/project/catalog/' + filter;	
+
+				$('body').append('<form id="magic_form" method="get" action="'+url+'"></form>');
+				$('#magic_form').submit();
+			},
+			'<?=$this->lang->line('Cancel')?>': function () { 
+				$(this).dialog('close'); 
+			}
+		},
+		close: function() {}
+	}); 
+
+
+	$("#project_catalog_mainarea_search_button").button().click (
+		function () { 
+			$('#project_catalog_mainarea_search_form').dialog('open'); 
+		}
+	);
+});
+</script>
+
+<title><?=$this->lang->line('Projects')?></title>
+</head>
+
+<body>
+
+<div class="content" id="project_catalog_content">
+
+<!---------------------------------------------------------------------------->
+
+<?php $this->load->view ('taskbar'); ?>
+
+<!---------------------------------------------------------------------------->
+
+<?php
+$this->load->view (
+	'projectbar', 
+	array (
+		'banner' => $this->lang->line('Projects'),
+		'site' => NULL,
+		'project' => NULL,
+		'pageid' => '',
+		'ctxmenuitems' => array (
+			array ("project/create", $this->lang->line('New'), 'project_catalog_new')
+		)
+	)
+); 
+?>
+
+<!---------------------------------------------------------------------------->
+
+<div class="mainarea" id="project_catalog_mainarea">
+
+<div class="infostrip">
+<?php printf ($this->lang->line('PROJECT_MSG_TOTAL_NUM_PROJECTS'), $total_num_projects); ?> | 
+<a id="project_catalog_mainarea_search_button" href='#'><?=$this->lang->line('Search')?></a>
+</div>
+
+<div id="project_catalog_mainarea_search_form">
+	<form id="project_search_form">
+		<div>
+			<?=form_label ($this->lang->line('ID'), 'id')
+			?>
+			<?=form_input('id',
+				set_value('owner', $search->id),
+				'id="project_search_id"')
+			?>
+		</div>
+
+		<div>
+			<?=form_label ($this->lang->line('Name'), 'name')
+			?>
+			<?=form_input('name',
+				set_value('owner', $search->name),
+				'id="project_search_name"')
+			?>
+		</div>
+
+		<div>
+			<?=form_label ($this->lang->line('Summary'), 'summary')
+			?>
+			<?=form_input('summary',
+				set_value('summary', $search->summary),
+				'id="project_search_summary" size="50"')
+			?>
+		</div>
+
+	</form>
+</div>
+
+
+<div id="project_catalog_mainarea_result">
+<?php
+if (empty($projects))
+{
+	print $this->lang->line('MSG_NO_PROJECTS_AVAIL');
+}
+else
+{
+/*
+	print '<table id="project_catalog_mainarea_result_table">';
+	print '<tr class="heading">';
+	print '<th class="id">' . $this->lang->line('ID') . '</th>';
+	print '<th class="name">' . $this->lang->line('Name') . '</th>';
+	print '<th class="summary">' . $this->lang->line('Summary') . '</th>';
+	print '</tr>';
+
+	$rowclasses = array ("even", "odd");
+	$rownum = 0;
+	foreach ($projects as $project)
+	{
+		$rowclass = $rowclasses[++$rownum % 2];
+		print "<tr class='{$rowclass}'>";
+
+		print '<td class="id">';
+		print anchor ("project/home/{$project->id}", 
+			htmlspecialchars($project->id));
+		print '</td>';
+
+		print '<td class="name">';
+		print htmlspecialchars($project->name);
+		print '</td>';
+
+		print '<td class="summary">';
+		print htmlspecialchars($project->summary);
+		print '</td>';
+
+		print '</tr>';
+	}
+
+	print '<tr class="foot">';
+	print "<td colspan='3' class='pages'>{$page_links}</td>";
+	print '</tr>';
+
+	print '</table>';
+*/
+	print '<ul>';
+	foreach ($projects as $project)
+	{
+		$cap = "{$project->name} ({$project->id})";
+		$anc = anchor ("project/home/{$project->id}", htmlspecialchars($cap));
+		$sum = htmlspecialchars ($project->summary);
+		print "<li>{$anc} - {$sum}</li>";
+	}
+	print '</ul>';
+	print "<span class='pages'>{$page_links}</span>";
+}
+?>
+</div> <!-- project_catalog_mainarea_result -->
+
+</div> <!-- project_catalog_mainarea -->
+
+<!---------------------------------------------------------------------------->
+
+<?php $this->load->view ('footer'); ?>
+
+<!---------------------------------------------------------------------------->
+
+
+</div> <!-- project_catalog_content -->
+
+</body>
+</html>
diff --git a/codepot/src/codepot/views/project_edit.php b/codepot/src/codepot/views/project_edit.php
index e3847b95..d8e43078 100644
--- a/codepot/src/codepot/views/project_edit.php
+++ b/codepot/src/codepot/views/project_edit.php
@@ -21,7 +21,7 @@
 $this->load->view (
 	'projectbar',
 	array (
-		'banner' => NULL,
+		'banner' => (($mode != 'create')? NULL: $this->lang->line('Projects')),
 		'site' => NULL,
 		'project' => (($mode != 'create')? $project: NULL),
 		'pageid' => 'project',
@@ -85,7 +85,16 @@ $this->load->view (
 				<?=form_error('project_description')?>
 			</div>
 			<div>
-				<?=form_textarea('project_description', set_value('project_description', $project->description))?>
+				<?php
+					$xdata = array (
+						'name' => 'project_description',
+						'value' => set_value ('project_description', $project->description),
+						'id' => 'project_edit_mainarea_description',
+						'rows' => 20,
+						'cols' => 80
+					);
+					print form_textarea ($xdata);
+				?>
 			</div>
 		</div>
 
@@ -95,7 +104,16 @@ $this->load->view (
 				<?=form_error('project_members')?>
 			</div>
 			<div>
-				<?=form_textarea('project_members', set_value ('project_members', $project->members))?>
+				<?php
+					$xdata = array (
+						'name' => 'project_members',
+						'value' => set_value ('project_members', $project->members),
+						'id' => 'project_edit_mainarea_members',
+						'rows' => 2,
+						'cols' => 80
+					);
+					print form_textarea ($xdata);
+				?>
 			</div>
 		</div>
 
diff --git a/codepot/src/codepot/views/site_home.php b/codepot/src/codepot/views/site_home.php
index 54a928b3..82d2de7a 100644
--- a/codepot/src/codepot/views/site_home.php
+++ b/codepot/src/codepot/views/site_home.php
@@ -184,7 +184,7 @@ foreach ($latest_projects as $project)
 	}
 ?>
 </table>
-</div>
+</div> <!-- box -->
 
 </div> <!-- site_home_mainarea_sidebar -->
 
diff --git a/codepot/src/codepot/views/taskbar.php b/codepot/src/codepot/views/taskbar.php
index 982bbd81..c43a5ca3 100644
--- a/codepot/src/codepot/views/taskbar.php
+++ b/codepot/src/codepot/views/taskbar.php
@@ -8,7 +8,7 @@ function show_taskbar ($con, $loginid, $issysadmin)
 
 	if (isset($loginid) && $loginid != '')
 	{
-		print anchor ('site/preference', htmlspecialchars($loginid));
+		print anchor ('site/userhome', htmlspecialchars($loginid));
 
 		$hex = $con->converter->AsciiToHex (current_url());
 		print anchor ("main/signout/{$hex}", $con->lang->line('Sign out'));
@@ -38,7 +38,7 @@ function show_taskbar ($con, $loginid, $issysadmin)
 
 	print '<div class="boxa">';
 	print anchor ('site/home', $con->lang->line('Home'));
-	print anchor ('site/projectlist', $con->lang->line('Projects'));
+	print anchor ('project/catalog', $con->lang->line('Projects'));
 	if ($issysadmin)
 		print anchor ('site/catalog', $con->lang->line('Administration'));
 	print '</div>';
diff --git a/codepot/src/codepot/views/project_list.php b/codepot/src/codepot/views/user_home.php
similarity index 52%
rename from codepot/src/codepot/views/project_list.php
rename to codepot/src/codepot/views/user_home.php
index 4a8e0005..eb09404b 100644
--- a/codepot/src/codepot/views/project_list.php
+++ b/codepot/src/codepot/views/user_home.php
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/common.css" />
-<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/project.css" />
+<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/user.css" />
 
 <script type="text/javascript" src="<?=base_url()?>/js/jquery.min.js"></script>
 <script type="text/javascript" src="<?=base_url()?>/js/jquery-ui.min.js"></script>
@@ -11,20 +11,16 @@
 
 <script type="text/javascript">
 $(function () {
-	$('#project_list_mainarea_result').tabs();
+	$('#user_home_mainarea_result').tabs();
 });
 </script>
 
-<?php
-	$caption = $this->lang->line('Projects');
-	if ($login['id'] != '') $caption .= "({$login['id']})";
-?>
-<title><?=htmlspecialchars($caption)?></title>
+<title><?=htmlspecialchars($login['id'])?></title>
 </head>
 
 <body>
 
-<div class="content" id="project_list_content">
+<div class="content" id="user_home_content">
 
 <!---------------------------------------------------------------------------->
 
@@ -36,44 +32,40 @@ $(function () {
 $this->load->view (
         'projectbar',
         array (
-		'banner' => NULL,
+		'banner' => $login['id'],
 		'site' => NULL,
 		'project' => NULL,
 		'pageid' => '',
-                'ctxmenuitems' => array (
-			array ('project/create', $this->lang->line('New')) 
-		)
+                'ctxmenuitems' => array ()
         )
 );
 ?>
 
 <!---------------------------------------------------------------------------->
 
-<div class="mainarea" id="project_list_mainarea">
+<div class="mainarea" id="user_home_mainarea">
 
 <?php
 $num_projects = count($projects);
-$num_other_projects = count($other_projects);
+$num_issues = count($issues);
 ?>
 
-<div id="project_list_mainarea_result">
+<div id="user_home_mainarea_result">
+
 <ul>
-<?php if ($login['id'] != '' || $num_projects > 0): ?>
-<li>
-	<a href='#project_list_mainarea_result_my_projects'>
-		<?=$this->lang->line('My projects')?> (<?=$num_projects?>)
-	</a>
-</li>
-<?php endif; ?>
-<li>
-	<a href='#project_list_mainarea_result_other_projects'>
-		<?=$this->lang->line('Other projects')?> (<?=$num_other_projects?>)
-	</a>
-</li>
+	<li>
+		<a href='#user_home_mainarea_result_my_projects'>
+			<?=$this->lang->line('My projects')?> (<?=$num_projects?>)
+		</a>
+	</li>
+	<li>
+		<a href='#user_home_mainarea_result_my_issues'>
+			<?=$this->lang->line('My issues')?> (<?=$num_issues?>)
+		</a>
+	</li>
 </ul>
 
-<?php if ($login['id'] != '' || $num_projects > 0): ?>
-<div id="project_list_mainarea_result_my_projects">
+<div id="user_home_mainarea_result_my_projects">
 <ul>
 <?php 
 foreach ($projects as $project) 
@@ -86,24 +78,34 @@ foreach ($projects as $project)
 ?>
 </ul>
 </div>
-<?php endif; ?>
 
-<div id="project_list_mainarea_result_other_projects">
+<div id="user_home_mainarea_result_my_issues">
 <ul>
 <?php 
-foreach ($other_projects as $project) 
+foreach ($issues as $issue) 
 {
-	$anc = anchor ("project/home/{$project->id}", htmlspecialchars($project->name));
-	$sum = htmlspecialchars ($project->summary);
-	print "<li>{$anc} - {$sum}</li>";
+	$pro = $issue->projectid;
+	$xid = $this->converter->AsciiToHex ((string)$issue->id);
+
+	$anc = anchor ("issue/show/{$issue->projectid}/{$xid}", '#' . htmlspecialchars($issue->id));
+
+	$status = htmlspecialchars(
+		array_key_exists($issue->status, $issue_status_array)?
+		$issue_status_array[$issue->status]: $issue->status);
+	$type = htmlspecialchars(
+		array_key_exists($issue->type, $issue_type_array)?
+		$issue_type_array[$issue->type]: $issue->type);
+
+	$sum = htmlspecialchars ($issue->summary);
+	print "<li>{$pro} {$anc} {$type} {$status} - {$sum}</li>";
 }
 ?>
 </ul>
 </div>
 
-</div> <!-- project_list_mainarea_result -->
+</div> <!-- user_home_mainarea_result -->
 
-</div> <!-- project_list_mainarea -->
+</div> <!-- user_home_mainarea -->
 
 <!---------------------------------------------------------------------------->
 
@@ -112,7 +114,7 @@ foreach ($other_projects as $project)
 <!---------------------------------------------------------------------------->
 
 
-</div> <!-- project_list_content -->
+</div> <!-- user_home_content -->
 
 
 </body>
diff --git a/codepot/src/codepot/views/wiki_delete.php b/codepot/src/codepot/views/wiki_delete.php
index 5cd3c0a8..b50276ba 100644
--- a/codepot/src/codepot/views/wiki_delete.php
+++ b/codepot/src/codepot/views/wiki_delete.php
@@ -3,13 +3,13 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/common.css" />
-<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/project.css" />
+<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/wiki.css" />
 <title><title><?=htmlspecialchars($wiki->name)?></title></title>
 </head>
 
 <body>
 
-<div class="content" id="project_wiki_delete_content">
+<div class="content" id="wiki_delete_content">
 
 <!---------------------------------------------------------------------------->
 
@@ -66,7 +66,7 @@ $this->load->view (
 
 <!---------------------------------------------------------------------------->
 
-</div>  <!-- project_wiki_delete_content -->
+</div>  <!-- wiki_delete_content -->
 
 </body>
 
diff --git a/codepot/src/codepot/views/wiki_edit.php b/codepot/src/codepot/views/wiki_edit.php
index 95bd8dce..d0778700 100644
--- a/codepot/src/codepot/views/wiki_edit.php
+++ b/codepot/src/codepot/views/wiki_edit.php
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/common.css" />
-<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/project.css" />
+<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/wiki.css" />
 <title><?=htmlspecialchars($wiki->name)?></title>
 </head>
 
@@ -45,7 +45,7 @@ $this->load->view (
 			<div>
 				<?php 
 					$extra = ($mode == 'update')? 'readonly="readonly"': ''; 
-					$extra .= 'maxlength="80" size="40"';
+					$extra .= 'maxlength="80" size="40" id="wiki_edit_mainarea_name"';
 				?>
 				<?=form_input('wiki_name', set_value('wiki_name', $wiki->name), $extra)?>
 			</div>
@@ -57,7 +57,16 @@ $this->load->view (
 				<?=form_error('wiki_text');?>
 			</div>
 			<div>
-				<?=form_textarea('wiki_text', set_value('wiki_text', $wiki->text))?>
+				<?php
+					$xdata = array (
+						'name' => 'wiki_text',
+						'value' => set_value ('wiki_text', $wiki->text),
+						'id' => 'wiki_edit_mainarea_text',
+						'rows' => 20,
+						'cols' => 80
+					);
+					print form_textarea ($xdata);
+				?>
 			</div>
 		</div>
 		
diff --git a/codepot/src/codepot/views/wiki_home.php b/codepot/src/codepot/views/wiki_home.php
index 316f6c9c..38f8ca43 100644
--- a/codepot/src/codepot/views/wiki_home.php
+++ b/codepot/src/codepot/views/wiki_home.php
@@ -3,13 +3,13 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/common.css" />
-<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/project.css" />
+<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/wiki.css" />
 <title><?=htmlspecialchars($project->name)?></title>
 </head>
 
 <body>
 
-<div class="content" id="project_wiki_home_content">
+<div class="content" id="wiki_home_content">
 
 <!---------------------------------------------------------------------------->
 
@@ -33,10 +33,10 @@ $this->load->view (
 
 <!---------------------------------------------------------------------------->
 
-<div class="mainarea" id="project_wiki_home_mainarea">
+<div class="mainarea" id="wiki_home_mainarea">
 <div class="title"><?=$this->lang->line('Wikis')?></div>
 
-<div id="project_wiki_home_textarea">
+<div id="wiki_home_textarea">
 <?php
 if (empty($wikis))
 {
@@ -54,7 +54,7 @@ else
 }
 ?>
 </div>
-</div> <!-- project_wiki_home_mainarea -->
+</div> <!-- wiki_home_mainarea -->
 
 <!---------------------------------------------------------------------------->
 
@@ -63,7 +63,7 @@ else
 <!---------------------------------------------------------------------------->
 
 
-</div> <!-- project_wiki_home_content -->
+</div> <!-- wiki_home_content -->
 
 </body>
 </html>
diff --git a/codepot/src/codepot/views/wiki_show.php b/codepot/src/codepot/views/wiki_show.php
index c61a37a1..b48d85be 100644
--- a/codepot/src/codepot/views/wiki_show.php
+++ b/codepot/src/codepot/views/wiki_show.php
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/common.css" />
-<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/project.css" />
+<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/wiki.css" />
 <script type="text/javascript" src="<?=base_url()?>/js/creole.js"></script>
 <title><?=htmlspecialchars($wiki->name)?></title>
 </head>
@@ -13,8 +13,8 @@ function render_wiki()
 {
 
 	creole_render_wiki (
-		"project_wiki_show_textpre", 
-		"project_wiki_show_textarea", 
+		"wiki_show_textpre", 
+		"wiki_show_textarea", 
 		"<?=site_url()?>/wiki/show/<?=$project->id?>/"
 	);
 }
@@ -22,7 +22,7 @@ function render_wiki()
 
 <body onLoad="render_wiki()">
 
-<div class="content" id="project_wiki_show_content">
+<div class="content" id="wiki_show_content">
 
 <!---------------------------------------------------------------------------->
 
@@ -49,7 +49,7 @@ $this->load->view (
 
 <!---------------------------------------------------------------------------->
 
-<div class="sidebar" id="project_wiki_show_sidebar">
+<div class="sidebar" id="wiki_show_sidebar">
 <div class="box">
 <ul>
 <li><?=$this->lang->line('Created on')?> <?= $wiki->createdon ?></li>
@@ -59,16 +59,16 @@ $this->load->view (
 </div>
 </div>
 
-<div class="mainarea" id="project_wiki_show_mainarea">
+<div class="mainarea" id="wiki_show_mainarea">
 <div class="title"><?=htmlspecialchars($wiki->name)?></div>
 
-<div id="project_wiki_show_textarea">
-<pre id="project_wiki_show_textpre" style="visibility: hidden">
+<div id="wiki_show_textarea">
+<pre id="wiki_show_textpre" style="visibility: hidden">
 <?php print htmlspecialchars($wiki->text); ?>
 </pre>
-</div> <!-- project_wiki_show_textarea -->
+</div> <!-- wiki_show_textarea -->
 
-</div> <!-- project_wiki_show_mainarea -->
+</div> <!-- wiki_show_mainarea -->
 
 <!---------------------------------------------------------------------------->
 
@@ -76,7 +76,7 @@ $this->load->view (
 
 <!---------------------------------------------------------------------------->
 
-</div> <!--  project_wiki_show_content -->
+</div> <!--  wiki_show_content -->
 
 </body>
 
diff --git a/codepot/src/config.php.in b/codepot/src/config.php.in
index ace10a66..a5d9fd2c 100644
--- a/codepot/src/config.php.in
+++ b/codepot/src/config.php.in
@@ -29,6 +29,7 @@ function load_ini ($file)
 		array ('sysadmin_userids',             'string',     ''),
 		array ('max_upload_size',              'string',     '10000'), // kbytes
 		array ('max_latest_projects',          'integer',    10),
+		array ('max_projects_per_page',        'integer',    50),
 		array ('max_issues_per_page',          'integer',    50),
 		array ('max_logs_per_page',            'integer',    50),
 		array ('max_logs_in_site_home',        'integer',    10),
diff --git a/codepot/src/css/Makefile.am b/codepot/src/css/Makefile.am
index bb3e3c9a..c91f2260 100644
--- a/codepot/src/css/Makefile.am
+++ b/codepot/src/css/Makefile.am
@@ -2,12 +2,16 @@ SUBDIRS =  images
 
 wwwdir=$(WWWDIR)/css
 www_DATA =  \
+	code.css \
 	common.css \
+	file.css \
 	issue.css \
 	jquery-ui.css \
 	project.css \
 	site.css \
-	websvn.css 
+	user.css \
+	websvn.css \
+	wiki.css
 
 EXTRA_DIST = $(www_DATA)
 
diff --git a/codepot/src/css/Makefile.in b/codepot/src/css/Makefile.in
index 48080e32..5ba1dfd0 100644
--- a/codepot/src/css/Makefile.in
+++ b/codepot/src/css/Makefile.in
@@ -122,6 +122,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -133,6 +134,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
@@ -204,12 +206,16 @@ top_srcdir = @top_srcdir@
 wwwdir = $(WWWDIR)/css
 SUBDIRS = images
 www_DATA = \
+	code.css \
 	common.css \
+	file.css \
 	issue.css \
 	jquery-ui.css \
 	project.css \
 	site.css \
-	websvn.css 
+	user.css \
+	websvn.css \
+	wiki.css
 
 EXTRA_DIST = $(www_DATA)
 all: all-recursive
diff --git a/codepot/src/css/code.css b/codepot/src/css/code.css
new file mode 100644
index 00000000..82d847e2
--- /dev/null
+++ b/codepot/src/css/code.css
@@ -0,0 +1,260 @@
+/*----------------------------------------------- 
+ * project source folder view 
+ *-----------------------------------------------*/
+#code_folder_sidebar_info pre {
+	white-space: pre-wrap;
+}
+
+#code_folder_mainarea_result {
+	overflow: auto;
+}
+
+#code_folder_mainarea_result_table tr {
+	vertical-align: top;
+	white-space: nowrap;
+}
+
+/*----------------------------------------------- 
+ * project source file view 
+ *-----------------------------------------------*/
+#code_file_mainarea_result {
+	position: relative;
+}
+
+#code_file_mainarea_result_pre {
+	/* make it the same as font-size of info .title below */
+	padding-top: 0.8em;
+}
+
+#code_file_mainarea_result_info {
+	position: absolute;
+	top: 0;
+	right: 0;
+	width: 22em;
+}
+
+#code_file_mainarea_result_info pre {
+	overflow: auto;
+	border: 0;
+	margin: 0;
+	padding: 0;
+}
+
+#code_file_mainarea_result_info .title {
+	background-color: #7777FF;
+	border: 0;
+	margin: 0;
+	font-size: 0.8em;
+	text-align: right;	
+}
+
+#code_file_mainarea_result_info .title a {
+	color: white;
+	font-size: inherit;
+	background-color: inherit;
+}
+
+#code_file_mainarea_result_info .title a:hover {
+	background-color: inherit;
+}
+
+/*----------------------------------------------- 
+ * project source blame view 
+ *-----------------------------------------------*/
+#code_blame_mainarea_result {
+	position: relative;
+}
+
+#code_blame_mainarea_result_pre {
+	/* make it the same as font-size of info .title below */
+	padding-top: 0.8em;
+}
+
+#code_blame_mainarea_result_info {
+	position: absolute;
+	top: 0;
+	right: 0;
+	width: 22em;
+}
+
+#code_blame_mainarea_result_info pre {
+	overflow: auto;
+	border: 0;
+	margin: 0;
+	padding: 0;
+}
+
+#code_blame_mainarea_result_info .title {
+	background-color: #7777FF;
+	border: 0;
+	margin: 0;
+	font-size: 0.8em;
+	text-align: right;	
+}
+
+#code_blame_mainarea_result_info .title a {
+	color: white;
+	font-size: inherit;
+	background-color: inherit;
+}
+
+#code_blame_mainarea_result_info .title a:hover {
+	background-color: inherit;
+}
+
+/*----------------------------------------------- 
+ * project source history view 
+ *-----------------------------------------------*/
+#code_history_mainarea_result {
+	overflow: auto;
+}
+
+#code_history_mainarea_result_table tr {
+	vertical-align: top;
+	white-space: nowrap;
+}
+
+#code_history_mainarea_result_table_path_list {
+	/* the list in the 'paths' column */
+	margin: 0;
+	padding: 0;
+	list-style: none;
+	white-space: nowrap;
+}
+
+#code_history_mainarea_result_table pre {
+	border: 0;
+	background-color: inherit;
+	padding: 0;
+	margin: 0;
+}
+
+#code_history_mainarea_result_table .title {
+	font-size: inherit;
+	font-weight: inherit;
+	font-style: italic;
+	text-align: center;
+	background-color: #AABBFF;
+}
+
+/*----------------------------------------------- 
+ * project source revision view 
+ *-----------------------------------------------*/
+
+#code_revision_mainarea_result {
+	overflow: auto;
+}
+
+#code_revision_mainarea_result_msg {
+	border: 0;
+	padding: 0;	
+	background-color: inherit;
+	margin: 0;
+	margin-bottom: 1em;
+	white-space: pre-wrap;
+}
+
+#code_revision_mainarea_result_table td.M {
+	white-space: nowrap;
+	background-image:url(images/page_white_edit.png);
+	background-position:2px 50%;
+	background-repeat:no-repeat;
+	padding-left: 22px;
+}
+
+#code_revision_mainarea_result_table td.D {
+	white-space: nowrap;
+	background-image:url(images/page_white_delete.png);
+	background-position:2px 50%;
+	background-repeat:no-repeat;
+	padding-left: 22px;
+}
+
+#code_revision_mainarea_result_table td.A {
+	white-space: nowrap;
+	background-image:url(images/page_white_add.png);
+	background-position:2px 50%;
+	background-repeat:no-repeat;
+	padding-left: 22px;
+}
+
+#code_revision_mainarea_result_table td.R {
+	white-space: nowrap;
+	background-image:url(images/page_white_add.png);
+	background-position:2px 50%;
+	background-repeat:no-repeat;
+	padding-left: 22px;
+}
+
+#code_revision_mainarea_result_sidebar {
+	/*overflow: auto;*/
+}
+
+#code_revision_mainarea_result_sidebar pre {
+	overflow: auto;
+	border: 0;
+	padding: 0;
+}
+
+/*----------------------------------------------- 
+ * project source diff view 
+ *-----------------------------------------------*/
+#code_diff_mainarea_result {
+	overflow: auto;
+}
+
+#code_diff_mainarea_result_table {
+	border: 0;
+}
+
+#code_diff_mainarea_result_table tr.diff td pre {
+	background-color: inherit;
+	border: 0;
+	margin: 0;
+	padding: 0;
+}
+
+#code_diff_mainarea_result_table tr.diff td.diff {
+	padding: 0;
+	padding-left:22px;
+	margin: 0;
+}
+
+#code_diff_mainarea_result_table tr.diff td.diffrow {
+	font-style: italic;
+	font-weight: bold;
+}
+
+#code_diff_mainarea_result_table tr.diff td.diffadded {
+	border:1px solid #cdf0cd;
+	background-color:#ddffdd;
+	background-image:url(images/bullet_add.png);
+	background-repeat:no-repeat;
+	background-position: 2px 50%;
+	padding: 0;
+	padding-left:22px;
+	margin: 0;
+}
+
+#code_diff_mainarea_result_table tr.diff td.diffdeleted {
+	border:1px solid #e8d4bc;
+	background-color:#f8e4cc;
+	background-image:url(images/bullet_delete.png);
+	background-position: 2px 50%;
+	background-repeat:no-repeat;
+	padding: 0;
+	padding-left:22px;
+	margin: 0;
+}
+
+#code_diff_mainarea_result_table tr.diff td.diffchanged {
+	border:1px solid #f0f0bc;
+	background-color:#ffffcc;
+	background-image:url(images/bullet_yellow.png);
+	background-repeat:no-repeat;
+	background-position: 2px 50%;
+	padding: 0;
+	padding-left:22px;
+	margin: 0;
+}
+
diff --git a/codepot/src/css/file.css b/codepot/src/css/file.css
new file mode 100644
index 00000000..911cca5c
--- /dev/null
+++ b/codepot/src/css/file.css
@@ -0,0 +1,12 @@
+/*-----------------------------------------------
+ * file home view
+ *-----------------------------------------------*/
+#file_home_mainarea_result {
+	overflow: auto;
+}
+
+#file_home_mainarea_result_table tr {
+	vertical-align: top;
+	white-space: nowrap;
+}
+
diff --git a/codepot/src/css/images/Makefile.in b/codepot/src/css/images/Makefile.in
index e3fddfea..e5bd5798 100644
--- a/codepot/src/css/images/Makefile.in
+++ b/codepot/src/css/images/Makefile.in
@@ -82,6 +82,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -93,6 +94,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/css/issue.css b/codepot/src/css/issue.css
index 475d0e1b..ab701075 100644
--- a/codepot/src/css/issue.css
+++ b/codepot/src/css/issue.css
@@ -2,11 +2,11 @@
 /*---------------------------------------------
  * issue home
  *---------------------------------------------*/
-#project_issue_home_mainarea_result {
+#issue_home_mainarea_result {
 	overflow: auto;
 }
 
-#project_issue_home_mainarea_result_table {
+#issue_home_mainarea_result_table {
 	padding-top: 1em;
 	/*border-collapse: separate;
 	border-spacing: 0px 1px;*/
@@ -14,97 +14,96 @@
 	font-size: inherit;
 }
 
-#project_issue_home_mainarea_result_table th {
+#issue_home_mainarea_result_table th {
 	padding-top: 3px;
 	padding-bottom: 3px;
 }
 
-#project_issue_home_mainarea_result_table td {
+#issue_home_mainarea_result_table td {
 	padding-top: 3px;
 	padding-bottom: 3px;
 }
 
-#project_issue_home_mainarea_result_table tr.new {
+#issue_home_mainarea_result_table tr.new {
 	background-color: #ffccbb;
 }
 
-#project_issue_home_mainarea_result_table tr.accepted {
+#issue_home_mainarea_result_table tr.accepted {
 }
 
-#project_issue_home_mainarea_result_table tr.rejected {
+#issue_home_mainarea_result_table tr.rejected {
 	background-color: #ffeedd;
 }
 
-#project_issue_home_mainarea_result_table tr.started {
+#issue_home_mainarea_result_table tr.started {
 	background-color: #ddeeff;
 }
 
-#project_issue_home_mainarea_result_table tr.stalled {
+#issue_home_mainarea_result_table tr.stalled {
 	background-color: #bbccff;
 }
 
-#project_issue_home_mainarea_result_table tr.resolved {
+#issue_home_mainarea_result_table tr.resolved {
 	background-color: #ddffdd;
 }
 
-#project_issue_home_mainarea_result_table tr.other {
+#issue_home_mainarea_result_table tr.other {
 	background-color: #ddeeff;
 }
 
-#project_issue_home_mainarea_result_table td.pages {
+#issue_home_mainarea_result_table td.pages {
         padding-top: 1em;
         text-align: center;
         font-weight: bold;
 }
 
-#project_issue_home_mainarea_result_table td.id {
+#issue_home_mainarea_result_table td.id {
 	white-space: nowrap;
 	width: 1px;
 }
 
-#project_issue_home_mainarea_result_table td.type {
+#issue_home_mainarea_result_table td.type {
 	white-space: nowrap;
 	width: 1px;
 }
 
-#project_issue_home_mainarea_result_table td.status {
+#issue_home_mainarea_result_table td.status {
 	white-space: nowrap;
 	width: 1px;
 }
 
-#project_issue_home_mainarea_result_table td.priority {
+#issue_home_mainarea_result_table td.priority {
 	white-space: nowrap;
 	width: 1px;
 }
 
-#project_issue_home_mainarea_result_table td.owner {
+#issue_home_mainarea_result_table td.owner {
 	white-space: nowrap;
 	width: 1px;
 }
 
-#project_issue_home_mainarea_result_table td.summary {
+#issue_home_mainarea_result_table td.summary {
 	white-space: nowrap;
 }
 
-#project_issue_home_mainarea_search_form {
+#issue_home_mainarea_search_form {
 }
 
-#project_issue_home_mainarea_search_form div {
+#issue_home_mainarea_search_form div {
 	padding: 0.2em;
 }
 
-
 /*---------------------------------------------
  * issue show
  *---------------------------------------------*/
-#project_issue_show_mainarea_change_form {
+#issue_show_mainarea_change_form {
 }
 
-#project_issue_show_mainarea_change_form div {
+#issue_show_mainarea_change_form div {
 	padding: 0.2em;
 }
 
-#project_issue_show_mainarea_change_form textarea {
+#issue_show_mainarea_change_form textarea {
 	display: block;
 	padding: 1px;
 	font-size: inherit;
@@ -112,28 +111,28 @@
 	width: 100%;
 }
 
-#project_issue_show_mainarea_changes {
+#issue_show_mainarea_changes {
 	margin-top: 1em;
 	padding-top: 0.5em;
 	padding-bottom: 0.5em;
 	overflow: auto;
 }
 
-#project_issue_show_mainarea_changes .infostrip {
+#issue_show_mainarea_changes .infostrip {
 	margin-bottom: 0.5em;
 }
 
-#project_issue_show_mainarea_changes .infostrip .title {
+#issue_show_mainarea_changes .infostrip .title {
 	float: left;
 }
 
-#project_issue_show_mainarea_changes_table {
+#issue_show_mainarea_changes_table {
 	border-collapse: collapse;
 	width: 100%;
 	font-size: inherit;
 }
 
-#project_issue_show_mainarea_changes_table td.project_issue_show_mainarea_changes_table_date {
+#issue_show_mainarea_changes_table td.date {
 	width: 1px;
 	white-space: nowrap;
 	vertical-align: top;
@@ -142,7 +141,7 @@
 	border-bottom: 1px solid lightgray;
 }
 
-#project_issue_show_mainarea_changes_table td.project_issue_show_mainarea_changes_table_updater {
+#issue_show_mainarea_changes_table td.updater {
 	width: 1px;
 	white-space: nowrap;
 	vertical-align: top;
@@ -151,7 +150,7 @@
 	border-bottom: 1px solid lightgray;
 }
 
-#project_issue_show_mainarea_changes_table td.project_issue_show_mainarea_changes_table_details {
+#issue_show_mainarea_changes_table td.details {
 	white-space: nowrap;
 	vertical-align: top;
 	padding-top: 0.2em;
@@ -159,22 +158,22 @@
 	border-bottom: 1px solid lightgray;
 }
 
-.project_issue_show_mainarea_changes_list {
+#issue_show_mainarea_changes_table td.details .list {
 	background-color: #F1F1FF;
 }
 
-.project_issue_show_mainarea_changes_list ul li {
+#issue_show_mainarea_changes_table td.details .list ul li {
 	padding-bottom: 0.3em;
 }
 
 /*---------------------------------------------
  * issue edit
  *---------------------------------------------*/
-#project_issue_edit_mainarea_type {
+#issue_edit_mainarea_type {
 	padding-bottom: 0.3em;
 }
 
-#project_issue_edit_mainarea form textarea {
+#issue_edit_mainarea form textarea {
 	display: block;
 	padding: 1px;
 	font-size: inherit;
@@ -186,6 +185,6 @@
 	width: 100%;
 }
 
-#project_issue_edit_mainarea_buttons {
+#issue_edit_mainarea_buttons {
 	padding-top: 0.5em;
 }
diff --git a/codepot/src/css/project.css b/codepot/src/css/project.css
index 9b19b1be..1d699a3c 100644
--- a/codepot/src/css/project.css
+++ b/codepot/src/css/project.css
@@ -107,15 +107,42 @@
 }
 
 /*----------------------------------------------- 
- * project file home view 
+ * project file edit view 
  *-----------------------------------------------*/
-#project_file_home_mainarea_result {
+#project_edit_mainarea_description {
+	width: 100%;
+}
+
+#project_edit_mainarea_members {
+	width: 100%;
+}
+
+/*----------------------------------------------- 
+ * project catalog view 
+ *-----------------------------------------------*/
+#project_catalog_mainarea_result {
 	overflow: auto;
 }
 
-#project_file_home_mainarea_result_table tr {
-	vertical-align: top;
+#project_catalog_mainarea_result_table {
+	width: 100%;
+}
+
+#project_catalog_mainarea_result_table td {
 	white-space: nowrap;
+	vertical-align: top;
+}
+
+#project_catalog_mainarea_result_table td.id {
+	width: 1px;
+}
+
+#project_catalog_mainarea_result_table td.name {
+	width: 1px;
+}
+
+#project_catalog_mainarea_result_table td.summary {
+	white-space: pre-wrap;
 }
 
 /*----------------------------------------------- 
@@ -402,3 +429,7 @@
 #project_list_mainarea_result_other_projects {
 	padding: 0;
 }
+
+#project_list_mainarea_result_my_issues {
+	padding: 0;
+}
diff --git a/codepot/src/css/user.css b/codepot/src/css/user.css
new file mode 100644
index 00000000..e8615d08
--- /dev/null
+++ b/codepot/src/css/user.css
@@ -0,0 +1,6 @@
+/*-----------------------------------------------
+ * user home view
+ *-----------------------------------------------*/
+#user_home_mainarea_result {
+	overflow: auto;
+}
diff --git a/codepot/src/css/wiki.css b/codepot/src/css/wiki.css
new file mode 100644
index 00000000..a3dd3030
--- /dev/null
+++ b/codepot/src/css/wiki.css
@@ -0,0 +1,7 @@
+
+/*---------------------------------------------
+ * wiki edit
+ *---------------------------------------------*/
+#wiki_edit_mainarea_text {
+	width: 100%;
+}
diff --git a/codepot/src/js/Makefile.in b/codepot/src/js/Makefile.in
index de5c0fcb..f3a31536 100644
--- a/codepot/src/js/Makefile.in
+++ b/codepot/src/js/Makefile.in
@@ -122,6 +122,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -133,6 +134,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/js/prettify/Makefile.in b/codepot/src/js/prettify/Makefile.in
index e82bac33..544ff168 100644
--- a/codepot/src/js/prettify/Makefile.in
+++ b/codepot/src/js/prettify/Makefile.in
@@ -82,6 +82,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -93,6 +94,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/system/Makefile.in b/codepot/src/system/Makefile.in
index f1271594..3a401676 100644
--- a/codepot/src/system/Makefile.in
+++ b/codepot/src/system/Makefile.in
@@ -122,6 +122,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -133,6 +134,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/system/cache/Makefile.in b/codepot/src/system/cache/Makefile.in
index f959b913..1acac967 100644
--- a/codepot/src/system/cache/Makefile.in
+++ b/codepot/src/system/cache/Makefile.in
@@ -82,6 +82,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -93,6 +94,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/system/codeigniter/Makefile.in b/codepot/src/system/codeigniter/Makefile.in
index 01845334..297a99c1 100644
--- a/codepot/src/system/codeigniter/Makefile.in
+++ b/codepot/src/system/codeigniter/Makefile.in
@@ -82,6 +82,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -93,6 +94,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/system/database/Makefile.in b/codepot/src/system/database/Makefile.in
index 781790d3..ee1022bd 100644
--- a/codepot/src/system/database/Makefile.in
+++ b/codepot/src/system/database/Makefile.in
@@ -122,6 +122,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -133,6 +134,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/system/database/drivers/Makefile.in b/codepot/src/system/database/drivers/Makefile.in
index 94ddf0ee..a17faadf 100644
--- a/codepot/src/system/database/drivers/Makefile.in
+++ b/codepot/src/system/database/drivers/Makefile.in
@@ -122,6 +122,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -133,6 +134,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/system/database/drivers/mssql/Makefile.in b/codepot/src/system/database/drivers/mssql/Makefile.in
index 171b20f7..440455de 100644
--- a/codepot/src/system/database/drivers/mssql/Makefile.in
+++ b/codepot/src/system/database/drivers/mssql/Makefile.in
@@ -82,6 +82,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -93,6 +94,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/system/database/drivers/mysql/Makefile.in b/codepot/src/system/database/drivers/mysql/Makefile.in
index dbb545e1..f8983df3 100644
--- a/codepot/src/system/database/drivers/mysql/Makefile.in
+++ b/codepot/src/system/database/drivers/mysql/Makefile.in
@@ -82,6 +82,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -93,6 +94,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/system/database/drivers/mysqli/Makefile.in b/codepot/src/system/database/drivers/mysqli/Makefile.in
index 4ed93ab4..acf41e85 100644
--- a/codepot/src/system/database/drivers/mysqli/Makefile.in
+++ b/codepot/src/system/database/drivers/mysqli/Makefile.in
@@ -82,6 +82,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -93,6 +94,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/system/database/drivers/oci8/Makefile.in b/codepot/src/system/database/drivers/oci8/Makefile.in
index bc4b9d35..4f044d29 100644
--- a/codepot/src/system/database/drivers/oci8/Makefile.in
+++ b/codepot/src/system/database/drivers/oci8/Makefile.in
@@ -82,6 +82,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -93,6 +94,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/system/database/drivers/odbc/Makefile.in b/codepot/src/system/database/drivers/odbc/Makefile.in
index 34c942b1..b84f4636 100644
--- a/codepot/src/system/database/drivers/odbc/Makefile.in
+++ b/codepot/src/system/database/drivers/odbc/Makefile.in
@@ -82,6 +82,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -93,6 +94,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/system/database/drivers/postgre/Makefile.in b/codepot/src/system/database/drivers/postgre/Makefile.in
index ffa3cb7f..b5ffb653 100644
--- a/codepot/src/system/database/drivers/postgre/Makefile.in
+++ b/codepot/src/system/database/drivers/postgre/Makefile.in
@@ -82,6 +82,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -93,6 +94,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/system/database/drivers/sqlite/Makefile.in b/codepot/src/system/database/drivers/sqlite/Makefile.in
index 50b840d5..9fcbf73f 100644
--- a/codepot/src/system/database/drivers/sqlite/Makefile.in
+++ b/codepot/src/system/database/drivers/sqlite/Makefile.in
@@ -82,6 +82,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -93,6 +94,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/system/fonts/Makefile.in b/codepot/src/system/fonts/Makefile.in
index ae19532a..f033be0a 100644
--- a/codepot/src/system/fonts/Makefile.in
+++ b/codepot/src/system/fonts/Makefile.in
@@ -82,6 +82,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -93,6 +94,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/system/helpers/Makefile.in b/codepot/src/system/helpers/Makefile.in
index c16adb52..9fa9a7a2 100644
--- a/codepot/src/system/helpers/Makefile.in
+++ b/codepot/src/system/helpers/Makefile.in
@@ -82,6 +82,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -93,6 +94,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/system/language/Makefile.in b/codepot/src/system/language/Makefile.in
index 3130de1d..8dce20be 100644
--- a/codepot/src/system/language/Makefile.in
+++ b/codepot/src/system/language/Makefile.in
@@ -122,6 +122,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -133,6 +134,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/system/language/english/Makefile.in b/codepot/src/system/language/english/Makefile.in
index 05b3c863..f55cd03f 100644
--- a/codepot/src/system/language/english/Makefile.in
+++ b/codepot/src/system/language/english/Makefile.in
@@ -82,6 +82,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -93,6 +94,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/system/language/korean/Makefile.in b/codepot/src/system/language/korean/Makefile.in
index c8db57a6..ee0e7a6b 100644
--- a/codepot/src/system/language/korean/Makefile.in
+++ b/codepot/src/system/language/korean/Makefile.in
@@ -82,6 +82,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -93,6 +94,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/system/libraries/Makefile.in b/codepot/src/system/libraries/Makefile.in
index 6d67a417..276b75f7 100644
--- a/codepot/src/system/libraries/Makefile.in
+++ b/codepot/src/system/libraries/Makefile.in
@@ -82,6 +82,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -93,6 +94,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/system/logs/Makefile.in b/codepot/src/system/logs/Makefile.in
index a804d2eb..df02483d 100644
--- a/codepot/src/system/logs/Makefile.in
+++ b/codepot/src/system/logs/Makefile.in
@@ -58,6 +58,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -69,6 +70,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/system/plugins/Makefile.in b/codepot/src/system/plugins/Makefile.in
index 94ded3a4..71baad63 100644
--- a/codepot/src/system/plugins/Makefile.in
+++ b/codepot/src/system/plugins/Makefile.in
@@ -82,6 +82,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -93,6 +94,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/system/scaffolding/Makefile.in b/codepot/src/system/scaffolding/Makefile.in
index bbda3c0c..ec26e00b 100644
--- a/codepot/src/system/scaffolding/Makefile.in
+++ b/codepot/src/system/scaffolding/Makefile.in
@@ -122,6 +122,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -133,6 +134,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/system/scaffolding/images/Makefile.in b/codepot/src/system/scaffolding/images/Makefile.in
index 18fe11de..c57dd23e 100644
--- a/codepot/src/system/scaffolding/images/Makefile.in
+++ b/codepot/src/system/scaffolding/images/Makefile.in
@@ -82,6 +82,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -93,6 +94,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/system/scaffolding/views/Makefile.in b/codepot/src/system/scaffolding/views/Makefile.in
index 7528bbb5..c3918db5 100644
--- a/codepot/src/system/scaffolding/views/Makefile.in
+++ b/codepot/src/system/scaffolding/views/Makefile.in
@@ -82,6 +82,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -93,6 +94,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/websvn/Makefile.in b/codepot/src/websvn/Makefile.in
index 6148ec5b..eea084a9 100644
--- a/codepot/src/websvn/Makefile.in
+++ b/codepot/src/websvn/Makefile.in
@@ -122,6 +122,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -133,6 +134,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/websvn/cache/Makefile.in b/codepot/src/websvn/cache/Makefile.in
index cd22fe5b..ff8fbea2 100644
--- a/codepot/src/websvn/cache/Makefile.in
+++ b/codepot/src/websvn/cache/Makefile.in
@@ -82,6 +82,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -93,6 +94,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/websvn/doc/Makefile.in b/codepot/src/websvn/doc/Makefile.in
index cafacf50..808c27b3 100644
--- a/codepot/src/websvn/doc/Makefile.in
+++ b/codepot/src/websvn/doc/Makefile.in
@@ -82,6 +82,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -93,6 +94,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/websvn/include/Makefile.in b/codepot/src/websvn/include/Makefile.in
index fd3aec68..b1e28726 100644
--- a/codepot/src/websvn/include/Makefile.in
+++ b/codepot/src/websvn/include/Makefile.in
@@ -82,6 +82,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -93,6 +94,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/websvn/languages/Makefile.in b/codepot/src/websvn/languages/Makefile.in
index e24cb678..f9c2c45b 100644
--- a/codepot/src/websvn/languages/Makefile.in
+++ b/codepot/src/websvn/languages/Makefile.in
@@ -82,6 +82,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -93,6 +94,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/websvn/lib/Makefile.in b/codepot/src/websvn/lib/Makefile.in
index 08440d91..f2af9524 100644
--- a/codepot/src/websvn/lib/Makefile.in
+++ b/codepot/src/websvn/lib/Makefile.in
@@ -122,6 +122,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -133,6 +134,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/websvn/lib/geshi/Makefile.in b/codepot/src/websvn/lib/geshi/Makefile.in
index b338e761..1029b202 100644
--- a/codepot/src/websvn/lib/geshi/Makefile.in
+++ b/codepot/src/websvn/lib/geshi/Makefile.in
@@ -82,6 +82,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -93,6 +94,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/websvn/temp/Makefile.in b/codepot/src/websvn/temp/Makefile.in
index 5c7bb3de..94d8d8cb 100644
--- a/codepot/src/websvn/temp/Makefile.in
+++ b/codepot/src/websvn/temp/Makefile.in
@@ -58,6 +58,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -69,6 +70,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/websvn/templates/Makefile.in b/codepot/src/websvn/templates/Makefile.in
index affa9706..6fa3fd45 100644
--- a/codepot/src/websvn/templates/Makefile.in
+++ b/codepot/src/websvn/templates/Makefile.in
@@ -98,6 +98,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -109,6 +110,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/websvn/templates/calm/Makefile.in b/codepot/src/websvn/templates/calm/Makefile.in
index de8586fa..eb5a4ed6 100644
--- a/codepot/src/websvn/templates/calm/Makefile.in
+++ b/codepot/src/websvn/templates/calm/Makefile.in
@@ -122,6 +122,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -133,6 +134,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/websvn/templates/calm/images/Makefile.in b/codepot/src/websvn/templates/calm/images/Makefile.in
index a8e33b8c..65276903 100644
--- a/codepot/src/websvn/templates/calm/images/Makefile.in
+++ b/codepot/src/websvn/templates/calm/images/Makefile.in
@@ -82,6 +82,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -93,6 +94,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/websvn/templates/calm/star-light/Makefile.in b/codepot/src/websvn/templates/calm/star-light/Makefile.in
index 620304a5..b799de05 100644
--- a/codepot/src/websvn/templates/calm/star-light/Makefile.in
+++ b/codepot/src/websvn/templates/calm/star-light/Makefile.in
@@ -122,6 +122,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -133,6 +134,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/websvn/templates/calm/star-light/smilies/Makefile.in b/codepot/src/websvn/templates/calm/star-light/smilies/Makefile.in
index 96ae5fa0..6c78da2f 100644
--- a/codepot/src/websvn/templates/calm/star-light/smilies/Makefile.in
+++ b/codepot/src/websvn/templates/calm/star-light/smilies/Makefile.in
@@ -82,6 +82,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -93,6 +94,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@
diff --git a/codepot/src/websvn/templates/calm/star-light/src/Makefile.in b/codepot/src/websvn/templates/calm/star-light/src/Makefile.in
index 4e51496c..7291348e 100644
--- a/codepot/src/websvn/templates/calm/star-light/src/Makefile.in
+++ b/codepot/src/websvn/templates/calm/star-light/src/Makefile.in
@@ -82,6 +82,7 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPOTDIR = @DEPOTDIR@
+DOCDIR = @DOCDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -93,6 +94,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LIBDIR = @LIBDIR@
+LIBEXECDIR = @LIBEXECDIR@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LOCALSTATEDIR = @LOCALSTATEDIR@