Fixes #754, differentiate neighboring theme blocks