Merge branch 'colorpalette'

Signed-off-by: anthonime <schiochetanthoni@gmail.com>