Reordered Paint Heirarchy to better support a wider range of paints