updated theme to be based on generic theme
merged