Added the Theme mapping and attendant classes.