diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig b/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig
index 59f8bdb9a..c785a3670 100644
--- a/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig
@@ -4,29 +4,7 @@
 <!-- To the Future! -->
 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
-<!-- Meta Tags -->
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width"/>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="generator" content="{{ config_get('streams::distribution.name') }}"/>
-<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
-<meta name="description" content="{{ trans(template.meta_description) }}"/>
-
-{% block ogdata %}
-    <meta property="og:site_name"
-          content="{{ template.get('og_site_name', setting_value('streams::name', config_get('streams::distribution.name'))) }}"/>
-    <meta property="og:description" content="{{ template.get('og_description', trans(template.meta_description)) }}"/>
-    <meta property="og:title" content="{{ template.get('og_title', trans(template.meta_title)) }}"/>
-    <meta property="og:url" content="{{ template.get('og_url', url_current()) }}"/>
-    <meta property="og:image" content="{{ template.get('og_image') }}"/>
-    <meta property="og:type" content="website"/>
-{% endblock %}
-
-<title>
-    {{ setting_value('streams::name', config_get('streams::distribution.name')) }}
-    &#8250;
-    {{ trans(template.meta_title) }}
-</title>
+{% include "visiosoft.theme.base::partials/metatags" %}
 
 <!-- Favicon -->
 {#{{ favicons("theme::img/favicon.png") }}#}
diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig b/addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig
new file mode 100644
index 000000000..3a0518888
--- /dev/null
+++ b/addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig
@@ -0,0 +1,16 @@
+<!-- Meta Tags -->
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width"/>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="generator" content="{{ config_get('streams::distribution.name') }}"/>
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<meta name="description" content="{{ trans(template.meta_description) }}"/>
+<!-- Meta Tags -->
+
+<title>
+    {{ setting_value('streams::name', config_get('streams::distribution.name')) }}
+    &#8250;
+    {{ trans(template.meta_title) }}
+</title>
+
+{% include "visiosoft.theme.base::partials/ogdata" %}
diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/ogdata.twig b/addons/default/visiosoft/base-theme/resources/views/partials/ogdata.twig
new file mode 100644
index 000000000..381f7f9d9
--- /dev/null
+++ b/addons/default/visiosoft/base-theme/resources/views/partials/ogdata.twig
@@ -0,0 +1,9 @@
+{% block ogdata %}
+    <meta property="og:site_name"
+          content="{{ template.get('og_site_name', setting_value('streams::name', config_get('streams::distribution.name'))) }}"/>
+    <meta property="og:description" content="{{ template.get('og_description', trans(template.meta_description)) }}"/>
+    <meta property="og:title" content="{{ template.get('og_title', trans(template.meta_title)) }}"/>
+    <meta property="og:url" content="{{ template.get('og_url', url_current()) }}"/>
+    <meta property="og:image" content="{{ template.get('og_image') }}"/>
+    <meta property="og:type" content="website"/>
+{% endblock %}
\ No newline at end of file