diff --git a/templates/default.html b/templates/default.html
index e58926e..8cd3c47 100644
--- a/templates/default.html
+++ b/templates/default.html
@@ -5,7 +5,7 @@
     <meta content="{{ appname }}" property="og:title" />
     <meta content="{{ message }}" property="og:description" />
     <meta content="{{ repo }}" property="og:url" />
-    <meta content="{{ color }}" name="theme-color" />
+    <meta content="{{ color }}"  name="theme-color" />
     <meta http-equiv = "refresh" content = "0; url = {{ repo }}" />
 {% endblock %}
 
diff --git a/templates/index.html b/templates/index.html
index 934c3dc..348f208 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -15,6 +15,7 @@
     <meta name="twitter:player:height"              content="480" />
     <meta name="twitter:player:stream"              content="{{ vidurl }}" />
     <meta name="twitter:player:stream:content_type" content="video/mp4" /> 
+
     
     <meta property="og:url"                content="{{ vidlink }}" />
     <meta property="og:video"              content="{{ vidurl }}" />
@@ -22,11 +23,10 @@
     <meta property="og:video:type"         content="video/mp4" />
     <meta property="og:video:width"        content="720" />
     <meta property="og:video:height"       content="480" />
-    <meta property="og:description"        content="{{ desc }}" />
+    <meta property="og:title"              content="{{ user }}" />
+    <!--<meta property="og:description"        content="{{ desc }}" />!-->
     <meta property="og:image"              content="{{ pic }}" />
 
-    <meta name="description"               content="{{ desc }}" />
-
         <!--!-->
     <link rel="alternate" href="{{ url }}/oembed.json?desc={{ urlUser }}&user={{ urlDesc }}&link={{ urlLink }}" type="application/json+oembed" title="{{ user }}">
     <meta http-equiv = "refresh" content = "0; url = {{ vidlink }}" />
diff --git a/templates/video.html b/templates/video.html
index 0c6300d..f2c81a7 100644
--- a/templates/video.html
+++ b/templates/video.html
@@ -2,7 +2,7 @@
 
 {% block head %}
     <meta content='text/html; charset=UTF-8' http-equiv='Content-Type' />
-    <meta content="{{ color }}" name="theme-color" />
+    <meta content="{{ color }}"  name="theme-color" />
     <meta property="og:site_name" content="{{ appname }}">
 
     <meta name="twitter:card"                       content="player" />
@@ -19,8 +19,8 @@
     <meta property="og:video:type"         content="video/mp4" />
     <meta property="og:video:width"        content="720" />
     <meta property="og:video:height"       content="480" />
+    <meta name="twitter:title"             content="{{ user }} (@{{ screenName }})"  />
     <meta property="og:image"              content="{{ pic }}" />
-    <meta name="description"               content="{{ desc }}" />
 
     <link rel="alternate" href="{{ url }}/oembed.json?desc={{ urlUser }}&user={{ urlDesc }}&link={{ urlLink }}&ttype=video" type="application/json+oembed" title="{{ user }}">
     <meta http-equiv = "refresh" content = "0; url = {{ vidlink }}" />