Merge "Clean up styles and aliases"