master
Work on highlighting, introduced highlight max distance
Revert: e5b6619 - bring back polymorphism to value formatters
If we are at it - rename those interfaces too