Got mapping right. Just use vixen_basic from now on.
merge stuff.