Moved more definitions to styles.