analytics added, theme-setup removed