HIGHWIRE: Added more theming