Remove unneeded configuration options.
Re-arrange styles and style data.