First version with right colors and right font
Merge branch 'casita/blocks-separation'