Add overrides for primary and auxiliary window classes