Themed shouts and locations. Minor improvements in controllers.