A bit more work on themes.