diff --git a/themes/gokarna/layouts/_default/baseof.html b/themes/gokarna/layouts/_default/baseof.html
index d663ad3..83ded07 100644
--- a/themes/gokarna/layouts/_default/baseof.html
+++ b/themes/gokarna/layouts/_default/baseof.html
@@ -5,7 +5,7 @@
         {{- partial "header.html" . -}}
         <main id="content">
         {{- block "main" . }}{{- end }}
-        </main>
         {{- partial "footer.html" . -}}
+        </main>
     </body>
 </html>
diff --git a/themes/gokarna/layouts/partials/footer.html b/themes/gokarna/layouts/partials/footer.html
index e839222..32a77ac 100644
--- a/themes/gokarna/layouts/partials/footer.html
+++ b/themes/gokarna/layouts/partials/footer.html
@@ -1,6 +1,5 @@
 <footer class="footer">
     <span>&copy; {{ now.Year }} {{ .Site.Params.Footer}}</span>
-    <br>
     <span>
         Made with &#10084;&#65039; using <a href="https://github.com/526avijitgupta/gokarna">Gokarna</a>
     </span>
diff --git a/themes/gokarna/static/css/dark.css b/themes/gokarna/static/css/dark.css
index c832665..d758dc5 100644
--- a/themes/gokarna/static/css/dark.css
+++ b/themes/gokarna/static/css/dark.css
@@ -10,8 +10,8 @@ pre {
   color: #e2e2e2 !important;
 }
 
-.footer a {
-    color: #e2e2e2 !important;
+.footer {
+  border-top-color: #333;
 }
 
 /* TODO: Check if this is needed or not */
diff --git a/themes/gokarna/static/css/main.css b/themes/gokarna/static/css/main.css
index 21e207b..da0ed75 100644
--- a/themes/gokarna/static/css/main.css
+++ b/themes/gokarna/static/css/main.css
@@ -98,12 +98,22 @@ html {
 
 /* FOOTER */
 .footer {
+  border-top: 1px solid #eee;
+  color: inherit;
+  margin-top: 50px;
+  padding: 40px 0;
   text-align: center;
 }
 
-.footer a {
+.footer span {
+  display: block;
+  font-size: 0.85rem;
+  padding: 1px 0;
+}
+
+.footer span a {
+  color: inherit;
   font-family: "Ubuntu", sans-serif;
-  color: #000000;
 }
 
 /** COMMON **/