30 files changed, 276 insertions, 1270 deletions

diff --git a/Makefile b/Makefile
index 3e5a38d..5162020 100644
--- a/Makefile
+++ b/Makefile
@@ -5,15 +5,12 @@ CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
 CGIT_CONFIG = /etc/cgitrc
 CACHE_ROOT = /var/cache/cgit
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 1.7.0
+GIT_VER = 1.6.4.3
 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 INSTALL = install
 
 # Define NO_STRCASESTR if you don't have strcasestr.
 #
-# Define NO_OPENSSL to disable linking with OpenSSL and use bundled SHA1
-# implementation (slower).
-#
 # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin).
 #
 
@@ -71,7 +68,7 @@ endif
 	$(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $<
 
 
-EXTLIBS = git/libgit.a git/xdiff/lib.a -lz
+EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto
 OBJECTS =
 OBJECTS += cache.o
 OBJECTS += cgit.o
@@ -93,7 +90,6 @@ OBJECTS += ui-refs.o
 OBJECTS += ui-repolist.o
 OBJECTS += ui-shared.o
 OBJECTS += ui-snapshot.o
-OBJECTS += ui-ssdiff.o
 OBJECTS += ui-stats.o
 OBJECTS += ui-summary.o
 OBJECTS += ui-tag.o
@@ -127,25 +123,17 @@ endif
 ifdef NO_STRCASESTR
 	CFLAGS += -DNO_STRCASESTR
 endif
-ifdef NO_OPENSSL
-	CFLAGS += -DNO_OPENSSL
-	GIT_OPTIONS += NO_OPENSSL=1
-else
-	EXTLIBS += -lcrypto
-endif
 
 cgit: $(OBJECTS) libgit
 	$(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
 
 cgit.o: VERSION
 
-ifneq "$(MAKECMDGOALS)" "clean"
-  -include $(OBJECTS:.o=.d)
-endif
+-include $(OBJECTS:.o=.d)
 
 libgit:
-	$(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) libgit.a
-	$(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) xdiff/lib.a
+	$(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 libgit.a
+	$(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 xdiff/lib.a
 
 test: all
 	$(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all
diff --git a/cgit.c b/cgit.c
index c263872..6c7e811 100644
--- a/cgit.c
+++ b/cgit.c
@@ -60,10 +60,6 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value)
 		repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value);
 	else if (!strcmp(name, "enable-log-linecount"))
 		repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value);
-	else if (!strcmp(name, "enable-remote-branches"))
-		repo->enable_remote_branches = atoi(value);
-	else if (!strcmp(name, "enable-subject-links"))
-		repo->enable_subject_links = atoi(value);
 	else if (!strcmp(name, "max-stats"))
 		repo->max_stats = cgit_find_stats_period(value, NULL);
 	else if (!strcmp(name, "module-link"))
@@ -141,10 +137,6 @@ void config_cb(const char *name, const char *value)
 		ctx.cfg.enable_log_filecount = atoi(value);
 	else if (!strcmp(name, "enable-log-linecount"))
 		ctx.cfg.enable_log_linecount = atoi(value);
-	else if (!strcmp(name, "enable-remote-branches"))
-		ctx.cfg.enable_remote_branches = atoi(value);
-	else if (!strcmp(name, "enable-subject-links"))
-		ctx.cfg.enable_subject_links = atoi(value);
 	else if (!strcmp(name, "enable-tree-linenumbers"))
 		ctx.cfg.enable_tree_linenumbers = atoi(value);
 	else if (!strcmp(name, "max-stats"))
@@ -152,7 +144,7 @@ void config_cb(const char *name, const char *value)
 	else if (!strcmp(name, "cache-size"))
 		ctx.cfg.cache_size = atoi(value);
 	else if (!strcmp(name, "cache-root"))
-		ctx.cfg.cache_root = xstrdup(expand_macros(value));
+		ctx.cfg.cache_root = xstrdup(value);
 	else if (!strcmp(name, "cache-root-ttl"))
 		ctx.cfg.cache_root_ttl = atoi(value);
 	else if (!strcmp(name, "cache-repo-ttl"))
@@ -169,23 +161,19 @@ void config_cb(const char *name, const char *value)
 		ctx.cfg.commit_filter = new_filter(value, 0);
 	else if (!strcmp(name, "embedded"))
 		ctx.cfg.embedded = atoi(value);
-	else if (!strcmp(name, "max-atom-items"))
-		ctx.cfg.max_atom_items = atoi(value);
 	else if (!strcmp(name, "max-message-length"))
 		ctx.cfg.max_msg_len = atoi(value);
 	else if (!strcmp(name, "max-repodesc-length"))
 		ctx.cfg.max_repodesc_len = atoi(value);
-	else if (!strcmp(name, "max-blob-size"))
-		ctx.cfg.max_blob_size = atoi(value);
 	else if (!strcmp(name, "max-repo-count"))
 		ctx.cfg.max_repo_count = atoi(value);
 	else if (!strcmp(name, "max-commit-count"))
 		ctx.cfg.max_commit_count = atoi(value);
 	else if (!strcmp(name, "scan-path"))
 		if (!ctx.cfg.nocache && ctx.cfg.cache_size)
-			process_cached_repolist(expand_macros(value));
+			process_cached_repolist(value);
 		else
-			scan_tree(expand_macros(value), repo_config);
+			scan_tree(value, repo_config);
 	else if (!strcmp(name, "source-filter"))
 		ctx.cfg.source_filter = new_filter(value, 1);
 	else if (!strcmp(name, "summary-log"))
@@ -194,8 +182,6 @@ void config_cb(const char *name, const char *value)
 		ctx.cfg.summary_branches = atoi(value);
 	else if (!strcmp(name, "summary-tags"))
 		ctx.cfg.summary_tags = atoi(value);
-	else if (!strcmp(name, "side-by-side-diffs"))
-		ctx.cfg.ssdiff = atoi(value);
 	else if (!strcmp(name, "agefile"))
 		ctx.cfg.agefile = xstrdup(value);
 	else if (!strcmp(name, "renamelimit"))
@@ -209,7 +195,7 @@ void config_cb(const char *name, const char *value)
 	else if (!prefixcmp(name, "mimetype."))
 		add_mimetype(name + 9, value);
 	else if (!strcmp(name, "include"))
-		parse_configfile(expand_macros(value), config_cb);
+		parse_configfile(value, config_cb);
 }
 
 static void querystring_cb(const char *name, const char *value)
@@ -223,8 +209,6 @@ static void querystring_cb(const char *name, const char *value)
 	} else if (!strcmp(name, "p")) {
 		ctx.qry.page = xstrdup(value);
 	} else if (!strcmp(name, "url")) {
-		if (*value == '/')
-			value++;
 		ctx.qry.url = xstrdup(value);
 		cgit_parse_url(value);
 	} else if (!strcmp(name, "qt")) {
@@ -254,14 +238,6 @@ static void querystring_cb(const char *name, const char *value)
 		ctx.qry.showmsg = atoi(value);
 	} else if (!strcmp(name, "period")) {
 		ctx.qry.period = xstrdup(value);
-	} else if (!strcmp(name, "ss")) {
-		ctx.qry.ssdiff = atoi(value);
-	} else if (!strcmp(name, "all")) {
-		ctx.qry.show_all = atoi(value);
-	} else if (!strcmp(name, "context")) {
-		ctx.qry.context = atoi(value);
-	} else if (!strcmp(name, "ignorews")) {
-		ctx.qry.ignorews = atoi(value);
 	}
 }
 
@@ -292,7 +268,6 @@ static void prepare_context(struct cgit_context *ctx)
 	ctx->cfg.max_lock_attempts = 5;
 	ctx->cfg.max_msg_len = 80;
 	ctx->cfg.max_repodesc_len = 80;
-	ctx->cfg.max_blob_size = 0;
 	ctx->cfg.max_stats = 0;
 	ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s";
 	ctx->cfg.renamelimit = -1;
@@ -304,8 +279,6 @@ static void prepare_context(struct cgit_context *ctx)
 	ctx->cfg.summary_branches = 10;
 	ctx->cfg.summary_log = 10;
 	ctx->cfg.summary_tags = 10;
-	ctx->cfg.max_atom_items = 10;
-	ctx->cfg.ssdiff = 0;
 	ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG"));
 	ctx->env.http_host = xstrdupn(getenv("HTTP_HOST"));
 	ctx->env.https = xstrdupn(getenv("HTTPS"));
@@ -437,12 +410,6 @@ static void process_request(void *cbdata)
 		return;
 	}
 
