diff --git a/docs/clear/conf.rst b/docs/clear/conf.rst
index 4c2cd9e..5db5c92 100644
--- a/docs/clear/conf.rst
+++ b/docs/clear/conf.rst
@@ -39,5 +39,24 @@ The **conf.py** file that generates this documentation.
             'otherpages/rightpage'
         ],
         'source_root': 'https://github.com/Thecarisma/themata/edit/test/docs/clear/',
-        'source_root_edit_text': 'Edit on Github'
+        'source_root_edit_text': 'Edit on Github',
+        'metadata': {
+            "enable": True,
+            "url": "https://thecarisma.github.io/themata",
+            "type": "website",
+            "title": "Set of Highly customizable sphinx themes.",
+            "description": "Themata package contains different sphinx theme that can be easily customized to look like a complete website or just a documentation webpage.",
+            "image": "https://github.com/raw/Thecarisma/themata/main/docs/images/themata.small.png",
+            "keywords": "python, sphinx, thecarisma, themata, documentation, markdown, rst, themes",
+            "author": "Adewale Azeez"
+        },
+        'twitter_metadata': {
+            "enable": True,
+            "card": "summary",
+            "site": "@iamthecarisma",
+            "creator": "@iamthecarisma",
+            "title": "Set of Highly customizable sphinx themes.",
+            "description": "Themata package contains different sphinx theme that can be easily customized to look like a complete website or just a documentation webpage.",
+            "image": "https://github.com/raw/Thecarisma/themata/main/docs/images/themata.small.png",
+        }
     }
\ No newline at end of file
diff --git a/docs/fandango/conf.rst b/docs/fandango/conf.rst
index c0215f5..5e27102 100644
--- a/docs/fandango/conf.rst
+++ b/docs/fandango/conf.rst
@@ -55,6 +55,12 @@ The **conf.py** file that generates this documentation.
                 ]
             }
         ],
+        'navbar_links': [
+            ('Twitter', 'https://twitter.com/iamthecarisma'),
+            ('Github', 'https://github.com/Thecarisma/themata/'),
+            ("Introduction", "general/introduction"),
+            ("FAQ", "general/faq")
+        ],
         'social_icons': [
             ('fab fa-twitter', 'https://twitter.com/iamthecarisma'),
             ('fab fa-github', 'https://github.com/Thecarisma/themata/')
@@ -72,5 +78,24 @@ The **conf.py** file that generates this documentation.
             'singlepage'
         ],
         'source_root': 'https://github.com/Thecarisma/themata/edit/test/docs/fandango/',
-        'source_root_edit_text': 'Edit on Github'
+        'source_root_edit_text': 'Edit on Github',
+        'metadata': {
+            "enable": True,
+            "url": "https://thecarisma.github.io/themata",
+            "type": "website",
+            "title": "Set of Highly customizable sphinx themes.",
+            "description": "Themata package contains different sphinx theme that can be easily customized to look like a complete website or just a documentation webpage.",
+            "image": "https://github.com/raw/Thecarisma/themata/main/docs/images/themata.small.png",
+            "keywords": "python, sphinx, thecarisma, themata, documentation, markdown, rst, themes",
+            "author": "Adewale Azeez"
+        },
+        'twitter_metadata': {
+            "enable": True,
+            "card": "summary",
+            "site": "@iamthecarisma",
+            "creator": "@iamthecarisma",
+            "title": "Set of Highly customizable sphinx themes.",
+            "description": "Themata package contains different sphinx theme that can be easily customized to look like a complete website or just a documentation webpage.",
+            "image": "https://github.com/raw/Thecarisma/themata/main/docs/images/themata.small.png",
+        }
     }
\ No newline at end of file
diff --git a/docs/fluid/conf.rst b/docs/fluid/conf.rst
index 3401c82..8104603 100644
--- a/docs/fluid/conf.rst
+++ b/docs/fluid/conf.rst
@@ -24,7 +24,9 @@ The **conf.py** file that generates this documentation.
         'collapsible_sidebar_display': 'block',
         'navbar_links': [
             ('Twitter', 'https://twitter.com/iamthecarisma'),
-            ('Github', 'https://github.com/Thecarisma/themata/')
+            ('Github', 'https://github.com/Thecarisma/themata/'),
+            ("Introduction", "general/introduction"),
+            ("FAQ", "general/faq")
         ],
         'has_left_sidebar': True,
         'has_right_sidebar': True,
