diff --git a/gatsby-config.js b/gatsby-config.js
index 3e0d24e6..2f3207ba 100644
--- a/gatsby-config.js
+++ b/gatsby-config.js
@@ -6,7 +6,6 @@ module.exports = {
     },
     plugins: [
         'gatsby-plugin-emotion',
-        'gatsby-plugin-react-helmet',
         {
             resolve: 'gatsby-source-filesystem',
             options: {
diff --git a/package-lock.json b/package-lock.json
index 89070262..d9a7f1c8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,12 +12,10 @@
         "@babel/core": "^7.26.0",
         "@emotion/react": "^11.13.3",
         "@emotion/styled": "^11.13.0",
-        "@types/react-helmet": "^6.1.11",
         "env-cmd": "^10.1.0",
         "gatsby": "^5.13.7",
         "gatsby-plugin-catch-links": "^5.13.1",
         "gatsby-plugin-emotion": "^8.13.1",
-        "gatsby-plugin-react-helmet": "^6.13.1",
         "gatsby-remark-autolink-headers": "^6.13.1",
         "gatsby-remark-external-links": "0.0.4",
         "gatsby-remark-prismjs": "^7.13.2",
@@ -28,7 +26,6 @@
         "prismjs": "^1.29.0",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
-        "react-helmet": "^6.1.0",
         "react-tweet-embed": "^2.0.0",
         "react-twitter-embed": "^4.0.4",
         "reactjs-popup": "^2.0.6",
@@ -4246,14 +4243,6 @@
         "csstype": "^3.0.2"
       }
     },
-    "node_modules/@types/react-helmet": {
-      "version": "6.1.11",
-      "resolved": "https://registry.npmjs.org/@types/react-helmet/-/react-helmet-6.1.11.tgz",
-      "integrity": "sha512-0QcdGLddTERotCXo3VFlUSWO3ztraw8nZ6e3zJSgG7apwV5xt+pJUS8ewPBqT4NYB1optGLprNQzFleIY84u/g==",
-      "dependencies": {
-        "@types/react": "*"
-      }
-    },
     "node_modules/@types/responselike": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.3.tgz",
@@ -9658,21 +9647,6 @@
         "gatsby": "^5.0.0-next"
       }
     },
-    "node_modules/gatsby-plugin-react-helmet": {
-      "version": "6.13.1",
-      "resolved": "https://registry.npmjs.org/gatsby-plugin-react-helmet/-/gatsby-plugin-react-helmet-6.13.1.tgz",
-      "integrity": "sha512-Fwgf2UDOo1LQgw1vUmGmDMK5hXVrIXDR92URzu4DylQWgyfycfQ3D9FdU2JZ8jB6F3OI6Yx6YHC7zL3OAL7iOw==",
-      "dependencies": {
-        "@babel/runtime": "^7.20.13"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      },
-      "peerDependencies": {
-        "gatsby": "^5.0.0-next",
-        "react-helmet": "^5.1.3 || ^6.0.0"
-      }
-    },
     "node_modules/gatsby-plugin-typescript": {
       "version": "5.13.1",
       "resolved": "https://registry.npmjs.org/gatsby-plugin-typescript/-/gatsby-plugin-typescript-5.13.1.tgz",
@@ -15002,25 +14976,6 @@
       "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz",
       "integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg=="
     },
-    "node_modules/react-fast-compare": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.2.tgz",
-      "integrity": "sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ=="
-    },
-    "node_modules/react-helmet": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/react-helmet/-/react-helmet-6.1.0.tgz",
-      "integrity": "sha512-4uMzEY9nlDlgxr61NL3XbKRy1hEkXmKNXhjbAIOVw5vcFrsdYbH2FEwcNyWvWinl103nXgzYNlns9ca+8kFiWw==",
-      "dependencies": {
-        "object-assign": "^4.1.1",
-        "prop-types": "^15.7.2",
-        "react-fast-compare": "^3.1.1",
-        "react-side-effect": "^2.1.0"
-      },
-      "peerDependencies": {
-        "react": ">=16.3.0"
-      }
-    },
     "node_modules/react-is": {
       "version": "16.13.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
@@ -15062,14 +15017,6 @@
         "node": ">=0.4.0"
       }
     },
-    "node_modules/react-side-effect": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-2.1.2.tgz",
-      "integrity": "sha512-PVjOcvVOyIILrYoyGEpDN3vmYNLdy1CajSFNt4TDsVQC5KpTijDvWVoR+/7Rz2xT978D8/ZtFceXxzsPwZEDvw==",
-      "peerDependencies": {
-        "react": "^16.3.0 || ^17.0.0 || ^18.0.0"
-      }
-    },
     "node_modules/react-tweet-embed": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/react-tweet-embed/-/react-tweet-embed-2.0.0.tgz",
