fix bug in add to cart + added changes for #184 and more
fix on theme option change