Improved shader replacement