For the home page at least:

(I'll be working on the other pages and their associated templates sometime soon, I hope)
Update: Nearly all done - just a few old bits that don't get rebuilt. I think I'm done.
<--break-->