Colours in manuals function added
Added s. and o. aliases
conflict resolved
Resolved conflicts