Added Orange Fade

Added in support to shift to Orange
Code re-factor

re-factored colour changing routine to avoid code duplication and make
it easier to read and maintain.