Theme count analysis additions