standardize bundle => theme mapping across presets #3226