Update to most recent calipso template structures and update theme to work with aloha.