theme: fix expansion for removed users/hashes