Final version includes cleaned-up sceondary themes