add more themes, more tidying