Map: Implemented fixed palette matching

Reverted last commit change