Add v5 ThemeManager