fixing up themes