-	/* If cmd->want_vpath is set, assume ctx->qry.path contains a "virtual"
-	 * in-project path limit to be made available at ctx->qry.vpath.
-	 * Otherwise, no path limit is in effect (ctx->qry.vpath = NULL).
-	 */
-	ctx->qry.vpath = cmd->want_vpath ? ctx->qry.path : NULL;
-
 	if (cmd->want_repo && !ctx->repo) {
 		cgit_print_http_headers(ctx);
 		cgit_print_docstart(ctx);
@@ -707,7 +674,7 @@ int main(int argc, const char **argv)
 	cgit_repolist.repos = NULL;
 
 	cgit_parse_args(argc, argv);
-	parse_configfile(expand_macros(ctx.env.cgit_config), config_cb);
+	parse_configfile(ctx.env.cgit_config, config_cb);
 	ctx.repo = NULL;
 	http_parse_querystring(ctx.qry.raw, querystring_cb);
 
diff --git a/cgit.css b/cgit.css
index 6e47eb3..c47ebc9 100644
--- a/cgit.css
+++ b/cgit.css
@@ -64,7 +64,7 @@ table#header td.sub {
 }
 
 table.tabs {
-	border-bottom: solid 3px #ccc;
+	/* border-bottom: solid 2px #ccc; */
 	border-collapse: collapse;
 	margin-top: 2em;
 	margin-bottom: 0px;
@@ -102,16 +102,10 @@ table.tabs td.form select {
 	font-size: 90%;
 }
 
-div.path {
-	margin: 0px;
-	padding: 5px 2em 2px 2em;
-	color: #000;
-	background-color: #eee;
-}
-
 div.content {
 	margin: 0px;
 	padding: 2em;
+	border-top: solid 3px #ccc;
 	border-bottom: solid 3px #ccc;
 }
 
@@ -168,11 +162,6 @@ table.list td a {
 	color: black;
 }
 
-table.list td a.ls-dir {
-	font-weight: bold;
-	color: #00f;
-}
-
 table.list td a:hover {
 	color: #00f;
 }
@@ -531,10 +520,7 @@ a.deco {
 	border: solid 1px #770000;
 }
 
-div.commit-subject a.branch-deco,
-div.commit-subject a.tag-deco,
-div.commit-subject a.remote-deco,
-div.commit-subject a.deco {
+div.commit-subject a {
 	margin-left: 1em;
 	font-size: 75%;
 }
@@ -615,102 +601,3 @@ table.hgraph div.bar {
 	background-color: #eee;
 	height: 1em;
 }
-
-table.ssdiff {
-	width: 100%;
-}
-
-table.ssdiff td {
-	font-size: 75%;
-	font-family: monospace;
-	white-space: pre;
-	padding: 1px 4px 1px 4px;
-	border-left: solid 1px #aaa;
-	border-right: solid 1px #aaa;
-}
-
-table.ssdiff td.add {
-	color: black;
-	background: #cfc;
-	min-width: 50%;
-}
-
-table.ssdiff td.add_dark {
-	color: black;
-	background: #aca;
-	min-width: 50%;
-}
-
-table.ssdiff span.add {
-	background: #cfc;
-	font-weight: bold;
-}
-
-table.ssdiff td.del {
-	color: black;
-	background: #fcc;
-	min-width: 50%;
-}
-
-table.ssdiff td.del_dark {
-	color: black;
-	background: #caa;
-	min-width: 50%;
-}
-
-table.ssdiff span.del {
-	background: #fcc;
-	font-weight: bold;
-}
-
-table.ssdiff td.changed {
-	color: black;
-	background: #ffc;
-	min-width: 50%;
-}
-
-table.ssdiff td.changed_dark {
-	color: black;
-	background: #cca;
-	min-width: 50%;
-}
-
-table.ssdiff td.lineno {
-	color: black;
-	background: #eee;
-	text-align: right;
-	width: 3em;
-	min-width: 3em;
-}
-
-table.ssdiff td.hunk {
-	color: #black;
-	background: #ccf;
-	border-top: solid 1px #aaa;
-	border-bottom: solid 1px #aaa;
-}
-
-table.ssdiff td.head {
-	border-top: solid 1px #aaa;
-	border-bottom: solid 1px #aaa;
-}
-
-table.ssdiff td.head div.head {
-	font-weight: bold;
-	color: black;
-}
-
-table.ssdiff td.foot {
-	border-top: solid 1px #aaa;
-        border-left: none;
-        border-right: none;
-        border-bottom: none;
-}
-
-table.ssdiff td.space {
-	border: none;
-}
-
-table.ssdiff td.space div {
-	min-height: 3em;
-}
\ No newline at end of file
diff --git a/cgit.h b/cgit.h
index e9e2718..6c6c460 100644
--- a/cgit.h
+++ b/cgit.h
@@ -72,8 +72,6 @@ struct cgit_repo {
 	int snapshots;
 	int enable_log_filecount;
 	int enable_log_linecount;
-	int enable_remote_branches;
-	int enable_subject_links;
 	int max_stats;
 	time_t mtime;
 	struct cgit_filter *about_filter;
@@ -145,11 +143,6 @@ struct cgit_query {
 	int nohead;
 	char *sort;
 	int showmsg;
-	int ssdiff;
-	int show_all;
-	int context;
-	int ignorews;
-	char *vpath;
 };
 
 struct cgit_config {
@@ -185,17 +178,13 @@ struct cgit_config {
 	int enable_index_links;
 	int enable_log_filecount;
 	int enable_log_linecount;
-	int enable_remote_branches;
-	int enable_subject_links;
 	int enable_tree_linenumbers;
 	int local_time;
-	int max_atom_items;
 	int max_repo_count;
 	int max_commit_count;
 	int max_lock_attempts;
 	int max_msg_len;
 	int max_repodesc_len;
-	int max_blob_size;
 	int max_stats;
 	int nocache;
 	int noplainemail;
@@ -205,7 +194,6 @@ struct cgit_config {
 	int summary_branches;
 	int summary_log;
 	int summary_tags;
-	int ssdiff;
 	struct string_list mimetypes;
 	struct cgit_filter *about_filter;
 	struct cgit_filter *commit_filter;
@@ -280,12 +268,11 @@ extern void *cgit_free_commitinfo(struct commitinfo *info);
 extern int cgit_diff_files(const unsigned char *old_sha1,
 			   const unsigned char *new_sha1,
 			   unsigned long *old_size, unsigned long *new_size,
-			   int *binary, int context, int ignorews,
-			   linediff_fn fn);
+			   int *binary, linediff_fn fn);
 
 extern void cgit_diff_tree(const unsigned char *old_sha1,
 			   const unsigned char *new_sha1,
-			   filepair_fn fn, const char *prefix, int ignorews);
+			   filepair_fn fn, const char *prefix);
 
 extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);
 
@@ -304,6 +291,4 @@ extern int cgit_close_filter(struct cgit_filter *filter);
 
 extern int readfile(const char *path, char **buf, size_t *size);
 
-extern char *expand_macros(const char *txt);
-
 #endif /* CGIT_H */
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index a853522..0c13485 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -110,17 +110,6 @@ enable-log-linecount::
 	and removed lines for each commit on the repository log page. Default
 	value: "0".
 
-enable-remote-branches::
-	Flag which, when set to "1", will make cgit display remote branches
-	in the summary and refs views. Default value: "0". See also:
-	"repo.enable-remote-branches".
-
-enable-subject-links::
-	Flag which, when set to "1", will make cgit use the subject of the
-	parent commit as link text when generating links to parent commits
-	in commit view. Default value: "0". See also:
-	"repo.enable-subject-links".
-
 enable-tree-linenumbers::
 	Flag which, when set to "1", will make cgit generate linenumber links
 	for plaintext blobs printed in the tree view. Default value: "1".
@@ -172,10 +161,6 @@ logo-link::
 	calculated url of the repository index page will be used. Default
 	value: none.
 
-max-atom-items::
-	Specifies the number of items to display in atom feeds view. Default
-	value: "10".
-
 max-commit-count::
 	Specifies the number of entries to list per page in "log" view. Default
 	value: "50".
@@ -192,10 +177,6 @@ max-repodesc-length::
 	Specifies the maximum number of repo description characters to display
 	on the repository index page. Default value: "80".
 
-max-blob-size::
-	Specifies the maximum size of a blob to display HTML for in KBytes.
-	Default value: "0" (limit disabled).
-
 max-stats::
 	Set the default maximum statistics period. Valid values are "week",
 	"month", "quarter" and "year". If unspecified, statistics are
@@ -260,10 +241,6 @@ section::
 	after this option will inherit the current section name. Default value:
 	none.
 
-side-by-side-diffs::
-	If set to "1" shows side-by-side diffs instead of unidiffs per
-	default. Default value: "0".
-
 snapshots::
 	Text which specifies the default set of snapshot formats generated by
 	cgit. The value is a space-separated list of zero or more of the
@@ -327,14 +304,6 @@ repo.enable-log-linecount::
 	A flag which can be used to disable the global setting
 	`enable-log-linecount'. Default value: none.
 
-repo.enable-remote-branches::
-	Flag which, when set to "1", will make cgit display remote branches
-	in the summary and refs views. Default value: <enable-remote-branches>.
-
-repo.enable-subject-links::
-	A flag which can be used to override the global setting
-	`enable-subject-links'. Default value: none.
-
 repo.max-stats::
 	Override the default maximum statistics period. Valid values are equal
 	to the values specified for the global "max-stats" setting. Default
@@ -444,7 +413,7 @@ snapshots=tar.gz tar.bz2 zip
 ## List of common mimetypes
 ##
 
-mimetype.gif=image/gif
+mimetype.git=image/git
 mimetype.html=text/html
 mimetype.jpg=image/jpeg
 mimetype.jpeg=image/jpeg
diff --git a/cmd.c b/cmd.c
index 6dc9f5e..766f903 100644
--- a/cmd.c
+++ b/cmd.c
@@ -33,7 +33,7 @@ static void HEAD_fn(struct cgit_context *ctx)
 
 static void atom_fn(struct cgit_context *ctx)
 {
-	cgit_print_atom(ctx->qry.head, ctx->qry.path, ctx->cfg.max_atom_items);
+	cgit_print_atom(ctx->qry.head, ctx->qry.path, 10);
 }
 
 static void about_fn(struct cgit_context *ctx)
@@ -51,7 +51,7 @@ static void blob_fn(struct cgit_context *ctx)
 
 static void commit_fn(struct cgit_context *ctx)
 {
-	cgit_print_commit(ctx->qry.sha1, ctx->qry.path);
+	cgit_print_commit(ctx->qry.sha1);
 }
 
 static void diff_fn(struct cgit_context *ctx)
@@ -90,7 +90,7 @@ static void repolist_fn(struct cgit_context *ctx)
 
 static void patch_fn(struct cgit_context *ctx)
 {
-	cgit_print_patch(ctx->qry.sha1, ctx->qry.path);
+	cgit_print_patch(ctx->qry.sha1);
 }
 
 static void plain_fn(struct cgit_context *ctx)
@@ -129,31 +129,31 @@ static void tree_fn(struct cgit_context *ctx)
 	cgit_print_tree(ctx->qry.sha1, ctx->qry.path);
 }
 
-#define def_cmd(name, want_repo, want_layout, want_vpath) \
-	{#name, name##_fn, want_repo, want_layout, want_vpath}
+#define def_cmd(name, want_repo, want_layout) \
+	{#name, name##_fn, want_repo, want_layout}
 
 struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx)
 {
 	static struct cgit_cmd cmds[] = {
-		def_cmd(HEAD, 1, 0, 0),
-		def_cmd(atom, 1, 0, 0),
-		def_cmd(about, 0, 1, 0),
-		def_cmd(blob, 1, 0, 0),
-		def_cmd(commit, 1, 1, 1),
-		def_cmd(diff, 1, 1, 1),
-		def_cmd(info, 1, 0, 0),
-		def_cmd(log, 1, 1, 1),
-		def_cmd(ls_cache, 0, 0, 0),
-		def_cmd(objects, 1, 0, 0),
-		def_cmd(patch, 1, 0, 1),
-		def_cmd(plain, 1, 0, 0),
-		def_cmd(refs, 1, 1, 0),
-		def_cmd(repolist, 0, 0, 0),
-		def_cmd(snapshot, 1, 0, 0),
-		def_cmd(stats, 1, 1, 1),
-		def_cmd(summary, 1, 1, 0),
-		def_cmd(tag, 1, 1, 0),
-		def_cmd(tree, 1, 1, 1),
+		def_cmd(HEAD, 1, 0),
+		def_cmd(atom, 1, 0),
+		def_cmd(about, 0, 1),
+		def_cmd(blob, 1, 0),
+		def_cmd(commit, 1, 1),
+		def_cmd(diff, 1, 1),
+		def_cmd(info, 1, 0),
+		def_cmd(log, 1, 1),
+		def_cmd(ls_cache, 0, 0),
+		def_cmd(objects, 1, 0),
+		def_cmd(patch, 1, 0),
+		def_cmd(plain, 1, 0),
+		def_cmd(refs, 1, 1),
+		def_cmd(repolist, 0, 0),
+		def_cmd(snapshot, 1, 0),
+		def_cmd(stats, 1, 1),
+		def_cmd(summary, 1, 1),
+		def_cmd(tag, 1, 1),
+		def_cmd(tree, 1, 1),
 	};
 	int i;
 
diff --git a/cmd.h b/cmd.h
index 8dc01bd..ec9e691 100644
--- a/cmd.h
+++ b/cmd.h
@@ -7,8 +7,7 @@ struct cgit_cmd {
 	const char *name;
 	cgit_cmd_fn fn;
 	unsigned int want_repo:1,
-		want_layout:1,
-		want_vpath:1;
+		want_layout:1;
 };
 
 extern struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx);
diff --git a/filters/commit-links.sh b/filters/commit-links.sh
index 110c609..165a533 100755
--- a/filters/commit-links.sh
+++ b/filters/commit-links.sh
@@ -1,14 +1,12 @@
 #!/bin/sh
-# This script can be used to generate links in commit messages.
+# This script can be used to generate links in commit messages - the first
+# sed expression generates links to commits referenced by their SHA1, while
+# the second expression generates links to a fictional bugtracker.
 #
 # To use this script, refer to this file with either the commit-filter or the
 # repo.commit-filter options in cgitrc.
 
-# This expression generates links to commits referenced by their SHA1.
-regex=$regex'
-s|\b([0-9a-fA-F]{8,40})\b|<a href="./?id=\1">\1</a>|g'
-# This expression generates links to a fictional bugtracker.
-regex=$regex'
-s| #([0-9]+)\b|<a href="http://bugs.example.com/?bug=\1">#\1</a>|g'
-
-sed -re "$regex"
+sed -re '
+s|\b([0-9a-fA-F]{8,40})\b|<a href="./?id=\1">\1</a>|g
+s| #([0-9]+)\b|<a href="http://bugs.example.com/?bug=\1">#\1</a>|g
+'
diff --git a/filters/syntax-highlighting.sh b/filters/syntax-highlighting.sh
index 6b1c576..999ad0c 100755
--- a/filters/syntax-highlighting.sh
+++ b/filters/syntax-highlighting.sh
@@ -3,10 +3,6 @@
 # tree-view by refering to this file with the source-filter or repo.source-
 # filter options in cgitrc.
 #
-# This script requires a shell supporting the ${var##pattern} syntax.
-# It is supported by at least dash and bash, however busybox environments
-# might have to use an external call to sed instead.
-#
 # Note: the highlight command (http://www.andre-simon.de/) uses css for syntax
 # highlighting, so you'll probably want something like the following included
 # in your css file (generated by highlight 2.4.8 and adapted for cgit):
@@ -24,11 +20,20 @@
 # table.blob .kwc  { color:#000000; font-weight:bold; }
 # table.blob .kwd  { color:#010181; }
 
-# store filename and extension in local vars
-BASENAME="$1"
-EXTENSION="${BASENAME##*.}"
-
-# map Makefile and Makefile.* to .mk
-[ "${BASENAME%%.*}" == "Makefile" ] && EXTENSION=mk
-
-exec highlight --force -f -I -X -S $EXTENSION 2>/dev/null
+case "$1" in
+	*.c)
+		highlight -f -I -X -S c
+		;;
+	*.h)
+		highlight -f -I -X -S c
+		;;
+	*.sh)
+		highlight -f -I -X -S sh
+		;;
+	*.css)
+		highlight -f -I -X -S css
+		;;
+	*)
+		highlight -f -I -X -S txt
+		;;
+esac
diff --git a/git b/git
-Subproject e923eaeb901ff056421b9007adcbbce271caa7b
+Subproject 7fb6bcff2dece2ff9fbc5ebfe526d9b2a7e764c
diff --git a/html.c b/html.c
index 337baeb..66ba65d 100644
--- a/html.c
+++ b/html.c
@@ -13,32 +13,6 @@
 #include <string.h>
 #include <errno.h>
 
