Pick up theme bugfix