Updated Theme according to the new markup