Fixed 'no themes' message when themes selected
Fixed double theme/product bug