finishing first pass at the theme