REL-2115: cleanup -- the theme isn't green anymore