brick generate data fix, theme change