Major refactor of style architecture.