Revisions to broken-theme per Rob's review