New tools and generator
Fix bug? On new generator
Resolve conflicts
DI refactoring in tools
FIX DI on GraoTools
Adjust generator:app theme paths and some clean up