Add @<cmd>
Handle aside (>)
Add option handling to @<fig>, @<tbl> and @<list>