Updated theme to be one bundle