Fix #1732 and #1735. Prepare webui for new colors