massive update to theme