@@ -71,5 +73,24 @@ The **conf.py** file that generates this documentation.
             'otherpages/rightpage'
         ],
         'source_root': 'https://github.com/Thecarisma/themata/edit/test/docs/fluid/',
-        'source_root_edit_text': 'Edit on Github'
+        'source_root_edit_text': 'Edit on Github',
+        'metadata': {
+            "enable": True,
+            "url": "https://thecarisma.github.io/themata",
+            "type": "website",
+            "title": "Set of Highly customizable sphinx themes.",
+            "description": "Themata package contains different sphinx theme that can be easily customized to look like a complete website or just a documentation webpage.",
+            "image": "https://github.com/raw/Thecarisma/themata/main/docs/images/themata.small.png",
+            "keywords": "python, sphinx, thecarisma, themata, documentation, markdown, rst, themes",
+            "author": "Adewale Azeez"
+        },
+        'twitter_metadata': {
+            "enable": True,
+            "card": "summary",
+            "site": "@iamthecarisma",
+            "creator": "@iamthecarisma",
+            "title": "Set of Highly customizable sphinx themes.",
+            "description": "Themata package contains different sphinx theme that can be easily customized to look like a complete website or just a documentation webpage.",
+            "image": "https://github.com/raw/Thecarisma/themata/main/docs/images/themata.small.png",
+        }
     }
\ No newline at end of file
diff --git a/docs/garri/conf.rst b/docs/garri/conf.rst
index c5798bf..55e37a2 100644
--- a/docs/garri/conf.rst
+++ b/docs/garri/conf.rst
@@ -26,5 +26,24 @@ The **conf.py** file that generates this documentation.
         ],
         'toc_title': 'Other Topics',
         'source_root': 'https://github.com/Thecarisma/themata/edit/test/docs/garri/',
-        'source_root_edit_text': 'Edit on Github'
+        'source_root_edit_text': 'Edit on Github',
+        'metadata': {
+            "enable": True,
+            "url": "https://thecarisma.github.io/themata",
+            "type": "website",
+            "title": "Set of Highly customizable sphinx themes.",
+            "description": "Themata package contains different sphinx theme that can be easily customized to look like a complete website or just a documentation webpage.",
+            "image": "https://github.com/raw/Thecarisma/themata/main/docs/images/themata.small.png",
+            "keywords": "python, sphinx, thecarisma, themata, documentation, markdown, rst, themes",
+            "author": "Adewale Azeez"
+        },
+        'twitter_metadata': {
+            "enable": True,
+            "card": "summary",
+            "site": "@iamthecarisma",
+            "creator": "@iamthecarisma",
+            "title": "Set of Highly customizable sphinx themes.",
+            "description": "Themata package contains different sphinx theme that can be easily customized to look like a complete website or just a documentation webpage.",
+            "image": "https://github.com/raw/Thecarisma/themata/main/docs/images/themata.small.png",
+        }
     }
\ No newline at end of file
diff --git a/docs/hackish/conf.rst b/docs/hackish/conf.rst
index 4280c7e..90b23c2 100644
--- a/docs/hackish/conf.rst
+++ b/docs/hackish/conf.rst
@@ -22,7 +22,9 @@ The **conf.py** file that generates this documentation.
         'show_navigators_in_index': False,
         'navbar_links': [
             ('Twitter', 'https://twitter.com/iamthecarisma'),
-            ('Github', 'https://github.com/Thecarisma/themata/')
+            ('Github', 'https://github.com/Thecarisma/themata/'),
+            ("Introduction", "general/introduction"),
+            ("FAQ", "general/faq")
         ],
         'has_left_sidebar': True,
         'show_navigators': True,
