Merge "fix decor color selection"