Combine the Mokee files into either Current CM ones or standard and also add
Missing color.

Change-Id: I0b8d9d5b9e3f3acee91c3fd2210eb9b2c36b04f9