tidying up themes