diff --git a/res/template/file_viewer.html b/res/template/file_viewer.html
index e8bdf8d..faae323 100644
--- a/res/template/file_viewer.html
+++ b/res/template/file_viewer.html
@@ -11,6 +11,7 @@
 		<link rel="shortcut icon" href="/res/img/tray32.png"/>
 		<link rel="icon" sizes="180x180" href="/res/img/pixeldrain.png"/>
 		<link rel="icon" sizes="256x256" href="/res/img/pixeldrain_big.png"/>
+		<meta name="theme-color" content="#75AD38"/>
 
 		<!-- <link rel="alternate" type="application/json+oembed" th:href="*{oEmbedHref}" th:title="*{ogTitle}" /> OEmbed will return soon -->
 
diff --git a/res/template/fragments/meta_tags.html b/res/template/fragments/meta_tags.html
index 9b0ac15..acc1bdc 100644
--- a/res/template/fragments/meta_tags.html
+++ b/res/template/fragments/meta_tags.html
@@ -4,20 +4,20 @@
 <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
 <link rel="stylesheet" href="/res/style/layout.css"/>
 <link rel="shortcut icon" href="/res/img/tray32.png"/>
-<meta name="theme-color" content="#9FCF6C"/>
+<meta name="theme-color" content="#75AD38"/>
 <link rel="icon" sizes="180x180" href="/res/img/pixeldrain.png"/>
 <link rel="icon" sizes="256x256" href="/res/img/pixeldrain_big.png"/>
 {{template "bgpattern"}}
 
-<meta name="description" content="PixelDrain is a free file sharing service, you
+<meta name="description" content="Pixeldrain is a free file sharing service, you
 	  can upload any file and you will be given a shareable link right away.
 	  PixelDrain also supports previews for images, videos, audio, PDFs and much more.
 	  Uncensored, unmonitored and unmoderated."/>
 <meta property="og:type" content="website" />
-<meta property="og:title" content="{{.}} ~ PixelDrain" />
-<meta property="og:site_name" content="PixelDrain" />
+<meta property="og:title" content="{{.}} ~ pixeldrain" />
+<meta property="og:site_name" content="pixeldrain" />
 <meta property="og:description" content="Instant file and screenshot sharing." />
-<meta property="og:url" content="http://pixeldra.in/" />
+<meta property="og:url" content="http://pixeldrain.com/" />
 <meta property="og:image" content="/res/img/pixeldrain_big.png" />
 <meta property="og:image:type" content="image/png" />
 {{end}}
diff --git a/webcontroller/opengraph.go b/webcontroller/opengraph.go
index 69b33e1..a5bdeaf 100644
--- a/webcontroller/opengraph.go
+++ b/webcontroller/opengraph.go
@@ -37,14 +37,21 @@ func (o linkRule) HTML() template.HTML {
 func metadataFromFile(f pixelapi.FileInfo) (meta template.HTML) {
 	meta += ogRule{"og:title", f.Name}.HTML()
 	meta += ogRule{"og:site_name", "pixeldrain"}.HTML()
-	meta += ogRule{"og:description", "View '" + f.Name + "' on Pixeldrain"}.HTML()
-	meta += ogRule{"description", "View '" + f.Name + "' on Pixeldrain"}.HTML()
+	meta += ogRule{"og:description", "View '" + f.Name + "' on pixeldrain"}.HTML()
+	meta += ogRule{"description", "View '" + f.Name + "' on pixeldrain"}.HTML()
 	meta += ogRule{"og:url", "/u/" + f.ID}.HTML()
+	meta += twitterRule{"twitter:title", f.Name}.HTML()
+	meta += twitterRule{"twitter:site", "@Fornax96"}.HTML()
+	meta += twitterRule{"twitter:domain", "pixeldrain.com"}.HTML()
 
 	if strings.HasPrefix(f.MimeType, "image") {
 		meta += ogRule{"og:type", "article"}.HTML()
 		meta += ogRule{"og:image", "/api/file/" + f.ID}.HTML()
+		meta += ogRule{"og:image:url", "/api/file/" + f.ID}.HTML()
+		meta += ogRule{"og:image:secure_url", "/api/file/" + f.ID}.HTML()
+		meta += ogRule{"og:image:type", f.MimeType}.HTML()
 
+		meta += twitterRule{"twitter:card", "summary_large_image"}.HTML()
 		meta += twitterRule{"twitter:image", "/api/file/" + f.ID}.HTML()
 		meta += linkRule{"image_src", "/api/file/" + f.ID}.HTML()
 	} else if strings.HasPrefix(f.MimeType, "video") {
@@ -76,12 +83,15 @@ func metadataFromList(l pixelapi.List) (meta template.HTML) {
 	meta += ogRule{"og:type", "website"}.HTML()
 	meta += ogRule{"og:title", l.Title}.HTML()
 	meta += ogRule{"og:site_name", "pixeldrain"}.HTML()
-	meta += ogRule{"og:description", "View '" + l.Title + "' on Pixeldrain"}.HTML()
-	meta += ogRule{"description", "View '" + l.Title + "' on Pixeldrain"}.HTML()
+	meta += ogRule{"og:description", "View '" + l.Title + "' on pixeldrain"}.HTML()
+	meta += ogRule{"description", "View '" + l.Title + "' on pixeldrain"}.HTML()
 	meta += ogRule{"og:url", "/l/" + l.ID}.HTML()
 	meta += ogRule{"og:image", "/api/file/" + l.Files[0].ID + "/thumbnail"}.HTML()
 	meta += ogRule{"og:image:url", "/api/file/" + l.Files[0].ID + "/thumbnail"}.HTML()
 	meta += twitterRule{"twitter:image", "/api/file/" + l.Files[0].ID + "/thumbnail"}.HTML()
+	meta += twitterRule{"twitter:title", l.Title}.HTML()
+	meta += twitterRule{"twitter:site", "@Fornax96"}.HTML()
+	meta += twitterRule{"twitter:domain", "pixeldrain.com"}.HTML()
 	meta += linkRule{"image_src", "/api/file/" + l.Files[0].ID + "/thumbnail"}.HTML()
 	return meta
 }