--- a/getAgency.php
+++ b/getAgency.php
@@ -13,8 +13,8 @@
         if (is_array($value)) {
             echo "<ol>";
             foreach ($value as $subkey => $subvalue) {
-                if (isset($schemas['agency']["properties"][$key]['x-itemprop'])) {
-                echo '<li itemprop="' . $schemas['agency']["properties"][$key]['x-itemprop'] . '">';
+                if (isset($schemas['agency']["properties"][$key]['x-property'])) {
+                echo '<li property="' . $schemas['agency']["properties"][$key]['x-property'] . '">';
             } else {
                 echo "<li>";
             }
@@ -22,8 +22,8 @@
             }
             echo "</ol></td></tr>";
         } else {
-            if (isset($schemas['agency']["properties"][$key]['x-itemprop'])) {
-                echo '<span itemprop="' . $schemas['agency']["properties"][$key]['x-itemprop'] . '">';
+            if (isset($schemas['agency']["properties"][$key]['x-property'])) {
+                echo '<span property="' . $schemas['agency']["properties"][$key]['x-property'] . '">';
             } else {
                 echo "<span>";
             }
@@ -128,7 +128,7 @@
     }
     
     if ($mode == "view") {
-        echo '<div itemscope itemtype ="http://schema.org/GovernmentOrganisation"><table width="100%">';
+        echo '<div typeof="schema:GovernmentOrganisation" about="#' . $row['_id'] . '"><table width="100%">';
         echo '<tr> <td colspan="2"><h3>' . $row['name'] . "</h3></td></tr>";
         echo "<tr><th>Field Name</th><th>Field Value</th></tr>";
     }
@@ -178,15 +178,19 @@
           } */
         $rows = $db->get_view("app", "byName")->rows;
         //print_r($rows);
+echo '<ul>';
         foreach ($rows as $row) {
             //   print_r($row);
-            echo '<li itemscope itemtype="http://schema.org/GovernmentOrganization"><a href="getAgency.php?id=' . $row->value . '" itemprop="url"><span itemprop="name">' .
+            echo '<li typeof="schema:GovernmentOrganisation foaf:Organization" about="getAgency.php?id=' . $row->value . '">
+<a href="getAgency.php?id=' . $row->value . '" rel="schema:url foaf:page" property="schema:name foaf:name">' .
             $row->key
-            . '</span></a></li>';
+            . '</a></li>';
         }
+echo "</ul>";
     } catch (SetteeRestClientException $e) {
         setteErrorHandler($e);
     }
 }
 include_footer();
 ?>
+


--- a/include/template.inc.php
+++ b/include/template.inc.php
@@ -33,7 +33,7 @@
             <![endif]-->
 
         </head>
-        <body>
+        <body xmlns:schema="http://schema.org/"  xmlns:foaf="http://xmlns.com/foaf/0.1/">
 
             <!-- navBar -->
             <div id="navbar" class="container">
@@ -70,10 +70,11 @@
             <script src="<?php echo $basePath; ?>javascripts/app.js"></script>
             <script src="http://code.jquery.com/jquery-1.7.1.min.js"></script>
             
-    <!--<script language="javascript" type="text/javascript" src="javascripts/jquery.js"></script>-->
-    <script language="javascript" type="text/javascript" src="javascripts/flot/jquery.flot.js"></script>
+    <!--<script type="text/javascript" src="javascripts/jquery.js"></script>-->
+    <script type="text/javascript" src="javascripts/flot/jquery.flot.js"></script>
 
         </body>
     </html>
 
 <?php }
+


--- a/schemas/agency.json.php
+++ b/schemas/agency.json.php
@@ -4,18 +4,18 @@
     "description" => "Representation of government agency and online transparency measures",
     "type" => "object",
     "properties" => Array(
-        "name" => Array("type" => "string", "required" => true, "x-itemprop" => "name", "x-title" => "Name", "description" => "Name, most recent and broadest"),
+        "name" => Array("type" => "string", "required" => true, "x-property" => "schema:name foaf:name", "x-title" => "Name", "description" => "Name, most recent and broadest"),
         "shortName" => Array("type" => "string", "required" => false, "x-title" => "Short Name", "description" => "Name shortened, usually to an acronym"),
         "foiEmail" => Array("type" => "string", "required" => false, "x-title" => "FOI Contact Email", "description" => "FOI contact email if not foi@"),
-        "sameAs" => Array("type" => "array", "required" => false, "x-itemprop"=>"http://www.w3.org/2002/07/owl#sameAs","x-title" => "Same As", "description" => "Same as other URLs/URIs for this entity",
+        "sameAs" => Array("type" => "array", "required" => false, "x-property"=>"owl:sameAs","x-title" => "Same As", "description" => "Same as other URLs/URIs for this entity",
             "items" => Array("type" => "string")),
         "otherNames" => Array("type" => "array", "required" => true, "x-title" => "Past/Other Names", "description" => "Other names for organisation",
             "items" => Array("type" => "string")),
-        "foiBodies" => Array("type" => "array", "required" => true, "x-title" => "FOI Bodies","x-itemprop"=>"members",  "description" => "Organisational units within this agency that are subject to FOI Act but are not autonomous",
+        "foiBodies" => Array("type" => "array", "required" => true, "x-title" => "FOI Bodies","x-property"=>"schema:members foaf:knows",  "description" => "Organisational units within this agency that are subject to FOI Act but are not autonomous",
             "items" => Array("type" => "string")),
         "orgType" => Array("type" => "string", "required" => true, "x-title" => "Organisation Type", "description" => "Org type based on legal formation via FMA/CAC legislation etc."),
         "parentOrg" => Array("type" => "string", "required" => true, "x-title" => "Parent Organisation", "description" => "Parent organisation, usually a department of state"),
-        "website" => Array("type" => "string", "required" => true, "x-title" => "Website", "x-itemprop" => "url", "description" => "Website URL"),
+        "website" => Array("type" => "string", "required" => true, "x-title" => "Website", "x-property" => "schema:url foaf:homepage", "description" => "Website URL"),
         "abn" => Array("type" => "string", "required" => true, "x-title" => "Australian Business Number", "description" => "ABN from business register"),
         "contractListURL" => Array("type" => "string", "required" => true, "x-title" => "Contract Listing", "description" => "Departmental and agency contracts, <a href='http://www.aph.gov.au/senate/pubs/standing_orders/d05.htm'>mandated by the Senate</a>"),
         "grantsReportingURL" => Array("type" => "string", "required" => true, "x-title" => "Grants Awarded",