Changed theme layout to the new style