Fixed copyright in scaffold
Improved theme module resolving