Fix issues with default colour form field
Update doc blocks