AAIII!! theme/theme contains both generated files and a live rules.xml
checkin mix of generated and non-generated diazo stuff untill we've splitted that out
debugging nav rendering WIP