added theme preview and some updates