-/* Percent-encoding of each character, except: a-zA-Z0-9!$()*,./:;@- */
-static const char* url_escape_table[256] = {
-	"%00", "%01", "%02", "%03", "%04", "%05", "%06", "%07", "%08", "%09",
-	"%0a", "%0b", "%0c", "%0d", "%0e", "%0f", "%10", "%11", "%12", "%13",
-	"%14", "%15", "%16", "%17", "%18", "%19", "%1a", "%1b", "%1c", "%1d",
-	"%1e", "%1f", "%20", 0, "%22", "%23", 0, "%25", "%26", "%27", 0, 0, 0,
-	"%2b", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "%3c", "%3d",
-	"%3e", "%3f", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, "%5c", 0, "%5e", 0, "%60", 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "%7b",
-	"%7c", "%7d", 0, "%7f", "%80", "%81", "%82", "%83", "%84", "%85",
-	"%86", "%87", "%88", "%89", "%8a", "%8b", "%8c", "%8d", "%8e", "%8f",
-	"%90", "%91", "%92", "%93", "%94", "%95", "%96", "%97", "%98", "%99",
-	"%9a", "%9b", "%9c", "%9d", "%9e", "%9f", "%a0", "%a1", "%a2", "%a3",
-	"%a4", "%a5", "%a6", "%a7", "%a8", "%a9", "%aa", "%ab", "%ac", "%ad",
-	"%ae", "%af", "%b0", "%b1", "%b2", "%b3", "%b4", "%b5", "%b6", "%b7",
-	"%b8", "%b9", "%ba", "%bb", "%bc", "%bd", "%be", "%bf", "%c0", "%c1",
-	"%c2", "%c3", "%c4", "%c5", "%c6", "%c7", "%c8", "%c9", "%ca", "%cb",
-	"%cc", "%cd", "%ce", "%cf", "%d0", "%d1", "%d2", "%d3", "%d4", "%d5",
-	"%d6", "%d7", "%d8", "%d9", "%da", "%db", "%dc", "%dd", "%de", "%df",
-	"%e0", "%e1", "%e2", "%e3", "%e4", "%e5", "%e6", "%e7", "%e8", "%e9",
-	"%ea", "%eb", "%ec", "%ed", "%ee", "%ef", "%f0", "%f1", "%f2", "%f3",
-	"%f4", "%f5", "%f6", "%f7", "%f8", "%f9", "%fa", "%fb", "%fc", "%fd",
-	"%fe", "%ff"
-};
-
 int htmlfd = STDOUT_FILENO;
 
 char *fmt(const char *format, ...)
@@ -89,9 +63,9 @@ void html_status(int code, const char *msg, int more_headers)
 		html("\n");
 }
 
-void html_txt(const char *txt)
+void html_txt(char *txt)
 {
-	const char *t = txt;
+	char *t = txt;
 	while(t && *t){
 		int c = *t;
 		if (c=='<' || c=='>' || c=='&') {
@@ -110,9 +84,9 @@ void html_txt(const char *txt)
 		html(txt);
 }
 
-void html_ntxt(int len, const char *txt)
+void html_ntxt(int len, char *txt)
 {
-	const char *t = txt;
+	char *t = txt;
 	while(t && *t && len--){
 		int c = *t;
 		if (c=='<' || c=='>' || c=='&') {
@@ -133,9 +107,9 @@ void html_ntxt(int len, const char *txt)
 		html("...");
 }
 
-void html_attr(const char *txt)
+void html_attr(char *txt)
 {
-	const char *t = txt;
+	char *t = txt;
 	while(t && *t){
 		int c = *t;
 		if (c=='<' || c=='>' || c=='\'' || c=='\"') {
@@ -156,15 +130,14 @@ void html_attr(const char *txt)
 		html(txt);
 }
 
-void html_url_path(const char *txt)
+void html_url_path(char *txt)
 {
-	const char *t = txt;
+	char *t = txt;
 	while(t && *t){
 		int c = *t;
-		const char *e = url_escape_table[c];
-		if (e && c!='+' && c!='&' && c!='+') {
+		if (c=='"' || c=='#' || c=='\'' || c=='?') {
 			write(htmlfd, txt, t - txt);
-			write(htmlfd, e, 3);
+			write(htmlfd, fmt("%%%2x", c), 3);
 			txt = t+1;
 		}
 		t++;
@@ -173,15 +146,14 @@ void html_url_path(const char *txt)
 		html(txt);
 }
 
-void html_url_arg(const char *txt)
+void html_url_arg(char *txt)
 {
-	const char *t = txt;
+	char *t = txt;
 	while(t && *t){
 		int c = *t;
-		const char *e = url_escape_table[c];
-		if (e) {
+		if (c=='"' || c=='#' || c=='%' || c=='&' || c=='\'' || c=='+' || c=='?') {
 			write(htmlfd, txt, t - txt);
-			write(htmlfd, e, 3);
+			write(htmlfd, fmt("%%%2x", c), 3);
 			txt = t+1;
 		}
 		t++;
@@ -190,7 +162,7 @@ void html_url_arg(const char *txt)
 		html(txt);
 }
 
-void html_hidden(const char *name, const char *value)
+void html_hidden(char *name, char *value)
 {
 	html("<input type='hidden' name='");
 	html_attr(name);
@@ -199,7 +171,7 @@ void html_hidden(const char *name, const char *value)
 	html("'/>");
 }
 
-void html_option(const char *value, const char *text, const char *selected_value)
+void html_option(char *value, char *text, char *selected_value)
 {
 	html("<option value='");
 	html_attr(value);
@@ -211,7 +183,7 @@ void html_option(const char *value, const char *text, const char *selected_value
 	html("</option>\n");
 }
 
-void html_link_open(const char *url, const char *title, const char *class)
+void html_link_open(char *url, char *title, char *class)
 {
 	html("<a href='");
 	html_attr(url);
@@ -285,14 +257,14 @@ char *convert_query_hexchar(char *txt)
 	}
 }
 
-int http_parse_querystring(const char *txt_, void (*fn)(const char *name, const char *value))
+int http_parse_querystring(char *txt, void (*fn)(const char *name, const char *value))
 {
-	char *t, *txt, *value = NULL, c;
+	char *t, *value = NULL, c;
 
-	if (!txt_)
+	if (!txt)
 		return 0;
 
-	t = txt = strdup(txt_);
+	t = txt = strdup(txt);
 	if (t == NULL) {
 		printf("Out of memory\n");
 		exit(1);
diff --git a/html.h b/html.h
index 16d55ec..a55d4b2 100644
--- a/html.h
+++ b/html.h
@@ -7,18 +7,18 @@ extern void html_raw(const char *txt, size_t size);
 extern void html(const char *txt);
 extern void htmlf(const char *format,...);
 extern void html_status(int code, const char *msg, int more_headers);
-extern void html_txt(const char *txt);
-extern void html_ntxt(int len, const char *txt);
-extern void html_attr(const char *txt);
-extern void html_url_path(const char *txt);
-extern void html_url_arg(const char *txt);
-extern void html_hidden(const char *name, const char *value);
-extern void html_option(const char *value, const char *text, const char *selected_value);
-extern void html_link_open(const char *url, const char *title, const char *class);
+extern void html_txt(char *txt);
+extern void html_ntxt(int len, char *txt);
+extern void html_attr(char *txt);
+extern void html_url_path(char *txt);
+extern void html_url_arg(char *txt);
+extern void html_hidden(char *name, char *value);
+extern void html_option(char *value, char *text, char *selected_value);
+extern void html_link_open(char *url, char *title, char *class);
 extern void html_link_close(void);
 extern void html_fileperm(unsigned short mode);
 extern int html_include(const char *filename);
 
-extern int http_parse_querystring(const char *txt, void (*fn)(const char *name, const char *value));
+extern int http_parse_querystring(char *txt, void (*fn)(const char *name, const char *value));
 
 #endif /* HTML_H */
diff --git a/scan-tree.c b/scan-tree.c
index 1e18f3c..dbca797 100644
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -56,8 +56,6 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
 			path, strerror(errno), errno);
 		return;
 	}
-	if (!stat(fmt("%s/noweb", path), &st))
-		return;
 	if ((pwd = getpwuid(st.st_uid)) == NULL) {
 		fprintf(stderr, "Error reading owner-info for %s: %s (%d)\n",
 			path, strerror(errno), errno);
diff --git a/shared.c b/shared.c
index b42c2a2..6adf2b6 100644
--- a/shared.c
+++ b/shared.c
@@ -10,6 +10,7 @@
 
 struct cgit_repolist cgit_repolist;
 struct cgit_context ctx;
+int cgit_cmd;
 
 int chk_zero(int result, char *msg)
 {
@@ -58,8 +59,6 @@ struct cgit_repo *cgit_add_repo(const char *url)
 	ret->snapshots = ctx.cfg.snapshots;
 	ret->enable_log_filecount = ctx.cfg.enable_log_filecount;
 	ret->enable_log_linecount = ctx.cfg.enable_log_linecount;
-	ret->enable_remote_branches = ctx.cfg.enable_remote_branches;
-	ret->enable_subject_links = ctx.cfg.enable_subject_links;
 	ret->max_stats = ctx.cfg.max_stats;
 	ret->module_link = ctx.cfg.module_link;
 	ret->readme = NULL;
@@ -263,8 +262,7 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf)
 
 int cgit_diff_files(const unsigned char *old_sha1,
 		    const unsigned char *new_sha1, unsigned long *old_size,
-		    unsigned long *new_size, int *binary, int context,
-		    int ignorews, linediff_fn fn)
+		    unsigned long *new_size, int *binary, linediff_fn fn)
 {
 	mmfile_t file1, file2;
 	xpparam_t diff_params;
@@ -291,9 +289,7 @@ int cgit_diff_files(const unsigned char *old_sha1,
 	memset(&emit_params, 0, sizeof(emit_params));
 	memset(&emit_cb, 0, sizeof(emit_cb));
 	diff_params.flags = XDF_NEED_MINIMAL;
-	if (ignorews)
-		diff_params.flags |= XDF_IGNORE_WHITESPACE;
-	emit_params.ctxlen = context > 0 ? context : 3;
+	emit_params.ctxlen = 3;
 	emit_params.flags = XDL_EMIT_FUNCNAMES;
 	emit_cb.outf = filediff_cb;
 	emit_cb.priv = fn;
@@ -307,7 +303,7 @@ int cgit_diff_files(const unsigned char *old_sha1,
 
 void cgit_diff_tree(const unsigned char *old_sha1,
 		    const unsigned char *new_sha1,
-		    filepair_fn fn, const char *prefix, int ignorews)
+		    filepair_fn fn, const char *prefix)
 {
 	struct diff_options opt;
 	int ret;
@@ -318,8 +314,6 @@ void cgit_diff_tree(const unsigned char *old_sha1,
 	opt.detect_rename = 1;
 	opt.rename_limit = ctx.cfg.renamelimit;
 	DIFF_OPT_SET(&opt, RECURSIVE);
-	if (ignorews)
-		DIFF_XDL_SET(&opt, IGNORE_WHITESPACE);
 	opt.format_callback = cgit_diff_tree_cb;
 	opt.format_callback_data = fn;
 	if (prefix) {
@@ -344,8 +338,7 @@ void cgit_diff_commit(struct commit *commit, filepair_fn fn)
 
 	if (commit->parents)
 		old_sha1 = commit->parents->item->object.sha1;
-	cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL,
-		       ctx.qry.ignorews);
+	cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL);
 }
 
 int cgit_parse_snapshots_mask(const char *str)
@@ -437,74 +430,3 @@ int readfile(const char *path, char **buf, size_t *size)
 	close(fd);
 	return (*size == st.st_size ? 0 : e);
 }
-
-int is_token_char(char c)
-{
-	return isalnum(c) || c == '_';
-}
-
-/* Replace name with getenv(name), return pointer to zero-terminating char
- */
-char *expand_macro(char *name, int maxlength)
-{
-	char *value;
-	int len;
-
-	len = 0;
-	value = getenv(name);
-	if (value) {
-		len = strlen(value);
-		if (len > maxlength)
-			len = maxlength;
-		strncpy(name, value, len);
-	}
-	return name + len;
-}
-
-#define EXPBUFSIZE (1024 * 8)
-
-/* Replace all tokens prefixed by '$' in the specified text with the
- * value of the named environment variable.
- * NB: the return value is a static buffer, i.e. it must be strdup'd
- * by the caller.
- */
-char *expand_macros(const char *txt)
-{
-	static char result[EXPBUFSIZE];
-	char *p, *start;
-	int len;
-
-	p = result;
-	start = NULL;
-	while (p < result + EXPBUFSIZE - 1 && txt && *txt) {
-		*p = *txt;
-		if (start) {
-			if (!is_token_char(*txt)) {
-				if (p - start > 0) {
-					*p = '\0';
-					len = result + EXPBUFSIZE - start - 1;
-					p = expand_macro(start, len) - 1;
-				}
-				start = NULL;
-				txt--;
-			}
-			p++;
-			txt++;
-			continue;
-		}
-		if (*txt == '$') {
-			start = p;
-			txt++;
-			continue;
-		}
-		p++;
-		txt++;
-	}
-	*p = '\0';
-	if (start && p - start > 0) {
-		len = result + EXPBUFSIZE - start - 1;
-		p = expand_macro(start, len);
-		*p = '\0';
-	}
-	return result;
-}
diff --git a/ui-atom.c b/ui-atom.c
index 9f049ae..808b2d0 100644
--- a/ui-atom.c
+++ b/ui-atom.c
@@ -85,9 +85,7 @@ void cgit_print_atom(char *tip, char *path, int max_count)
 	struct rev_info rev;
 	int argc = 2;
 
-	if (ctx.qry.show_all)
-		argv[1] = "--all";
-	else if (!tip)
+	if (!tip)
 		argv[1] = ctx.qry.head;
 
 	if (path) {
diff --git a/ui-commit.c b/ui-commit.c
index a11bc5f..f5b0ae5 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -12,13 +12,13 @@
 #include "ui-diff.h"
 #include "ui-log.h"
 
-void cgit_print_commit(char *hex, const char *prefix)
+void cgit_print_commit(char *hex)
 {
 	struct commit *commit, *parent;
-	struct commitinfo *info, *parent_info;
+	struct commitinfo *info;
 	struct commit_list *p;
 	unsigned char sha1[20];
-	char *tmp, *tmp2;
+	char *tmp;
 	int parents = 0;
 
 	if (!hex)
@@ -58,23 +58,14 @@ void cgit_print_commit(char *hex, const char *prefix)
 	html("</td></tr>\n");
 	html("<tr><th>commit</th><td colspan='2' class='sha1'>");
 	tmp = sha1_to_hex(commit->object.sha1);
-	cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, prefix, 0);
+	cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp);
 	html(" (");
-	cgit_patch_link("patch", NULL, NULL, NULL, tmp, prefix);
-	html(") (");
-	if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff))
-		cgit_commit_link("unidiff", NULL, NULL, ctx.qry.head, tmp, prefix, 1);
-	else
-		cgit_commit_link("side-by-side diff", NULL, NULL, ctx.qry.head, tmp, prefix, 1);
+	cgit_patch_link("patch", NULL, NULL, NULL, tmp);
 	html(")</td></tr>\n");
 	html("<tr><th>tree</th><td colspan='2' class='sha1'>");
 	tmp = xstrdup(hex);
 	cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL,
 		       ctx.qry.head, tmp, NULL);
-	if (prefix) {
-		html(" /");
-		cgit_tree_link(prefix, NULL, NULL, ctx.qry.head, tmp, prefix);
-	}
 	html("</td></tr>\n");
       	for (p = commit->parents; p ; p = p->next) {
 		parent = lookup_commit_reference(p->item->object.sha1);
@@ -86,15 +77,11 @@ void cgit_print_commit(char *hex, const char *prefix)
 		}
 		html("<tr><th>parent</th>"
 		     "<td colspan='2' class='sha1'>");
-		tmp = tmp2 = sha1_to_hex(p->item->object.sha1);
-		if (ctx.repo->enable_subject_links) {
-			parent_info = cgit_parse_commit(parent);
-			tmp2 = parent_info->subject;
-		}
-		cgit_commit_link(tmp2, NULL, NULL, ctx.qry.head, tmp, prefix, 0);
+		cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL,
+				 ctx.qry.head, sha1_to_hex(p->item->object.sha1));
 		html(" (");
 		cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex,
-			       sha1_to_hex(p->item->object.sha1), prefix, 0);
+			       sha1_to_hex(p->item->object.sha1), NULL);
 		html(")</td></tr>");
 		parents++;
 	}
@@ -125,7 +112,7 @@ void cgit_print_commit(char *hex, const char *prefix)
 			tmp = sha1_to_hex(commit->parents->item->object.sha1);
 		else
 			tmp = NULL;
-		cgit_print_diff(ctx.qry.sha1, tmp, prefix);
+		cgit_print_diff(ctx.qry.sha1, tmp, NULL);
 	}
 	cgit_free_commitinfo(info);
 }
diff --git a/ui-commit.h b/ui-commit.h
index 8198b4b..40bcb31 100644
--- a/ui-commit.h
+++ b/ui-commit.h
@@ -1,6 +1,6 @@
 #ifndef UI_COMMIT_H
 #define UI_COMMIT_H
 
-extern void cgit_print_commit(char *hex, const char *prefix);
+extern void cgit_print_commit(char *hex);
 
 #endif /* UI_COMMIT_H */
diff --git a/ui-diff.c b/ui-diff.c
index 0dcabe9..2196745 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -9,7 +9,6 @@
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
-#include "ui-ssdiff.h"
 
 unsigned char old_rev_sha1[20];
 unsigned char new_rev_sha1[20];
@@ -33,7 +32,6 @@ static struct fileinfo {
 	int binary:1;
 } *items;
 
-static int use_ssdiff = 0;
 
 static void print_fileinfo(struct fileinfo *info)
 {
@@ -85,7 +83,7 @@ static void print_fileinfo(struct fileinfo *info)
 	}
 	htmlf("</td><td class='%s'>", class);
 	cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
-		       ctx.qry.sha2, info->new_path, 0);
+		       ctx.qry.sha2, info->new_path);
 	if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED)
 		htmlf(" (%s from %s)",
 		      info->status == DIFF_STATUS_COPIED ? "copied" : "renamed",
@@ -127,7 +125,7 @@ static void inspect_filepair(struct diff_filepair *pair)
 	lines_added = 0;
 	lines_removed = 0;
 	cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, &new_size,
-			&binary, 0, ctx.qry.ignorews, count_diff_lines);
+			&binary, count_diff_lines);
 	if (files >= slots) {
 		if (slots == 0)
 			slots = 4;
@@ -154,33 +152,17 @@ static void inspect_filepair(struct diff_filepair *pair)
 }
 
 void cgit_print_diffstat(const unsigned char *old_sha1,
-			 const unsigned char *new_sha1, const char *prefix)
+			 const unsigned char *new_sha1)
 {
-	int i, save_context = ctx.qry.context;
+	int i;
 
 	html("<div class='diffstat-header'>");
 	cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
-		       ctx.qry.sha2, NULL, 0);
-	if (prefix)
-		htmlf(" (limited to '%s')", prefix);
-	html(" (");
-	ctx.qry.context = (save_context > 0 ? save_context : 3) << 1;
-	cgit_self_link("more", NULL, NULL, &ctx);
-	html("/");
-	ctx.qry.context = (save_context > 3 ? save_context : 3) >> 1;
-	cgit_self_link("less", NULL, NULL, &ctx);
-	ctx.qry.context = save_context;
-	html(" context)");
-	html(" (");
-	ctx.qry.ignorews = (ctx.qry.ignorews + 1) % 2;
-	cgit_self_link(ctx.qry.ignorews ? "ignore" : "show", NULL, NULL, &ctx);
-	ctx.qry.ignorews = (ctx.qry.ignorews + 1) % 2;
-	html(" whitespace changes)");
+		       ctx.qry.sha2, NULL);
 	html("</div>");
 	html("<table summary='diffstat' class='diffstat'>");
 	max_changes = 0;
