Improved support for "none" color in previews
Improved support for "none" color in previews