remaining fixes for custom color pickers, thanks neekfenwick, fixes #16881 !strict