diff --git a/app/web/src/components/Seo/Seo.tsx b/app/web/src/components/Seo/Seo.tsx
index 7c8adc5..9a951bc 100644
--- a/app/web/src/components/Seo/Seo.tsx
+++ b/app/web/src/components/Seo/Seo.tsx
@@ -1,9 +1,9 @@
 import { Helmet } from 'react-helmet'
 
 const Seo = ({
-  title,
-  description,
-  lang,
+  title = "CadHub",
+  description = "Edit this part of CadHub",
+  lang = 'en-US',
   socialImageUrl,
 }: {
   title: string
@@ -20,12 +20,25 @@ const Seo = ({
         title={title}
         titleTemplate={`Cadhub - ${title}`}
       >
-        <meta property="og:locale" content={lang} />
+        <title>{title || 'cadhub'}</title>
+        <meta name="description" content={description} />
+
+        {/*  Facebook Meta Tags */}
+        <meta property="og:url" content={location.href} />
+        <meta property="og:type" content="website" />
         <meta property="og:title" content={title} />
         <meta property="og:description" content={description} />
-        <meta name="description" content={description} />
         <meta property="og:image" content={socialImageUrl} />
-        <title>Cadhub - {title}</title>
+
+        {/* Twitter Meta Tags */}
+        <meta name="twitter:card" content="summary_large_image" />
+        <meta property="twitter:domain" content="cadhub.xyz" />
+        <meta property="twitter:url" content={location.href} />
+        <meta name="twitter:title" content={title} />
+        <meta name="twitter:description" content={description} />
+        <meta name="twitter:image" content={socialImageUrl} />
+
+        <meta property="og:locale" content={lang} />
       </Helmet>
     </>
   )
diff --git a/app/web/src/index.html b/app/web/src/index.html
index a8dc4ed..ea5a410 100644
--- a/app/web/src/index.html
+++ b/app/web/src/index.html
@@ -6,7 +6,11 @@
     <meta name="keywords" content="cadhub, app, application, web application, cad, code, code-cad, cad-modeling, community, website, cascade studio, openscad" />
     <meta property="og:type" content="website" />
     <meta name="robots" content="index, follow" />
-    <title><%= htmlWebpackPlugin.options.title %></title>
+    <title>CadHub</title>
+    <meta property="og:description" content="A community hub for CodeCAD parts, OpenSCAD, CadQuery and more" />
+    <meta name="twitter:card" content="summary_large_image" />
+    <meta property="twitter:domain" content="cadhub.xyz" />
+    <meta property="og:locale" content={lang} />
   </head>
   <body>
     <div id="redwood-app">