-	cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix,
-		       ctx.qry.ignorews);
+	cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, NULL);
 	for(i = 0; i<files; i++)
 		print_fileinfo(&items[i]);
 	html("</table>");
@@ -264,55 +246,26 @@ static void header(unsigned char *sha1, char *path1, int mode1,
 	html("</div>");
 }
 
-static void print_ssdiff_link()
-{
-	if (!strcmp(ctx.qry.page, "diff")) {
-		if (use_ssdiff)
-			cgit_diff_link("Unidiff", NULL, NULL, ctx.qry.head,
-				       ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path, 1);
-		else
-			cgit_diff_link("Side-by-side diff", NULL, NULL,
-				       ctx.qry.head, ctx.qry.sha1,
-				       ctx.qry.sha2, ctx.qry.path, 1);
-	}
-}
-
 static void filepair_cb(struct diff_filepair *pair)
 {
 	unsigned long old_size = 0;
 	unsigned long new_size = 0;
 	int binary = 0;
-	linediff_fn print_line_fn = print_line;
 
-	if (use_ssdiff) {
-		cgit_ssdiff_header_begin();
-		print_line_fn = cgit_ssdiff_line_cb;
-	}
 	header(pair->one->sha1, pair->one->path, pair->one->mode,
 	       pair->two->sha1, pair->two->path, pair->two->mode);
-	if (use_ssdiff)
-		cgit_ssdiff_header_end();
 	if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {
 		if (S_ISGITLINK(pair->one->mode))
-			print_line_fn(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
+			print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
 		if (S_ISGITLINK(pair->two->mode))
-			print_line_fn(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
-		if (use_ssdiff)
-			cgit_ssdiff_footer();
+			print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
 		return;
 	}
-	if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
-			    &new_size, &binary, ctx.qry.context,
-			    ctx.qry.ignorews, print_line_fn))
+	if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, 
+			    &new_size, &binary, print_line))
 		cgit_print_error("Error running diff");
-	if (binary) {
-		if (use_ssdiff)
-			html("<tr><td colspan='4'>Binary files differ</td></tr>");
-		else
-			html("Binary files differ");
-	}
-	if (use_ssdiff)
-		cgit_ssdiff_footer();
+	if (binary)
+		html("Binary files differ");
 }
 
 void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix)
@@ -350,22 +303,11 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi
 		if (!commit2 || parse_commit(commit2))
 			cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1)));
 	}
+	cgit_print_diffstat(old_rev_sha1, new_rev_sha1);
 
-	if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff))
-		use_ssdiff = 1;
-
-	print_ssdiff_link();
-	cgit_print_diffstat(old_rev_sha1, new_rev_sha1, prefix);
-
-	if (use_ssdiff) {
-		html("<table summary='ssdiff' class='ssdiff'>");
-	} else {
-		html("<table summary='diff' class='diff'>");
-		html("<tr><td>");
-	}
-	cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix,
-		       ctx.qry.ignorews);
-	if (!use_ssdiff)
-		html("</td></tr>");
+	html("<table summary='diff' class='diff'>");
+	html("<tr><td>");
+	cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix);
+	html("</td></tr>");
 	html("</table>");
 }
diff --git a/ui-log.c b/ui-log.c
index ee93653..f3132c9 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -33,8 +33,7 @@ void inspect_files(struct diff_filepair *pair)
 	files++;
 	if (ctx.repo->enable_log_linecount)
 		cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
-				&new_size, &binary, 0, ctx.qry.ignorews,
-				count_lines);
+				&new_size, &binary, count_lines);
 }
 
 void show_commit_decorations(struct commit *commit)
@@ -47,9 +46,8 @@ void show_commit_decorations(struct commit *commit)
 	while (deco) {
 		if (!prefixcmp(deco->name, "refs/heads/")) {
 			strncpy(buf, deco->name + 11, sizeof(buf) - 1);
-			cgit_log_link(buf, NULL, "branch-deco", buf, NULL,
-				      ctx.qry.vpath, 0, NULL, NULL,
-				      ctx.qry.showmsg);
+			cgit_log_link(buf, NULL, "branch-deco", buf, NULL, NULL,
+				0, NULL, NULL, ctx.qry.showmsg);
 		}
 		else if (!prefixcmp(deco->name, "tag: refs/tags/")) {
 			strncpy(buf, deco->name + 15, sizeof(buf) - 1);
@@ -62,15 +60,13 @@ void show_commit_decorations(struct commit *commit)
 		else if (!prefixcmp(deco->name, "refs/remotes/")) {
 			strncpy(buf, deco->name + 13, sizeof(buf) - 1);
 			cgit_log_link(buf, NULL, "remote-deco", NULL,
-				      sha1_to_hex(commit->object.sha1),
-				      ctx.qry.vpath, 0, NULL, NULL,
-				      ctx.qry.showmsg);
+				sha1_to_hex(commit->object.sha1), NULL,
+				0, NULL, NULL, ctx.qry.showmsg);
 		}
 		else {
 			strncpy(buf, deco->name, sizeof(buf) - 1);
 			cgit_commit_link(buf, NULL, "deco", ctx.qry.head,
-					 sha1_to_hex(commit->object.sha1),
-					 ctx.qry.vpath, 0);
+				sha1_to_hex(commit->object.sha1));
 		}
 		deco = deco->next;
 	}
