margin var for branch
Advanced color gestion
Refactor template objects + fix colors