<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
  <head>
    <title>{{title}}</title>
    <meta charset="utf-8"/>
    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
    <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,300italic,400,400italic,600,600italic|Ubuntu+Mono:400" rel="stylesheet" type="text/css"/>
    <link rel="stylesheet" href="{{site_url}}/site.css" type="text/css"/>
    <link rel="icon" href="" type="image/png"/>
    <script type="text/javascript" src="{{site_url}}/site.js" defer="defer"></script>
    {{extra_headers}}
  </head>
  <body>
    <div id="-head">
      <div id="-head-content">
        {{path_navigation}}
      </div>
    </div>
    <div id="-body">
      <div id="-body-content">
    
@inner_template@
    
      </div>
    </div>
    <div id="-foot">
      <div id="-foot-content">
      </div>
    </div>
  </body>
</html>

<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
  <head>
    <title>{{title}}</title>
    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,300italic,400,400italic,600,600italic|Ubuntu+Mono:400" type="text/css"/>
    <link rel="stylesheet" href="{{site_url}}/site.css" type="text/css"/>
    <link rel="icon" href="" type="image/png"/>
    <script type="text/javascript" src="{{site_url}}/site.js" defer="defer"></script>

@extra_headers@

  </head>
  <body>
    <div id="-head">
      <div id="-head-content">
        {{path_navigation}}
      </div>
    </div>
    <div id="-body">
      <div id="-body-content">

@inner_template@

      </div>
    </div>
    <div id="-foot">
      <div id="-foot-content">
      </div>
    </div>
  </body>
</html>

Fix the extra_headers replaceable; minor cleanup
Fix the extra_headers replaceable; minor cleanup
