Added missing color support to mobile controls
Move color preview box in to addColorPicker function to make it easier to maintain