Handle multiple visual formats in cart + fixes in theme initialization