Update to reflect themes