--- a/bitten/admin.py
+++ b/bitten/admin.py
@@ -13,12 +13,8 @@
 import re
 
 from trac.core import *
+from trac.admin import IAdminPanelProvider
 from trac.web.chrome import add_stylesheet
-try:
-    require("TracWebAdmin")
-    from webadmin.web_ui import IAdminPageProvider
-except DistributionNotFound, ImportError:
-    IAdminPageProvider = None
 
 from bitten.model import BuildConfig, TargetPlatform
 from bitten.recipe import Recipe, InvalidRecipeError
@@ -28,15 +24,15 @@
 class BuildMasterAdminPageProvider(Component):
     """Web administration panel for configuring the build master."""
 
-    implements(IAdminPageProvider)
+    implements(IAdminPanelProvider)
 
-    # IAdminPageProvider methods
+    # IAdminPanelProvider methods
 
-    def get_admin_pages(self, req):
+    def get_admin_panels(self, req):
         if req.perm.has_permission('BUILD_ADMIN'):
             yield ('bitten', 'Builds', 'master', 'Master Settings')
 
-    def process_admin_request(self, req, cat, page, path_info):
+    def render_admin_panel(self, req, cat, page, path_info):
         from bitten.master import BuildMaster
         master = BuildMaster(self.env)
 
@@ -44,14 +40,9 @@
             self._save_config_changes(req, master)
             req.redirect(req.abs_href.admin(cat, page))
 
-        req.hdf['admin.master'] = {
-            'build_all': master.build_all,
-            'adjust_timestamps': master.adjust_timestamps,
-            'stabilize_wait': master.stabilize_wait,
-            'slave_timeout': master.slave_timeout,
-        }
+        data = {'master': master}
         add_stylesheet(req, 'bitten/admin.css')
-        return 'bitten_admin_master.cs', None
+        return 'bitten_admin_master.html', data
 
     # Internal methods
 
@@ -89,15 +80,15 @@
 class BuildConfigurationsAdminPageProvider(Component):
     """Web administration panel for configuring the build master."""
 
-    implements(IAdminPageProvider)
+    implements(IAdminPanelProvider)
 
-    # IAdminPageProvider methods
+    # IAdminPanelProvider methods
 
-    def get_admin_pages(self, req):
+    def get_admin_panels(self, req):
         if req.perm.has_permission('BUILD_MODIFY'):
             yield ('bitten', 'Builds', 'configs', 'Configurations')
 
-    def process_admin_request(self, req, cat, page, path_info):
+    def render_admin_panel(self, req, cat, page, path_info):
         data = {}
 
         # Analyze url
@@ -108,7 +99,8 @@
             platform_id = None
 
         if config_name: # Existing build config
-            if platform_id or ( # Editing or creating one of the config's target platforms
+            if platform_id or (
+                    # Editing or creating one of the config's target platforms
                     req.method == 'POST' and 'new' in req.args):
 
                 if platform_id: # Editing target platform
@@ -202,9 +194,8 @@
                 })
             data['configs'] = configs
 
-        req.hdf['admin'] = data
         add_stylesheet(req, 'bitten/admin.css')
-        return 'bitten_admin_configs.cs', None
+        return 'bitten_admin_configs.html', data
 
     # Internal methods
 

--- a/bitten/api.py
+++ b/bitten/api.py
@@ -78,8 +78,11 @@
         """
 
     def render_summary(req, config, build, step, category):
-        """Render a summary for the given report and return the resulting HTML
-        as string.
+        """Render a summary for the given report.
+        
+        This function should return a tuple of the form `(template, data)`,
+        where `template` is the name of the template to use and `data` is the
+        data to be passed to the template.
         
         :param req: the request object
         :param config: the build configuration
@@ -94,7 +97,7 @@
 
 
 class IReportChartGenerator(Interface):
-    """Extension point interface for components that generator a chart for a
+    """Extension point interface for components that generate a chart for a
     set of reports."""
 
     def get_supported_categories():
@@ -105,8 +108,9 @@
     def generate_chart_data(req, config, category):
         """Generate the data for a report chart.
         
-        This method should store the data in the HDF of the request and return
-        the name of the template that should process the data.
+        This function should return a tuple of the form `(template, data)`,
+        where `template` is the name of the template to use and `data` is the
+        data to be passed to the template.
         
         :param req: the request object
         :param config: the build configuration

--- a/bitten/build/ctools.py
+++ b/bitten/build/ctools.py
@@ -201,7 +201,82 @@
         print e
         log.warning('Error parsing CppUnit results file (%s)', e)
 
-def gcov(ctxt, include=None, exclude=None, prefix=None):
+def cunit (ctxt, file_=None, srcdir=None):
+    """Collect CUnit XML data.
+    
+    :param ctxt: the build context
+    :type ctxt: `Context`
+    :param file\_: path of the file containing the CUnit results; may contain
+                  globbing wildcards to match multiple files
+    :param srcdir: name of the directory containing the source files, used to
+                   link the test results to the corresponding files
+    """
+    assert file_, 'Missing required attribute "file"'
+
+    try:
+        fileobj = file(ctxt.resolve(file_), 'r')
+        try:
+            total, failed = 0, 0
+            results = xmlio.Fragment()
+            log_elem = xmlio.Fragment()
+            def info (msg):
+                log.info (msg)
+                log_elem.append (xmlio.Element ('message', level='info')[msg])
+            def warning (msg):
+                log.warning (msg)
+                log_elem.append (xmlio.Element ('message', level='warning')[msg])
+            def error (msg):
+                log.error (msg)
+                log_elem.append (xmlio.Element ('message', level='error')[msg])
+            for node in xmlio.parse(fileobj):
+                if node.name != 'CUNIT_RESULT_LISTING':
+                    continue
+                for suiteRun in node.children ('CUNIT_RUN_SUITE'):
+                    for suite in suiteRun.children():
+                        if suite.name not in ('CUNIT_RUN_SUITE_SUCCESS', 'CUNIT_RUN_SUITE_FAILURE'):
+                            warning ("Unknown node: %s" % suite.name)
+                            continue
+                        suiteName = suite.children ('SUITE_NAME').next().gettext()
+                        info ("%s [%s]" % ("*" * (57 - len (suiteName)), suiteName))
+                        for record in suite.children ('CUNIT_RUN_TEST_RECORD'):
+                            for result in record.children():
+                                if result.name not in ('CUNIT_RUN_TEST_SUCCESS', 'CUNIT_RUN_TEST_FAILURE'):
+                                    continue
+                                testName = result.children ('TEST_NAME').next().gettext()
+                                info ("Running %s..." % testName);
+                                test = xmlio.Element('test')
+                                test.attr['fixture'] = suiteName
+                                test.attr['name'] = testName
+                                if result.name == 'CUNIT_RUN_TEST_FAILURE':
+                                    error ("%s(%d): %s"
+                                               % (result.children ('FILE_NAME').next().gettext(),
+                                                  int (result.children ('LINE_NUMBER').next().gettext()),
+                                                  result.children ('CONDITION').next().gettext()))
+                                    test.attr['status'] = 'failure'
+                                    failed += 1
+                                else:
+                                    test.attr['status'] = 'success'
+
+                                results.append(test)
+                                total += 1
+
+            if failed:
+                ctxt.error('%d of %d test%s failed' % (failed, total,
+                           total != 1 and 's' or ''))
+
+            ctxt.report('test', results)
+            ctxt.log (log_elem)
+
+        finally:
+            fileobj.close()
+
+    except IOError, e:
+        log.warning('Error opening CUnit results file (%s)', e)
+    except xmlio.ParseError, e:
+        print e
+        log.warning('Error parsing CUnit results file (%s)', e)
+
+def gcov(ctxt, include=None, exclude=None, prefix=None, root=""):
     """Run ``gcov`` to extract coverage data where available.
     
     :param ctxt: the build context
@@ -210,8 +285,10 @@
     :param exclude: patterns of files and directories that should be excluded
     :param prefix: optional prefix name that is added to object files by the
                    build system
+    :param root: optional root path in which the build system puts the object
+                 files
     """
-    file_re = re.compile(r'^File \`(?P<file>[^\']+)\'\s*$')
+    file_re = re.compile(r'^File (?:\'|\`)(?P<file>[^\']+)\'\s*$')
     lines_re = re.compile(r'^Lines executed:(?P<cov>\d+\.\d+)\% of (?P<num>\d+)\s*$')
 
     files = []
@@ -220,24 +297,35 @@
             files.append(filename)
 
     coverage = xmlio.Fragment()
+    log_elem = xmlio.Fragment()
+    def info (msg):
+        log.info (msg)
+        log_elem.append (xmlio.Element ('message', level='info')[msg])
+    def warning (msg):
+        log.warning (msg)
+        log_elem.append (xmlio.Element ('message', level='warning')[msg])
+    def error (msg):
+        log.error (msg)
+        log_elem.append (xmlio.Element ('message', level='error')[msg])
 
     for srcfile in files:
         # Determine the coverage for each source file by looking for a .gcno
         # and .gcda pair
+        info ("Getting coverage info for %s" % srcfile)
         filepath, filename = os.path.split(srcfile)
         stem = os.path.splitext(filename)[0]
         if prefix is not None:
             stem = prefix + '-' + stem
 
-        objfile = os.path.join(filepath, stem + '.o')
+        objfile = os.path.join (root, filepath, stem + '.o')
         if not os.path.isfile(ctxt.resolve(objfile)):
-            log.warn('No object file found for %s at %s', srcfile, objfile)
+            warning ('No object file found for %s at %s' % (srcfile, objfile))
             continue
-        if not os.path.isfile(ctxt.resolve(stem + '.gcno')):
-            log.warn('No .gcno file found for %s', srcfile)
+        if not os.path.isfile (ctxt.resolve (os.path.join (root, filepath, stem + '.gcno'))):
+            warning ('No .gcno file found for %s at %s' % (srcfile, os.path.join (root, filepath, stem + '.gcno')))
             continue
-        if not os.path.isfile(ctxt.resolve(stem + '.gcda')):
-            log.warn('No .gcda file found for %s', srcfile)
+        if not os.path.isfile (ctxt.resolve (os.path.join (root, filepath, stem + '.gcda'))):
+            warning ('No .gcda file found for %s at %s' % (srcfile, os.path.join (root, filepath, stem + '.gcda')))
             continue
 
         num_lines, num_covered = 0, 0
@@ -274,3 +362,4 @@
         coverage.append(module)
 
     ctxt.report('coverage', coverage)
+    ctxt.log (log_elem)

--- a/bitten/build/tests/ctools.py
+++ b/bitten/build/tests/ctools.py
@@ -107,6 +107,8 @@
         ctools.CommandLine = dummy.CommandLine()
         ctools.gcov(self.ctxt)
         type, category, generator, xml = self.ctxt.output.pop()
+        self.assertEqual('log', type)
+        type, category, generator, xml = self.ctxt.output.pop()
         self.assertEqual('report', type)
         self.assertEqual('coverage', category)
         self.assertEqual(0, len(xml.children))
@@ -131,6 +133,8 @@
 """)
         ctools.gcov(self.ctxt)
         type, category, generator, xml = self.ctxt.output.pop()
+        self.assertEqual('log', type)
+        type, category, generator, xml = self.ctxt.output.pop()
         self.assertEqual('report', type)
         self.assertEqual('coverage', category)
         self.assertEqual(1, len(xml.children))

--- a/bitten/htdocs/bitten.css
+++ b/bitten/htdocs/bitten.css
@@ -157,6 +157,7 @@
 }
 #content.build table.tests tr.failed { background: #d99; }
 #content.build table.tests tr.failed td { font-weight: bold; }
+#content.build table.tests tr.failed:hover th,
 #content.build table.tests tr.failed:hover td,
 #content.build table.tests tr.failed:hover tr { background: #966; }
 #content.build table.tests tr.failed :link,

--- a/bitten/report/coverage.py
+++ b/bitten/report/coverage.py
@@ -58,14 +58,14 @@
                 coverage[-1][2] = int(cov)
             prev_rev = rev
 
-        req.hdf['chart.title'] = 'Test Coverage'
-        req.hdf['chart.data'] = [
-            [''] + ['[%s]' % item[0] for item in coverage],
-            ['Lines of code'] + [item[1] for item in coverage],
-            ['Coverage'] + [int(item[2]) for item in coverage]
-        ]
+        data = {'title': 'Test Coverage',
+                'data': [
+                    [''] + ['[%s]' % item[0] for item in coverage],
+                    ['Lines of code'] + [item[1] for item in coverage],
+                    ['Coverage'] + [int(item[2]) for item in coverage]
+                ]}
 
-        return 'bitten_chart_coverage.cs'
+        return 'bitten_chart_coverage.html', data
 
 
 class TestCoverageSummarizer(Component):
@@ -101,7 +101,7 @@
 GROUP BY file, item_name.value
 ORDER BY item_name.value""", (build.id, step.name))
 
-        data = []
+        units = []
         total_loc, total_cov = 0, 0
         for unit, file, loc, cov in cursor:
             try:
@@ -112,7 +112,7 @@
                 d = {'name': unit, 'loc': loc, 'cov': int(cov)}
                 if file:
                     d['href'] = req.href.browser(config.path, file, rev=build.rev, annotate='coverage')
-                data.append(d)
+                units.append(d)
                 total_loc += loc
                 total_cov += loc * cov
 
@@ -120,10 +120,10 @@
         if total_loc != 0:
             coverage = total_cov // total_loc
 
-        hdf = HDFWrapper(loadpaths=Chrome(self.env).get_all_templates_dirs())
-        hdf['data'] = data
-        hdf['totals'] = {'loc': total_loc, 'cov': int(coverage)}
-        return hdf.render('bitten_summary_coverage.cs')
+        return 'bitten_summary_coverage.html', {
+            'units': units,
+            'totals': {'loc': total_loc, 'cov': int(coverage)}
+        }
 
 
 # Coverage annotation requires the new interface from 0.11

--- a/bitten/report/testing.py
+++ b/bitten/report/testing.py
@@ -56,14 +56,14 @@
             if status != 'success':
                 tests[-1][2] = max(num, tests[-1][2])
 
-        req.hdf['chart.title'] = 'Unit Tests'
-        req.hdf['chart.data'] = [
-            [''] + ['[%s]' % item[0] for item in tests],
-            ['Total'] + [item[1] for item in tests],
-            ['Failures'] + [item[2] for item in tests]
-        ]
+        data = {'title': 'Unit Tests',
+                'data': [
+                    [''] + ['[%s]' % item[0] for item in tests],
+                    ['Total'] + [item[1] for item in tests],
+                    ['Failures'] + [item[2] for item in tests]
+                ]}
 
-        return 'bitten_chart_tests.cs'
+        return 'bitten_chart_tests.html', data
 
 
 class TestResultsSummarizer(Component):
@@ -103,19 +103,20 @@
 GROUP BY file, fixture
 ORDER BY fixture""", (build.id, step.name))
 
-        data = []
+        fixtures = []
         total_success, total_failure, total_error = 0, 0, 0
         for fixture, file, num_success, num_failure, num_error in cursor:
-            data.append({'name': fixture, 'num_success': num_success,
-                         'num_error': num_error, 'num_failure': num_failure})
+            fixtures.append({'name': fixture, 'num_success': num_success,
+                             'num_error': num_error,
+                             'num_failure': num_failure})
             total_success += num_success
             total_failure += num_failure
             total_error += num_error
             if file:
-                data[-1]['href'] = req.href.browser(config.path, file)
+                fixtures[-1]['href'] = req.href.browser(config.path, file)
 
-        hdf = HDFWrapper(loadpaths=Chrome(self.env).get_all_templates_dirs())
-        hdf['data'] = data
-        hdf['totals'] = {'success': total_success, 'failure': total_failure,
-                         'error': total_error}
-        return hdf.render('bitten_summary_tests.cs')
+        data = {'fixtures': fixtures,
+                'totals': {'success': total_success, 'failure': total_failure,
+                           'error': total_error}
+               }
+        return 'bitten_summary_tests.html', data

--- a/bitten/report/tests/coverage.py
+++ b/bitten/report/tests/coverage.py
@@ -13,7 +13,6 @@
 
 from trac.db import DatabaseManager
 from trac.test import EnvironmentStub, Mock
-from trac.web.clearsilver import HDFWrapper
 from bitten.model import *
 from bitten.report import coverage
 from bitten.report.coverage import TestCoverageChartGenerator
@@ -39,15 +38,15 @@
         self.assertEqual(['coverage'], generator.get_supported_categories())
 
     def test_no_reports(self):
-        req = Mock(hdf=HDFWrapper())
+        req = Mock()
         config = Mock(name='trunk')
         generator = TestCoverageChartGenerator(self.env)
