Fix a couple of small theming bugs, plus some new handlers from adrian. These need some adjustments still but I wanted to get them in as a start.