@@ -86,14 +82,14 @@ void print_commit(struct commit *commit)
 	htmlf("<tr%s><td>",
 		ctx.qry.showmsg ? " class='logheader'" : "");
 	tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1));
-	tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp);
+	tmp = cgit_pageurl(ctx.repo->url, "commit", tmp);
 	html_link_open(tmp, NULL, NULL);
 	cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
 	html_link_close();
 	htmlf("</td><td%s>",
 		ctx.qry.showmsg ? " class='logsubject'" : "");
 	cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
-			 sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0);
+			 sha1_to_hex(commit->object.sha1));
 	show_commit_decorations(commit);
 	html("</td><td>");
 	html_txt(info->author);
@@ -150,13 +146,10 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
 
 	argv[1] = disambiguate_ref(tip);
 
-	if (grep && pattern) {
-		if (!strcmp(grep, "grep") || !strcmp(grep, "author") ||
-		    !strcmp(grep, "committer"))
-			argv[argc++] = fmt("--%s=%s", grep, pattern);
-		if (!strcmp(grep, "range"))
-			argv[1] = pattern;
-	}
+	if (grep && pattern && (!strcmp(grep, "grep") ||
+				!strcmp(grep, "author") ||
+				!strcmp(grep, "committer")))
+		argv[argc++] = fmt("--%s=%s", grep, pattern);
 
 	if (path) {
 		argv[argc++] = "--";
@@ -183,7 +176,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
 		html(" (");
 		cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL,
 			      NULL, ctx.qry.head, ctx.qry.sha1,
-			      ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep,
+			      ctx.qry.path, ctx.qry.ofs, ctx.qry.grep,
 			      ctx.qry.search, ctx.qry.showmsg ? 0 : 1);
 		html(")");
 	}
@@ -220,22 +213,22 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
 		     columns);
 		if (ofs > 0) {
 			cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
-				      ctx.qry.sha1, ctx.qry.vpath,
+				      ctx.qry.sha1, ctx.qry.path,
 				      ofs - cnt, ctx.qry.grep,
 				      ctx.qry.search, ctx.qry.showmsg);
 			html("&nbsp;");
 		}
 		if ((commit = get_revision(&rev)) != NULL) {
 			cgit_log_link("[next]", NULL, NULL, ctx.qry.head,
-				      ctx.qry.sha1, ctx.qry.vpath,
+				      ctx.qry.sha1, ctx.qry.path,
 				      ofs + cnt, ctx.qry.grep,
 				      ctx.qry.search, ctx.qry.showmsg);
 		}
 		html("</div>");
 	} else if ((commit = get_revision(&rev)) != NULL) {
 		html("<tr class='nohover'><td colspan='3'>");
-		cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL,
-			      ctx.qry.vpath, 0, NULL, NULL, ctx.qry.showmsg);
+		cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL, NULL, 0,
+			      NULL, NULL, ctx.qry.showmsg);
 		html("</td></tr>\n");
 	}
 }
diff --git a/ui-patch.c b/ui-patch.c
index ca008f3..2a8f7a5 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -71,13 +71,13 @@ static void filepair_cb(struct diff_filepair *pair)
 		return;
 	}
 	if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
-			    &new_size, &binary, 0, 0, print_line))
+			    &new_size, &binary, print_line))
 		html("Error running diff");
 	if (binary)
 		html("Binary files differ\n");
 }
 
-void cgit_print_patch(char *hex, const char *prefix)
+void cgit_print_patch(char *hex)
 {
 	struct commit *commit;
 	struct commitinfo *info;
@@ -122,9 +122,7 @@ void cgit_print_patch(char *hex, const char *prefix)
 			html("\n");
 	}
 	html("---\n");
-	if (prefix)
-		htmlf("(limited to '%s')\n\n", prefix);
-	cgit_diff_tree(old_sha1, sha1, filepair_cb, prefix, 0);
+	cgit_diff_tree(old_sha1, sha1, filepair_cb, NULL);
 	html("--\n");
 	htmlf("cgit %s\n", CGIT_VERSION);
 	cgit_free_commitinfo(info);
diff --git a/ui-patch.h b/ui-patch.h
index 1641cea..9f68212 100644
--- a/ui-patch.h
+++ b/ui-patch.h
@@ -1,6 +1,6 @@
 #ifndef UI_PATCH_H
 #define UI_PATCH_H
 
-extern void cgit_print_patch(char *hex, const char *prefix);
+extern void cgit_print_patch(char *hex);
 
 #endif /* UI_PATCH_H */
diff --git a/ui-plain.c b/ui-plain.c
index da76406..66cb19c 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -10,7 +10,8 @@
 #include "html.h"
 #include "ui-shared.h"
 
-int match_baselen;
+char *curr_rev;
+char *match_path;
 int match;
 
 static void print_object(const unsigned char *sha1, const char *path)
@@ -52,63 +53,17 @@ static void print_object(const unsigned char *sha1, const char *path)
 	match = 1;
 }
 
-static void print_dir(const unsigned char *sha1, const char *path,
-		      const char *base)
-{
-	char *fullpath;
-	if (path[0] || base[0])
-		fullpath = fmt("/%s%s/", base, path);
-	else
-		fullpath = "/";
-	ctx.page.etag = sha1_to_hex(sha1);
-	cgit_print_http_headers(&ctx);
-	htmlf("<html><head><title>%s</title></head>\n<body>\n"
-	      " <h2>%s</h2>\n <ul>\n", fullpath, fullpath);
-	if (path[0] || base[0])
-	      html("  <li><a href=\"../\">../</a></li>\n");
-	match = 2;
-}
-
-static void print_dir_entry(const unsigned char *sha1, const char *path,
-			    unsigned mode)
-{
-	const char *sep = "";
-	if (S_ISDIR(mode))
-		sep = "/";
-	htmlf("  <li><a href=\"%s%s\">%s%s</a></li>\n", path, sep, path, sep);
-	match = 2;
-}
-
-static void print_dir_tail(void)
-{
-	html(" </ul>\n</body></html>\n");
-}
-
 static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
 		     const char *pathname, unsigned mode, int stage,
 		     void *cbdata)
 {
-	if (baselen == match_baselen) {
-		if (S_ISREG(mode))
-			print_object(sha1, pathname);
-		else if (S_ISDIR(mode)) {
-			print_dir(sha1, pathname, base);
-			return READ_TREE_RECURSIVE;
-		}
-	}
-	else if (baselen > match_baselen)
-		print_dir_entry(sha1, pathname, mode);
-	else if (S_ISDIR(mode))
+	if (S_ISDIR(mode))
 		return READ_TREE_RECURSIVE;
 
-	return 0;
-}
+	if (S_ISREG(mode) && !strncmp(base, match_path, baselen) &&
+	    !strcmp(pathname, match_path + baselen))
+		print_object(sha1, pathname);
 
-static int basedir_len(const char *path)
-{
-	char *p = strrchr(path, '/');
-	if (p)
-		return p - path + 1;
 	return 0;
 }
 
@@ -122,6 +77,7 @@ void cgit_print_plain(struct cgit_context *ctx)
 	if (!rev)
 		rev = ctx->qry.head;
 
+	curr_rev = xstrdup(rev);
 	if (get_sha1(rev, sha1)) {
 		html_status(404, "Not found", 0);
 		return;
@@ -131,16 +87,8 @@ void cgit_print_plain(struct cgit_context *ctx)
 		html_status(404, "Not found", 0);
 		return;
 	}
-	if (!paths[0]) {
-		paths[0] = "";
-		match_baselen = -1;
-		print_dir(commit->tree->object.sha1, "", "");
-	}
-	else
-		match_baselen = basedir_len(paths[0]);
+	match_path = ctx->qry.path;
 	read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL);
 	if (!match)
 		html_status(404, "Not found", 0);
-	else if (match == 2)
-		print_dir_tail();
 }
diff --git a/ui-refs.c b/ui-refs.c
index caddfbc..6571cc4 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -76,7 +76,7 @@ static int print_branch(struct refinfo *ref)
 	html("</td><td>");
 
 	if (ref->object->type == OBJ_COMMIT) {
-		cgit_commit_link(info->subject, NULL, NULL, name, NULL, NULL, 0);
+		cgit_commit_link(info->subject, NULL, NULL, name, NULL);
 		html("</td><td>");
 		html_txt(info->author);
 		html("</td><td colspan='2'>");
@@ -189,8 +189,6 @@ void cgit_print_branches(int maxcount)
 	list.refs = NULL;
 	list.alloc = list.count = 0;
 	for_each_branch_ref(cgit_refs_cb, &list);
-	if (ctx.repo->enable_remote_branches)
-		for_each_remote_ref(cgit_refs_cb, &list);
 
 	if (maxcount == 0 || maxcount > list.count)
 		maxcount = list.count;
diff --git a/ui-shared.c b/ui-shared.c
index ae29615..8a7cc32 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -27,7 +27,7 @@ static char *http_date(time_t t)
 		   tm->tm_hour, tm->tm_min, tm->tm_sec);
 }
 
-void cgit_print_error(const char *msg)
+void cgit_print_error(char *msg)
 {
 	html("<div class='error'>");
 	html_txt(msg);
@@ -133,7 +133,7 @@ char *cgit_currurl()
 		return fmt("%s/", ctx.cfg.virtual_root);
 }
 
-static void site_url(const char *page, const char *search, int ofs)
+static void site_url(char *page, char *search, int ofs)
 {
 	char *delim = "?";
 
@@ -160,8 +160,8 @@ static void site_url(const char *page, const char *search, int ofs)
 	}
 }
 