-        template = generator.generate_chart_data(req, config, 'coverage')
-        self.assertEqual('bitten_chart_coverage.cs', template)
-        self.assertEqual('Test Coverage', req.hdf['chart.title'])
-        self.assertEqual('', req.hdf['chart.data.0.0'])
-        self.assertEqual('Lines of code', req.hdf['chart.data.1.0'])
-        self.assertEqual('Coverage', req.hdf['chart.data.2.0'])
+        template, data = generator.generate_chart_data(req, config, 'coverage')
+        self.assertEqual('bitten_chart_coverage.html', template)
+        self.assertEqual('Test Coverage', data['title'])
+        self.assertEqual('', data['data'][0][0])
+        self.assertEqual('Lines of code', data['data'][1][0])
+        self.assertEqual('Coverage', data['data'][2][0])
 
     def test_single_platform(self):
         config = Mock(name='trunk')
@@ -59,17 +58,17 @@
         report.items += [{'lines': '12', 'percentage': '25'}]
         report.insert()
 
-        req = Mock(hdf=HDFWrapper())
+        req = Mock()
         generator = TestCoverageChartGenerator(self.env)
-        template = generator.generate_chart_data(req, config, 'coverage')
-        self.assertEqual('bitten_chart_coverage.cs', template)
-        self.assertEqual('Test Coverage', req.hdf['chart.title'])
-        self.assertEqual('', req.hdf['chart.data.0.0'])
-        self.assertEqual('[123]', req.hdf['chart.data.0.1'])
-        self.assertEqual('Lines of code', req.hdf['chart.data.1.0'])
-        self.assertEqual('12', req.hdf['chart.data.1.1'])
-        self.assertEqual('Coverage', req.hdf['chart.data.2.0'])
-        self.assertEqual('3', req.hdf['chart.data.2.1'])
+        template, data = generator.generate_chart_data(req, config, 'coverage')
+        self.assertEqual('bitten_chart_coverage.html', template)
+        self.assertEqual('Test Coverage', data['title'])
+        self.assertEqual('', data['data'][0][0])
+        self.assertEqual('[123]', data['data'][0][1])
+        self.assertEqual('Lines of code', data['data'][1][0])
+        self.assertEqual(12, data['data'][1][1])
+        self.assertEqual('Coverage', data['data'][2][0])
+        self.assertEqual(3, data['data'][2][1])
 
     def test_multi_platform(self):
         config = Mock(name='trunk')
@@ -88,17 +87,17 @@
         report.items += [{'lines': '12', 'percentage': '50'}]
         report.insert()
 
-        req = Mock(hdf=HDFWrapper())
+        req = Mock()
         generator = TestCoverageChartGenerator(self.env)
-        template = generator.generate_chart_data(req, config, 'coverage')
-        self.assertEqual('bitten_chart_coverage.cs', template)
-        self.assertEqual('Test Coverage', req.hdf['chart.title'])
-        self.assertEqual('', req.hdf['chart.data.0.0'])
-        self.assertEqual('[123]', req.hdf['chart.data.0.1'])
-        self.assertEqual('Lines of code', req.hdf['chart.data.1.0'])
-        self.assertEqual('12', req.hdf['chart.data.1.1'])
-        self.assertEqual('Coverage', req.hdf['chart.data.2.0'])
-        self.assertEqual('6', req.hdf['chart.data.2.1'])
+        template, data = generator.generate_chart_data(req, config, 'coverage')
+        self.assertEqual('bitten_chart_coverage.html', template)
+        self.assertEqual('Test Coverage', data['title'])
+        self.assertEqual('', data['data'][0][0])
+        self.assertEqual('[123]', data['data'][0][1])
+        self.assertEqual('Lines of code', data['data'][1][0])
+        self.assertEqual(12, data['data'][1][1])
+        self.assertEqual('Coverage', data['data'][2][0])
+        self.assertEqual(6, data['data'][2][1])
 
 
 def suite():

--- a/bitten/report/tests/testing.py
+++ b/bitten/report/tests/testing.py
@@ -12,7 +12,6 @@
 
 from trac.db import DatabaseManager
 from trac.test import EnvironmentStub, Mock
-from trac.web.clearsilver import HDFWrapper
 from bitten.model import *
 from bitten.report.testing import TestResultsChartGenerator
 
@@ -35,15 +34,15 @@
         self.assertEqual(['test'], generator.get_supported_categories())
 
     def test_no_reports(self):
-        req = Mock(hdf=HDFWrapper())
+        req = Mock()
         config = Mock(name='trunk')
         generator = TestResultsChartGenerator(self.env)
-        template = generator.generate_chart_data(req, config, 'test')
-        self.assertEqual('bitten_chart_tests.cs', template)
-        self.assertEqual('Unit Tests', req.hdf['chart.title'])
-        self.assertEqual('', req.hdf['chart.data.0.0'])
-        self.assertEqual('Total', req.hdf['chart.data.1.0'])
-        self.assertEqual('Failures', req.hdf['chart.data.2.0'])
+        template, data = generator.generate_chart_data(req, config, 'test')
+        self.assertEqual('bitten_chart_tests.html', template)
+        self.assertEqual('Unit Tests', data['title'])
+        self.assertEqual('', data['data'][0][0])
+        self.assertEqual('Total', data['data'][1][0])
+        self.assertEqual('Failures', data['data'][2][0])
 
     def test_single_platform(self):
         config = Mock(name='trunk')
@@ -55,17 +54,17 @@
                          {'status': 'success'}]
         report.insert()
 
-        req = Mock(hdf=HDFWrapper())
+        req = Mock()
         generator = TestResultsChartGenerator(self.env)
-        template = generator.generate_chart_data(req, config, 'test')
-        self.assertEqual('bitten_chart_tests.cs', template)
-        self.assertEqual('Unit Tests', req.hdf['chart.title'])
-        self.assertEqual('', req.hdf['chart.data.0.0'])
-        self.assertEqual('[123]', req.hdf['chart.data.0.1'])
-        self.assertEqual('Total', req.hdf['chart.data.1.0'])
-        self.assertEqual('3', req.hdf['chart.data.1.1'])
-        self.assertEqual('Failures', req.hdf['chart.data.2.0'])
-        self.assertEqual('1', req.hdf['chart.data.2.1'])
+        template, data = generator.generate_chart_data(req, config, 'test')
+        self.assertEqual('bitten_chart_tests.html', template)
+        self.assertEqual('Unit Tests', data['title'])
+        self.assertEqual('', data['data'][0][0])
+        self.assertEqual('[123]', data['data'][0][1])
+        self.assertEqual('Total', data['data'][1][0])
+        self.assertEqual(3, data['data'][1][1])
+        self.assertEqual('Failures', data['data'][2][0])
+        self.assertEqual(1, data['data'][2][1])
 
     def test_multi_platform(self):
         config = Mock(name='trunk')
@@ -86,17 +85,17 @@
                          {'status': 'failure'}]
         report.insert()
 
-        req = Mock(hdf=HDFWrapper())
+        req = Mock()
         generator = TestResultsChartGenerator(self.env)
-        template = generator.generate_chart_data(req, config, 'test')
-        self.assertEqual('bitten_chart_tests.cs', template)
-        self.assertEqual('Unit Tests', req.hdf['chart.title'])
-        self.assertEqual('', req.hdf['chart.data.0.0'])
-        self.assertEqual('[123]', req.hdf['chart.data.0.1'])
-        self.assertEqual('Total', req.hdf['chart.data.1.0'])
-        self.assertEqual('3', req.hdf['chart.data.1.1'])
-        self.assertEqual('Failures', req.hdf['chart.data.2.0'])
-        self.assertEqual('2', req.hdf['chart.data.2.1'])
+        template, data = generator.generate_chart_data(req, config, 'test')
+        self.assertEqual('bitten_chart_tests.html', template)
+        self.assertEqual('Unit Tests', data['title'])
+        self.assertEqual('', data['data'][0][0])
+        self.assertEqual('[123]', data['data'][0][1])
+        self.assertEqual('Total', data['data'][1][0])
+        self.assertEqual(3, data['data'][1][1])
+        self.assertEqual('Failures', data['data'][2][0])
+        self.assertEqual(2, data['data'][2][1])
 
 
 def suite():

