Add the separator into span to handle styles
Active generator install
Merge branch 'feature_active_generator'
Merge branch 'feature_better_separator'