Synchronize with mainstream theme (commit edfb3d6)