@@ -66,5 +68,24 @@ The **conf.py** file that generates this documentation.
         ],
         'toc_title': 'Other Topics',
         'source_root': 'https://github.com/Thecarisma/themata/edit/test/docs/hackish/',
-        'source_root_edit_text': 'Edit on Github'
+        'source_root_edit_text': 'Edit on Github',
+        'metadata': {
+            "enable": True,
+            "url": "https://thecarisma.github.io/themata",
+            "type": "website",
+            "title": "Set of Highly customizable sphinx themes.",
+            "description": "Themata package contains different sphinx theme that can be easily customized to look like a complete website or just a documentation webpage.",
+            "image": "https://github.com/raw/Thecarisma/themata/main/docs/images/themata.small.png",
+            "keywords": "python, sphinx, thecarisma, themata, documentation, markdown, rst, themes",
+            "author": "Adewale Azeez"
+        },
+        'twitter_metadata': {
+            "enable": True,
+            "card": "summary",
+            "site": "@iamthecarisma",
+            "creator": "@iamthecarisma",
+            "title": "Set of Highly customizable sphinx themes.",
+            "description": "Themata package contains different sphinx theme that can be easily customized to look like a complete website or just a documentation webpage.",
+            "image": "https://github.com/raw/Thecarisma/themata/main/docs/images/themata.small.png",
+        }
     }
\ No newline at end of file
diff --git a/docs/milkish/conf.rst b/docs/milkish/conf.rst
index a771260..2cd4412 100644
--- a/docs/milkish/conf.rst
+++ b/docs/milkish/conf.rst
@@ -24,7 +24,9 @@ The **conf.py** file that generates this documentation.
         'collapsible_sidebar_display': 'block',
         'navbar_links': [
             ('Twitter', 'https://twitter.com/iamthecarisma'),
-            ('Github', 'https://github.com/Thecarisma/themata/')
+            ('Github', 'https://github.com/Thecarisma/themata/'),
+            ("Introduction", "general/introduction"),
+            ("FAQ", "general/faq")
         ],
         'has_left_sidebar': True,
         'has_right_sidebar': True,
@@ -71,5 +73,24 @@ The **conf.py** file that generates this documentation.
             'otherpages/rightpage'
         ],
         'source_root': 'https://github.com/Thecarisma/themata/edit/test/docs/milkish/',
-        'source_root_edit_text': 'Edit on Github'
+        'source_root_edit_text': 'Edit on Github',
+        'metadata': {
+            "enable": True,
+            "url": "https://thecarisma.github.io/themata",
+            "type": "website",
+            "title": "Set of Highly customizable sphinx themes.",
+            "description": "Themata package contains different sphinx theme that can be easily customized to look like a complete website or just a documentation webpage.",
+            "image": "https://github.com/raw/Thecarisma/themata/main/docs/images/themata.small.png",
+            "keywords": "python, sphinx, thecarisma, themata, documentation, markdown, rst, themes",
+            "author": "Adewale Azeez"
+        },
+        'twitter_metadata': {
+            "enable": True,
+            "card": "summary",
+            "site": "@iamthecarisma",
+            "creator": "@iamthecarisma",
+            "title": "Set of Highly customizable sphinx themes.",
+            "description": "Themata package contains different sphinx theme that can be easily customized to look like a complete website or just a documentation webpage.",
+            "image": "https://github.com/raw/Thecarisma/themata/main/docs/images/themata.small.png",
+        }
     }
\ No newline at end of file
diff --git a/docs/sugar/conf.rst b/docs/sugar/conf.rst
index 09a3e3a..519fd34 100644
--- a/docs/sugar/conf.rst
+++ b/docs/sugar/conf.rst
@@ -24,7 +24,9 @@ The **conf.py** file that generates this documentation.
         'collapsible_sidebar_display': 'block',
         'navbar_links': [
             ('Twitter', 'https://twitter.com/iamthecarisma'),
-            ('Github', 'https://github.com/Thecarisma/themata/')
+            ('Github', 'https://github.com/Thecarisma/themata/'),
+            ("Introduction", "general/introduction"),
+            ("FAQ", "general/faq")
         ],
         'navbar_sec_links': [
             ('Twitter', 'https://twitter.com/iamthecarisma'),
@@ -75,5 +77,24 @@ The **conf.py** file that generates this documentation.
             'otherpages/rightpage'
         ],
         'source_root': 'https://github.com/Thecarisma/themata/edit/test/docs/sugar/',
