Changed the mechanism of adding themes, now user can add as many theme as he wants