Updating demo
Updating theme and utils