adjusting theme css after failure to merge