Finally the finishing parts came for the light switch switch, a real light switch on the right and above a 2x2 RGB LED button pad from Sparkfun.  At the minute the programming is proving a little tricky as there is so much multiplexing to be done but I'm sure IL get it sorted eventually.  Next job is designing a case for this lot.