diff --git a/components/Header.vue b/components/Header.vue
index 95ad71c..ac7c040 100644
--- a/components/Header.vue
+++ b/components/Header.vue
@@ -7,10 +7,12 @@
                         <img class="w-10 h-10 mr-1" src="../assets/svg/logo.svg" alt="logo"> Meraki <span class="text-blue-400">UI</span>
                     </a>
 
-                    <div class="flex items-center">
+                    <div class="flex items-center space-x-6">
                         <a :href="SHARE_LINK" class="font-medium text-white hover:underline">Share on twitter</a>
 
-                        <a class="ml-4 text-white hover:text-blue-500" href="https://github.com/bakateam/merakiui" target="_blink">
+                        <dark-mode />
+
+                        <a class="text-white hover:text-blue-500" href="https://github.com/bakateam/merakiui" target="_blink">
                             <svg class="w-6 h-6 fill-current" viewBox="0 0 30 30">
                                 <path d="M15 1.875C7.75195 1.875 1.875 7.9043 1.875 15.334C1.875 21.2812 5.63672 26.3203 10.8516 28.1016C10.9247 28.1175 10.9994 28.1253 11.0742 28.125C11.5605 28.125 11.748 27.7676 11.748 27.457C11.748 27.1348 11.7363 26.291 11.7305 25.166C11.2963 25.2678 10.8522 25.3209 10.4062 25.3242C7.88086 25.3242 7.30664 23.3613 7.30664 23.3613C6.70898 21.8086 5.84766 21.3926 5.84766 21.3926C4.70508 20.5898 5.8418 20.5664 5.92969 20.5664H5.93555C7.25391 20.6836 7.94531 21.9609 7.94531 21.9609C8.60156 23.1094 9.48047 23.4316 10.2656 23.4316C10.7848 23.4213 11.2959 23.3015 11.7656 23.0801C11.8828 22.2129 12.2227 21.6211 12.5977 21.2812C9.68555 20.9414 6.62109 19.7871 6.62109 14.6309C6.62109 13.1602 7.13086 11.959 7.96875 11.0215C7.83398 10.6816 7.38281 9.31055 8.09766 7.45898C8.19354 7.43604 8.29209 7.42619 8.39062 7.42969C8.86523 7.42969 9.9375 7.61133 11.707 8.8418C13.8572 8.24022 16.1311 8.24022 18.2812 8.8418C20.0508 7.61133 21.123 7.42969 21.5977 7.42969C21.6962 7.42619 21.7947 7.43604 21.8906 7.45898C22.6055 9.31055 22.1543 10.6816 22.0195 11.0215C22.8574 11.9648 23.3672 13.166 23.3672 14.6309C23.3672 19.7988 20.2969 20.9355 17.373 21.2695C17.8418 21.6855 18.2637 22.5059 18.2637 23.7598C18.2637 25.5586 18.2461 27.0117 18.2461 27.4512C18.2461 27.7676 18.4277 28.125 18.9141 28.125C18.9928 28.1253 19.0713 28.1175 19.1484 28.1016C24.3691 26.3203 28.125 21.2754 28.125 15.334C28.125 7.9043 22.248 1.875 15 1.875Z"/>
                             </svg>
@@ -67,7 +69,10 @@
 </template>
 
 <script>
+import DarkMode from './utilities/DarkMode.vue';
+
 export default {
+  components: { DarkMode },
     data() {
         return {
             components_count: 51,
diff --git a/components/utilities/DarkMode.vue b/components/utilities/DarkMode.vue
new file mode 100644
index 0000000..e82a30e
--- /dev/null
+++ b/components/utilities/DarkMode.vue
@@ -0,0 +1,42 @@
+<template>
+    <button @click="toggle" class="text-white hover:text-blue-500 focus:outline-none" aria-label="Color Mode">
+        <svg v-if="darkMode" class="w-6 h-6" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
+            <path fill-rule="evenodd" d="M10 2a1 1 0 011 1v1a1 1 0 11-2 0V3a1 1 0 011-1zm4 8a4 4 0 11-8 0 4 4 0 018 0zm-.464 4.95l.707.707a1 1 0 001.414-1.414l-.707-.707a1 1 0 00-1.414 1.414zm2.12-10.607a1 1 0 010 1.414l-.706.707a1 1 0 11-1.414-1.414l.707-.707a1 1 0 011.414 0zM17 11a1 1 0 100-2h-1a1 1 0 100 2h1zm-7 4a1 1 0 011 1v1a1 1 0 11-2 0v-1a1 1 0 011-1zM5.05 6.464A1 1 0 106.465 5.05l-.708-.707a1 1 0 00-1.414 1.414l.707.707zm1.414 8.486l-.707.707a1 1 0 01-1.414-1.414l.707-.707a1 1 0 011.414 1.414zM4 11a1 1 0 100-2H3a1 1 0 000 2h1z" clip-rule="evenodd" />
+        </svg>
+        <svg v-if="!darkMode" class="w-6 h-6" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
+            <path d="M17.293 13.293A8 8 0 016.707 2.707a8.001 8.001 0 1010.586 10.586z" />
+        </svg>
+    </button>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            darkMode: false,
+        }
+    },
+    
+    created() {
+        this.darkMode = JSON.parse(localStorage.getItem('darkMode'))
+        
+        this.set()
+    },
+
+    methods: {
+        toggle() {
+            this.darkMode = ! this.darkMode
+            localStorage.setItem('darkMode', this.darkMode)
+            this.set()
+        },
+        
+        set() {
+            if (this.darkMode) {
+                document.querySelector('html').classList.add('dark')
+                return
+            }
+            document.querySelector('html').classList.remove('dark')
+        }
+    }
+}
+</script>
\ No newline at end of file
diff --git a/pages/index.vue b/pages/index.vue
index 91ae4c8..51bd1f7 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -1,27 +1,16 @@
 <template>
