Copied styles from 0.9.6 branch.