Theme Editor: Fixed some more code generation bugs