Re-indentation
Add highlights for spell components