-static void site_link(const char *page, const char *name, const char *title,
-		      const char *class, const char *search, int ofs)
+static void site_link(char *page, char *name, char *title, char *class,
+		      char *search, int ofs)
 {
 	html("<a");
 	if (title) {
@@ -181,14 +181,14 @@ static void site_link(const char *page, const char *name, const char *title,
 	html("</a>");
 }
 
-void cgit_index_link(const char *name, const char *title, const char *class,
-		     const char *pattern, int ofs)
+void cgit_index_link(char *name, char *title, char *class, char *pattern,
+		     int ofs)
 {
 	site_link(NULL, name, title, class, pattern, ofs);
 }
 
-static char *repolink(const char *title, const char *class, const char *page,
-		      const char *head, const char *path)
+static char *repolink(char *title, char *class, char *page, char *head,
+		      char *path)
 {
 	char *delim = "?";
 
@@ -240,9 +240,8 @@ static char *repolink(const char *title, const char *class, const char *page,
 	return fmt("%s", delim);
 }
 
-static void reporevlink(const char *page, const char *name, const char *title,
-			const char *class, const char *head, const char *rev,
-			const char *path)
+static void reporevlink(char *page, char *name, char *title, char *class,
+			char *head, char *rev, char *path)
 {
 	char *delim;
 
@@ -257,33 +256,32 @@ static void reporevlink(const char *page, const char *name, const char *title,
 	html("</a>");
 }
 
-void cgit_summary_link(const char *name, const char *title, const char *class,
-		       const char *head)
+void cgit_summary_link(char *name, char *title, char *class, char *head)
 {
 	reporevlink(NULL, name, title, class, head, NULL, NULL);
 }
 
-void cgit_tag_link(const char *name, const char *title, const char *class,
-		   const char *head, const char *rev)
+void cgit_tag_link(char *name, char *title, char *class, char *head,
+		   char *rev)
 {
 	reporevlink("tag", name, title, class, head, rev, NULL);
 }
 
-void cgit_tree_link(const char *name, const char *title, const char *class,
-		    const char *head, const char *rev, const char *path)
+void cgit_tree_link(char *name, char *title, char *class, char *head,
+		    char *rev, char *path)
 {
 	reporevlink("tree", name, title, class, head, rev, path);
 }
 
-void cgit_plain_link(const char *name, const char *title, const char *class,
-		     const char *head, const char *rev, const char *path)
+void cgit_plain_link(char *name, char *title, char *class, char *head,
+		     char *rev, char *path)
 {
 	reporevlink("plain", name, title, class, head, rev, path);
 }
 
-void cgit_log_link(const char *name, const char *title, const char *class,
-		   const char *head, const char *rev, const char *path,
-		   int ofs, const char *grep, const char *pattern, int showmsg)
+void cgit_log_link(char *name, char *title, char *class, char *head,
+		   char *rev, char *path, int ofs, char *grep, char *pattern,
+		   int showmsg)
 {
 	char *delim;
 
@@ -318,9 +316,8 @@ void cgit_log_link(const char *name, const char *title, const char *class,
 	html("</a>");
 }
 
-void cgit_commit_link(char *name, const char *title, const char *class,
-		      const char *head, const char *rev, const char *path,
-		      int toggle_ssdiff)
+void cgit_commit_link(char *name, char *title, char *class, char *head,
+		      char *rev)
 {
 	if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) {
 		name[ctx.cfg.max_msg_len] = '\0';
@@ -328,53 +325,23 @@ void cgit_commit_link(char *name, const char *title, const char *class,
 		name[ctx.cfg.max_msg_len - 2] = '.';
 		name[ctx.cfg.max_msg_len - 3] = '.';
 	}
-
-	char *delim;
-
-	delim = repolink(title, class, "commit", head, path);
-	if (rev && strcmp(rev, ctx.qry.head)) {
-		html(delim);
-		html("id=");
-		html_url_arg(rev);
-		delim = "&amp;";
-	}
-	if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) {
-		html(delim);
-		html("ss=1");
-		delim = "&amp;";
-	}
-	if (ctx.qry.context > 0 && ctx.qry.context != 3) {
-		html(delim);
-		html("context=");
-		htmlf("%d", ctx.qry.context);
-		delim = "&amp;";
-	}
-	if (ctx.qry.ignorews) {
-		html(delim);
-		html("ignorews=1");
-		delim = "&amp;";
-	}
-	html("'>");
-	html_txt(name);
-	html("</a>");
+	reporevlink("commit", name, title, class, head, rev, NULL);
 }
 
-void cgit_refs_link(const char *name, const char *title, const char *class,
-		    const char *head, const char *rev, const char *path)
+void cgit_refs_link(char *name, char *title, char *class, char *head,
+		    char *rev, char *path)
 {
 	reporevlink("refs", name, title, class, head, rev, path);
 }
 
-void cgit_snapshot_link(const char *name, const char *title, const char *class,
-			const char *head, const char *rev,
-			const char *archivename)
+void cgit_snapshot_link(char *name, char *title, char *class, char *head,
+			char *rev, char *archivename)
 {
 	reporevlink("snapshot", name, title, class, head, rev, archivename);
 }
 
-void cgit_diff_link(const char *name, const char *title, const char *class,
-		    const char *head, const char *new_rev, const char *old_rev,
-		    const char *path, int toggle_ssdiff)
+void cgit_diff_link(char *name, char *title, char *class, char *head,
+		    char *new_rev, char *old_rev, char *path)
 {
 	char *delim;
 
@@ -389,99 +356,24 @@ void cgit_diff_link(const char *name, const char *title, const char *class,
 		html(delim);
 		html("id2=");
 		html_url_arg(old_rev);
-		delim = "&amp;";
-	}
-	if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) {
-		html(delim);
-		html("ss=1");
-		delim = "&amp;";
-	}
-	if (ctx.qry.context > 0 && ctx.qry.context != 3) {
-		html(delim);
-		html("context=");
-		htmlf("%d", ctx.qry.context);
-		delim = "&amp;";
-	}
-	if (ctx.qry.ignorews) {
-		html(delim);
-		html("ignorews=1");
-		delim = "&amp;";
 	}
 	html("'>");
 	html_txt(name);
 	html("</a>");
 }
 
-void cgit_patch_link(const char *name, const char *title, const char *class,
-		     const char *head, const char *rev, const char *path)
+void cgit_patch_link(char *name, char *title, char *class, char *head,
+		     char *rev)
 {
-	reporevlink("patch", name, title, class, head, rev, path);
+	reporevlink("patch", name, title, class, head, rev, NULL);
 }
 
-void cgit_stats_link(const char *name, const char *title, const char *class,
-		     const char *head, const char *path)
+void cgit_stats_link(char *name, char *title, char *class, char *head,
+		     char *path)
 {
 	reporevlink("stats", name, title, class, head, NULL, path);
 }
 
-void cgit_self_link(char *name, const char *title, const char *class,
-		    struct cgit_context *ctx)
-{
-	if (!strcmp(ctx->qry.page, "repolist"))
-		return cgit_index_link(name, title, class, ctx->qry.search,
-				       ctx->qry.ofs);
-	else if (!strcmp(ctx->qry.page, "summary"))
-		return cgit_summary_link(name, title, class, ctx->qry.head);
-	else if (!strcmp(ctx->qry.page, "tag"))
-		return cgit_tag_link(name, title, class, ctx->qry.head,
-				     ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL);
-	else if (!strcmp(ctx->qry.page, "tree"))
-		return cgit_tree_link(name, title, class, ctx->qry.head,
-				      ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
-				      ctx->qry.path);
-	else if (!strcmp(ctx->qry.page, "plain"))
-		return cgit_plain_link(name, title, class, ctx->qry.head,
-				      ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
-				      ctx->qry.path);
-	else if (!strcmp(ctx->qry.page, "log"))
-		return cgit_log_link(name, title, class, ctx->qry.head,
-				      ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
-				      ctx->qry.path, ctx->qry.ofs,
-				      ctx->qry.grep, ctx->qry.search,
-				      ctx->qry.showmsg);
-	else if (!strcmp(ctx->qry.page, "commit"))
-		return cgit_commit_link(name, title, class, ctx->qry.head,
-				      ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
-				      ctx->qry.path, 0);
-	else if (!strcmp(ctx->qry.page, "patch"))
-		return cgit_patch_link(name, title, class, ctx->qry.head,
-				      ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
-				      ctx->qry.path);
-	else if (!strcmp(ctx->qry.page, "refs"))
-		return cgit_refs_link(name, title, class, ctx->qry.head,
-				      ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
-				      ctx->qry.path);
-	else if (!strcmp(ctx->qry.page, "snapshot"))
-		return cgit_snapshot_link(name, title, class, ctx->qry.head,
-				      ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
-				      ctx->qry.path);
-	else if (!strcmp(ctx->qry.page, "diff"))
-		return cgit_diff_link(name, title, class, ctx->qry.head,
-				      ctx->qry.sha1, ctx->qry.sha2,
-				      ctx->qry.path, 0);
-	else if (!strcmp(ctx->qry.page, "stats"))
-		return cgit_stats_link(name, title, class, ctx->qry.head,
-				      ctx->qry.path);
-
-	/* Don't known how to make link for this page */
-	repolink(title, class, ctx->qry.page, ctx->qry.head, ctx->qry.path);
-	html("><!-- cgit_self_link() doesn't know how to make link for page '");
-	html_txt(ctx->qry.page);
-	html("' -->");
-	html_txt(name);
-	html("</a>");
-}
-
 void cgit_object_link(struct object *obj)
 {
 	char *page, *shortrev, *fullrev, *name;
@@ -491,7 +383,7 @@ void cgit_object_link(struct object *obj)
 	shortrev[10] = '\0';
 	if (obj->type == OBJ_COMMIT) {
                 cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL,
-				 ctx.qry.head, fullrev, NULL, 0);
+				 ctx.qry.head, fullrev);
 		return;
 	} else if (obj->type == OBJ_TREE)
 		page = "tree";
@@ -503,7 +395,7 @@ void cgit_object_link(struct object *obj)
 	reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL);
 }
 
-void cgit_print_date(time_t secs, const char *format, int local_time)
+void cgit_print_date(time_t secs, char *format, int local_time)
 {
 	char buf[64];
 	struct tm *time;
@@ -518,7 +410,7 @@ void cgit_print_date(time_t secs, const char *format, int local_time)
 	html_txt(buf);
 }
 
-void cgit_print_age(time_t t, time_t max_relative, const char *format)
+void cgit_print_age(time_t t, time_t max_relative, char *format)
 {
 	time_t now, secs;
 
@@ -617,7 +509,7 @@ void cgit_print_docstart(struct cgit_context *ctx)
 		html("<link rel='alternate' title='Atom feed' href='");
 		html(cgit_httpscheme());
 		html_attr(cgit_hosturl());
-		html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.vpath,
+		html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path,
 				       fmt("h=%s", ctx->qry.head)));
 		html("' type='application/atom+xml'/>\n");
 	}
@@ -697,15 +589,14 @@ int print_archive_ref(const char *refname, const unsigned char *sha1,
 	return 0;
 }
 
-void cgit_add_hidden_formfields(int incl_head, int incl_search,
-				const char *page)
+void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page)
 {
 	char *url;
 
 	if (!ctx.cfg.virtual_root) {
 		url = fmt("%s/%s", ctx.qry.repo, page);
-		if (ctx.qry.vpath)
-			url = fmt("%s/%s", url, ctx.qry.vpath);
+		if (ctx.qry.path)
+			url = fmt("%s/%s", url, ctx.qry.path);
 		html_hidden("url", url);
 	}
 
@@ -728,30 +619,11 @@ void cgit_add_hidden_formfields(int incl_head, int incl_search,
 	}
 }
 
-static const char *hc(struct cgit_context *ctx, const char *page)
-{
-	return strcmp(ctx->qry.page, page) ? NULL : "active";
-}
+const char *fallback_cmd = "repolist";
 
-static void cgit_print_path_crumbs(struct cgit_context *ctx, char *path)
+char *hc(struct cgit_cmd *cmd, const char *page)
 {
-	char *old_path = ctx->qry.path;
-	char *p = path, *q, *end = path + strlen(path);
-
-	ctx->qry.path = NULL;
-	cgit_self_link("root", NULL, NULL, ctx);
-	ctx->qry.path = p = path;
-	while (p < end) {
-		if (!(q = strchr(p, '/')))
-			q = end;
-		*q = '\0';
-		html_txt("/");
-		cgit_self_link(p, NULL, NULL, ctx);
-		if (q < end)
-			*q = '/';
-		p = q + 1;
-	}
-	ctx->qry.path = old_path;
+	return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active");
 }
 
 static void print_header(struct cgit_context *ctx)
@@ -803,44 +675,47 @@ static void print_header(struct cgit_context *ctx)
 
 void cgit_print_pageheader(struct cgit_context *ctx)
 {
+	struct cgit_cmd *cmd = cgit_get_cmd(ctx);
+
+	if (!cmd && ctx->repo)
+		fallback_cmd = "summary";
+
 	html("<div id='cgit'>");
 	if (!ctx->cfg.noheader)
 		print_header(ctx);
 
 	html("<table class='tabs'><tr><td>\n");
 	if (ctx->repo) {
-		cgit_summary_link("summary", NULL, hc(ctx, "summary"),
+		cgit_summary_link("summary", NULL, hc(cmd, "summary"),
 				  ctx->qry.head);
-		cgit_refs_link("refs", NULL, hc(ctx, "refs"), ctx->qry.head,
+		cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head,
 			       ctx->qry.sha1, NULL);
-		cgit_log_link("log", NULL, hc(ctx, "log"), ctx->qry.head,
-			      NULL, ctx->qry.vpath, 0, NULL, NULL,
-			      ctx->qry.showmsg);
-		cgit_tree_link("tree", NULL, hc(ctx, "tree"), ctx->qry.head,
-			       ctx->qry.sha1, ctx->qry.vpath);
-		cgit_commit_link("commit", NULL, hc(ctx, "commit"),
-				 ctx->qry.head, ctx->qry.sha1, ctx->qry.vpath, 0);
-		cgit_diff_link("diff", NULL, hc(ctx, "diff"), ctx->qry.head,
-			       ctx->qry.sha1, ctx->qry.sha2, ctx->qry.vpath, 0);
+		cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head,
+			      NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg);
+		cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head,
+			       ctx->qry.sha1, NULL);
+		cgit_commit_link("commit", NULL, hc(cmd, "commit"),
+				 ctx->qry.head, ctx->qry.sha1);
+		cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head,
+			       ctx->qry.sha1, ctx->qry.sha2, NULL);
 		if (ctx->repo->max_stats)