-        'source_root_edit_text': 'Edit on Github'
+        'source_root_edit_text': 'Edit on Github',
+        'metadata': {
+            "enable": True,
+            "url": "https://thecarisma.github.io/themata",
+            "type": "website",
+            "title": "Set of Highly customizable sphinx themes.",
+            "description": "Themata package contains different sphinx theme that can be easily customized to look like a complete website or just a documentation webpage.",
+            "image": "https://github.com/raw/Thecarisma/themata/main/docs/images/themata.small.png",
+            "keywords": "python, sphinx, thecarisma, themata, documentation, markdown, rst, themes",
+            "author": "Adewale Azeez"
+        },
+        'twitter_metadata': {
+            "enable": True,
+            "card": "summary",
+            "site": "@iamthecarisma",
+            "creator": "@iamthecarisma",
+            "title": "Set of Highly customizable sphinx themes.",
+            "description": "Themata package contains different sphinx theme that can be easily customized to look like a complete website or just a documentation webpage.",
+            "image": "https://github.com/raw/Thecarisma/themata/main/docs/images/themata.small.png",
+        }
     }
\ No newline at end of file
diff --git a/docs/water/conf.rst b/docs/water/conf.rst
index 666f0aa..52d2997 100644
--- a/docs/water/conf.rst
+++ b/docs/water/conf.rst
@@ -22,7 +22,9 @@ The **conf.py** file that generates this documentation.
         'show_navigators_in_index': False,
         'navbar_links': [
             ('Twitter', 'https://twitter.com/iamthecarisma'),
-            ('Github', 'https://github.com/Thecarisma/themata/')
+            ('Github', 'https://github.com/Thecarisma/themata/'),
+            ("Introduction", "general/introduction"),
+            ("FAQ", "general/faq")
         ],
         'has_left_sidebar': True,
         'show_navigators': True,
@@ -65,5 +67,24 @@ The **conf.py** file that generates this documentation.
             'otherpages/singlepage'
         ],
         'source_root': 'https://github.com/Thecarisma/themata/edit/test/docs/water/',
-        'source_root_edit_text': 'Edit on Github'
+        'source_root_edit_text': 'Edit on Github',
+        'metadata': {
+            "enable": True,
+            "url": "https://thecarisma.github.io/themata",
+            "type": "website",
+            "title": "Set of Highly customizable sphinx themes.",
+            "description": "Themata package contains different sphinx theme that can be easily customized to look like a complete website or just a documentation webpage.",
+            "image": "https://github.com/raw/Thecarisma/themata/main/docs/images/themata.small.png",
+            "keywords": "python, sphinx, thecarisma, themata, documentation, markdown, rst, themes",
+            "author": "Adewale Azeez"
+        },
+        'twitter_metadata': {
+            "enable": True,
+            "card": "summary",
+            "site": "@iamthecarisma",
+            "creator": "@iamthecarisma",
+            "title": "Set of Highly customizable sphinx themes.",
+            "description": "Themata package contains different sphinx theme that can be easily customized to look like a complete website or just a documentation webpage.",
+            "image": "https://github.com/raw/Thecarisma/themata/main/docs/images/themata.small.png",
+        }
     }
