more deep pack to avoid conflicts with themes from psi-plus