Custom scheme change again