Incorporated track color fix from upstream
Fixed to use default track already implemented upstream
Fixed merge conflicts