diff --git a/templates/raw/changeset.tmpl b/templates/raw/changeset.tmpl
--- a/templates/raw/changeset.tmpl
+++ b/templates/raw/changeset.tmpl
@@ -1,9 +1,9 @@
-#header#
+{header}
 # HG changeset patch
-# User #author#
-# Date #date|hgdate#
-# Node ID #node#
-#parent%changesetparent#
-#desc#
+# User {author}
+# Date {date|hgdate}
+# Node ID {node}
+{parent%changesetparent}
+{desc}
 
-#diff#
+{diff}
diff --git a/templates/raw/error.tmpl b/templates/raw/error.tmpl
--- a/templates/raw/error.tmpl
+++ b/templates/raw/error.tmpl
@@ -1,2 +1,2 @@
-#header#
-error: #error#
+{header}
+error: {error}
diff --git a/templates/raw/fileannotate.tmpl b/templates/raw/fileannotate.tmpl
--- a/templates/raw/fileannotate.tmpl
+++ b/templates/raw/fileannotate.tmpl
@@ -1,5 +1,5 @@
-#header#
-#annotate%annotateline#
-#footer#
+{header}
+{annotate%annotateline}
+{footer}
 
 
diff --git a/templates/raw/filediff.tmpl b/templates/raw/filediff.tmpl
--- a/templates/raw/filediff.tmpl
+++ b/templates/raw/filediff.tmpl
@@ -1,5 +1,5 @@
-#header#
-#diff#
-#footer#
+{header}
+{diff}
+{footer}
 
 
diff --git a/templates/raw/index.tmpl b/templates/raw/index.tmpl
--- a/templates/raw/index.tmpl
+++ b/templates/raw/index.tmpl
@@ -1,2 +1,2 @@
-#header#
-#entries%indexentry#
+{header}
+{entries%indexentry}
diff --git a/templates/raw/map b/templates/raw/map
--- a/templates/raw/map
+++ b/templates/raw/map
@@ -2,15 +2,15 @@ mimetype = 'text/plain; charset={encodin
 header = ''
 footer = ''
 changeset = changeset.tmpl
-difflineplus = '#line#'
-difflineminus = '#line#'
-difflineat = '#line#'
-diffline = '#line#'
-changesetparent = '# Parent  #node#'
-changesetchild = '# Child   #node#'
+difflineplus = '{line}'
+difflineminus = '{line}'
+difflineat = '{line}'
+diffline = '{line}'
+changesetparent = '# Parent  {node}'
+changesetchild = '# Child   {node}'
 filenodelink = ''
-fileline = '#line#'
-diffblock = '#lines#'
+fileline = '{line}'
+diffblock = '{lines}'
 filediff = filediff.tmpl
 fileannotate = fileannotate.tmpl
 annotateline = '{author|user}@{rev}: {line}'
@@ -20,4 +20,4 @@ fileentry = '{permissions|permissions} {
 index = index.tmpl
 notfound = notfound.tmpl
 error = error.tmpl
-indexentry = '#url#\n'
+indexentry = '{url}\n'
diff --git a/templates/raw/notfound.tmpl b/templates/raw/notfound.tmpl
--- a/templates/raw/notfound.tmpl
+++ b/templates/raw/notfound.tmpl
@@ -1,2 +1,2 @@
-#header#
-error: repository #repo# not found
+{header}
+error: repository {repo} not found