-			cgit_stats_link("stats", NULL, hc(ctx, "stats"),
-					ctx->qry.head, ctx->qry.vpath);
+			cgit_stats_link("stats", NULL, hc(cmd, "stats"),
+					ctx->qry.head, NULL);
 		if (ctx->repo->readme)
 			reporevlink("about", "about", NULL,
-				    hc(ctx, "about"), ctx->qry.head, NULL,
+				    hc(cmd, "about"), ctx->qry.head, NULL,
 				    NULL);
 		html("</td><td class='form'>");
 		html("<form class='right' method='get' action='");
 		if (ctx->cfg.virtual_root)
 			html_url_path(cgit_fileurl(ctx->qry.repo, "log",
-						   ctx->qry.vpath, NULL));
+						   ctx->qry.path, NULL));
 		html("'>\n");
 		cgit_add_hidden_formfields(1, 0, "log");
 		html("<select name='qt'>\n");
 		html_option("grep", "log msg", ctx->qry.grep);
 		html_option("author", "author", ctx->qry.grep);
 		html_option("committer", "committer", ctx->qry.grep);
-		html_option("range", "range", ctx->qry.grep);
 		html("</select>\n");
 		html("<input class='txt' type='text' size='10' name='q' value='");
 		html_attr(ctx->qry.search);
@@ -848,9 +723,9 @@ void cgit_print_pageheader(struct cgit_context *ctx)
 		html("<input type='submit' value='search'/>\n");
 		html("</form>\n");
 	} else {
-		site_link(NULL, "index", NULL, hc(ctx, "repolist"), NULL, 0);
+		site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0);
 		if (ctx->cfg.root_readme)
-			site_link("about", "about", NULL, hc(ctx, "about"),
+			site_link("about", "about", NULL, hc(cmd, "about"),
 				  NULL, 0);
 		html("</td><td class='form'>");
 		html("<form method='get' action='");
@@ -863,12 +738,6 @@ void cgit_print_pageheader(struct cgit_context *ctx)
 		html("</form>");
 	}
 	html("</td></tr></table>\n");
-	if (ctx->qry.vpath) {
-		html("<div class='path'>");
-		html("path: ");
-		cgit_print_path_crumbs(ctx, ctx->qry.vpath);
-		html("</div>");
-	}
 	html("<div class='content'>");
 }
 
@@ -891,18 +760,13 @@ void cgit_print_snapshot_links(const char *repo, const char *head,
 			       const char *hex, int snapshots)
 {
 	const struct cgit_snapshot_format* f;
-	char *prefix;
     	char *filename;
-	unsigned char sha1[20];
 
-	if (get_sha1(fmt("refs/tags/%s", hex), sha1) == 0 &&
-	    (hex[0] == 'v' || hex[0] == 'V') && isdigit(hex[1]))
-		hex++;
-	prefix = xstrdup(fmt("%s-%s", cgit_repobasename(repo), hex));
 	for (f = cgit_snapshot_formats; f->suffix; f++) {
 		if (!(snapshots & f->bit))
 			continue;
-		filename = fmt("%s%s", prefix, f->suffix);
+		filename = fmt("%s-%s%s", cgit_repobasename(repo), hex,
+			       f->suffix);
 		cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename);
 		html("<br/>");
 	}
diff --git a/ui-shared.h b/ui-shared.h
index 3cc1258..b12aa89 100644
--- a/ui-shared.h
+++ b/ui-shared.h
@@ -10,50 +10,35 @@ extern char *cgit_fileurl(const char *reponame, const char *pagename,
 extern char *cgit_pageurl(const char *reponame, const char *pagename,
 			  const char *query);
 
-extern void cgit_index_link(const char *name, const char *title,
-			    const char *class, const char *pattern, int ofs);
-extern void cgit_summary_link(const char *name, const char *title,
-			      const char *class, const char *head);
-extern void cgit_tag_link(const char *name, const char *title,
-			  const char *class, const char *head,
-			  const char *rev);
-extern void cgit_tree_link(const char *name, const char *title,
-			   const char *class, const char *head,
-			   const char *rev, const char *path);
-extern void cgit_plain_link(const char *name, const char *title,
-			    const char *class, const char *head,
-			    const char *rev, const char *path);
-extern void cgit_log_link(const char *name, const char *title,
-			  const char *class, const char *head, const char *rev,
-			  const char *path, int ofs, const char *grep,
-			  const char *pattern, int showmsg);
-extern void cgit_commit_link(char *name, const char *title,
-			     const char *class, const char *head,
-			     const char *rev, const char *path,
-			     int toggle_ssdiff);
-extern void cgit_patch_link(const char *name, const char *title,
-			    const char *class, const char *head,
-			    const char *rev, const char *path);
-extern void cgit_refs_link(const char *name, const char *title,
-			   const char *class, const char *head,
-			   const char *rev, const char *path);
-extern void cgit_snapshot_link(const char *name, const char *title,
-			       const char *class, const char *head,
-			       const char *rev, const char *archivename);
-extern void cgit_diff_link(const char *name, const char *title,
-			   const char *class, const char *head,
-			   const char *new_rev, const char *old_rev,
-			   const char *path, int toggle_ssdiff);
-extern void cgit_stats_link(const char *name, const char *title,
-			    const char *class, const char *head,
-			    const char *path);
-extern void cgit_self_link(char *name, const char *title,
-			   const char *class, struct cgit_context *ctx);
+extern void cgit_index_link(char *name, char *title, char *class,
+			    char *pattern, int ofs);
+extern void cgit_summary_link(char *name, char *title, char *class, char *head);
+extern void cgit_tag_link(char *name, char *title, char *class, char *head,
+			  char *rev);
+extern void cgit_tree_link(char *name, char *title, char *class, char *head,
+			   char *rev, char *path);
+extern void cgit_plain_link(char *name, char *title, char *class, char *head,
+			    char *rev, char *path);
+extern void cgit_log_link(char *name, char *title, char *class, char *head,
+			  char *rev, char *path, int ofs, char *grep,
+			  char *pattern, int showmsg);
+extern void cgit_commit_link(char *name, char *title, char *class, char *head,
+			     char *rev);
+extern void cgit_patch_link(char *name, char *title, char *class, char *head,
+			    char *rev);
+extern void cgit_refs_link(char *name, char *title, char *class, char *head,
+			   char *rev, char *path);
+extern void cgit_snapshot_link(char *name, char *title, char *class,
+			       char *head, char *rev, char *archivename);
+extern void cgit_diff_link(char *name, char *title, char *class, char *head,
+			   char *new_rev, char *old_rev, char *path);
+extern void cgit_stats_link(char *name, char *title, char *class, char *head,
+			    char *path);
 extern void cgit_object_link(struct object *obj);
 
-extern void cgit_print_error(const char *msg);
-extern void cgit_print_date(time_t secs, const char *format, int local_time);
-extern void cgit_print_age(time_t t, time_t max_relative, const char *format);
+extern void cgit_print_error(char *msg);
+extern void cgit_print_date(time_t secs, char *format, int local_time);
+extern void cgit_print_age(time_t t, time_t max_relative, char *format);
 extern void cgit_print_http_headers(struct cgit_context *ctx);
 extern void cgit_print_docstart(struct cgit_context *ctx);
 extern void cgit_print_docend();
@@ -62,5 +47,5 @@ extern void cgit_print_filemode(unsigned short mode);
 extern void cgit_print_snapshot_links(const char *repo, const char *head,
 				      const char *hex, int snapshots);
 extern void cgit_add_hidden_formfields(int incl_head, int incl_search,
-				       const char *page);
+				       char *page);
 #endif /* UI_SHARED_H */
diff --git a/ui-snapshot.c b/ui-snapshot.c
index 1b25dca..4136b3e 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -35,17 +35,11 @@ static int write_tar_bzip2_archive(struct archiver_args *args)
 	return write_compressed_tar_archive(args,"bzip2");
 }
 
-static int write_tar_xz_archive(struct archiver_args *args)
-{
-	return write_compressed_tar_archive(args,"xz");
-}
-
 const struct cgit_snapshot_format cgit_snapshot_formats[] = {
-	{ ".zip", "application/x-zip", write_zip_archive, 0x01 },
-	{ ".tar.gz", "application/x-gzip", write_tar_gzip_archive, 0x02 },
-	{ ".tar.bz2", "application/x-bzip2", write_tar_bzip2_archive, 0x04 },
-	{ ".tar", "application/x-tar", write_tar_archive, 0x08 },
-	{ ".tar.xz", "application/x-xz", write_tar_xz_archive, 0x10 },
+	{ ".zip", "application/x-zip", write_zip_archive, 0x1 },
+	{ ".tar.gz", "application/x-gzip", write_tar_gzip_archive, 0x2 },
+	{ ".tar.bz2", "application/x-bzip2", write_tar_bzip2_archive, 0x4 },
+	{ ".tar", "application/x-tar", write_tar_archive, 0x8 },
 	{}
 };
 
