Themes fully integrated