2nd attempt at custom repaint

[jena]

Thanks for the awesome resources, I'm feeling more confident to give this a go now!