Pull logic into skills_with_modes and skills_without_modes
Pull logic into skills-with-modes and skills-without-modes templates