Pull don't give up the cat improvements here

[ericoporto]

I recently used this to make don't give up the cat, but did lots of performance improvements when doing so. It would be nice to refactor and filter what can go here.

Probably will need to drop bitmap rendering and keep only the hardware accelerated way so I can simplify the code when doing so.