[DEV] Review THEME management to support sepatrated color from shader