Added Marked support and Hex Color Picker