- Add some color blocks
- Move some class
- Reorganize code