\ No newline at end of file
diff --git a/test/confs/fandango.conf.py b/test/confs/fandango.conf.py
index b858d6d..0665200 100644
--- a/test/confs/fandango.conf.py
+++ b/test/confs/fandango.conf.py
@@ -32,10 +32,10 @@
         "singlepage"
     ],
     'navbar_links': [
-        ("Docs", "./docs"),
-        ("Download", "https://pypi.python.org/pypi/milkish"),
-        ("Examples", "./examples"),
-        ("FAQ", "./faq")
+        ("General", "general/index"),
+        ("Download", "https://pypi.python.org/pypi/themata"),
+        ("Introduction", "general/introduction"),
+        ("FAQ", "general/faq")
     ],
     'social_icons': [
         ("fab fa-twitter", "https://twitter.com/iamthecarisma"),
diff --git a/test/confs/fluid.conf.py b/test/confs/fluid.conf.py
index dd385ad..f1deb78 100644
--- a/test/confs/fluid.conf.py
+++ b/test/confs/fluid.conf.py
@@ -31,10 +31,10 @@
         "singlepage"
     ],
     'navbar_links': [
-        ("Docs", "./docs"),
-        ("Download", "https://pypi.python.org/pypi/milkish"),
-        ("Examples", "./examples"),
-        ("FAQ", "./faq")
+        ("General", "general/index"),
+        ("Download", "https://pypi.python.org/pypi/themata"),
+        ("Introduction", "general/introduction"),
+        ("FAQ", "general/faq")
     ],
     'social_icons': [
         ("fab fa-twitter", "https://twitter.com/iamthecarisma"),
diff --git a/test/confs/hackish.conf.py b/test/confs/hackish.conf.py
index a35ab90..ba0372a 100644
--- a/test/confs/hackish.conf.py
+++ b/test/confs/hackish.conf.py
@@ -26,10 +26,10 @@
         "singlepage"
     ],
     'navbar_links': [
-        ("Docs", "./docs"),
-        ("Download", "https://pypi.python.org/pypi/milkish"),
-        ("Examples", "./examples"),
-        ("FAQ", "./faq")
+        ("General", "general/index"),
+        ("Download", "https://pypi.python.org/pypi/themata"),
+        ("Introduction", "general/introduction"),
+        ("FAQ", "general/faq")
     ],
     'social_icons': [
         ("fab fa-twitter", "https://twitter.com/iamthecarisma"),
diff --git a/test/confs/milkish.conf.py b/test/confs/milkish.conf.py
index 54ff380..f4bfdfc 100644
--- a/test/confs/milkish.conf.py
+++ b/test/confs/milkish.conf.py
@@ -30,10 +30,10 @@
         "singlepage"
     ],
     'navbar_links': [
-        ("Docs", "./docs"),
-        ("Download", "https://pypi.python.org/pypi/milkish"),
-        ("Examples", "./examples"),
-        ("FAQ", "./faq")
+        ("General", "general/index"),
+        ("Download", "https://pypi.python.org/pypi/themata"),
+        ("Introduction", "general/introduction"),
+        ("FAQ", "general/faq")
     ],
     'social_icons': [
         ("fab fa-twitter", "https://twitter.com/iamthecarisma"),
diff --git a/test/confs/sugar.conf.py b/test/confs/sugar.conf.py
index 2701729..7949ae3 100644
--- a/test/confs/sugar.conf.py
+++ b/test/confs/sugar.conf.py
@@ -30,16 +30,16 @@
         "singlepage"
     ],
     'navbar_links': [
-        ("Docs", "./docs"),
-        ("Download", "https://pypi.python.org/pypi/milkish"),
-        ("Examples", "./examples"),
-        ("FAQ", "./faq")
+        ("General", "general/index"),
+        ("Download", "https://pypi.python.org/pypi/themata"),
+        ("Introduction", "general/introduction"),
+        ("FAQ", "general/faq")
     ],
     'navbar_sec_links': [
-        ("Docs", "./docs"),
-        ("Download", "https://pypi.python.org/pypi/milkish"),
-        ("Examples", "./examples"),
-        ("FAQ", "./faq")
+        ("General", "general/index"),
+        ("Download", "https://pypi.python.org/pypi/themata"),
+        ("Introduction", "general/introduction"),
+        ("FAQ", "general/faq")
     ],
     'social_icons': [
         ("fab fa-twitter", "https://twitter.com/iamthecarisma"),
diff --git a/test/confs/water.conf.py b/test/confs/water.conf.py
index ed143fa..e9a2192 100644
--- a/test/confs/water.conf.py
+++ b/test/confs/water.conf.py
@@ -26,10 +26,10 @@
         "singlepage"
     ],
     'navbar_links': [
-        ("Docs", "./docs"),
-        ("Download", "https://pypi.python.org/pypi/milkish"),
-        ("Examples", "./examples"),
-        ("FAQ", "./faq")
+        ("General", "general/index"),
+        ("Download", "https://pypi.python.org/pypi/themata"),
+        ("Introduction", "general/introduction"),
+        ("FAQ", "general/faq")
     ],
     'social_icons': [
         ("fab fa-twitter", "https://twitter.com/iamthecarisma"),
diff --git a/test/test_rst/index.rst b/test/test_rst/index.rst
index 0737713..a007d36 100644
--- a/test/test_rst/index.rst
+++ b/test/test_rst/index.rst
@@ -34,7 +34,7 @@ Sphinx’s basic theme provides base templates with a couple of blocks it will f
 
 For example, to add a new link to the template area containing related links all you have to do is to add a new template called layout.html with the following contents:
 
-.. image:: https://github.com/Thecarisma/themata/raw/master/docs/images/themata.png
+.. image:: https://github.com/Thecarisma/themata/raw/main/docs/images/themata.png
     :alt: About to make the tackle, Yale Alumni Game 2017
     :align: center
 
diff --git a/themata/fandango/layout.html b/themata/fandango/layout.html
index 3d3790e..aa16293 100644
--- a/themata/fandango/layout.html
+++ b/themata/fandango/layout.html
@@ -56,7 +56,11 @@
             </div>
             <div>
                 {% for navbar_link in theme_navbar_links %}
-                    <a href="{{ navbar_link[1] }}">{{ navbar_link[0] }}</a> <!-- class="active" -->
+                    {% if ("://" in navbar_link[1] or "www." in navbar_link[1]) %}
+                        <a href="{{ navbar_link[1] }}">{{ navbar_link[0] }}</a> 
+                    {% else %}
+                        <a href="{{ pathto(navbar_link[1] + ('' if navbar_link[1].endswith(file_suffix) else file_suffix), 1) }}">{{ navbar_link[0] }}</a>
+                    {% endif %}
                 {% endfor %}
             </div>
         </div>
diff --git a/themata/fluid/layout.html b/themata/fluid/layout.html
index 16b4564..7b119f0 100644
--- a/themata/fluid/layout.html
+++ b/themata/fluid/layout.html
@@ -58,7 +58,11 @@
                 </form>
             </div>
             {% for navbar_link in theme_navbar_links %}
-                <a href="{{ navbar_link[1] }}">{{ navbar_link[0] }}</a> <!-- class="active" -->
+                {% if ("://" in navbar_link[1] or "www." in navbar_link[1]) %}
+                    <a href="{{ navbar_link[1] }}">{{ navbar_link[0] }}</a> 
+                {% else %}
+                    <a href="{{ pathto(navbar_link[1] + ('' if navbar_link[1].endswith(file_suffix) else file_suffix), 1) }}">{{ navbar_link[0] }}</a>
+                {% endif %}
             {% endfor %}
         </div>
     </header>
diff --git a/themata/hackish/layout.html b/themata/hackish/layout.html
index 45f72b3..e5e0229 100644
--- a/themata/hackish/layout.html
+++ b/themata/hackish/layout.html
@@ -62,7 +62,11 @@
         </div>
         <div class="topnavbar-sec">
             {% for navbar_link in theme_navbar_links %}
-                <a href="{{ navbar_link[1] }}">{{ navbar_link[0] }}</a> <!-- class="active" -->
+                {% if ("://" in navbar_link[1] or "www." in navbar_link[1]) %}
+                    <a href="{{ navbar_link[1] }}">{{ navbar_link[0] }}</a> 
+                {% else %}
+                    <a href="{{ pathto(navbar_link[1] + ('' if navbar_link[1].endswith(file_suffix) else file_suffix), 1) }}">{{ navbar_link[0] }}</a>
+                {% endif %}
             {% endfor %}
         </div>
     </header>
diff --git a/themata/milkish/layout.html b/themata/milkish/layout.html
index 54669e0..3395857 100644
--- a/themata/milkish/layout.html
+++ b/themata/milkish/layout.html
@@ -51,9 +51,13 @@
             {% if theme_project_icon %}
                 <img class="icon" src="{{ theme_project_icon }}"></img>
             {% endif %}
-            <a href="{{ pathto(master_doc) }}" class="title">{{ project }}</a>
+            <a href="{{ pathto(master_doc) }}" class="title">{{ project }}</a> <!-- class="active" -->
             {% for navbar_link in theme_navbar_links %}
-                <a href="{{ navbar_link[1] }}">{{ navbar_link[0] }}</a> <!-- class="active" -->
+                {% if ("://" in navbar_link[1] or "www." in navbar_link[1]) %}
+                    <a href="{{ navbar_link[1] }}">{{ navbar_link[0] }}</a> 
+                {% else %}
+                    <a href="{{ pathto(navbar_link[1] + ('' if navbar_link[1].endswith(file_suffix) else file_suffix), 1) }}">{{ navbar_link[0] }}</a>
+                {% endif %}
             {% endfor %}
             <div class="search-container">
                 <form class="search" action="{{ pathto('search', 1) }}.html" method="get">
diff --git a/themata/sugar/layout.html b/themata/sugar/layout.html
index 6e12ad3..37faf21 100644
--- a/themata/sugar/layout.html
+++ b/themata/sugar/layout.html
@@ -54,13 +54,21 @@
             <a href="{{ pathto(master_doc) }}" class="title">{{ project }}</a>
             <div style="float:right;">
                 {% for navbar_link in theme_navbar_links %}
-                    <a href="{{ navbar_link[1] }}">{{ navbar_link[0] }}</a> <!-- class="active" -->
+                    {% if ("://" in navbar_link[1] or "www." in navbar_link[1]) %}
+                        <a href="{{ navbar_link[1] }}">{{ navbar_link[0] }}</a> 
+                    {% else %}
+                        <a href="{{ pathto(navbar_link[1] + ('' if navbar_link[1].endswith(file_suffix) else file_suffix), 1) }}">{{ navbar_link[0] }}</a>
+                    {% endif %}
                 {% endfor %}
             </div>
         </div>
         <div class="topnavbar-sec">
             {% for navbar_link in theme_navbar_sec_links %}
-                <a href="{{ navbar_link[1] }}">{{ navbar_link[0] }}</a> <!-- class="active" -->
+                {% if ("://" in navbar_link[1] or "www." in navbar_link[1]) %}
+                    <a href="{{ navbar_link[1] }}">{{ navbar_link[0] }}</a> 
+                {% else %}
+                    <a href="{{ pathto(navbar_link[1] + ('' if navbar_link[1].endswith(file_suffix) else file_suffix), 1) }}">{{ navbar_link[0] }}</a>
+                {% endif %}
             {% endfor %}
             <div class="search-container">
                 <form class="search" action="{{ pathto('search', 1) }}.html" method="get">
diff --git a/themata/water/layout.html b/themata/water/layout.html
index 73057e4..86c4f9f 100644
--- a/themata/water/layout.html
+++ b/themata/water/layout.html
@@ -53,7 +53,11 @@
             {% endif %}
             <a href="{{ pathto(master_doc) }}" class="title">{{ project }}</a>
             {% for navbar_link in theme_navbar_links %}
-                <a href="{{ navbar_link[1] }}">{{ navbar_link[0] }}</a> <!-- class="active" -->
+                {% if ("://" in navbar_link[1] or "www." in navbar_link[1]) %}
+                    <a href="{{ navbar_link[1] }}">{{ navbar_link[0] }}</a> 
+                {% else %}
+                    <a href="{{ pathto(navbar_link[1] + ('' if navbar_link[1].endswith(file_suffix) else file_suffix), 1) }}">{{ navbar_link[0] }}</a>
+                {% endif %}
             {% endfor %}
         </div>
     </header>