Update definitions for colour macros

Colour macros now colour the entire argument, rather than just the first
letter
Add ElGamal definitions