update product and rebase theme