Basis for the FSM system
ColorExtensions & general code cleaning
Merge branch 'feature-FSM'