Single xml solution - compatibility with skill-set and special-set

Mana-mantis: #506.