Paintpot Enhancements