Add upstream change + repeatable field + colorpicker