Add more hardcore force repainting