Changed error checking
Fail early
Fixed themes path
Removed node-dev
Refactoring