diff --git a/ui-ssdiff.c b/ui-ssdiff.c
deleted file mode 100644
index 408e620..0000000
--- a/ui-ssdiff.c
+++ /dev/null
@@ -1,369 +0,0 @@
-#include "cgit.h"
-#include "html.h"
-#include "ui-shared.h"
-
-extern int use_ssdiff;
-
-static int current_old_line, current_new_line;
-
-struct deferred_lines {
-	int line_no;
-	char *line;
-	struct deferred_lines *next;
-};
-
-static struct deferred_lines *deferred_old, *deferred_old_last;
-static struct deferred_lines *deferred_new, *deferred_new_last;
-
-static char *longest_common_subsequence(char *A, char *B)
-{
-	int i, j, ri;
-	int m = strlen(A);
-	int n = strlen(B);
-	int L[m + 1][n + 1];
-	int tmp1, tmp2;
-	int lcs_length;
-	char *result;
-
-	for (i = m; i >= 0; i--) {
-		for (j = n; j >= 0; j--) {
-			if (A[i] == '\0' || B[j] == '\0') {
-				L[i][j] = 0;
-			} else if (A[i] == B[j]) {
-				L[i][j] = 1 + L[i + 1][j + 1];
-			} else {
-				tmp1 = L[i + 1][j];
-				tmp2 = L[i][j + 1];
-				L[i][j] = (tmp1 > tmp2 ? tmp1 : tmp2);
-			}
-		}
-	}
-
-	lcs_length = L[0][0];
-	result = xmalloc(lcs_length + 2);
-	memset(result, 0, sizeof(*result) * (lcs_length + 2));
-
-	ri = 0;
-	i = 0;
-	j = 0;
-	while (i < m && j < n) {
-		if (A[i] == B[j]) {
-			result[ri] = A[i];
-			ri += 1;
-			i += 1;
-			j += 1;
-		} else if (L[i + 1][j] >= L[i][j + 1]) {
-			i += 1;
-		} else {
-			j += 1;
-		}
-	}
-	return result;
-}
-
-static int line_from_hunk(char *line, char type)
-{
-	char *buf1, *buf2;
-	int len;
-
-	buf1 = strchr(line, type);
-	if (buf1 == NULL)
-		return 0;
-	buf1 += 1;
-	buf2 = strchr(buf1, ',');
-	if (buf2 == NULL)
-		return 0;
-	len = buf2 - buf1;
-	buf2 = xmalloc(len + 1);
-	strncpy(buf2, buf1, len);
-	buf2[len] = '\0';
-	int res = atoi(buf2);
-	free(buf2);
-	return res;
-}
-
-static char *replace_tabs(char *line)
-{
-	char *prev_buf = line;
-	char *cur_buf;
-	int linelen = strlen(line);
-	int n_tabs = 0;
-	int i;
-	char *result;
-	char *spaces = "        ";
-
-	if (linelen == 0) {
-		result = xmalloc(1);
-		result[0] = '\0';
-		return result;
-	}
-
-	for (i = 0; i < linelen; i++)
-		if (line[i] == '\t')
-			n_tabs += 1;
-	result = xmalloc(linelen + n_tabs * 8 + 1);
-	result[0] = '\0';
-
-	while (1) {
-		cur_buf = strchr(prev_buf, '\t');
-		if (!cur_buf) {
-			strcat(result, prev_buf);
-			break;
-		} else {
-			strcat(result, " ");
-			strncat(result, spaces, 8 - (strlen(result) % 8));
-			strncat(result, prev_buf, cur_buf - prev_buf);
-		}
-		prev_buf = cur_buf + 1;
-	}
-	return result;
-}
-
-static int calc_deferred_lines(struct deferred_lines *start)
-{
-	struct deferred_lines *item = start;
-	int result = 0;
-	while (item) {
-		result += 1;
-		item = item->next;
-	}
-	return result;
-}
-
-static void deferred_old_add(char *line, int line_no)
-{
-	struct deferred_lines *item = xmalloc(sizeof(struct deferred_lines));
-	item->line = xstrdup(line);
-	item->line_no = line_no;
-	item->next = NULL;
-	if (deferred_old) {
-		deferred_old_last->next = item;
-		deferred_old_last = item;
-	} else {
-		deferred_old = deferred_old_last = item;
-	}
-}
-
-static void deferred_new_add(char *line, int line_no)
-{
-	struct deferred_lines *item = xmalloc(sizeof(struct deferred_lines));
-	item->line = xstrdup(line);
-	item->line_no = line_no;
-	item->next = NULL;
-	if (deferred_new) {
-		deferred_new_last->next = item;
-		deferred_new_last = item;
-	} else {
-		deferred_new = deferred_new_last = item;
-	}
-}
-
-static void print_part_with_lcs(char *class, char *line, char *lcs)
-{
-	int line_len = strlen(line);
-	int i, j;
-	char c[2] = " ";
-	int same = 1;
-
-	j = 0;
-	for (i = 0; i < line_len; i++) {
-		c[0] = line[i];
-		if (same) {
-			if (line[i] == lcs[j])
-				j += 1;
-			else {
-				same = 0;
-				htmlf("<span class='%s'>", class);
-			}
-		} else if (line[i] == lcs[j]) {
-			same = 1;
-			htmlf("</span>");
-			j += 1;
-		}
-		html_txt(c);
-	}
-}
-
-static void print_ssdiff_line(char *class,
-			      int old_line_no,
-			      char *old_line,
-			      int new_line_no,
-			      char *new_line, int individual_chars)
-{
-	char *lcs = NULL;
-	if (old_line)
-		old_line = replace_tabs(old_line + 1);
-	if (new_line)
-		new_line = replace_tabs(new_line + 1);
-	if (individual_chars && old_line && new_line)
-		lcs = longest_common_subsequence(old_line, new_line);
-	html("<tr>");
-	if (old_line_no > 0)
-		htmlf("<td class='lineno'>%d</td><td class='%s'>",
-		      old_line_no, class);
-	else if (old_line)
-		htmlf("<td class='lineno'></td><td class='%s'>", class);
-	else
-		htmlf("<td class='lineno'></td><td class='%s_dark'>", class);
-	if (old_line) {
-		if (lcs)
-			print_part_with_lcs("del", old_line, lcs);
-		else
-			html_txt(old_line);
-	}
-
-	html("</td>");
-	if (new_line_no > 0)
-		htmlf("<td class='lineno'>%d</td><td class='%s'>",
-		      new_line_no, class);
-	else if (new_line)
-		htmlf("<td class='lineno'></td><td class='%s'>", class);
-	else
-		htmlf("<td class='lineno'></td><td class='%s_dark'>", class);
-	if (new_line) {
-		if (lcs)
-			print_part_with_lcs("add", new_line, lcs);
-		else
-			html_txt(new_line);
-	}
-
-	html("</td></tr>");
-	if (lcs)
-		free(lcs);
-	if (new_line)
-		free(new_line);
-	if (old_line)
-		free(old_line);
-}
-
-static void print_deferred_old_lines()
-{
-	struct deferred_lines *iter_old, *tmp;
-	iter_old = deferred_old;
-	while (iter_old) {
-		print_ssdiff_line("del", iter_old->line_no,
-				  iter_old->line, -1, NULL, 0);
-		tmp = iter_old->next;
-		free(iter_old);
-		iter_old = tmp;
-	}
-}
-
-static void print_deferred_new_lines()
-{
-	struct deferred_lines *iter_new, *tmp;
-	iter_new = deferred_new;
-	while (iter_new) {
-		print_ssdiff_line("add", -1, NULL,
-				  iter_new->line_no, iter_new->line, 0);
-		tmp = iter_new->next;
-		free(iter_new);
-		iter_new = tmp;
-	}
-}
-
-static void print_deferred_changed_lines()
-{
-	struct deferred_lines *iter_old, *iter_new, *tmp;
-	int n_old_lines = calc_deferred_lines(deferred_old);
-	int n_new_lines = calc_deferred_lines(deferred_new);
-	int individual_chars = (n_old_lines == n_new_lines ? 1 : 0);
-
-	iter_old = deferred_old;
-	iter_new = deferred_new;
-	while (iter_old || iter_new) {
-		if (iter_old && iter_new)
-			print_ssdiff_line("changed", iter_old->line_no,
-					  iter_old->line,
-					  iter_new->line_no, iter_new->line,
-					  individual_chars);
-		else if (iter_old)
-			print_ssdiff_line("changed", iter_old->line_no,
-					  iter_old->line, -1, NULL, 0);
-		else if (iter_new)
-			print_ssdiff_line("changed", -1, NULL,
-					  iter_new->line_no, iter_new->line, 0);
-		if (iter_old) {
-			tmp = iter_old->next;
-			free(iter_old);
-			iter_old = tmp;
-		}
-
-		if (iter_new) {
-			tmp = iter_new->next;
-			free(iter_new);
-			iter_new = tmp;
-		}
-	}
-}
-
-void cgit_ssdiff_print_deferred_lines()
-{
-	if (!deferred_old && !deferred_new)
-		return;
-	if (deferred_old && !deferred_new)
-		print_deferred_old_lines();
-	else if (!deferred_old && deferred_new)
-		print_deferred_new_lines();
-	else
-		print_deferred_changed_lines();
-	deferred_old = deferred_old_last = NULL;
-	deferred_new = deferred_new_last = NULL;
-}
-
-/*
- * print a single line returned from xdiff
- */
-void cgit_ssdiff_line_cb(char *line, int len)
-{
-	char c = line[len - 1];
-	line[len - 1] = '\0';
-	if (line[0] == '@') {
-		current_old_line = line_from_hunk(line, '-');
-		current_new_line = line_from_hunk(line, '+');
-	}
-
-	if (line[0] == ' ') {
-		if (deferred_old || deferred_new)
-			cgit_ssdiff_print_deferred_lines();
-		print_ssdiff_line("ctx", current_old_line, line,
-				  current_new_line, line, 0);
-		current_old_line += 1;
-		current_new_line += 1;
-	} else if (line[0] == '+') {
-		deferred_new_add(line, current_new_line);
-		current_new_line += 1;
-	} else if (line[0] == '-') {
-		deferred_old_add(line, current_old_line);
-		current_old_line += 1;
-	} else if (line[0] == '@') {
-		html("<tr><td colspan='4' class='hunk'>");
-		html_txt(line);
-		html("</td></tr>");
-	} else {
-		html("<tr><td colspan='4' class='ctx'>");
-		html_txt(line);
-		html("</td></tr>");
-	}
-	line[len - 1] = c;
-}
-
-void cgit_ssdiff_header_begin()
-{
-	current_old_line = -1;
-	current_new_line = -1;
-	html("<tr><td class='space' colspan='4'><div></div></td></tr>");
-	html("<tr><td class='head' colspan='4'>");
-}
-
-void cgit_ssdiff_header_end()
-{
-	html("</td><tr>");
-}
-
-void cgit_ssdiff_footer()
-{
-	if (deferred_old || deferred_new)
-		cgit_ssdiff_print_deferred_lines();
-	html("<tr><td class='foot' colspan='4'></td></tr>");
-}
diff --git a/ui-ssdiff.h b/ui-ssdiff.h
deleted file mode 100644
index 64b4b12..0000000
--- a/ui-ssdiff.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef UI_SSDIFF_H
-#define UI_SSDIFF_H
-
-extern void cgit_ssdiff_print_deferred_lines();
-
-extern void cgit_ssdiff_line_cb(char *line, int len);
-
-extern void cgit_ssdiff_header_begin();
-extern void cgit_ssdiff_header_end();
-
-extern void cgit_ssdiff_footer();
-
-#endif /* UI_SSDIFF_H */
diff --git a/ui-tag.c b/ui-tag.c
index 39e4cb8..c2d72af 100644
--- a/ui-tag.c
+++ b/ui-tag.c
@@ -30,14 +30,6 @@ static void print_tag_content(char *buf)
 	}
 }
 
-void print_download_links(char *revname)
-{
-	html("<tr><th>download</th><td class='sha1'>");
-	cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head,
-				  revname, ctx.repo->snapshots);
-	html("</td></tr>");
-}
-
 void cgit_print_tag(char *revname)
 {
 	unsigned char sha1[20];
@@ -64,16 +56,16 @@ void cgit_print_tag(char *revname)
 			return;
 		}
 		html("<table class='commit-info'>\n");
-		htmlf("<tr><td>tag name</td><td>");
+		htmlf("<tr><td>Tag name</td><td>");
 		html_txt(revname);
 		htmlf(" (%s)</td></tr>\n", sha1_to_hex(sha1));
 		if (info->tagger_date > 0) {
-			html("<tr><td>tag date</td><td>");
+			html("<tr><td>Tag date</td><td>");
 			cgit_print_date(info->tagger_date, FMT_LONGDATE, ctx.cfg.local_time);
 			html("</td></tr>\n");
 		}
 		if (info->tagger) {
-			html("<tr><td>tagged by</td><td>");
+			html("<tr><td>Tagged by</td><td>");
 			html_txt(info->tagger);
 			if (info->tagger_email && !ctx.cfg.noplainemail) {
 				html(" ");
@@ -81,23 +73,19 @@ void cgit_print_tag(char *revname)
 			}
 			html("</td></tr>\n");
 		}
-		html("<tr><td>tagged object</td><td class='sha1'>");
+		html("<tr><td>Tagged object</td><td>");
 		cgit_object_link(tag->tagged);
 		html("</td></tr>\n");
-		if (ctx.repo->snapshots)
-			print_download_links(revname);
 		html("</table>\n");
 		print_tag_content(info->msg);
 	} else {
 		html("<table class='commit-info'>\n");
-		htmlf("<tr><td>tag name</td><td>");
+		htmlf("<tr><td>Tag name</td><td>");
 		html_txt(revname);
 		html("</td></tr>\n");
-		html("<tr><td>Tagged object</td><td class='sha1'>");
+		html("<tr><td>Tagged object</td><td>");
 		cgit_object_link(obj);
 		html("</td></tr>\n");
-		if (ctx.repo->snapshots)
-			print_download_links(revname);
 		html("</table>\n");
         }
 	return;
diff --git a/ui-tree.c b/ui-tree.c
index 75ec9cb..a164767 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -102,16 +102,10 @@ static void print_object(const unsigned char *sha1, char *path, const char *base
 		return;
 	}
 
-	htmlf("blob: %s (", sha1_to_hex(sha1));
+	html(" (");
 	cgit_plain_link("plain", NULL, NULL, ctx.qry.head,
 		        curr_rev, path);
-	html(")\n");
-
-	if (ctx.cfg.max_blob_size && size / 1024 > ctx.cfg.max_blob_size) {
-		htmlf("<div class='error'>blob size (%dKB) exceeds display size limit (%dKB).</div>",
-				size / 1024, ctx.cfg.max_blob_size);
-		return;
-	}
+	htmlf(")<br/>blob: %s\n", sha1_to_hex(sha1));
 
 	if (buffer_is_binary(buf, size))
 		print_binary_buffer(buf, size);
@@ -175,8 +169,6 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
 	if (ctx.repo->max_stats)
 		cgit_stats_link("stats", NULL, "button", ctx.qry.head,
 				fullpath);
-	cgit_plain_link("plain", NULL, "button", ctx.qry.head, curr_rev,
-			fullpath);
 	html("</td></tr>\n");
 	free(name);
 	return 0;
@@ -225,10 +217,17 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
 {
 	static int state;
 	static char buffer[PATH_MAX];
+	char *url;
 
 	if (state == 0) {
 		memcpy(buffer, base, baselen);
 		strcpy(buffer+baselen, pathname);
+		url = cgit_pageurl(ctx.qry.repo, "tree",
+				   fmt("h=%s&amp;path=%s", curr_rev, buffer));
+		html("/");
+		cgit_tree_link(xstrdup(pathname), NULL, NULL, ctx.qry.head,
+			       curr_rev, buffer);
+
 		if (strcmp(match_path, buffer))
 			return READ_TREE_RECURSIVE;
 
@@ -271,6 +270,10 @@ void cgit_print_tree(const char *rev, char *path)
 		return;
 	}
 
+	html("path: <a href='");
+	html_attr(cgit_pageurl(ctx.qry.repo, "tree", fmt("h=%s", rev)));
+	html("'>root</a>");
+
 	if (path == NULL) {
 		ls_tree(commit->tree->object.sha1, NULL);
 		return;