Add aliases to all options
Fix template option checking logic