diff --git a/package.json b/package.json
index 74a448d2..e1ba5995 100644
--- a/package.json
+++ b/package.json
@@ -16,12 +16,10 @@
     "@babel/core": "^7.26.0",
     "@emotion/react": "^11.13.3",
     "@emotion/styled": "^11.13.0",
-    "@types/react-helmet": "^6.1.11",
     "env-cmd": "^10.1.0",
     "gatsby": "^5.13.7",
     "gatsby-plugin-catch-links": "^5.13.1",
     "gatsby-plugin-emotion": "^8.13.1",
-    "gatsby-plugin-react-helmet": "^6.13.1",
     "gatsby-remark-autolink-headers": "^6.13.1",
     "gatsby-remark-external-links": "0.0.4",
     "gatsby-remark-prismjs": "^7.13.2",
@@ -32,7 +30,6 @@
     "prismjs": "^1.29.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-helmet": "^6.1.0",
     "react-tweet-embed": "^2.0.0",
     "react-twitter-embed": "^4.0.4",
     "reactjs-popup": "^2.0.6",
diff --git a/src/layouts/basehead.js b/src/layouts/basehead.js
new file mode 100644
index 00000000..473bd473
--- /dev/null
+++ b/src/layouts/basehead.js
@@ -0,0 +1,26 @@
+import React from 'react'
+import useSiteMetadata from '../hooks/use-site-metadata'
+import AppleTouchIcon from '../resources/apple-touch-icon.png'
+import Favicon from '../resources/theia-favicon.svg'
+import Favicon196 from '../resources/theia-favicon-196x196.png'
+
+const BaseHead = ({ canonical }) => {
+    const { title, description } = useSiteMetadata()
+    return (
+      <>
+        <html lang="en" />
+        <title>{title}</title>
+        <meta name="description" content={description} />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <meta name="theme-color" content="#FFFFFF" />
+        {canonical && <link rel="canonical" href={`https://theia-ide.org${canonical}`} />}
+        <link rel="apple-touch-icon" type="image/png" href={AppleTouchIcon} sizes="180x180" />
+        <link rel="icon" type="image/png" href={Favicon196} sizes="196x196" />
+        <link rel="icon" type="image/svg+xml" href={Favicon} sizes="any" />
+        <link href="https://fonts.googleapis.com/css?family=Anonymous+Pro&display=swap" rel="stylesheet" />
+        <link href="https://fonts.googleapis.com/css?family=Montserrat:400,500&display=swap" rel="stylesheet" />
+      </>
+    )
+}
+
+export default BaseHead
diff --git a/src/layouts/headwithschema.js b/src/layouts/headwithschema.js
new file mode 100644
index 00000000..932a9dfc
--- /dev/null
+++ b/src/layouts/headwithschema.js
@@ -0,0 +1,94 @@
+import React from 'react'
+import BaseHead from './basehead'
+
+const HeadWithSchema = ({ canonical }) => (
+  <>
+    <BaseHead canonical={canonical} />
+    {/* JSON-LD for Theia IDE */}
+    <script
+      type="application/ld+json"
+      dangerouslySetInnerHTML={{
+        __html: JSON.stringify({
+          "@context": "https://schema.org",
+          "@type": "SoftwareApplication",
+          "name": "Theia IDE",
+          "url": "https://theia-ide.org/#theiaide",
+          "image": "https://theia-ide.org/static/TheiaIDE.png",
+          "description": "Theia IDE is a modern, open-source, and flexible development environment (IDE) for developers on desktop and browser, featuring advanced AI-powered capabilities with full control over AI interactions.",
+          "operatingSystem": "Linux, macOS, Windows",
+          "applicationCategory": "DeveloperApplication",
+          "applicationSubCategory": "IntegratedDevelopmentEnvironment",
+          "softwareVersion": "1.55.0",
+          "softwareRequirements": "Compatible with VS Code extensions",
+          "author": {
+            "@type": "Organization",
+            "name": "Eclipse Foundation",
+            "url": "https://www.eclipse.org/"
+          },
+          "publisher": {
+            "@type": "Organization",
+            "name": "Eclipse Foundation",
+            "url": "https://www.eclipse.org/"
+          },
+          "releaseNotes": "https://eclipsesource.com/blogs/2024/11/07/eclipse-theia-1-54-release-news-and-noteworthy/",
+          "keywords": [
+            "open-source IDE",
+            "development environment",
+            "AI-powered IDE",
+            "VS Code extensions",
+            "VS Code alternative"
+          ],
+          "license": "Eclipse Public License 2.0",
+          "featureList": [
+            "AI-powered",
+            "Open-source",
+            "Compatible with VS Code extensions",
+            "Cross-platform support",
+            "Runs in browser and desktop environments"
+          ]
+        })
+      }}
+    />
+    {/* JSON-LD for Theia Platform */}
+    <script
+      type="application/ld+json"
+      dangerouslySetInnerHTML={{
+        __html: JSON.stringify({
+          "@context": "https://schema.org",
+          "@type": "SoftwareApplication",
+          "name": "Theia Platform",
+          "url": "https://theia-ide.org/",
+          "image": "https://theia-ide.org/static/TheiaPlatform.png",
+          "description": "Theia Platform is an extensible open-source framework for building customizable integrated development environments (IDEs) for desktop and web.",
+          "applicationCategory": "DeveloperApplication",
+          "applicationSubCategory": "FrameworkApplication",
+          "softwareRequirements": "Compatible with VS Code extensions",
+          "operatingSystem": "Linux, macOS, Windows",
+          "author": {
+            "@type": "Organization",
+            "name": "Eclipse Foundation",
+            "url": "https://www.eclipse.org/"
+          },
+          "publisher": {
+            "@type": "Organization",
+            "name": "Eclipse Foundation",
+            "url": "https://www.eclipse.org/"
+          },
+          "keywords": [
+            "custom IDE", "build custom IDE", "custom IDE Framework",
+            "alternative VS Code", "alternative Code OSS", "build custom tool",
+            "custom tool framework"
+          ],
+          "license": "Eclipse Public License 2.0",
+          "featureList": [
+            "AI-powered", "Open-source", "Build tailored IDEs and Tools",
+            "Cross-platform support", "VS Code extension compatibility",
+            "Desktop, browser and cloud support"
+          ]
+        })
+      }}
+    />
+  </>
+)
+
+export default HeadWithSchema
diff --git a/src/layouts/layout.js b/src/layouts/layout.js
index bcec79a9..3386df6e 100644
--- a/src/layouts/layout.js
+++ b/src/layouts/layout.js
@@ -16,19 +16,11 @@
 
 import React from 'react'
 import { Global, css } from '@emotion/react'