-    <div :class="{ 'dark' : darkMode }">
-        <div class="bg-white dark:bg-gray-900 font-roboto">
-            <header-component />
-            <main-component />
-            <footer-component />
+    <div class="bg-white dark:bg-gray-900 font-roboto">
+        <header-component />
+        <main-component />
+        <footer-component />
 
-            <back-to-top visibleoffset="800">
-                <app-button class="fixed bottom-0 right-0 p-2 mx-10 my-10 text-white bg-gray-800 rounded-md hover:bg-gray-900 dark:hover:bg-gray-700 focus:outline-none" aria-label="Back to top">
-                    <svg class="w-6 h-6" viewBox="0 0 20 20" fill="currentColor">
-                        <path fill-rule="evenodd" d="M14.707 12.707a1 1 0 01-1.414 0L10 9.414l-3.293 3.293a1 1 0 01-1.414-1.414l4-4a1 1 0 011.414 0l4 4a1 1 0 010 1.414z" clip-rule="evenodd"/>
-                    </svg>
-                </app-button>
-            </back-to-top>
-
-            <app-button @click="darkMode = !darkMode" class="fixed bottom-0 right-0 z-50 p-2 mx-10 my-24 text-white bg-gray-800 rounded-md hover:bg-gray-900 dark:hover:bg-gray-700 focus:outline-none" aria-label="Color Mode">
-                <svg v-if="darkMode" class="w-6 h-6" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
-                    <path fill-rule="evenodd" d="M10 2a1 1 0 011 1v1a1 1 0 11-2 0V3a1 1 0 011-1zm4 8a4 4 0 11-8 0 4 4 0 018 0zm-.464 4.95l.707.707a1 1 0 001.414-1.414l-.707-.707a1 1 0 00-1.414 1.414zm2.12-10.607a1 1 0 010 1.414l-.706.707a1 1 0 11-1.414-1.414l.707-.707a1 1 0 011.414 0zM17 11a1 1 0 100-2h-1a1 1 0 100 2h1zm-7 4a1 1 0 011 1v1a1 1 0 11-2 0v-1a1 1 0 011-1zM5.05 6.464A1 1 0 106.465 5.05l-.708-.707a1 1 0 00-1.414 1.414l.707.707zm1.414 8.486l-.707.707a1 1 0 01-1.414-1.414l.707-.707a1 1 0 011.414 1.414zM4 11a1 1 0 100-2H3a1 1 0 000 2h1z" clip-rule="evenodd" />
-                </svg>
-                <svg v-if="!darkMode" class="w-6 h-6" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
-                    <path d="M17.293 13.293A8 8 0 016.707 2.707a8.001 8.001 0 1010.586 10.586z" />
+        <back-to-top visibleoffset="800">
+            <app-button class="fixed bottom-0 right-0 p-2 mx-10 my-10 text-white bg-gray-800 rounded-md hover:bg-gray-900 dark:hover:bg-gray-700 focus:outline-none" aria-label="Back to top">
+                <svg class="w-6 h-6" viewBox="0 0 20 20" fill="currentColor">
+                    <path fill-rule="evenodd" d="M14.707 12.707a1 1 0 01-1.414 0L10 9.414l-3.293 3.293a1 1 0 01-1.414-1.414l4-4a1 1 0 011.414 0l4 4a1 1 0 010 1.414z" clip-rule="evenodd"/>
                 </svg>
             </app-button>
-        </div>
+        </back-to-top>
     </div>
 </template>
 
@@ -33,18 +22,6 @@ import FooterComponent from "~/components/Footer";
 import BackToTop from "vue-backtotop";
 
 export default {
-    components: { AppButton, HeaderComponent, MainComponent, FooterComponent, BackToTop },
-
-    data() {
-        return {
-            darkMode: JSON.parse(localStorage.getItem("darkMode")) || false,
-        };
-    },
-
-    watch: {
-      darkMode() {
-        localStorage.setItem("darkMode", this.darkMode);
-      }
-	},
+    components: { AppButton, HeaderComponent, MainComponent, FooterComponent, BackToTop }
 };
 </script>