deleted file mode 100644
--- a/bitten/templates/bitten_admin_configs.cs
+++ /dev/null
@@ -1,181 +0,0 @@
-<h2>Manage Build Configurations</h2><?cs
-
-if admin.config.name ?>
- <form class="mod" id="modconfig" method="post">
-  <table class="form" summary=""><tr>
-   <td class="name"><label>Name:<br />
-    <input type="text" name="name" value="<?cs var:admin.config.name ?>" />
-   </label></td>
-   <td class="label"><label>Label (for display):<br />
-    <input type="text" name="label" size="32" value="<?cs
-      var:admin.config.label ?>" />
-   </label></td>
-  </tr><tr>
-   <td colspan="2"><fieldset class="iefix">
-    <label for="description">Description (you may use <a tabindex="42" href="<?cs
-      var:trac.href.wiki ?>/WikiFormatting">WikiFormatting</a> here):</label>
-    <p><textarea id="description" name="description" class="wikitext" rows="3" cols="65"><?cs
-      var:admin.config.description ?></textarea></p>
-    <script type="text/javascript" src="<?cs
-      var:chrome.href ?>/common/js/wikitoolbar.js"></script>
-   </fieldset></td>
-  </tr><tr>
-   <td colspan="2"><fieldset class="iefix">
-    <label for="recipe">Recipe:</label>
-    <p><textarea id="recipe" name="recipe" rows="8" cols="78"><?cs
-     var:admin.config.recipe ?></textarea></p>
-   </fieldset></td>
-  </tr></table>
-  <fieldset id="repos">
-   <legend>Repository Mapping</legend>
-   <table class="form" summary=""><tr>
-    <th><label for="path">Path:</label></th>
-    <td colspan="3"><input type="text" name="path" size="48" value="<?cs
-      var:admin.config.path ?>" /></td>
-   </tr><tr>
-    <th><label for="min_rev">Oldest revision:</label></th>
-    <td><input type="text" name="min_rev" size="8" value="<?cs
-      var:admin.config.min_rev ?>" /></td>
-    <th><label for="min_rev">Youngest revision:</label></th>
-    <td><input type="text" name="max_rev" size="8" value="<?cs
-      var:admin.config.max_rev ?>" /></td>
-   </table>
-  </fieldset>
-  <div class="buttons">
-   <input type="submit" name="cancel" value="Cancel" />
-   <input type="submit" name="save" value="Save" />
-  </div>
-  <div class="platforms">
-   <h3>Target Platforms</h3>
-   <table class="listing" id="platformlist">
-    <thead>
-     <tr><th class="sel">&nbsp;</th><th>Name</th><th>Rules</th></tr>
-    </thead><?cs each:platform = admin.config.platforms ?><tr>
-      <td class="sel"><input type="checkbox" name="sel" value="<?cs
-        var:platform.id ?>" /></td>
-      <td class="name"><a href="<?cs var:platform.href?>"><?cs
-        var:platform.name ?></a></td>
-      <td class="rules"><?cs if:len(platform.rules) ?><ul><?cs
-       each:rule = platform.rules ?><li><code>
-        <strong><?cs var:rule.property ?></strong> ~= <?cs var:rule.pattern ?>
-       </code></li><?cs
-       /each ?></ul><?cs
-      /if ?></td>
-     </tr><?cs
-    /each ?>
-   </table>
-   <div class="buttons">
-    <input type="submit" name="new" value="Add platform" />
-    <input type="submit" name="remove" value="Delete selected platforms" />
-   </div>
-  </div>
- </form><?cs
-
-elif len(admin.platform) ?>
- <form class="mod" id="modplatform" method="post">
-  <div class="field"><label>Target Platform:
-   <input type="text" name="name" value="<?cs var:admin.platform.name ?>" />
-  </label></div>
-  <fieldset>
-   <legend>Rules</legend>
-   <table><thead><tr>
-    <th>Property name</th><th>Match pattern</th>
-   </tr></thead><tbody><?cs
-    each:rule = admin.platform.rules ?><tr>
-     <td><input type="text" name="property_<?cs var:name(rule) ?>" value="<?cs
-      var:rule.property ?>" /></td>
-     <td><input type="text" name="pattern_<?cs var:name(rule) ?>" value="<?cs
-      var:rule.pattern ?>" /></td>
-     <td><input type="submit" name="add_rule_<?cs
-       var:name(rule) ?>" value="+" /><input type="submit" name="rm_rule_<?cs
-       var:name(rule) ?>" value="-" />
-     </td>
-    </tr><?cs /each ?>
-   </tbody></table>
-  </fieldset>
-  <p class="help">
-   The property name can be any of a set of standard default properties, or
-   custom properties defined in slave configuration files. The default
-   properties are:
-  </p>
-  <dl class="help">
-   <dt><code>os<code>:</dt>
-   <dd>The name of the operating system (for example "Darwin")</dd>
-   <dt><code>family<code>:</dt>
-   <dd>The type of operating system (for example "posix" or "nt")</dd>
-   <dt><code>version<code>:</dt>
-   <dd>The operating system version (for example "8.10.1)</dd>
-   <dt><code>machine<code>:</dt>
-   <dd>The hardware architecture (for example "i386")</dd>
-   <dt><code>processor<code>:</dt>
-   <dd>The CPU model (for example "i386", this may be empty or the same as for
-     <code>machine</code>)</dd>
-   <dt><code>name<code>:</dt>
-   <dd>The name of the slave</dd>
-   <dt><code>ipnr<code>:</dt>
-   <dd>The IP address of the slave</dd>
-  </dl>
-  <p class="help">The match pattern is a regular expression.</p>
-  <div class="buttons">
-   <form method="get" action=""><div>
-    <input type="hidden" name="<?cs
-     if:admin.platform.exists ?>edit<?cs else ?>new<?cs /if ?>" value="" />
-    <input type="hidden" name="platform" value="<?cs
-     var:admin.platform.id ?>" />
-    <input type="submit" name="cancel" value="Cancel" />
-    <?cs if:admin.platform.exists ?>
-     <input type="submit" name="save" value="Save" />
-    <?cs else ?>
-     <input type="submit" name="add" value="Add" />
-    <?cs /if ?>
-   </div></form>
-  </div>
- </form><?cs
-
-else ?>
- <form class="addnew" id="addcomp" method="post">
-  <fieldset>
-   <legend>Add Configuration:</legend>
-   <table summary=""><tr>
-    <td class="name"><div class="field"><label>Name:<br />
-     <input type="text" name="name" size="12" />
-    </label></div></td>
-    <td class="label"><div class="field"><label>Label:<br />
-     <input type="text" name="label" size="22" />
-    </label></div></td>
-   </tr><tr>
-     <td class="path" colspan="2"><div class="field">
-      <label>Path:<br /><input type="text" name="path" size="32" /></label>
-     </div>
-   </tr></table>
-   <div class="buttons">
-    <input type="submit" name="add" value="Add">
-   </div>
-  </fieldset>
- </form>
-
- <form method="POST">
-  <table class="listing" id="configlist">
-   <thead>
-    <tr><th class="sel">&nbsp;</th><th>Name</th>
-    <th>Path</th><th>Active</th></tr>
-   </thead><?cs each:config = admin.configs ?>
-    <tr>
-     <td class="sel"><input type="checkbox" name="sel" value="<?cs
-       var:config.name ?>" /></td>
-     <td class="name"><a href="<?cs var:config.href?>"><?cs
-       var:config.label ?></a></td>
-     <td class="path"><code><?cs var:config.path ?></code></td>
-     <td class="active"><input type="checkbox" name="active" value="<?cs
-       var:config.name ?>"<?cs
-       if:config.active ?> checked="checked" <?cs /if ?>></td>
-    </tr><?cs
-   /each ?>
-  </table>
-  <div class="buttons">
-   <input type="submit" name="remove" value="Remove selected items" />
-   <input type="submit" name="apply" value="Apply changes" />
-  </div>
- </form><?cs
-
-/if ?>

new file mode 100755
--- /dev/null
+++ b/bitten/templates/bitten_admin_configs.html
@@ -0,0 +1,240 @@
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:xi="http://www.w3.org/2001/XInclude"
+      xmlns:py="http://genshi.edgewall.org/">
+  <xi:include href="admin.html" />
+  <head>
+    <title>Manage Build Configurations</title>
+  </head>
+  <body>
+    <h2>Manage Build Configurations</h2>
+    <py:choose><form py:when="config" class="mod"
+         id="modconfig" method="post" action="">
+      <table class="form" summary=""><tr>
+        <td class="name"><label>Name:<br />
+          <input type="text" name="name"
+                 value="$config.name" />
+        </label></td>
+        <td class="label"><label>Label (for display):<br />
+          <input type="text" name="label" size="32"
+                 value="$config.label" />
+        </label></td>
+      </tr><tr>
+        <td colspan="2"><fieldset class="iefix">
+          <label for="description">
+            Description (you may use 
+            <a tabindex="42"
+               href="${href.wiki('WikiFormatting')}">
+              WikiFormatting</a> here):
+          </label>
+          <p>
+            <textarea id="description" name="description"
+                      class="wikitext" rows="3" cols="65">$config.description</textarea>
+          </p>
+          <script type="text/javascript" src="${chrome.htdocs_location}js/wikitoolbar.js"></script>
+        </fieldset></td>
+      </tr><tr>
+        <td colspan="2"><fieldset class="iefix">
+          <label for="recipe">Recipe:</label>
+          <p>
+            <textarea id="recipe" name="recipe" rows="8" cols="78">$config.recipe</textarea>
+          </p>
+        </fieldset></td>
+      </tr></table>
+      <fieldset id="repos">
+        <legend>Repository Mapping</legend>
+        <table class="form" summary=""><tr>
+          <th><label for="path">Path:</label></th>
+          <td colspan="3"><input id="path" type="text" name="path"
+              size="48" value="$config.path" /></td>
+        </tr><tr>
+          <th><label for="min_rev">
+            Oldest revision:
+          </label></th>
+          <td><input id="min_rev" type="text" name="min_rev" size="8"
+                     value="$config.min_rev" /></td>
+          <th><label for="max_rev">
+            Youngest revision:
+          </label></th>
+          <td><input id="max_rev" type="text" name="max_rev" size="8"
+                     value="$config.max_rev" /></td>
+        </tr></table>
+      </fieldset>
+      <div class="buttons">
+        <input type="submit" name="cancel"
+               value="Cancel" />
+        <input type="submit" name="save" value="Save" />
+      </div>
+      <div class="platforms">
+        <h3>Target Platforms</h3>
+        <table class="listing" id="platformlist">
+          <thead>
+            <tr><th class="sel">&nbsp;</th>
+            <th>Name</th><th>Rules</th></tr>
+          </thead>
+          <tbody>
+            <tr py:if="not config.platforms">
+              <td colspan="3"><em>(No Platforms)</em></td>
+            </tr>
+            <tr py:for="platform in config.platforms">
+              <td class="sel">
+                <input type="checkbox" name="sel"
+                       value="$platform.id" />
+              </td>
+              <td class="name"><a href="$platform.href">
+                $platform.name
+              </a></td>
+              <td class="rules">
+                <ul py:if="len(platform.rules)">
+                  <li py:for="rule in platform.rules">
+                    <code>
+                      <strong>$rule.property</strong> ~= 
+                      $rule.pattern
+                    </code>
+                  </li>
+                </ul>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+        <div class="buttons">
+          <input type="submit" name="new"
+                 value="Add platform" />
+          <input type="submit" name="remove"
+                 value="Delete selected platforms" />
+        </div>
+      </div>
+    </form>
+
+    <form py:when="platform" class="mod" id="modplatform"
+          method="post" action="">
+      <div class="field"><label>Target Platform:
+        <input type="text" name="name"
+               value="$platform.name" />
+      </label></div>
+      <fieldset>
+        <legend>Rules</legend>
+        <table><thead><tr>
+          <th>Property name</th><th>Match pattern</th>
+        </tr></thead><tbody>
+          <tr py:for="idx, rule in enumerate(platform.rules)">
+            <td><input type="text" name="property_${idx}"
+                       value="$rule.property" /></td>
+            <td><input type="text" name="pattern_${idx}" 
+                       value="$rule.pattern" /></td>
+            <td><input type="submit"
+                       name="add_rule_${idx}" value="+" />
+                <input type="submit" name="rm_rule_${idx}"
+                       value="-" />
+            </td>
+          </tr>
+        </tbody></table>
+      </fieldset>
+      <p class="help">
+        The property name can be any of a set of standard
+        default properties, or custom properties defined
+        in slave configuration files. The default 
+        properties are:
+      </p>
+      <dl class="help">
+        <dt><code>os</code>:</dt>
+        <dd>The name of the operating system (for example
+            "Darwin")</dd>
+        <dt><code>family</code>:</dt>
+        <dd>The type of operating system (for example
+            "posix" or "nt")</dd>
+        <dt><code>version</code>:</dt>
+        <dd>The operating system version (for example
+            "8.10.1)</dd>
+        <dt><code>machine</code>:</dt>
+        <dd>The hardware architecture (for example "i386"</dd>
+        <dt><code>processor</code>:</dt>
+        <dd>The CPU model (for example "i386", this may be
+            empty or the same as for <code>machine</code>
+        </dd>
+        <dt><code>name</code>:</dt>
+        <dd>The name of the slave</dd>
+        <dt><code>ipnr</code>:</dt>
+        <dd>The IP address of the slave</dd>
+      </dl>
+      <p class="help">
+        The match pattern is a regular expression.
+      </p>
+      <div class="buttons">
+        <form method="get" action=""><div>
+          <input type="hidden"
+                 name="${platform.exists and 'edit'
+                         or 'new'}" value="" />
+          <input type="hidden" name="platform"
+                 value="$platform.id" />
+          <input type="submit" name="cancel"
+                 value="Cancel" /><py:choose>
+          <input py:when="platform.exists" type="submit"
+                 name="save" value="Save" />
+          <input py:otherwise="" type="submit"
+                 name="add" value="Add" /></py:choose>
+        </div></form>
+      </div>
+    </form>
+
+    <py:otherwise><form class="addnew" id="addcomp"
+                        method="post" action=""><fieldset>
+      <legend>Add Configuration:</legend>
+      <table summary=""><tr>
+        <td class="name"><div  
+            class="field"><label>Name:<br />
+          <input type="text" name="name" size="12" />
+        </label></div></td>
+        <td class="label"><div
+            class="field"><label>Label:<br />
+          <input type="text" name="label" size="22" />
+        </label></div></td>
+      </tr><tr>
+        <td class="path" colspan="2"><div class="field">
+          <label>Path:<br />
+            <input type="text" name="path" size="32" />
+          </label>
+        </div></td>
+      </tr></table>
+      <div class="buttons">
+        <input type="submit" name="add" value="Add" />
+      </div>
+    </fieldset></form>
+
+    <form method="post" action="">
+      <table class="listing" id="configlist">
+        <thead>
+          <tr><th class="sel">&nbsp;</th><th>Name</th>
+          <th>Path</th><th>Active</th></tr>
+        </thead><tbody>
+        <tr py:if="not configs">
+          <td colspan="4"><em>(No Build Configurations)</em></td>
+        </tr>
+        <tr py:for="config in configs">
+          <td class="sel">
+            <input type="checkbox" name="sel"
+                   value="$config.name" />
+          </td>
+          <td class="name">
+            <a href="$config.href">$config.label</a>
+          </td>
+          <td class="path"><code>$config.path</code></td>
+          <td class="active">
+            <input type="checkbox" name="active"
+                   value="$config.name"
+                   checked="${config.active and 'checked'
+                              or None}" />
+          </td>
+        </tr>
+      </tbody></table>
+      <div class="buttons">
+        <input type="submit" name="remove"
+               value="Remove selected items" />
+        <input type="submit" name="apply"
+               value="Apply changes" />
+      </div>
+    </form></py:otherwise></py:choose>
+  </body>
+</html>

deleted file mode 100644
--- a/bitten/templates/bitten_admin_master.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-<h2>Manage Build Master</h2>
-
-<form class="mod" id="bitten" method="post">
-
-  <fieldset id="config">
-    <legend>Configuration Options</legend>
-    <div class="field">
-      <label>
-        <input type="checkbox" id="build_all" name="build_all"
-               <?cs if:admin.master.build_all ?> checked="checked"<?cs /if ?> />
-        Build all revisions
-      </label>
-    </div>
-    <p class="hint">
-      Whether to build older revisions even when a more recent revision has
-      already been built.
-    </p>
-    <div class="field">
-      <label>
-        <input type="checkbox" id="adjust_timestamps" name="adjust_timestamps"
-               <?cs if:admin.master.adjust_timestamps ?> checked="checked"<?cs /if ?> />
-        Adjust build timestamps
-      </label>
-    </div>
-    <p class="hint">
-      Whether the timestamps of builds should be adjusted to be close to the
-      timestamps of the corresponding changesets.
-    </p>
-    <hr />
-    <div class="field">
-      <label>
-        Time to wait for stabilization:
-        <input type="text" id="stabilize_wait" name="stabilize_wait"
-               value="<?cs var:admin.master.stabilize_wait ?>" size="5" />
-      </label>
-    </div>
-    <p class="hint">
-      The time in seconds to wait for the repository to stabilize after a
-      check-in before initiating a build.
-    </p>
-    <hr />
-    <div class="field">
-      <label>
-        Connection timeout for build slaves:
-        <input type="text" id="slave_timeout" name="slave_timeout"
-               value="<?cs var:admin.master.slave_timeout ?>" size="5" />
-      </label>
-    </div>
-    <p class="hint">
-      The timeout in seconds after which a build started by a slave is
-      considered aborted, in case there has been no activity from that slave
-      in that time.
-    </p>
-  </fieldset>
-
-  <div class="buttons">
-    <input type="submit" value="Apply changes"/>
-  </div>
-</form>

new file mode 100755
--- /dev/null
+++ b/bitten/templates/bitten_admin_master.html
@@ -0,0 +1,73 @@
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:xi="http://www.w3.org/2001/XInclude"
+      xmlns:py="http://genshi.edgewall.org/">
+  <xi:include href="admin.html" />
+  <head>
+    <title>Manage Build Master</title>
+  </head>
+  <body>
+    <h2>Manage Build Master</h2>
+
+    <form class="mod" id="bitten" method="post" action="">
+      <fieldset id="config">
+        <legend>Configuration Options</legend>
+        <div class="field">
+          <label>
+            <input type="checkbox" id="build_all" name="build_all"
+                   checked="${master.build_all and 'checked' or None}" />
+            Build all revisions
+          </label>
+        </div>
+        <p class="hint">
+          Whether to build older revisions even when a more recent
+          revision has already been built.
+        </p>
+        <div class="field">
+          <label>
+            <input type="checkbox" id="adjust_timestamps"
+                   name="adjust_timestamps"
+                   checked="${master.adjust_timestamps and 'checked'
+                              or None}" />
+            Adjust build timestamps
+          </label>
+        </div>
+        <p class="hint">
+          Whether the timestamps of builds should be adjusted to be
+          close to the timestamps of the corresponding changesets.
+        </p>
+        <hr />
+        <div class="field">
+          <label>
+            Time to wait for stabilization:
+            <input type="text" id="stabilize_wait" name="stabilize_wait"
+                   value="$master.stabilize_wait" size="5" />
+          </label>
+        </div>
+        <p class="hint">
+          The time in seconds to wait for the repository to stabilize
+          after a check-in before initiating a build.
+        </p>
+        <hr />
+        <div class="field">
+          <label>
+            Connection timeout for build slaves:
+            <input type="text" id="slave_timeout" name="slave_timeout"
+                   value="$master.slave_timeout" size="5" />
+          </label>
+        </div>
+        <p class="hint">
+          The timeout in seconds after which a build started by a slave
+          is considered aborted, in case there has been no activity from
+          that slave in that time.
+        </p>
+      </fieldset>
+
+      <div class="buttons">
+        <input type="submit" value="Apply changes"/>
+      </div>
+    </form>
+  </body>
+</html>

deleted file mode 100644
--- a/bitten/templates/bitten_build.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-<?cs include:"header.cs" ?>
- <script type="text/javascript" src="<?cs
-   var:chrome.href ?>/bitten/tabset.js"></script>
- <div id="ctxtnav" class="nav"></div>
- <div id="content" class="build">
-  <h1><?cs var:title ?></h1>
-  <dl id="overview">
-   <dt class="config">Configuration:</dt>
-   <dd class="config"><a href="<?cs var:build.config.href ?>"><?cs
-    var:build.config.name ?></a>
-   </dd>
-   <dt class="trigger">Triggered by:</dt>
-   <dd class="trigger">Changeset <a href="<?cs
-    var:build.chgset_href ?>">[<?cs var:build.rev ?>]</a> by <?cs
-    var:build.chgset_author ?>
-   </dd>
-   <dt class="slave">Built by:</dt>
-   <dd class="slave"><code><?cs var:build.slave.name ?></code> (<?cs
-    var:build.slave.ipnr ?>)
-   </dd>
-   <dt class="os">Operating system:</dt>
-   <dd><?cs var:build.slave.os.name ?> <?cs var:build.slave.os.version ?> (<?cs
-    var:build.slave.os.family ?>)
-   </dd><?cs
-   if:build.slave.machine ?>
-    <dt class="machine">Hardware:</dt>
-    <dd class="machine"><?cs
-     var:build.slave.machine ?><?cs
-     if:build.slave.processor ?> (<?cs
-      var:build.slave.processor ?>)<?cs
-     /if ?>
-    </dd><?cs
-   /if ?>
-   <dt class="time"><?cs if:build.stopped ?>Started:<?cs else ?>Building since:<?cs /if ?>
-   <dd class="time"><?cs var:build.started ?> (<?cs
-    var:build.started_delta ?> ago)
-   </dd>
-   <?cs if:build.stopped ?>
-     <dt class="time">Stopped:</dt>
-     <dd class="time"><?cs var:build.stopped ?> (<?cs var:build.stopped_delta ?> ago) </dd>
-   <?cs /if ?>
-   <dt class="duration">Duration:</dt>
-   <dd class="duration"><?cs
-    var:build.duration ?>
-   </dd>
-  </dl><?cs
-  if:build.can_delete ?>
-   <div class="buttons">
-    <form method="post" action=""><div>
-     <input type="hidden" name="action" value="invalidate" />
-     <input type="submit" value="Invalidate build" />
-    </div></form>
-   </div><?cs
-  /if ?><?cs
-  each:step = build.steps ?>
-   <h2 class="step" id="step_<?cs var:step.name ?>"><?cs var:step.name ?> (<?cs
-     var:step.duration ?>)</h2><?cs
-   if:len(step.errors) ?>
-    <div class="errors">
-     <h3>Errors</h3><ul><?cs
-     each:error = step.errors ?><li><?cs var:error ?></li><?cs
-     /each ?></ul>
-    </div><?cs
-   /if ?><p><?cs var:step.description ?></p>
-   <div id="<?cs var:step.name ?>_tabs">
-    <div class="tab"><h3>Log</h3><div class="log"><?cs
-     each:item = step.log ?><code class="<?cs var:item.level ?>"><?cs
-      var:item.message ?></code><br /><?cs
-     /each ?></div>
-    </div><?cs
-    each:report = step.reports ?><?cs
-     if:report.summary ?>
-      <div class="tab report <?cs var:report.type ?>">
-       <?cs var:report.summary ?>
-      </div><?cs
-     /if ?><?cs
-    /each ?>
-   </div>
-   <script type="text/javascript">
-     makeTabSet(document.getElementById("<?cs var:step.name ?>_tabs"));
-   </script><?cs
-  /each ?>
- </div>
-<?cs include:"footer.cs" ?>

new file mode 100755
--- /dev/null
+++ b/bitten/templates/bitten_build.html
@@ -0,0 +1,73 @@
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:xi="http://www.w3.org/2001/XInclude"
+      xmlns:py="http://genshi.edgewall.org/">
+  <xi:include href="layout.html" />
+  <head>
+    <title>$title</title>
+  </head>
+  <body>
+    <div id="content" class="build">
+      <h1>$title</h1>
+      <dl id="overview" py:with="slave = build.slave">
+        <dt class="config">Configuration:</dt>
+        <dd class="config">
+          <a href="$build.config.href">$build.config.name</a>
+        </dd>
+        <dt class="trigger">Triggered by:</dt>
+        <dd class="trigger">
+          Changeset <a href="$build.chgset_href">[$build.rev]</a> by 
+          $build.chgset_author
+        </dd>
+        <dt class="slave">Built by:</dt>
+        <dd class="slave">
+          <code>$slave.name</code> ($slave.ipnr)
+        </dd>
+        <dt class="os">Operating system:</dt>
+        <dd>$slave.os_name $slave.os_version ($slave.os_family)</dd>
+        <py:if test="slave.machine"><dt class="machine">Hardware:</dt>
+        <dd class="machine">
+          $slave.machine
+          <py:if test="slave.processor"> ($slave.processor)</py:if>
+        </dd></py:if>
+        <dt class="time">
+          ${build.stopped and 'Started:' or 'Building since:'}
+        </dt>
+        <dd class="time">$build.started ($build.started_delta ago)</dd>
+        <py:if test="build.stopped"><dt class="time">Stopped:</dt>
+        <dd class="time">$build.stopped ($build.stopped_delta ago)</dd></py:if>
+        <dt class="duration">Duration:</dt>
+        <dd class="duration">$build.duration</dd>
+      </dl>
+      <div py:if="build.can_delete" class="buttons">
+        <form method="post" action=""><div>
+          <input type="hidden" name="action" value="invalidate" />
+          <input type="submit" value="Invalidate build" />
+        </div></form>
+      </div><py:for each="step in build.steps">
+      <h2 class="step" id="step_${step.name}">$step.name ($step.duration)</h2>
+      <div py:if="step.errors" class="errors">
+        <h3>Errors</h3>
+        <ul>
+          <li py:for="error in step.errors">$error</li>
+        </ul>
+      </div>
+      <p>$step.description</p>
+      <div id="${step.name}_tabs">
+        <div class="tab">
+          <h3>Log</h3>
+          <div class="log"><py:for each="item in step.log"><code class="$item.level">$item.message</code><br /></py:for></div>
+        </div>
+        <div py:for="report in [r for r in step.reports if r.template]"
+             class="tab report $report.category">
+          <xi:include href="$report.template" py:with="data = report.data" />
+        </div>
+      </div>
+      <script type="text/javascript">
+        makeTabSet(document.getElementById("${step.name}_tabs"));
+      </script></py:for>
+    </div>
+  </body>
+</html>

deleted file mode 100644
--- a/bitten/templates/bitten_chart_coverage.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-<chart>
- <chart_type>
-  <value>area</value>
-  <value>area</value>
- </chart_type>
-
- <axis_category size="10" orientation="diagonal_up"
-   skip="<?cs var:len(chart.data.0) / 6 ?>"/>
- <axis_ticks value_ticks="false" category_ticks="true" major_thickness="1"
-   minor_thickness="0" major_color="000000" position="outside"/>
-
- <chart_data><?cs
-  each:row = chart.data ?><row><?cs
-   each:value = row ?><?cs
-    if:name(row) == 0 || name(value) == 0 ?><string><?cs
-     var:value ?></string><?cs
-    else ?><number><?cs
-     var:value ?></number><?cs
-    /if ?><?cs
-   /each ?></row><?cs
-  /each ?></chart_data>
-
- <chart_border color="999999" left_thickness="1" bottom_thickness="1"/>
- <chart_grid_h alpha="5" color="666666" thickness="3"/>
- <chart_pref line_thickness="2" point_shape="none"/>
- <chart_value position="cursor"/>
- <series_color>
-  <color>bbbbbb</color>
-  <color>9999ff</color>
- </series_color>
-
- <legend_label layout="vertical" alpha="60"/>
- <legend_rect x="60" y="50" width="10"/>
-
- <draw>
-  <text width="320" height="40" h_align="center" v_align="bottom" size="12" ><?cs
-    var:chart.title ?></text>
- </draw>
-
-</chart>

new file mode 100755
--- /dev/null
+++ b/bitten/templates/bitten_chart_coverage.html
@@ -0,0 +1,38 @@
+<chart xmlns:py="http://genshi.edgewall.org/">
+ <chart_type>
+  <value>area</value>
+  <value>area</value>
+ </chart_type>
+
+ <axis_category size="10" orientation="diagonal_up"
+   skip="${len(data[0]) / 6}"/>
+ <axis_ticks value_ticks="false" category_ticks="true" major_thickness="1"
+   minor_thickness="0" major_color="000000" position="outside"/>
+
+ <chart_data>
+  <row py:for="idx, row in enumerate(data)">
+   <py:choose py:for="jdx, value in enumerate(row)">
+     <string py:when="not idx or not jdx">$value</string>
+     <number py:otherwise="">$value</number>
+   </py:choose>
+  </row>
+ </chart_data>
+
+ <chart_border color="999999" left_thickness="1" bottom_thickness="1"/>
+ <chart_grid_h alpha="5" color="666666" thickness="3"/>
+ <chart_pref line_thickness="2" point_shape="none"/>
+ <chart_value position="cursor"/>
+ <series_color>
+  <color>bbbbbb</color>
+  <color>9999ff</color>
+ </series_color>
+
+ <legend_label layout="vertical" alpha="60"/>
+ <legend_rect x="60" y="50" width="10"/>
+
+ <draw>
+  <text width="320" height="40" h_align="center" v_align="bottom"
+        size="12">$title</text>
+ </draw>
+
+</chart>

deleted file mode 100644
--- a/bitten/templates/bitten_chart_tests.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-<chart>
- <chart_type>
-  <value>area</value>
-  <value>column</value>
- </chart_type>
-
- <axis_category size="10" orientation="diagonal_up"
-   skip="<?cs var:len(chart.data.0) / 6 ?>"/>
- <axis_ticks value_ticks="false" category_ticks="true" major_thickness="2"
-   minor_thickness="0" major_color="000000" position="outside"/>
-
- <chart_data><?cs
-  each:row = chart.data ?><row><?cs
-   each:value = row ?><?cs
-    if:name(row) == 0 || name(value) == 0 ?><string><?cs
-     var:value ?></string><?cs
-    else ?><number><?cs
-     var:value ?></number><?cs
-    /if ?><?cs
-   /each ?></row><?cs
-  /each ?></chart_data>
-
- <chart_border color="999999" left_thickness="1" bottom_thickness="1"/>
- <chart_grid_h alpha="5" color="666666" thickness="3"/>
- <chart_pref line_thickness="2" point_shape="none"/>
- <chart_value position="cursor"/>
- <series_color>
-  <color>99dd99</color>
-  <color>ff0000</color>
- </series_color>
-
- <legend_label layout="vertical" alpha="60"/>
- <legend_rect x="60" y="50" width="10"/>
-
- <draw>
-  <text width="320" height="40" h_align="center" v_align="bottom" size="12" ><?cs
-    var:chart.title ?></text>
- </draw>
-
-</chart>

new file mode 100755
--- /dev/null
+++ b/bitten/templates/bitten_chart_tests.html
@@ -0,0 +1,38 @@
+<chart xmlns:py="http://genshi.edgewall.org/">
+ <chart_type>
+  <value>area</value>
+  <value>column</value>
+ </chart_type>
+
+ <axis_category size="10" orientation="diagonal_up"
+   skip="${len(data[0]) / 6}"/>
+ <axis_ticks value_ticks="false" category_ticks="true" major_thickness="2"
+   minor_thickness="0" major_color="000000" position="outside"/>
+
+ <chart_data>
+  <row py:for="idx, row in enumerate(data)">
+   <py:choose py:for="jdx, value in enumerate(row)">
+     <string py:when="not idx or not jdx">$value</string>
+     <number py:otherwise="">$value</number>
+   </py:choose>
+  </row>
+ </chart_data>
+
+ <chart_border color="999999" left_thickness="1" bottom_thickness="1"/>
+ <chart_grid_h alpha="5" color="666666" thickness="3"/>
+ <chart_pref line_thickness="2" point_shape="none"/>
+ <chart_value position="cursor"/>
+ <series_color>
+  <color>99dd99</color>
+  <color>ff0000</color>
+ </series_color>
+
+ <legend_label layout="vertical" alpha="60"/>
+ <legend_rect x="60" y="50" width="10"/>
+
+ <draw>
+  <text width="320" height="40" h_align="center" v_align="bottom"
+        size="12">$title</text>
+ </draw>
+
+</chart>

deleted file mode 100644
--- a/bitten/templates/bitten_config.cs
+++ /dev/null
@@ -1,365 +0,0 @@
-<?cs include:"header.cs" ?>
- <div id="ctxtnav" class="nav"><?cs
- if:page.mode == 'view_config' ?><?cs
-  with:links = chrome.links ?><?cs
-   if:len(links.prev) || len(links.next) ?><ul><?cs
-    if:len(links.prev) ?>
-     <li class="first<?cs if:!len(links.up) && !len(links.next) ?> last<?cs /if ?>">
-      &larr; <a href="<?cs var:links.prev.0.href ?>"><?cs
-        var:links.prev.0.title ?></a>
-     </li><?cs
-    /if ?><?cs
-    if:len(links.next) ?>
-     <li class="<?cs if:!len(links.prev) && !len(links.up) ?>first <?cs /if ?>last">
-      <a href="<?cs var:links.next.0.href ?>"><?cs
-        var:links.next.0.title ?></a> &rarr;
-     </li><?cs
-    /if ?></ul><?cs
-   /if ?><?cs
-  /with ?><?cs
- elif:page.mode == 'overview' ?><?cs
-  with:links = chrome.links ?><?cs
-    if:len(links.views) ?><ul>
-     <li class="last">
-      <a href="<?cs var:links.views.0.href ?>"><?cs
-        var:links.views.0.title ?></a>
-     </li><?cs
-    /if ?></ul><?cs
-  /with ?><?cs
- /if ?></div>
- <div id="content" class="build">
-  <h1><?cs var:title ?></h1><?cs
-
-  if:page.mode == 'overview' ?>
-   <form id="prefs" method="get">
-    <div>
-     <input type="checkbox" id="showall" name="show" value="all"<?cs
-      if:config.show_all ?> checked="checked"<?cs /if ?> />
-     <label for="showall">Show deactivated configurations</label>
-    </div>
-    <div class="buttons">
-     <input type="submit" value="Update" />
-    </div>
-   </form><?cs
-   each:config = configs ?>
-    <h2 class="config <?cs
-     if:!config.active ?>deactivated<?cs
-     /if ?>"><a href="<?cs var:config.href ?>"><?cs
-     var:config.label ?></a></h2><?cs
-    if:config.description ?><div class="description"><?cs
-     var:config.description ?></div><?cs
-    /if ?><?cs
-    if:len(config.builds) ?>
-     <h3 class="builds"><a href="<?cs var:config.href ?>">Latest builds</a></h3>
-     <table class="builds"><tr>
-      <th><a href="<?cs var:config.youngest_rev.href ?>">[<?cs
-       var:config.youngest_rev.id ?>]</a> by <?cs
-       var:config.youngest_rev.author ?><p class="date"><?cs
-       var:config.youngest_rev.date ?></p><p class="message"><?cs
-       var:config.youngest_rev.message ?></p>
-      </th><?cs
-      each:build = config.builds ?><td class="<?cs
-       var:build.cls ?>"><?cs
-        if:build.status != 'pending' ?><a href="<?cs var:build.href ?>"><?cs
-         var:build.platform ?></a><p class="date"><?cs
-         var:build.stopped ?></p><div class="system">
-         <strong><?cs var:build.slave.name ?></strong> (<?cs
-         var:build.slave.ipnr ?>)<br /><?cs
-         var:build.slave.os.name ?> <?cs var:build.slave.os.version ?><?cs
-         if:build.slave.machine || build.slave.processor ?> / <?cs
-          alt:build.slave.processor ?><?cs
-           var:build.slave.machine ?><?cs
-          /alt ?><?cs
-         /if ?></div><strong class="status"><?cs
-         if:build.status == 'completed' ?>Success<?cs
-         elif:build.status == 'failed' ?>Failed<?cs
-         elif:build.status == 'in progress' ?>In-progress<?cs
-         /if ?></strong><?cs
-        else ?><strong><?cs var:build.platform ?></strong>
-         <p class="nobuild">No build yet</p><?cs
-        /if ?>
-       </td><?cs
-      /each ?>
-     </tr></table><?cs
-    /if ?><?cs
-   /each ?><?cs
-   if:config.can_create ?><div class="buttons">
-    <form method="get" action=""><div>
-     <input type="hidden" name="action" value="new" />
-     <input type="submit" value="Add configuration" />
-    </div></form></div><?cs
-   /if ?></div><?cs
-
-  elif:page.mode == 'edit_config' ?>
-   <form class="config" method="post" action="">
-    <table summary=""><tr>
-     <td class="name"><label>Name:<br />
-      <input type="text" name="name" value="<?cs var:config.name ?>" />
-     </label></td>
-     <td class="label"><label>Label (for display):<br />
-      <input type="text" name="label" size="32" value="<?cs
-        var:config.label ?>" />
-     </label></td>
-    </tr><tr>
-     <td colspan="2"><fieldset class="iefix">
-      <label for="description">Description (you may use <a tabindex="42" href="<?cs
-        var:trac.href.wiki ?>/WikiFormatting">WikiFormatting</a> here):</label>
-      <p><textarea id="description" name="description" class="wikitext" rows="5" cols="78"><?cs
-        var:config.description ?></textarea></p>
-      <script type="text/javascript" src="<?cs
-        var:htdocs_location ?>js/wikitoolbar.js"></script>
-     </fieldset></td>
-    </tr></table>
-    <fieldset id="recipe">
-     <legend>Build Recipe</legend>
-     <textarea id="recipe" name="recipe" rows="8" cols="78"><?cs
-       var:config.recipe ?></textarea>
-    </fieldset>
-    <fieldset id="repos">
-     <legend>Repository Mapping</legend>
-     <table summary=""><tr>
-      <th><label for="path">Path:</label></th>
-      <td colspan="3"><input type="text" name="path" size="48" value="<?cs
-        var:config.path ?>" /></td>
-     </tr><tr>
-      <th><label for="min_rev">Oldest revision:</label></th>
-      <td><input type="text" name="min_rev" size="8" value="<?cs
-        var:config.min_rev ?>" /></td>
-      <th><label for="min_rev">Youngest revision:</label></th>
-      <td><input type="text" name="max_rev" size="8" value="<?cs
-        var:config.max_rev ?>" /></td>
-     </table>
-    </fieldset>
-    <div class="buttons">
-     <input type="hidden" name="action" value="<?cs
-       if:config.exists ?>edit<?cs else ?>new<?cs /if ?>" />
-     <input type="submit" value="<?cs
-       if:config.exists ?>Save changes<?cs else ?>Create<?cs /if ?>" />
-     <input type="submit" name="cancel" value="Cancel" />
-    </div>
-   </form><?cs
-   if:config.exists ?><div class="platforms">
-     <form class="platforms" method="post" action="">
-      <h2>Target Platforms</h2><?cs
-       if:len(config.platforms) ?><ul><?cs
-        each:platform = config.platforms ?>
-         <li><input type="checkbox" name="delete_platform" value="<?cs
-          var:platform.id ?>"> <a href="<?cs
-          var:platform.href ?>"><?cs var:platform.name ?></a>
-         </li><?cs
-        /each ?></ul><?cs
-       /if ?>
-      <div class="buttons">
-       <input type="submit" name="new" value="Add target platform" />
-       <input type="submit" name="delete" value="Delete selected platforms" />
-      </div>
-     </form>
-    </div><?cs
-   /if ?><?cs
-
- elif:page.mode == 'delete_config' ?>
-  <p><strong>Are you sure you want to delete the build configuration "<?cs
-    var:config.name ?>?</strong></p>
-  <p>This will also delete all builds performed for that configuration.</p>
-  <form action="" method="POST"><div class="buttons">
-   <input type="hidden" name="action" value="delete" />
-   <input type="submit" name="cancel" value="Cancel" />
-   <input type="submit" value="Delete configuration" />
-  </div></form><?cs
-
-  elif:page.mode == 'view_config' ?><?cs
-   if:config.can_modify ?><form id="prefs" method="post" class="activation"><?cs
-    if:!config.active ?><div class="help">This build configuration is currently
-     inactive.<br /> No builds will be initiated for this configuration<br />
-     until it is activated.</div><?cs
-    else ?><div class="help">This configuration is currently active.</div><?cs
-    /if ?>
-    <div class="buttons">
-     <input type="hidden" name="action" value="edit" /><?cs
-     if:config.active ?>
-      <input type="submit" name="deactivate" value="Deactivate" /><?cs
-     else ?>
-      <input type="submit" name="activate" value="Activate" /><?cs
-     /if ?>
-    </div></form><?cs
-   /if ?>
-   <p class="path">
-    Repository path: <?cs if:config.path ?><a href="<?cs
-     var:config.browser_href ?>"><?cs
-     var:config.path ?></a><?cs else ?>&mdash;<?cs /if ?><?cs
-     if:config.min_rev || config.max_rev ?> (<?cs
-      if:config.min_rev ?>starting at <a href="<?cs
-       var:config.min_rev_href ?>">[<?cs var:config.min_rev ?>]</a><?cs
-      /if ?><?cs
-      if:config.min_rev && config.max_rev ?>, <?cs /if ?><?cs
-      if:config.max_rev ?>up to <a href="<?cs
-       var:config.max_rev_href ?>">[<?cs var:config.max_rev ?>]</a><?cs
-      /if ?>)<?cs
-     /if ?>
-   </p><?cs
-   if:config.description ?><div class="description"><?cs
-     var:config.description ?></div><?cs
-   /if ?>
-   <div id="charts"><?cs
-    each:chart = config.charts ?>
-     <object type="application/x-shockwave-flash" width="320" height="240" data="<?cs
-       var:chrome.href ?>/bitten/charts.swf">
-      <param name="movie" value="<?cs var:chrome.href ?>/bitten/charts.swf" />
-      <param name="FlashVars" value="library_path=<?cs
-        var:chrome.href ?>/bitten&amp;xml_source=<?cs
-        var:chart.href ?><?cs if:config.charts_license ?>&amp;license=<?cs
-        var:config.charts_license ?><?cs /if ?>" />
-      <param name="wmode" value="transparent" />
-     </object><br /><?cs
-    /each ?>
-   </div><?cs
-
-   if:config.can_modify || config.can_delete ?><div class="buttons"><?cs
-    if:config.can_modify ?><form method="get" action=""><div>
-     <input type="hidden" name="action" value="edit" />
-     <input type="submit" value="Edit configuration" />
-    </div></form><?cs /if ?><?cs
-    if:config.can_delete ?><form method="get" action=""><div>
-     <input type="hidden" name="action" value="delete" />
-     <input type="submit" value="Delete configuration" />
-    </div></form><?cs /if ?><?cs
-   /if ?><?cs
-   if:len(config.platforms) && len(config.builds) ?>
-    <table class="listing" id="builds"><thead><tr>
-     <th class="chgset" abbrev="Changeset">Chgset</th><?cs
-     each:platform = config.platforms ?><th><?cs var:platform.name ?><?cs
-     /each ?>
-    </tr></thead><?cs
-    if:len(config.builds) ?><tbody><?cs
-     each:rev = config.builds ?><tr>
-      <th class="chgset" scope="row"><a href="<?cs
-        var:rev.href ?>" title="View Changeset">[<?cs
-        var:name(rev) ?>]</a></th><?cs
-      each:platform = config.platforms ?><?cs
-       if:len(rev[platform.id]) ?><?cs
-        with:build = rev[platform.id] ?><td class="<?cs
-         var:build.cls ?>"><div class="info"><a href="<?cs
-         var:build.href ?>" title="View build results"><?cs var:build.id ?>:
-         <strong class="status"><?cs
-         if:build.status == 'completed' ?>Success<?cs
-         elif:build.status == 'failed' ?>Failed<?cs
-         else ?>In-progress<?cs
-         /if ?></strong></a>
-         <div class="system">
-          <strong class="ipnr"><?cs var:build.slave.name ?></strong> (<?cs
-           var:build.slave.ipnr ?>)<br />
-          <?cs var:build.slave.os.name ?> <?cs var:build.slave.os.version ?><?cs
-          if:build.slave.machine || build.slave.processor ?> / <?cs
-           alt:build.slave.processor ?><?cs
-            var:build.slave.machine ?><?cs
-           /alt ?><?cs
-          /if ?></div></div><?cs
-         if:len(build.steps) ?><ul class="steps"><?cs
-          each:step = build.steps ?><li class="<?cs
-           if:step.failed ?>failed<?cs else ?>success<?cs /if ?>">
-           <span class="duration"><?cs var:step.duration ?></span> <a href="<?cs
-           var:step.href ?>"<?cs
-           if:step.description ?> title="<?cs
-            var:step.description ?>"<?cs
-           /if ?>><?cs
-           var:name(step) ?></a><?cs
-           if:step.failed && len(step.errors) ?><ul><?cs
-            each:error = step.errors ?><li><?cs
-             var:error ?></li><?cs
-            /each ?></ul><?cs
-           /if ?></li><?cs
-          /each ?></ul><?cs
-         /if ?></td><?cs
-        /with ?><?cs
-       else ?><td>&mdash;</td><?cs
-       /if ?><?cs
-      /each ?></tr><?cs
-     /each ?></tbody><?cs
-    /if ?></table><?cs
-   /if ?></div><br style="clear: right"/><?cs
-
-  elif:page.mode == 'view_inprogress' ?><?cs
-   each:config = configs ?>
-    <h2 class="config <?cs if:!config.active ?>deactivated<?cs
-    /if ?>"><a href="<?cs var:config.href ?>"><?cs var:config.label ?></a></h2>
-     <table class="listing" id="builds"><thead><tr>
-     <th class="chgset" abbrev="Changeset">Chgset</th>
-     <th>Build</th></tr></thead><?cs 
-      each:build = config.builds ?><tr><th class="chgset" scope="row">
-        <a href="<?cs var:build.rev_href ?>" title="View Changeset">[<?cs
-        var:build.rev ?>]</a></th><td class="<?cs
-        var:build.cls ?>"><div class="info">
-        <a href="<?cs
-        var:build.href ?>" title="View build results"><?cs var:build.id ?>:
-         <strong class="status"><?cs var:build.platform ?></strong></a>
-        <div class="system">
-       <strong><?cs var:build.slave.name ?></strong> (<?cs
-       var:build.slave.ipnr ?>)<br /><?cs
-       var:build.slave.os.name ?> <?cs var:build.slave.os.version ?><?cs 
-       if:build.slave.machine || build.slave.processor ?> / <?cs
-        alt:build.slave.processor ?><?cs
-         var:build.slave.machine ?><?cs
-        /alt ?><?cs
-       /if ?><br /><?cs
-         if:build.started ?>
-           Building since: <?cs var:build.started ?>
-           (<?cs var:build.started_delta ?> ago)<?cs
-         /if ?>
-        </div>
-        </div><?cs
-         if:len(build.steps) ?><ul class="steps"><?cs
-          each:step = build.steps ?><li class="<?cs
-           if:step.failed ?>failed<?cs else ?>success<?cs /if ?>">
-           <span class="duration"><?cs var:step.duration ?></span> <a href="<?cs
-           var:step.href ?>"<?cs
-           if:step.description ?> title="<?cs
-            var:step.description ?>"<?cs
-           /if ?>><?cs
-           var:name(step) ?></a><?cs
-           if:step.failed && len(step.errors) ?><ul><?cs
-            each:error = step.errors ?><li><?cs
-             var:error ?></li><?cs
-            /each ?></ul><?cs
-           /if ?></li><?cs
-          /each ?></ul><?cs
-         /if ?></td></td></tr><?cs
-     /each ?></table><?cs
-   /each ?></div><?cs
-
-  elif:page.mode == 'edit_platform' ?>
-   <form class="platform" method="post" action="">
-    <div class="field"><label>Name:<br />
-     <input type="text" name="name" value="<?cs var:platform.name ?>" />
-    </label></div>
-    <h2>Rules</h2>
-    <table><thead><tr>
-     <th>Property name</th><th>Match pattern</th>
-    </tr></thead><tbody><?cs
-     each:rule = platform.rules ?><tr>
-      <td><input type="text" name="property_<?cs var:name(rule) ?>" value="<?cs
-       var:rule.property ?>" /></td>
-      <td><input type="text" name="pattern_<?cs var:name(rule) ?>" value="<?cs
-       var:rule.pattern ?>" /></td>
-      <td><input type="submit" name="add_rule_<?cs
-        var:name(rule) ?>" value="+" /><input type="submit" name="rm_rule_<?cs
-        var:name(rule) ?>" value="-" />
-      </td>
-     </tr><?cs /each ?>
-    </tbody></table>
-    <div class="buttons">
-     <form method="get" action=""><div>
-     <input type="hidden" name="action" value="<?cs
-       if:platform.exists ?>edit<?cs else ?>new<?cs /if ?>" />
-      <input type="hidden" name="platform" value="<?cs
-       var:platform.id ?>" />
-      <input type="submit" value="<?cs
-       if:platform.exists ?>Save changes<?cs else ?>Add platform<?cs
-       /if ?>" />
-      <input type="submit" name="cancel" value="Cancel" />
-     </div></form>
-    </div>
-   </form><?cs
-
-  /if ?>
- </div>
-<?cs include:"footer.cs" ?>

new file mode 100755
--- /dev/null
+++ b/bitten/templates/bitten_config.html
@@ -0,0 +1,178 @@
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:xi="http://www.w3.org/2001/XInclude"
+      xmlns:py="http://genshi.edgewall.org/">
+  <xi:include href="layout.html" />
+  <head>
+    <title>$title</title>
+  </head>
+  <body>
+    <strong py:def="build_status(status)" class="status">
+      <py:choose test="status">
+      <py:when test="'completed'">Success</py:when>
+      <py:when test="'failed'">Failed</py:when>
+      <py:when test="'in progress'">In-progress</py:when>
+      </py:choose>
+    </strong>
+    
+    <div py:def="slave_info(slave)" class="system">
+      <strong>$slave.name</strong> ($slave.ipnr)<br />
+      $slave.os_name $slave.os_version
+      <py:if test="slave.machine or slave.processor"> / </py:if>
+      ${slave.processor or slave.machine or ''}
+    </div>
+    
+    <ul py:def="build_steps(steps)" py:if="steps" class="steps">
+      <li py:for="step in steps"
+          class="${step.failed and 'failed' or 'success'}">
+        <span class="duration">$step.duration</span> 
+        <a href="$step.href" title="${step.description or None}">
+          $step.name
+        </a>
+        <ul py:if="step.failed and step.errors">
+          <li py:for="error in step.errors">$error</li>
+        </ul>
+      </li>
+    </ul>
+ 
+    <div id="content" class="build">
+      <h1>$title</h1><py:choose test="page_mode"><py:when test="'overview'">
+      <form id="prefs" method="get" action="">
+        <div>
+          <input type="checkbox" id="showall" name="show" value="all"
+                 checked="${show_all and 'checked' or None}" />
+          <label for="showall">Show deactivated configurations</label>
+        </div>
+        <div class="buttons">
+          <input type="submit" value="Update" />
+        </div>
+      </form><py:for each="config in configs">
+      <h2 class="config ${not config.active and 'deactivated' or ''}">
+        <a href="$config.href">$config.label</a>
+      </h2>
+      <div py:if="config.description" class="description">
+        $config.description
+      </div><py:if test="len(config.builds)">
+      <h3 class="builds"><a href="$config.href">Latest builds</a></h3>
+      <table class="builds"><tbody><tr>
+        <th py:with="youngest_rev = config.youngest_rev">
+          <a href="$youngest_rev.href">[$youngest_rev.id]</a>
+          by $youngest_rev.author<p class="date">$youngest_rev.date</p>
+          <p class="message">$youngest_rev.message</p>
+        </th>
+        <td py:for="build in config.builds" class="$build.cls"><py:choose>
+        <py:when test="build.status != 'pending'">
+          <a href="$build.href">$build.platform</a>
+          <p class="date">$build.stopped</p>
+          ${slave_info(build.slave)}
+          ${build_status(build.status)}
+        </py:when><py:otherwise>
+          <strong>$build.platform</strong>
+          <p class="nobuild">No build yet</p>
+        </py:otherwise></py:choose>
+        </td>
+      </tr></tbody></table></py:if></py:for>
+
+    </py:when><py:when test="'view_config'">
+      <form py:if="config.can_modify" id="prefs" method="post"
+            class="activation"><py:choose>
+        <div py:when="not config.active" class="help">
+          This build configuration is currently inactive.<br />
+          No builds will be initiated for this configuration<br />
+          until it is activated.
+        </div>
+        <div py:otherwise="" class="help">
+          This configuration is currently active.
+        </div></py:choose>
+        <div class="buttons" py:choose="">
+          <input type="hidden" name="action" value="edit" />
+          <input py:when="config.active" type="submit" name="deactivate"
+                 value="Deactivate" />
+          <input py:otherwise="" type="submit" name="activate"
+                 value="Activate" />
+        </div>
+      </form>
+      <p class="path">
+        Repository path: 
+        <a py:if="config.path" href="$config.browser_href">$config.path</a>
+        ${not config.path and '&mdash;' or ''}
+        <py:if test="config.min_rev or config.max_rev">
+        (<py:if test="config.min_rev">starting at 
+         <a href="$config.min_rev_href">[$config.min_rev]</a></py:if>
+         <py:if test="config.min_rev and config.max_rev">, </py:if>
+         <py:if test="config.max_rev">up to 
+         <a href="$config.max_rev_href">[$config.max_rev]</a></py:if>)
+        </py:if>
+      </p>
+      <div py:if="config.description" class="description">
+        $config.description
+      </div>
+      <div id="charts"><py:for each="chart in config.charts">
+        <object type="application/x-shockwave-flash"
+                width="320" height="240"
+                data="${href.chrome('bitten', 'charts.swf')}">
+          <param name="movie" value="${href.chrome('bitten', 'charts.swf')}" />
+          <param name="FlashVars"
+                 value="library_path=${href.chrome('bitten')}&amp;xml_source=$chart.href${config.charts_license and '&amp;license='+config.charts_license or ''}" />
+          <param name="wmode" value="transparent" />
+        </object><br /></py:for>
+      </div>
+
+      <table py:if="config.platforms and config.builds"
+             class="listing" id="builds">
+        <thead><tr>
+          <th class="chgset"><abbr title="Changeset">Chgset</abbr></th>
+          <th py:for="platform in config.platforms">$platform.name</th>
+        </tr></thead>
+        <tbody py:if="config.builds">
+          <tr py:for="rev_num in sorted(config.builds, reverse=True)"
+              py:with="rev = config.builds[rev_num]">
+            <th class="chgset" scope="row">
+              <a href="$rev.href" title="View Changeset">[$rev_num]</a>
+            </th><py:for each="platform in config.platforms"><py:choose>
+            <td py:when="platform.id in rev" py:with="build = rev[platform.id]"
+                class="$build.cls">
+              <div class="info">
+                <a href="$build.href" title="View build results">
+                  $build.id
+                  ${build_status(build.status)}
+                </a>
+                ${slave_info(build.slave)}
+              </div>
+              ${build_steps(build.steps)}
+            </td>
+            <td py:otherwise="">&mdash;</td></py:choose></py:for>
+          </tr>
+        </tbody>
+      </table>
+      <br style="clear: right"/>
+
+    </py:when><py:when test="'view-inprogress'">
+      <py:for each="config in configs">
+      <h2 class="config ${not config.active and 'deactivated' or ''}">
+        <a href="$config.href">$config.label</a>
+      </h2>
+      <table class="listing" id="builds">
+        <thead><tr>
+          <th class="chgset" abbrev="Changeset">Chgset</th><th>Build</th>
+        </tr></thead><tbody>
+        <tr py:for="build in config.builds">
+          <th class="chgset" scope="row">
+            <a href="$build.rev_href" title="View Changeset">[$build.rev]</a>
+          </th>
+          <td class="$build.cls">
+            <div class="info">
+              <a href="$build.href" title="View build results">
+                $build.id: <strong class="status">$build.platform</strong>
+              </a>
+              ${slave_info(build.slave)}
+            </div>
+            ${build_steps(build.steps)}
+          </td>
+        </tr></tbody>
+      </table></py:for></py:when>
+    </py:choose></div>
+  </body>
+</html>

deleted file mode 100644
--- a/bitten/templates/bitten_summary_coverage.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-<h3>Code Coverage</h3>
-<table class="listing coverage">
- <thead><tr><th class="name">Unit</th><th class="loc">Lines of Code</th>
- <th class="cov">Coverage</th></tr></thead>
- <tbody><?cs
- each:item = data ?><tr><td class="name"><?cs
-  if:item.href ?><a href="<?cs var:item.href ?>"><?cs var:item.name ?></a><?cs
-  else ?><?cs var:item.name ?><?cs
-  /if ?></td><td class="loc"><?cs
-  var:item.loc ?></td><td class="cov"><?cs var:item.cov ?>%</td></tr><?cs
- /each ?></tbody>
- <tbody class="totals"><tr>
-  <th>Total</th><td><?cs var:totals.loc ?></td>
-  <td><?cs var:totals.cov ?>%</td>
- </tr></tbody>
-</table>

new file mode 100755
--- /dev/null
+++ b/bitten/templates/bitten_summary_coverage.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:py="http://genshi.edgewall.org/" py:strip="">
+ <body py:strip="">
+  <h3>Code Coverage</h3>
+  <table class="listing coverage">
+   <thead><tr>
+    <th class="name">Unit</th><th class="loc">Lines of Code</th>
+    <th class="cov">Coverage</th>
+   </tr></thead>
+   <tbody><tr py:for="item in data.units">
+    <td class="name" py:choose="">
+     <a py:when="item.href" href="$item.href">$item.name</a>
+     <py:otherwise>$item.name</py:otherwise>
+    </td>
+    <td class="loc">$item.loc</td>
+    <td class="cov">${item.cov}%</td>
+   </tr></tbody>
+   <tbody class="totals"><tr py:with="totals = data.totals">
+    <th>Total</th><td>$totals.loc</td>
+    <td>${totals.cov}%</td>
+   </tr></tbody>
+  </table>
+ </body>
+</html>

deleted file mode 100644
--- a/bitten/templates/bitten_summary_tests.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-<h3>Test Results</h3>
-<table class="listing tests">
- <thead><tr>
-  <th>Test Fixture</th><th>Total</th>
-  <th>Failures</th><th>Errors</th>
- </tr></thead>
- <tbody><?cs
- each:item = data ?><tr<?cs
-  if:item.num_failure != 0 || item.num_error != 0 ?> class="failed"<?cs
-  /if ?>><th><?cs
-  if:item.href ?><a href="<?cs var:item.href ?>"><?cs var:item.name ?></a><?cs
-  else ?><?cs var:item.name ?><?cs
-  /if ?></th><td><?cs
-  var:#item.num_success + #item.num_failure + #item.num_error ?></td><td><?cs
-  var:item.num_failure ?></td><td><?cs
-  var:item.num_error ?></td></tr><?cs
- /each ?></tbody>
- <tbody class="totals"><tr>
-  <th>Total</th>
-  <td><?cs var:totals.success ?></td>
-  <td><?cs var:totals.failure ?></td><td><?cs var:totals.error ?></td>
- </tr></tbody>
-</table>

new file mode 100755
--- /dev/null
+++ b/bitten/templates/bitten_summary_tests.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:py="http://genshi.edgewall.org/" py:strip="">
+ <body py:strip="">
+  <h3>Test Results</h3>
+  <table class="listing tests">
+   <thead><tr>
+    <th>Test Fixture</th><th>Total</th>
+    <th>Failures</th><th>Errors</th>
+   </tr></thead>
+   <tbody><tr py:for="item in data.fixtures"
+              class="${item.num_failure or item.num_error and 'failed' or None}">
+    <th py:choose="">
+     <a py:when="item.href" href="$item.href">$item.name</a>
+     <py:otherwise>$item.name</py:otherwise>
+    </th>
+    <td>${item.num_success + item.num_failure + item.num_error}</td>
+    <td>$item.num_failure</td>
+    <td>$item.num_error</td>
+   </tr></tbody>
+   <tbody class="totals"><tr py:with="totals = data.totals">
+    <th>Total</th>
+    <td>$totals.success</td>
+    <td>$totals.failure</td>
+    <td>$totals.error</td>
+   </tr></tbody>
+  </table>
+ </body>
+</html>

--- a/bitten/tests/admin.py
+++ b/bitten/tests/admin.py
@@ -63,36 +63,33 @@
             DefaultPermissionPolicy.CACHE_EXPIRY = self.old_perm_cache_expiry
         shutil.rmtree(self.env.path)
 
-    def test_get_admin_pages(self):
+    def test_get_admin_panels(self):
         provider = BuildMasterAdminPageProvider(self.env)
 
         req = Mock(perm=PermissionCache(self.env, 'joe'))
         self.assertEqual([('bitten', 'Builds', 'master', 'Master Settings')],
-                         list(provider.get_admin_pages(req)))
+                         list(provider.get_admin_panels(req)))
 
         PermissionSystem(self.env).revoke_permission('joe', 'BUILD_ADMIN')
         req = Mock(perm=PermissionCache(self.env, 'joe'))
-        self.assertEqual([], list(provider.get_admin_pages(req)))
+        self.assertEqual([], list(provider.get_admin_panels(req)))
 
     def test_process_get_request(self):
-        data = {}
-        req = Mock(method='GET', chrome={}, hdf=data, href=Href('/'),
+        req = Mock(method='GET', chrome={}, href=Href('/'),
                    perm=PermissionCache(self.env, 'joe'))
 
         provider = BuildMasterAdminPageProvider(self.env)
-        template_name, content_type = provider.process_admin_request(
+        template_name, data = provider.render_admin_panel(
             req, 'bitten', 'master', ''
         )
 
-        self.assertEqual('bitten_admin_master.cs', template_name)
-        self.assertEqual(None, content_type)
-        assert 'admin.master' in data
-        self.assertEqual({
-            'slave_timeout': 3600,
-            'stabilize_wait': 0,
-            'adjust_timestamps': False,
-            'build_all': False,
-        }, data['admin.master'])
+        self.assertEqual('bitten_admin_master.html', template_name)
+        assert 'master' in data
+        master = data['master']
+        self.assertEqual(3600, master.slave_timeout)
+        self.assertEqual(0, master.stabilize_wait)
+        assert not master.adjust_timestamps
+        assert not master.build_all
 
     def test_process_config_changes(self):
         redirected_to = []
@@ -105,7 +102,7 @@
 
         provider = BuildMasterAdminPageProvider(self.env)
         try:
-            provider.process_admin_request(req, 'bitten', 'master', '')
+            provider.render_admin_panel(req, 'bitten', 'master', '')
             self.fail('Expected RequestDone')
 
         except RequestDone:
@@ -155,30 +152,28 @@
             DefaultPermissionPolicy.CACHE_EXPIRY = self.old_perm_cache_expiry
         shutil.rmtree(self.env.path)
 
-    def test_get_admin_pages(self):
+    def test_get_admin_panels(self):
         provider = BuildConfigurationsAdminPageProvider(self.env)
 
         req = Mock(perm=PermissionCache(self.env, 'joe'))
         self.assertEqual([('bitten', 'Builds', 'configs', 'Configurations')],
-                         list(provider.get_admin_pages(req)))
+                         list(provider.get_admin_panels(req)))
 
         PermissionSystem(self.env).revoke_permission('joe', 'BUILD_MODIFY')
         req = Mock(perm=PermissionCache(self.env, 'joe'))
-        self.assertEqual([], list(provider.get_admin_pages(req)))
+        self.assertEqual([], list(provider.get_admin_panels(req)))
 
     def test_process_view_configs_empty(self):
-        data = {}
-        req = Mock(method='GET', chrome={}, hdf=data, href=Href('/'),
+        req = Mock(method='GET', chrome={}, href=Href('/'),
                    perm=PermissionCache(self.env, 'joe'))
 
         provider = BuildConfigurationsAdminPageProvider(self.env)
-        template_name, content_type = provider.process_admin_request(
+        template_name, data = provider.render_admin_panel(
             req, 'bitten', 'configs', ''
         )
 
-        self.assertEqual('bitten_admin_configs.cs', template_name)
-        self.assertEqual(None, content_type)
-        self.assertEqual([], data['admin']['configs'])
+        self.assertEqual('bitten_admin_configs.html', template_name)
+        self.assertEqual([], data['configs'])
 
     def test_process_view_configs(self):
         BuildConfig(self.env, name='foo', label='Foo', path='branches/foo',
@@ -186,18 +181,17 @@
         BuildConfig(self.env, name='bar', label='Bar', path='branches/bar',
                     min_rev='123', max_rev='456').insert()
 
-        data = {}
-        req = Mock(method='GET', chrome={}, hdf=data, href=Href('/'),
+        req = Mock(method='GET', chrome={}, href=Href('/'),
                    perm=PermissionCache(self.env, 'joe'))
 
         provider = BuildConfigurationsAdminPageProvider(self.env)
-        template_name, content_type = provider.process_admin_request(
+        template_name, data = provider.render_admin_panel(
             req, 'bitten', 'configs', ''
         )
 
-        self.assertEqual('bitten_admin_configs.cs', template_name)
-        self.assertEqual(None, content_type)
-        configs = data['admin']['configs']
+        self.assertEqual('bitten_admin_configs.html', template_name)
+        assert 'configs' in data
+        configs = data['configs']
         self.assertEqual(2, len(configs))
         self.assertEqual({
             'name': 'bar', 'href': '/admin/bitten/configs/bar',
@@ -215,18 +209,17 @@
                     active=True).insert()
         TargetPlatform(self.env, config='foo', name='any').insert()
 
-        data = {}
-        req = Mock(method='GET', chrome={}, hdf=data, href=Href('/'),
+        req = Mock(method='GET', chrome={}, href=Href('/'),
                    perm=PermissionCache(self.env, 'joe'))
 
         provider = BuildConfigurationsAdminPageProvider(self.env)
-        template_name, content_type = provider.process_admin_request(
+        template_name, data = provider.render_admin_panel(
             req, 'bitten', 'configs', 'foo'
         )
 
-        self.assertEqual('bitten_admin_configs.cs', template_name)
-        self.assertEqual(None, content_type)
-        config = data['admin']['config']
+        self.assertEqual('bitten_admin_configs.html', template_name)
+        assert 'config' in data
+        config = data['config']
         self.assertEqual({
             'name': 'foo', 'label': 'Foo', 'description': '', 'recipe': '',
             'path': 'branches/foo', 'min_rev': None, 'max_rev': None,
@@ -251,7 +244,7 @@
 
         provider = BuildConfigurationsAdminPageProvider(self.env)
         try:
-            provider.process_admin_request(req, 'bitten', 'configs', '')
+            provider.render_admin_panel(req, 'bitten', 'configs', '')
             self.fail('Expected RequestDone')
 
         except RequestDone:
@@ -277,7 +270,7 @@
 
         provider = BuildConfigurationsAdminPageProvider(self.env)
         try:
-            provider.process_admin_request(req, 'bitten', 'configs', '')
+            provider.render_admin_panel(req, 'bitten', 'configs', '')
             self.fail('Expected RequestDone')
 
         except RequestDone:
@@ -303,7 +296,7 @@
 
         provider = BuildConfigurationsAdminPageProvider(self.env)
         try:
-            provider.process_admin_request(req, 'bitten', 'configs', '')
+            provider.render_admin_panel(req, 'bitten', 'configs', '')
             self.fail('Expected RequestDone')
 
         except RequestDone:
@@ -323,7 +316,7 @@
 
         provider = BuildConfigurationsAdminPageProvider(self.env)
         try:
-            provider.process_admin_request(req, 'bitten', 'configs', '')
+            provider.render_admin_panel(req, 'bitten', 'configs', '')
             self.fail('Expected RequestDone')
 
         except RequestDone:
@@ -338,7 +331,7 @@
 
         provider = BuildConfigurationsAdminPageProvider(self.env)
         try:
-            provider.process_admin_request(req, 'bitten', 'configs', '')
+            provider.render_admin_panel(req, 'bitten', 'configs', '')
             self.fail('Expected TracError')
 
         except TracError, e:
@@ -351,7 +344,7 @@
 
         provider = BuildConfigurationsAdminPageProvider(self.env)
         try:
-            provider.process_admin_request(req, 'bitten', 'configs', '')
+            provider.render_admin_panel(req, 'bitten', 'configs', '')
             self.fail('Expected TracError')
 
         except TracError, e:
@@ -370,7 +363,7 @@
 
         provider = BuildConfigurationsAdminPageProvider(self.env)
         try:
-            provider.process_admin_request(req, 'bitten', 'configs', '')
+            provider.render_admin_panel(req, 'bitten', 'configs', '')
             self.fail('Expected TracError')
 
         except TracError, e:
@@ -387,7 +380,7 @@
                    args={'add': '', 'name': 'bar', 'label': 'Bar'})
 
         provider = BuildConfigurationsAdminPageProvider(self.env)
-        self.assertRaises(PermissionError, provider.process_admin_request, req,
+        self.assertRaises(PermissionError, provider.render_admin_panel, req,
                           'bitten', 'configs', '')
 
     def test_process_remove_config(self):
@@ -406,7 +399,7 @@
 
         provider = BuildConfigurationsAdminPageProvider(self.env)
         try:
-            provider.process_admin_request(req, 'bitten', 'configs', '')
+            provider.render_admin_panel(req, 'bitten', 'configs', '')
             self.fail('Expected RequestDone')
 
         except RequestDone:
@@ -430,7 +423,7 @@
 
         provider = BuildConfigurationsAdminPageProvider(self.env)
         try:
-            provider.process_admin_request(req, 'bitten', 'configs', '')
+            provider.render_admin_panel(req, 'bitten', 'configs', '')
             self.fail('Expected RequestDone')
 
         except RequestDone:
@@ -448,7 +441,7 @@
 
         provider = BuildConfigurationsAdminPageProvider(self.env)
         try:
-            provider.process_admin_request(req, 'bitten', 'configs', '')
+            provider.render_admin_panel(req, 'bitten', 'configs', '')
             self.fail('Expected TracError')
 
         except TracError, e:
@@ -463,7 +456,7 @@
 
         provider = BuildConfigurationsAdminPageProvider(self.env)
         try:
-            provider.process_admin_request(req, 'bitten', 'configs', '')
+            provider.render_admin_panel(req, 'bitten', 'configs', '')
             self.fail('Expected TracError')
 
         except TracError, e:
@@ -479,7 +472,7 @@
                    args={'remove': '', 'sel': 'bar'})
 
         provider = BuildConfigurationsAdminPageProvider(self.env)
-        self.assertRaises(PermissionError, provider.process_admin_request, req,
+        self.assertRaises(PermissionError, provider.render_admin_panel, req,
                           'bitten', 'configs', '')
 
     def test_process_update_config(self):
@@ -499,7 +492,7 @@
 
         provider = BuildConfigurationsAdminPageProvider(self.env)
         try:
-            provider.process_admin_request(req, 'bitten', 'configs', 'foo')
+            provider.render_admin_panel(req, 'bitten', 'configs', 'foo')
             self.fail('Expected RequestDone')
 
         except RequestDone:
@@ -518,7 +511,7 @@
 
         provider = BuildConfigurationsAdminPageProvider(self.env)
         try:
-            provider.process_admin_request(req, 'bitten', 'configs', 'foo')
+            provider.render_admin_panel(req, 'bitten', 'configs', 'foo')
             self.fail('Expected TracError')
 
         except TracError, e:
@@ -534,7 +527,7 @@
 
         provider = BuildConfigurationsAdminPageProvider(self.env)
         try:
-            provider.process_admin_request(req, 'bitten', 'configs', 'foo')
+            provider.render_admin_panel(req, 'bitten', 'configs', 'foo')
             self.fail('Expected TracError')
 
         except TracError, e:
@@ -556,7 +549,7 @@
 
         provider = BuildConfigurationsAdminPageProvider(self.env)
         try:
-            provider.process_admin_request(req, 'bitten', 'configs', 'foo')
+            provider.render_admin_panel(req, 'bitten', 'configs', 'foo')
             self.fail('Expected TracError')
 
         except TracError, e:
@@ -573,7 +566,7 @@
 
         provider = BuildConfigurationsAdminPageProvider(self.env)
         try:
-            provider.process_admin_request(req, 'bitten', 'configs', 'foo')
+            provider.render_admin_panel(req, 'bitten', 'configs', 'foo')
             self.fail('Expected TracError')
 
         except TracError, e:
@@ -592,7 +585,7 @@
 
         provider = BuildConfigurationsAdminPageProvider(self.env)
         try:
-            provider.process_admin_request(req, 'bitten', 'configs', 'foo')
+            provider.render_admin_panel(req, 'bitten', 'configs', 'foo')
             self.fail('Expected TracError')
 
         except TracError, e:
@@ -609,13 +602,13 @@
                    args={'new': ''})
 
         provider = BuildConfigurationsAdminPageProvider(self.env)
-        template_name, content_type = provider.process_admin_request(
+        template_name, data = provider.render_admin_panel(
             req, 'bitten', 'configs', 'foo'
         )
 
-        self.assertEqual('bitten_admin_configs.cs', template_name)
-        self.assertEqual(None, content_type)
-        platform = data['admin']['platform']
+        self.assertEqual('bitten_admin_configs.html', template_name)
+        assert 'platform' in data
+        platform = data['platform']
         self.assertEqual({
             'id': None, 'exists': False, 'name': None, 'rules': [('', '')],
         }, platform)
@@ -636,7 +629,7 @@
 
         provider = BuildConfigurationsAdminPageProvider(self.env)
         try:
-            provider.process_admin_request(req, 'bitten', 'configs', 'foo')
+            provider.render_admin_panel(req, 'bitten', 'configs', 'foo')
             self.fail('Expected RequestDone')
 
         except RequestDone:
@@ -663,7 +656,7 @@
 
         provider = BuildConfigurationsAdminPageProvider(self.env)
         try:
-            provider.process_admin_request(req, 'bitten', 'configs', 'foo')
+            provider.render_admin_panel(req, 'bitten', 'configs', 'foo')
             self.fail('Expected RequestDone')
 
         except RequestDone:
@@ -689,7 +682,7 @@
 
         provider = BuildConfigurationsAdminPageProvider(self.env)
         try:
-            provider.process_admin_request(req, 'bitten', 'configs', 'foo')
+            provider.render_admin_panel(req, 'bitten', 'configs', 'foo')
             self.fail('Expected RequestDone')
 
         except RequestDone:
@@ -715,7 +708,7 @@
 
         provider = BuildConfigurationsAdminPageProvider(self.env)
         try:
-            provider.process_admin_request(req, 'bitten', 'configs', 'foo')
+            provider.render_admin_panel(req, 'bitten', 'configs', 'foo')
             self.fail('Expected TracError')
 
         except TracError, e:
@@ -727,18 +720,17 @@
         platform = TargetPlatform(self.env, config='foo', name='any')
         platform.insert()
 
-        data = {}
-        req = Mock(method='GET', chrome={}, hdf=data, href=Href('/'),
+        req = Mock(method='GET', chrome={}, href=Href('/'),
                    perm=PermissionCache(self.env, 'joe'), args={})
 
         provider = BuildConfigurationsAdminPageProvider(self.env)
-        template_name, content_type = provider.process_admin_request(
+        template_name, data = provider.render_admin_panel(
             req, 'bitten', 'configs', 'foo/%d' % platform.id
         )
 
-        self.assertEqual('bitten_admin_configs.cs', template_name)
-        self.assertEqual(None, content_type)
-        platform = data['admin']['platform']
+        self.assertEqual('bitten_admin_configs.html', template_name)
+        assert 'platform' in data
+        platform = data['platform']
         self.assertEqual({
             'id': 1, 'exists': True, 'name': 'any', 'rules': [('', '')],
         }, platform)
@@ -761,7 +753,7 @@
 
         provider = BuildConfigurationsAdminPageProvider(self.env)
         try:
-            provider.process_admin_request(req, 'bitten', 'configs',
+            provider.render_admin_panel(req, 'bitten', 'configs',
                                            'foo/%d' % platform.id)
             self.fail('Expected RequestDone')
 
@@ -791,7 +783,7 @@
 
         provider = BuildConfigurationsAdminPageProvider(self.env)
         try:
-            provider.process_admin_request(req, 'bitten', 'configs',
+            provider.render_admin_panel(req, 'bitten', 'configs',
                                            'foo/%d' % platform.id)
             self.fail('Expected RequestDone')
 

--- a/bitten/tests/web_ui.py
+++ b/bitten/tests/web_ui.py
@@ -17,7 +17,6 @@
 from trac.perm import PermissionCache, PermissionSystem
 from trac.test import EnvironmentStub, Mock
 from trac.util.html import Markup
-from trac.web.clearsilver import HDFWrapper
 from trac.web.href import Href
 from bitten.main import BuildSystem
 from bitten.model import Build, BuildConfig, BuildStep, TargetPlatform, schema
@@ -58,14 +57,13 @@
         PermissionSystem(self.env).grant_permission('joe', 'BUILD_VIEW')
         req = Mock(method='GET', base_path='', cgi_location='',
                    path_info='/build', href=Href('/trac'), args={}, chrome={},
-                   hdf=HDFWrapper(), perm=PermissionCache(self.env, 'joe'))
+                   perm=PermissionCache(self.env, 'joe'))
 
         module = BuildConfigController(self.env)
         assert module.match_request(req)
-        module.process_request(req)
+        _, data, _ = module.process_request(req)
 
-        self.assertEqual('overview', req.hdf['page.mode'])
-        self.assertEqual('0', req.hdf.get('build.can_create', '0'))
+        self.assertEqual('overview', data['page_mode'])
 
     def test_view_config(self):
         config = BuildConfig(self.env, name='test', path='trunk')
@@ -76,7 +74,7 @@
         PermissionSystem(self.env).grant_permission('joe', 'BUILD_VIEW')
         req = Mock(method='GET', base_path='', cgi_location='',
                    path_info='/build/test', href=Href('/trac'), args={},
-                   chrome={}, hdf=HDFWrapper(), authname='joe',
+                   chrome={}, authname='joe',
                    perm=PermissionCache(self.env, 'joe'))
 
         root = Mock(get_entries=lambda: ['foo'],
@@ -87,12 +85,10 @@
 
         module = BuildConfigController(self.env)
         assert module.match_request(req)
-        module.process_request(req)
+        _, data, _ = module.process_request(req)
 
-        self.assertEqual('view_config', req.hdf['page.mode'])
-        self.assertEqual('0', req.hdf.get('build.config.can_delete', '0'))
-        self.assertEqual('0', req.hdf.get('build.config.can_modify', '0'))
-        self.assertEqual(None, req.hdf.get('chrome.links.next.0.href'))
+        self.assertEqual('view_config', data['page_mode'])
+        assert not 'next' in req.chrome['links']
 
     def test_view_config_paging(self):
         config = BuildConfig(self.env, name='test', path='trunk')
@@ -103,7 +99,7 @@
         PermissionSystem(self.env).grant_permission('joe', 'BUILD_VIEW')
         req = Mock(method='GET', base_path='', cgi_location='',
                    path_info='/build/test', href=Href('/trac'), args={},
-                   chrome={}, hdf=HDFWrapper(), authname='joe',
+                   chrome={}, authname='joe',
                    perm=PermissionCache(self.env, 'joe'))
 
         root = Mock(get_entries=lambda: ['foo'],
@@ -114,14 +110,11 @@
 
         module = BuildConfigController(self.env)
         assert module.match_request(req)
-        module.process_request(req)
+        _, data, _ = module.process_request(req)
 
-        if req.chrome: # Trac 0.11
+        if req.chrome:
             self.assertEqual('/trac/build/test?page=2',
                              req.chrome['links']['next'][0]['href'])
-        else:
-            self.assertEqual('/trac/build/test?page=2',
-                             req.hdf.get('chrome.links.next.0.href'))
 
 
 class SourceFileLinkFormatterTestCase(unittest.TestCase):

--- a/bitten/util/testrunner.py
+++ b/bitten/util/testrunner.py
@@ -128,8 +128,9 @@
         test.finalize_options(self)
 
         if self.xml_output is not None:
-            if not os.path.exists(os.path.dirname(self.xml_output)):
-                os.makedirs(os.path.dirname(self.xml_output))
+            output_dir = os.path.dirname(self.xml_output) or '.'
+            if not os.path.exists(output_dir):
+                os.makedirs(output_dir)
             self.xml_output_file = open(self.xml_output, 'w')
 
         if self.coverage_method not in ('trace', 'coverage', 'figleaf'):

--- a/bitten/util/xmlio.py
+++ b/bitten/util/xmlio.py
@@ -20,6 +20,17 @@
     from StringIO import StringIO
 from UserDict import DictMixin
 
+import cgi
+import string
+
+__trans = string.maketrans ("", "")
+__todel = ""
+for c in range (0, 256):
+    c1 = chr (c)
+    if not c1 in string.printable:
+        __todel += c1
+del c, c1
+
 __all__ = ['Fragment', 'Element', 'ParsedElement', 'parse']
 __docformat__ = 'restructuredtext en'
 
@@ -27,8 +38,7 @@
     """Escape special characters in the provided text so that it can be safely
     included in XML text nodes.
     """
-    return str(text).replace('&', '&amp;').replace('<', '&lt;') \
-                    .replace('>', '&gt;')
+    return cgi.escape (str(text)).translate (__trans, __todel)
 
 def _escape_attr(attr):
     """Escape special characters in the provided text so that it can be safely

--- a/bitten/web_ui.py
+++ b/bitten/web_ui.py
@@ -16,65 +16,51 @@
 from StringIO import StringIO
 
 import pkg_resources
+from genshi.builder import tag
 from trac.core import *
-try:
-    from trac.timeline import ITimelineEventProvider
-    have_trac_011 = True
-except ImportError:
-    from trac.Timeline import ITimelineEventProvider
-    have_trac_011 = False
+from trac.timeline import ITimelineEventProvider
 from trac.util import escape, pretty_timedelta, format_datetime, shorten_line, \
                       Markup
 from trac.util.html import html
 from trac.web import IRequestHandler
 from trac.web.chrome import INavigationContributor, ITemplateProvider, \
-                            add_link, add_stylesheet
-from trac.wiki import wiki_to_html
-from trac.wiki import wiki_to_oneliner as wiki_to_oneliner_
+                            add_link, add_stylesheet, add_ctxtnav, \
+                            prevnext_nav, add_script
+from trac.wiki import wiki_to_html, wiki_to_oneliner
 from bitten.api import ILogFormatter, IReportChartGenerator, IReportSummarizer
 from bitten.model import BuildConfig, TargetPlatform, Build, BuildStep, \
                          BuildLog, Report
 from bitten.queue import collect_changes
 
-def wiki_to_oneliner(wikitext, env, db=None, shorten=False, absurls=False,
-                      req=None):
-    if have_trac_011:
-        return wiki_to_oneliner_(wikitext, env, db=db, shorten=shorten,
-                                 absurls=absurls, req=req)
-    else:
-        return wiki_to_oneliner_(wikitext, env, db=db, shorten=shorten,
-                                 absurls=absurls)
-
-
 _status_label = {Build.PENDING: 'pending',
                  Build.IN_PROGRESS: 'in progress',
                  Build.SUCCESS: 'completed',
                  Build.FAILURE: 'failed'}
 
-def _build_to_hdf(env, req, build):
-    hdf = {'id': build.id, 'name': build.slave, 'rev': build.rev,
-           'status': _status_label[build.status],
-           'cls': _status_label[build.status].replace(' ', '-'),
-           'href': req.href.build(build.config, build.id),
-           'chgset_href': req.href.changeset(build.rev)}
+def _get_build_data(env, req, build):
+    data = {'id': build.id, 'name': build.slave, 'rev': build.rev,
+            'status': _status_label[build.status],
+            'cls': _status_label[build.status].replace(' ', '-'),
+            'href': req.href.build(build.config, build.id),
+            'chgset_href': req.href.changeset(build.rev)}
     if build.started:
-        hdf['started'] = format_datetime(build.started)
-        hdf['started_delta'] = pretty_timedelta(build.started)
-        hdf['duration'] = pretty_timedelta(build.started)
+        data['started'] = format_datetime(build.started)
+        data['started_delta'] = pretty_timedelta(build.started)
+        data['duration'] = pretty_timedelta(build.started)
     if build.stopped:
-        hdf['stopped'] = format_datetime(build.stopped)
-        hdf['stopped_delta'] = pretty_timedelta(build.stopped)
-        hdf['duration'] = pretty_timedelta(build.stopped, build.started)
-    hdf['slave'] = {
+        data['stopped'] = format_datetime(build.stopped)
+        data['stopped_delta'] = pretty_timedelta(build.stopped)
+        data['duration'] = pretty_timedelta(build.stopped, build.started)
+    data['slave'] = {
         'name': build.slave,
         'ipnr': build.slave_info.get(Build.IP_ADDRESS),
-        'os.name': build.slave_info.get(Build.OS_NAME),
-        'os.family': build.slave_info.get(Build.OS_FAMILY),
-        'os.version': build.slave_info.get(Build.OS_VERSION),
+        'os_name': build.slave_info.get(Build.OS_NAME),
+        'os_family': build.slave_info.get(Build.OS_FAMILY),
+        'os_version': build.slave_info.get(Build.OS_VERSION),
         'machine': build.slave_info.get(Build.MACHINE),
         'processor': build.slave_info.get(Build.PROCESSOR)
     }
-    return hdf
+    return data
 
 
 class BittenChrome(Component):
@@ -95,11 +81,9 @@
     def get_navigation_items(self, req):
         """Return the navigation item for access the build status overview from
         the Trac navigation bar."""
-        if not req.perm.has_permission('BUILD_VIEW'):
-            return
-        yield ('mainnav', 'build', \
-               Markup('<a href="%s" accesskey="5">Build Status</a>') %
-                      req.href.build())
+        if 'BUILD_VIEW' in req.perm:
+            yield ('mainnav', 'build',
+                   tag.a('Builds Status', href=req.href.build(), accesskey=5))
 
     # ITemplatesProvider methods
 
@@ -127,43 +111,44 @@
             return True
 
     def process_request(self, req):
-        req.perm.assert_permission('BUILD_VIEW')
+        req.perm.require('BUILD_VIEW')
 
         action = req.args.get('action')
         view = req.args.get('view')
         config = req.args.get('config')
 
         if config:
-            self._render_config(req, config)
+            data = self._render_config(req, config)
         elif view == 'inprogress':
-            self._render_inprogress(req)
+            data = self._render_inprogress(req)
         else:
-            self._render_overview(req)
+            data = self._render_overview(req)
 
         add_stylesheet(req, 'bitten/bitten.css')
-        return 'bitten_config.cs', None
+        return 'bitten_config.html', data, None
 
     # Internal methods
 
     def _render_overview(self, req):
-        req.hdf['title'] = 'Build Status'
+        data = {'title': 'Build Status'}
         show_all = False
         if req.args.get('show') == 'all':
             show_all = True
-        req.hdf['config.show_all'] = show_all
+        data['show_all'] = show_all
 
-        configs = BuildConfig.select(self.env, include_inactive=show_all)
-        for idx, config in enumerate(configs):
-            prefix = 'configs.%d' % idx
+        configs = []
+        for config in BuildConfig.select(self.env, include_inactive=show_all):
             description = config.description
             if description:
                 description = wiki_to_html(description, self.env, req)
-            req.hdf[prefix] = {
+            config_data = {
                 'name': config.name, 'label': config.label or config.name,
                 'active': config.active, 'path': config.path,
                 'description': description,
                 'href': req.href.build(config.name),
+                'builds': []
             }
+            configs.append(config_data)
             if not config.active:
                 continue
 
@@ -176,69 +161,74 @@
                 if rev != prev_rev:
                     if prev_rev is None:
                         chgset = repos.get_changeset(rev)
-                        req.hdf[prefix + '.youngest_rev'] = {
+                        config_data['youngest_rev'] = {
                             'id': rev, 'href': req.href.changeset(rev),
                             'author': chgset.author or 'anonymous',
                             'date': format_datetime(chgset.date),
                             'message': wiki_to_oneliner(
-                                shorten_line(chgset.message), self.env, req=req
-                            )
+                                shorten_line(chgset.message), self.env, req=req)
                         }
                     else:
                         break
                     prev_rev = rev
                 if build:
-                    build_hdf = _build_to_hdf(self.env, req, build)
-                    build_hdf['platform'] = platform.name
-                    req.hdf[prefix + '.builds.%d' % platform.id] = build_hdf
+                    build_data = _get_build_data(self.env, req, build)
+                    build_data['platform'] = platform.name
+                    config_data['builds'].append(build_data)
                 else:
-                    req.hdf[prefix + '.builds.%d' % platform.id] = {
+                    config_data['builds'].append({
                         'platform': platform.name, 'status': 'pending'
-                    }
+                    })
 
-        req.hdf['page.mode'] = 'overview'
+        data['configs'] = configs
+        data['page_mode'] = 'overview'
         add_link(req, 'views', req.href.build(view='inprogress'),
                  'In Progress Builds')
+        add_ctxtnav(req, 'In Progress Builds',
+                    req.href.build(view='inprogress'))
+        return data
 
     def _render_inprogress(self, req):
-        req.hdf['title'] = 'In Progress Builds'
+        data = {'title': 'In Progress Builds',
+                'page_mode': 'view-inprogress'}
 
         db = self.env.get_db_cnx()
 
-        configs = BuildConfig.select(self.env, include_inactive=False)
-        for idx, config in enumerate(configs):
+        configs = []
+        for config in BuildConfig.select(self.env, include_inactive=False):
+            self.log.debug(config.name)
             if not config.active:
                 continue
 
             in_progress_builds = Build.select(self.env, config=config.name,
                                               status=Build.IN_PROGRESS, db=db)
 
-            # sort correctly by revision.
-            builds = list(in_progress_builds)
-            builds.sort(lambda x, y: int(y.rev) - int(x.rev))
-            prefix = 'configs.%d' % idx
-
             current_builds = 0
-            for idx2, build in enumerate(builds):
-                prefix2 = '%s.builds.%d' % (prefix, idx2)
+            builds = []
+            # sort correctly by revision.
+            for build in sorted(in_progress_builds,
+                                cmp=lambda x, y: int(y.rev) - int(x.rev)):
                 rev = build.rev
-                req.hdf[prefix2] = _build_to_hdf(self.env, req, build)
-                req.hdf[prefix2 + '.rev'] = rev
-                req.hdf[prefix2 + '.rev_href'] = req.href.changeset(rev)
+                build_data = _get_build_data(self.env, req, build)
+                build_data['rev'] = rev
+                build_data['rev_href'] = req.href.changeset(rev)
                 platform = TargetPlatform.fetch(self.env, build.platform)
-                req.hdf[prefix2 + '.platform'] = platform.name
+                build_data['platform'] = platform.name
+                build_data['steps'] = []
 
                 for step in BuildStep.select(self.env, build=build.id, db=db):
-                    req.hdf['%s.steps.%s' % (prefix2, step.name)] = {
-                         'description': step.description,
-                         'duration': datetime.fromtimestamp(step.stopped) - \
-                                     datetime.fromtimestamp(step.started),
-                         'failed': not step.successful,
-                         'errors': step.errors,
-                         'href': req.hdf[prefix2 + '.href'] + '#step_' + step.name
-                    }
+                    build_data['steps'].append({
+                        'name': step.name,
+                        'description': step.description,
+                        'duration': datetime.fromtimestamp(step.stopped) - \
+                                    datetime.fromtimestamp(step.started),
+                        'failed': not step.successful,
+                        'errors': step.errors,
+                        'href': build_data['href'] + '#step_' + step.name
+                    })
 
-                current_builds = current_builds + 1
+                builds.append(build_data)
+                current_builds += 1
 
             if current_builds == 0: 
                 continue
@@ -246,26 +236,29 @@
             description = config.description
             if description:
                 description = wiki_to_html(description, self.env, req)
-            req.hdf[prefix] = {
+            configs.append({
                 'name': config.name, 'label': config.label or config.name,
                 'active': config.active, 'path': config.path,
                 'description': description,
                 'href': req.href.build(config.name),
-            }
+                'builds': builds
+            })
 
-        req.hdf['page.mode'] = 'view_inprogress'
+        data['configs'] = configs
+        return data
 
     def _render_config(self, req, config_name):
         db = self.env.get_db_cnx()
 
         config = BuildConfig.fetch(self.env, config_name, db=db)
-        req.hdf['title'] = 'Build Configuration "%s"' \
-                           % config.label or config.name
+        data = {'title': 'Build Configuration "%s"' \
+                          % config.label or config.name,
+                'page_mode': 'view_config'}
         add_link(req, 'up', req.href.build(), 'Build Status')
         description = config.description
         if description:
             description = wiki_to_html(description, self.env, req)
-        req.hdf['config'] = {
+        data['config'] = {
             'name': config.name, 'label': config.label, 'path': config.path,
             'min_rev': config.min_rev,
             'min_rev_href': req.href.changeset(config.min_rev),
@@ -274,12 +267,12 @@
             'active': config.active, 'description': description,
             'browser_href': req.href.browser(config.path)
         }
-        req.hdf['page.mode'] = 'view_config'
 
         platforms = list(TargetPlatform.select(self.env, config=config_name,
                                                db=db))
-        req.hdf['config.platforms'] = [
-            {'name': platform.name, 'id': platform.id} for platform in platforms
+        data['config']['platforms'] = [
+            {'name': platform.name, 'id': platform.id}
+            for platform in platforms
         ]
 
         has_reports = False
@@ -294,14 +287,14 @@
                     chart_generators.append({
                         'href': req.href.build(config.name, 'chart/' + category) 
                     })
-            req.hdf['config.charts'] = chart_generators 
+            data['config']['charts'] = chart_generators 
             charts_license = self.config.get('bitten', 'charts_license')
             if charts_license:
-                req.hdf['config.charts_license'] = charts_license
+                data['config']['charts_license'] = charts_license
 
         page = max(1, int(req.args.get('page', 1)))
         more = False
-        req.hdf['page.number'] = page
+        data['page_number'] = page
 
         repos = self.env.get_repository(req.authname)
         if hasattr(repos, 'sync'):
@@ -309,28 +302,31 @@
 
         builds_per_page = 12 * len(platforms)
         idx = 0
+        builds = {}
         for platform, rev, build in collect_changes(repos, config):
             if idx >= page * builds_per_page:
                 more = True
                 break
             elif idx >= (page - 1) * builds_per_page:
-                prefix = 'config.builds.%s' % rev
-                req.hdf[prefix + '.href'] = req.href.changeset(rev)
+                builds.setdefault(rev, {})
+                builds[rev].setdefault('href', req.href.changeset(rev))
                 if build and build.status != Build.PENDING:
-                    build_hdf = _build_to_hdf(self.env, req, build)
-                    req.hdf['%s.%s' % (prefix, platform.id)] = build_hdf
+                    build_data = _get_build_data(self.env, req, build)
+                    build_data['steps'] = []
                     for step in BuildStep.select(self.env, build=build.id,
                                                  db=db):
-                        req.hdf['%s.%s.steps.%s' % (prefix, platform.id,
-                                                    step.name)] = {
+                        build_data['steps'].append({
+                            'name': step.name,
                             'description': step.description,
                             'duration': datetime.fromtimestamp(step.stopped) - \
                                         datetime.fromtimestamp(step.started),
                             'failed': not step.successful,
                             'errors': step.errors,
-                            'href': build_hdf['href'] + '#step_' + step.name,
-                        }
+                            'href': build_data['href'] + '#step_' + step.name
+                        })
+                    builds[rev][platform.id] = build_data
             idx += 1
+        data['config']['builds'] = builds
 
         if page > 1:
             if page == 2:
@@ -341,6 +337,8 @@
         if more:
             next_href = req.href.build(config.name, page=page + 1)
             add_link(req, 'next', next_href, 'Next Page')
+        prevnext_nav(req, 'Page')
+        return data
 
 
 class BuildController(Component):
@@ -370,7 +368,7 @@
             return True
 
     def process_request(self, req):
-        req.perm.assert_permission('BUILD_VIEW')
+        req.perm.require('BUILD_VIEW')
 
         db = self.env.get_db_cnx()
         build_id = int(req.args.get('id'))
@@ -386,11 +384,12 @@
                  'Build Configuration')
         status2title = {Build.SUCCESS: 'Success', Build.FAILURE: 'Failure',
                         Build.IN_PROGRESS: 'In Progress'}
-        req.hdf['title'] = 'Build %s - %s' % (build_id,
-                                              status2title[build.status])
-        req.hdf['page.mode'] = 'view_build'
+        data = {'title': 'Build %s - %s' % (build_id,
+                                            status2title[build.status]),
+                'page_mode': 'view_build',
+                'build': {}}
         config = BuildConfig.fetch(self.env, build.config, db=db)
-        req.hdf['build.config'] = {
+        data['build']['config'] = {
             'name': config.label,
             'href': req.href.build(config.name)
         }
@@ -404,7 +403,7 @@
             categories = summarizer.get_supported_categories()
             summarizers.update(dict([(cat, summarizer) for cat in categories]))
 
-        req.hdf['build'] = _build_to_hdf(self.env, req, build)
+        data['build'].update(_get_build_data(self.env, req, build))
         steps = []
         for step in BuildStep.select(self.env, build=build.id, db=db):
             steps.append({
@@ -416,20 +415,21 @@
                 'reports': self._render_reports(req, config, build, summarizers,
                                                 step)
             })
-        req.hdf['build.steps'] = steps
-        req.hdf['build.can_delete'] = req.perm.has_permission('BUILD_DELETE')
+        data['build']['steps'] = steps
+        data['build']['can_delete'] = ('BUILD_DELETE' in req.perm)
 
         repos = self.env.get_repository(req.authname)
         chgset = repos.get_changeset(build.rev)
-        req.hdf['build.chgset_author'] = chgset.author
+        data['build']['chgset_author'] = chgset.author
 
+        add_script(req, 'bitten/tabset.js')
         add_stylesheet(req, 'bitten/bitten.css')
-        return 'bitten_build.cs', None
+        return 'bitten_build.html', data, None
 
     # ITimelineEventProvider methods
 
     def get_timeline_filters(self, req):
-        if req.perm.has_permission('BUILD_VIEW'):
+        if 'BUILD_VIEW' in req.perm:
             yield ('build', 'Builds')
 
     def get_timeline_events(self, req, start, stop, filters):
@@ -465,9 +465,8 @@
                     errors += [(step.name, error) for error
                                in step.errors]
 
-            title = Markup('Build of <em>%s [%s]</em> on %s %s') % (
-                label, rev, platform, _status_label[status]
-            )
+            title = tag('Build of ', tag.em('%s [%s]' % (label, rev)),
+                        ' on %s %s' % (platform, _status_label[status]))
             message = ''
             if req.args.get('format') == 'rss':
                 href = req.abs_href.build(config, id)
@@ -536,12 +535,12 @@
         for report in Report.select(self.env, build=build.id, step=step.name):
             summarizer = summarizers.get(report.category)
             if summarizer:
-                summary = summarizer.render_summary(req, config, build, step,
-                                                    report.category)
+                tmpl, data = summarizer.render_summary(req, config, build,
+                                                        step, report.category)
             else:
-                summary = None
+                tmpl = data = None
             reports.append({'category': report.category,
-                            'summary': Markup(summary)})
+                            'template': tmpl, 'data': data})
         return reports
 
 
@@ -565,13 +564,13 @@
 
         for generator in self.generators:
             if category in generator.get_supported_categories():
-                template = generator.generate_chart_data(req, config,
-                                                         category)
+                tmpl, data = generator.generate_chart_data(req, config,
+                                                           category)
                 break
         else:
             raise TracError('Unknown report category "%s"' % category)
 
-        return template, 'text/xml'
+        return tmpl, data, 'text/xml'
 
 
 class SourceFileLinkFormatter(Component):
@@ -609,7 +608,7 @@
             link = href(config.path, filepath)
             if m.group('line'):
                 link += '#L' + m.group('line')[1:]
-            return Markup(html.A(m.group(0), href=link))
+            return Markup(tag.a(m.group(0), href=link))
 
         def _formatter(step, type, level, message):
             buf = []

--- a/setup.py
+++ b/setup.py
@@ -38,7 +38,7 @@
     package_data = {
         'bitten': ['htdocs/*.*',
                    'htdocs/charts_library/*.swf',
-                   'templates/*.cs']
+                   'templates/*.html']
     },
     test_suite = 'bitten.tests.suite',
     entry_points = {
@@ -62,6 +62,7 @@
             NS + 'c#configure = bitten.build.ctools:configure',
             NS + 'c#autoreconf = bitten.build.ctools:autoreconf',
             NS + 'c#cppunit = bitten.build.ctools:cppunit',
+            NS + 'c#cunit = bitten.build.ctools:cunit',
             NS + 'c#gcov = bitten.build.ctools:gcov',
             NS + 'c#make = bitten.build.ctools:make',
             NS + 'java#ant = bitten.build.javatools:ant',

deleted file mode 100644
--- a/trac-0.11/COPYING
+++ /dev/null
@@ -1,36 +0,0 @@
-Copyright (C) 2007 Edgewall Software
-Copyright (C) 2005-2007 Christopher Lenz
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
- 3. The name of the author may not be used to endorse or promote
-    products derived from this software without specific prior
-    written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-====================================================================
-
-This software includes a copy of XML/SWF charts, which is
-Copyright (C) 2004-2005 maani.us
-See http://www.maani.us/xml_charts/index.php?menu=License for more
-information.

deleted file mode 100644
--- a/trac-0.11/ChangeLog
+++ /dev/null
@@ -1,71 +0,0 @@
-Version 0.6
-(?, from 0.6.x branch)
-http://svn.edgewall.org/repos/bitten/tags/0.6.0
-
- * Switch to using HTTP for communication between the build master and build
-   slaves. This means the `build-master` executable is no longer needed or
-   installed, the build simply runs in the scope of the Trac site.
- * Build recipes now need to include instructions for performing the checkout 
-   from the version control repository. The slave no longer receives a snapshot
-   archive of the code, but performs the checkout itself based on the 
-   instructions in the build recipe.
- * Many fixes for compatibility with more recent versions of Trac.
-
-
-Version 0.5.3
-(18 April 2006, from 0.5.x branch)
-http://svn.edgewall.org/repos/bitten/tags/0.5.3
-
- * Fix double-escaping of report summaries.
- * Fix build master error when build log contains no messages.
-
-
-Version 0.5.2
-(17 January 2006, from 0.5.x branch)
-http://svn.edgewall.org/repos/bitten/tags/0.5.2
-
- * Fixes the main navigation tab that was broken in 0.5.1.
-
-
-Version 0.5.1
-(10 January 2006, from 0.5.x branch)
-http://svn.edgewall.org/repos/bitten/tags/0.5.1
-
- * Fixes compatibility with Trac 0.9.3 release, as well as the current trunk.
-   This also means that Bitten now longer works with versions of Trac earlier
-   than 0.9.3.
- * Improves PostgreSQL compatibility.
- * Fixes encoding of non-ASCII characters in command output.
- * Fix for missing log output when using <java:ant> on Windows.
-
-
-Version 0.5
-(6 October 2005, from 0.5.x branch)
-http://svn.edgewall.org/repos/bitten/tags/0.5
-
- * BDB XML is no longer being used for report storage. Instead,
-   collected metrics data is stored in the Trac database.
- * Snapshot archives created by the master are checked for integrity
-   prior to their transmission to the slaves.
- * Improvements to the build status presentation in Trac.
- * Changes to the build recipe format. See the documentation on the web
-   site for details.
- * New recipe commands: <sh:pipe>, <c:configure>, <c:cppunit>,
-   <java:ant>, <java:junit>, and <x:transform>. Various improvements to
-   the existing commands.
- * Recipe commands and command attributes in recipes can now reference
-   slave configuration values.
- * The names of the master and slaves scripts have changed: `bittend`
-   is now `bitten-master`, `bitten` is now `bitten-slave`.
- * The build master can now handle multiple Trac environments.
- * The build slave now by default removes any working directories when
-   done.
- * Build configurations can now be completely deleted.
- * Build configurations can now have a minimum and maximum revision
-   specified. Any revisions outside that range will not be built.
- * The build configuration editor now validates the supplied values.
- * Fix management of target platforms when running under mod_python.
- * Improved performance of the build log formatter that is responsible
-   for linking file references in build logs to the repository browser.
- * Add paging to the build configuration view.
- * Fix compatibility with PySQLite2.

deleted file mode 100644
--- a/trac-0.11/MANIFEST.in
+++ /dev/null
@@ -1,2 +0,0 @@
-include doc/api/*.*
-include doc/*.html

deleted file mode 100644
--- a/trac-0.11/README.txt
+++ /dev/null
@@ -1,141 +0,0 @@
-About Bitten
-============
-
-Bitten is a simple distributed continuous integration system that not only
-coordinates builds across multiple machines, but also collects software
-metrics generated by builds, to enable feedback and reporting about
-the progress of a software project.
-
-The Bitten software consists of three separate parts:
- * The build slave, which executes builds on behalf of a local or remote
-   build master
- * The build master, which orchestrates builds for a project across all
-   connected slaves, and stores the build status and results to the
-   database
- * The web interface, which is implemented as an add-on to Trac
-   (http://trac.edgewall.com/) and provides a build management interface
-   as well as presentation of build results.
-
-Both the build master and the web interface depend on Trac 0.10, and need
-to be installed on the same machine, together with the Subversion
-repository. The build slave only requires Python (>= 2.3), setuptools
-(>= 0.6a2),  as well as any tools required by the build process itself. A
-build slave may be run on any machine that can connect to the server
-running the Bitten build master.
-
-
-Installation
-------------
-
-Bitten is written in Python, so make sure that you have Python installed.
-You'll need Python 2.3 or later. Also, make sure that setuptools
-(http://peak.telecommunity.com/DevCenter/setuptools), version 0.6a2 or later,
-is installed.
-
-If that's taken care of, you just need to download and unpack the Bitten
-distribution, and execute the command:
-
-  $ python setup.py install
-
-from the top of the directory where you unpacked (or checked out) the Bitten
-code. Note that you may need administrator/root privileges for this step, as
-it will by default attempt to install Bitten to the Python site-packages
-directory on your system.
-
-It's also a good idea to run the unit tests at this point, to make sure that
-the code works as expected on your platform:
-
-  $ python setup.py test
-
-
-What's left to do now depends on whether you want to use the build master and
-web interface, or just the build slave. In the latter case, you're already
-done. You might need to install software that the build of your project
-requires, but the Bitten build slave itself doesn't require anything extra.
-
-For the build master and web interface, you'll need to install Trac 0.10 or
-later. Please refer to the Trac documentation for information on how it is
-installed.
-
-
-Build Master Configuration
---------------------------
-
-Once both Bitten and Trac are installed and working, you'll have to introduce
-Bitten to your Trac project environment. If you don't have a  Trac project
-set up yet, you'll need to do so in order to use Bitten.
-
-If you already have a Trac project environment, the Bitten plugin needs to be
-explicitly enabled in the Trac configuration. This is done by adding it to the
-[components] section in /path/to/projenv/conf/trac.ini:
-
-  [components]
-  bitten.* = enabled
-
-The Trac web interface should now inform you with an error message that the
-environment needs to be upgraded. To do this, run:
-
-  $ trac-admin /path/to/projenv upgrade
-
-This will create the database tables and directories that Bitten requires.
-You probably also want to grant permissions to someone (such as yourself)
-to manage build configurations, and allow anonymous users to view the
-status and results of builds:
-
-  $ trac-admin /path/to/projenv permission add anonymous BUILD_EXEC
-  $ trac-admin /path/to/projenv permission add anonymous BUILD_VIEW
-  $ trac-admin /path/to/projenv permission add [yourname] BUILD_ADMIN
-
-You should now see an additional tab labeled "Build Status" in the Trac
-navigation bar. This link will take you to the list of build configurations,
-which at this point is of course empty. If you've set up permissions
-correctly as described previously, you should see a button for adding new
-build configurations. Click that button and fill out the form. Also, add
-at least one target platform after saving the configuration. Last but not
-least, you'll have to "activate" the build configuration.
-
-
-Running the Build Master
-------------------------
-
-At this point, you're ready to start the Bitten build master. The
-installation of Bitten should have put a `bitten-master` executable on your
-path. If the script is not on your path, look for it in the `bin` or
-`scripts` subdirectory of your Python installation.
-
-To find out about the options and arguments of the master, execute it with
-the `--help` option as follows:
-
-  $ bitten-master --help
-
-Most commonly, you'll want to specify the log level and log file, as well as
-the path to the Trac environment:
-
-  $ bitten-master --verbose --log=/var/log/bittend /var/trac/myproject
-
-
-Running the Build Slave
------------------------
-
-The build slave can be run on any machine that can connect to the machine
-on which the build master is running. The installation of Bitten should have put
-a `bitten-slave` executable on your path. If the script is not on your path,
-look for it in the `bin` or `scripts` subdirectory of your Python installation.
-
-To get a list of options for the build slave, execute it with the `--help`
-option:
-
-  $ bitten-slave --help
-
-To run the build slave against a Bitten-enabled Trac site installed at 
-http://myproject.example.org/trac, you'd run:
-
-  $ bitten-slave http://myproject.example.org/trac/builds
-
-
-More Information
-----------------
-
-For further documentation, please see the Bitten website at:
-
-  <http://bitten.cmlenz.net/>