AvantGuard Repaints and Enhancements