Sorting by name from command works now. Also fixed command highlighting.
Fixed merge conflict.