Bug fixes & Theme Generator Update