-import Helmet from 'react-helmet'
-import useSiteMetadata from '../hooks/use-site-metadata'
 import { fontSizes, colors, grid, breakpoints } from '../utils/variables'
-import Favicon from '../resources/theia-favicon.svg'
-import Favicon196 from '../resources/theia-favicon-196x196.png'
-import AppleTouchIcon from '../resources/apple-touch-icon.png'
+const Layout = ({ children }) => (
+  <>
+    <Global styles={css`
 
-
-const Layout = ({ children, canonical }) => {
-    const { title, description } = useSiteMetadata()
-    return (
-        <>
-            <Global styles={css`
                 /* --------------------------------------------- */
                 /* ----- Basic Setup ----- */
                 /* --------------------------------------------- */
@@ -191,29 +183,11 @@ const Layout = ({ children, canonical }) => {
                     border: 1px solid #cfcece;
                     outline: none;
                 }
-                
-
-            `} />
-            <Helmet>
-                <html lang='en' />
-                <title>{title}</title>
-                <meta name='description' content={description} />
-                <meta name="viewport" content="width=device-width, initial-scale=1" />
-                <meta name="theme-color" content="#FFFFFF" />
-                {
-                    canonical ? <link rel="canonical" href={`https://theia-ide.org${canonical}`} /> : null
-                }
-                <link rel="apple-touch-icon" type="image/png" href={AppleTouchIcon} sizes="180x180"/>
-                <link rel="icon" type="image/png" href={Favicon196} sizes="196x196"/>
-                <link rel="icon" type="image/svg+xml" href={Favicon} sizes="any"/>
-                <link href="https://fonts.googleapis.com/css?family=Anonymous+Pro&display=swap" rel="stylesheet" />
-                <link href="https://fonts.googleapis.com/css?family=Montserrat:400,500&display=swap" rel="stylesheet" />
-            </Helmet>
-            <>
-                {children}
-            </>
-        </>
-    )
-}
-
-export default Layout
\ No newline at end of file
+    `} />
+    <>
+      {children}
+    </>
+  </>
+)
+
+export default Layout
diff --git a/src/pages/404.js b/src/pages/404.js
index 19281b74..cf93eeba 100644
--- a/src/pages/404.js
+++ b/src/pages/404.js
@@ -24,6 +24,7 @@ import styled from '@emotion/styled'
 import { breakpoints } from '../utils/variables'
 import Nav from '../components/Nav'
 import { Link } from 'gatsby'
+import BaseHead from '../layouts/basehead'
 
 const StyledNotFoundPage = styled.div`
     background-image: url(${Background});
