#21956 improved photoshop hooks.