Updating old layouts to new theme layout, still need to combine the common parts.