@@ -63,6 +64,8 @@ const StyledNotFoundPage = styled.div`
     }
 
 `
+export const Head = BaseHead
+
 
 const NotFoundPage = () => (
     <Layout>
diff --git a/src/pages/blogs.js b/src/pages/blogs.js
index 89ecec8c..e83f8752 100644
--- a/src/pages/blogs.js
+++ b/src/pages/blogs.js
@@ -18,6 +18,11 @@ import React from 'react'
 import Layout from '../layouts/layout'
 import Blogs from '../components/Blogs'
 import Footer from '../components/Footer'
+import BaseHead from '../layouts/basehead'
+
+
+export const Head = BaseHead
+
 
 export default () => {
     return (
diff --git a/src/pages/docs.js b/src/pages/docs.js
index 4418fd91..13e31284 100644
--- a/src/pages/docs.js
+++ b/src/pages/docs.js
@@ -17,6 +17,7 @@
 import React from 'react'
 import DocsLayout from '../layouts/docs-layout'
 import { graphql } from 'gatsby'
+import BaseHead from '../layouts/basehead'
 
 export const query = graphql`
     query {
@@ -31,6 +32,7 @@ export const query = graphql`
         }
     }
 `
+export const Head = BaseHead
 
 const Docs = ({ data }) => {
     const context =  { next: "/docs/architecture/", nextTitle: "Architecture Overview" }
diff --git a/src/pages/index.js b/src/pages/index.js
index a3b8562d..615fd403 100644
--- a/src/pages/index.js
+++ b/src/pages/index.js
@@ -29,7 +29,9 @@ import TheiaIDEHeader from '../components/index/TheiaIDEHeader'
 import VSCodeExtensions from '../components/index/VSCodeExtensions'
 import TheiaIDEDownloads from '../components/index/TheiaIDEDownloads'
 import TheiaIDEExtensible from '../components/index/TheiaIDEExtensible'
+import HeadWithSchema from '../layouts/headwithschema'
 
+export const Head = HeadWithSchema
 
 export default ({ pageContext }) => {
     return (
diff --git a/src/pages/releases.js b/src/pages/releases.js
index de9fe6ef..a06e3f6e 100644
--- a/src/pages/releases.js
+++ b/src/pages/releases.js
@@ -18,6 +18,9 @@ import React from 'react'
 import Layout from '../layouts/layout'
 import Releases from '../components/Releases'
 import Footer from '../components/Footer'
+import BaseHead from '../layouts/basehead'
+
+export const Head = BaseHead
 
 export default () => {
     return (
diff --git a/src/pages/resources.js b/src/pages/resources.js
index 06a82342..2b2c46f5 100644
--- a/src/pages/resources.js
+++ b/src/pages/resources.js
@@ -18,6 +18,9 @@ import React from 'react'
 import Layout from '../layouts/layout'
 import Resources from '../components/Resources'
 import Footer from '../components/Footer'
+import BaseHead from '../layouts/basehead'
+
+export const Head = BaseHead
 
 export default () => {
     return (
diff --git a/src/pages/support.js b/src/pages/support.js
index cbbc934d..a6453e4c 100644
--- a/src/pages/support.js
+++ b/src/pages/support.js
@@ -18,6 +18,10 @@ import React from 'react'
 import Layout from '../layouts/layout'
 import Support from '../components/Support'
 import Footer from '../components/Footer'
+import BaseHead from '../layouts/basehead'
+
+
+export const Head = BaseHead
 
 export default () => {
     return (
diff --git a/src/templates/doc.js b/src/templates/doc.js
index 316b551c..9ae36a53 100644
--- a/src/templates/doc.js
+++ b/src/templates/doc.js
@@ -18,6 +18,7 @@ import React from 'react'
 import DocsLayout from '../layouts/docs-layout'
 import { graphql } from 'gatsby'
 import { getMenuContext } from '../docs/menu'
+import BaseHead from '../layouts/basehead'
 
 export const query = graphql`
   query($slug: String) {
@@ -32,6 +33,7 @@ export const query = graphql`
     }
   }
 `
+export const Head = BaseHead
 
 const DocTemplate = ({ data }) => {
     const slug = data.markdownRemark.fields.slug
diff --git a/static/TheiaIDE.png b/static/TheiaIDE.png
new file mode 100644
index 00000000..4379f33e
Binary files /dev/null and b/static/TheiaIDE.png differ
diff --git a/static/TheiaPlatform.png b/static/TheiaPlatform.png
new file mode 100644
index 00000000..9d470775
Binary files /dev/null and b/static/TheiaPlatform.png differ