Re-work code that colors selected and to-be-added elements so it implements the decorator pattern.