Reestructured theme

Changed to default rules of W3C