New update to generic theme