Theme dependency check fixes for #931