Revert "upstream: fixed problems with RGB images in maps"

This reverts commit 6f185f37ee7f5262b81ede310d0667df8e735786.
fix kerning
random fixes