diff --git a/error.html b/error.html
index 81b5d00..b3ac86c 100644
--- a/error.html
+++ b/error.html
@@ -1,5 +1,5 @@
 <!Doctype HTML>
-<html lang="en" itemscope itemtype="http://schema.org/WebApplication">
+<html lang="en">
 <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
@@ -9,7 +9,7 @@
 <body>
     <div class="wrapper">
         <div class="main">
-            <h1><img itemprop="image" class="logo" src="img/logo.png"
+            <h1><img class="logo" src="img/logo.png"
             alt="AllTube Download" width="328" height="284"></h1>
             <div>An error occurred in the application and your page could not be served. Please try again in a few moments.</div>
         </div>
diff --git a/maintenance.html b/maintenance.html
index f7ba7a5..cae4766 100644
--- a/maintenance.html
+++ b/maintenance.html
@@ -1,5 +1,5 @@
 <!Doctype HTML>
-<html lang="en" itemscope itemtype="http://schema.org/WebApplication">
+<html lang="en">
 <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
@@ -9,7 +9,7 @@
 <body>
     <div class="wrapper">
         <div class="main">
-            <h1><img itemprop="image" class="logo" src="img/logo.png"
+            <h1><img class="logo" src="img/logo.png"
             alt="AllTube Download" width="328" height="284"></h1>
             <div>This application is undergoing maintenance right now. Please check back later.</div>
         </div>
diff --git a/templates/footer.tpl b/templates/footer.tpl
index 8dcf4dd..cdbb327 100644
--- a/templates/footer.tpl
+++ b/templates/footer.tpl
@@ -1,10 +1,10 @@
 </div>
 <footer>
     <div class="footer_wrapper">
-     Code by <a rel="author" target="blank" itemprop="author"
+     Code by <a rel="author" target="blank"
         href="http://rudloff.pro/">Pierre Rudloff</a>
      &middot; Design by
-     <a rel="author" itemprop="author" target="blank"
+     <a rel="author" target="blank"
         href="http://olivierhaquette.fr">Olivier Haquette</a>
      &middot;
      <a target="_blank"
diff --git a/templates/head.tpl b/templates/head.tpl
index 061e0ad..68f052f 100644
--- a/templates/head.tpl
+++ b/templates/head.tpl
@@ -1,5 +1,5 @@
 <!Doctype HTML>
-<html lang="en" itemscope itemtype="http://schema.org/WebApplication">
+<html lang="en">
 <head>
 <meta charset="UTF-8" />
 <meta name=viewport content="width=device-width, initial-scale=1">
@@ -8,8 +8,7 @@
 <link rel="author" href="https://plus.google.com/110403274854419000481?rel=author" />
 <link rel="author" href="https://plus.google.com/103696815796116179392?rel=author" />
 <link href="https://plus.google.com/108799967445657477255" rel="publisher" />
-<title itemprop="name">AllTube Download</title>
-<meta itemprop="url" content="{base_url|noscheme}" />
+<title>AllTube Download</title>
 <link rel="canonical" href="//{$smarty.server.HTTP_HOST|cat:$smarty.server.REQUEST_URI|replace:{base_url|noscheme}:'http://www.alltubedownload.net'}" />
 <link rel="icon" href="{base_url|noscheme}/img/favicon.png" />
 <meta property="og:url" content="{base_url|noscheme}" />
@@ -22,9 +21,6 @@
 <meta name="twitter:creator" content="@Tael67" />
 <meta name="twitter:description" content="Easily download videos from Youtube, Dailymotion, Vimeo and other websites." />
 <script type="text/javascript" src="https://www.gstatic.com/cv/js/sender/v1/cast_sender.js"></script>
-<meta itemprop="applicationCategory" content="Download" />
-<meta itemprop="operatingSystem" content="Linux" />
-<meta itemprop="operatingSystem" content="Mac OS X" />
 <meta name="theme-color" content="#4F4F4F">
 <link rel="manifest" href="manifest.json" />
 </head>
diff --git a/templates/index.tpl b/templates/index.tpl
index f91a55e..b4e273d 100644
--- a/templates/index.tpl
+++ b/templates/index.tpl
@@ -1,5 +1,5 @@
     <div class="main">
-    <div><img itemprop="image" class="logo" src="{base_url|noscheme}/img/logo.png"
+    <div><img class="logo" src="{base_url|noscheme}/img/logo.png"
     alt="AllTube Download" width="328" height="284"></div>
     <form action="{path_for name="video"}">
     <label class="labelurl" for="url">
diff --git a/templates/video.tpl b/templates/video.tpl
index 2e0191f..470b44f 100644
--- a/templates/video.tpl
+++ b/templates/video.tpl
@@ -19,7 +19,13 @@
     alt="Casting to ChromeCast…" title="Stop casting"
     id="cast_btn_stop" class="cast_btn cast_hidden cast_icon" /></p>
 {if isset($video->thumbnail)}
-    <img itemprop="image" class="thumb" src="{$video->thumbnail}" alt="" />
+    <img itemprop="thumbnailUrl" class="thumb" src="{$video->thumbnail}" alt="" />
+{/if}
+{if isset($video->description)}
+    <meta itemprop="description" content="{$video->description|escape}" />
+{/if}
+{if isset($video->upload_date)}
+    <meta itemprop="uploadDate" content="{$video->upload_date}" />
 {/if}
 <br/>
 {if isset($video->formats)}
