diff --git a/_includes/footer-js.html b/_includes/footer-js.html
index 117ceb94..86226beb 100644
--- a/_includes/footer-js.html
+++ b/_includes/footer-js.html
@@ -1 +1 @@
-<script src="/assets/js/core.js"></script>
+<script src="/assets/js/core.js?v=123"></script>
diff --git a/_includes/head.html b/_includes/head.html
index 42ddef47..42713a21 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -86,6 +86,9 @@
             })
         })()
     </script>
+    <link rel="stylesheet"
+          type="text/css"
+          href="/assets/css/dark.css?v=123">
 
     <meta name="generator" content="Jekyll">
     <meta name="application-name" content="{{ site.app.name }}">
@@ -137,13 +140,10 @@
     <!-- End Google Analytics -->
     <link rel="stylesheet"
           type="text/css"
-          href="/assets/css/dark.css">
-    <link rel="stylesheet"
-          type="text/css"
-          href="/assets/css/core.css">
+          href="/assets/css/core.css?v=123">
     <link rel="stylesheet"
           type="text/css"
-          href="/assets/css/custom.css">
+          href="/assets/css/custom.css?v=123">
 
     <title>
         {{ site.data.languages[page.language][page.title] }} - {{ site.app.title }}
diff --git a/_includes/header.html b/_includes/header.html
index 990070db..f9aa5a67 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -104,12 +104,6 @@
 
             <nav class="header-nav--mobile _navToggle">
 
-                <div class="modes">
-                    <span data-mode="light">Light</span>
-                    <span data-mode="dark">Dark</span>
-                    <span data-mode="auto">Auto</span>
-                </div>
-
                 <ul>
                     <li>
                         <a href="https://docs.phalcon.io/">{{ site.data.languages[page.language]['download'] }}</a>
@@ -235,12 +229,6 @@
 
         <div class="header__right">
 
-            <div class="modes">
-                <span data-mode="light">Light</span>
-                <span data-mode="dark">Dark</span>
-                <span data-mode="auto">Auto</span>
-            </div>
-
             {% include menu-language.html %}
             <div class="header__github">
                 <a href="https://phalcon.io/github" aria-label="github">
diff --git a/assets/css/custom.css b/assets/css/custom.css
index 6103878d..93d6dc81 100644
--- a/assets/css/custom.css
+++ b/assets/css/custom.css
@@ -9,18 +9,3 @@
 .info-block__img img {
     padding: 5px;
 }
-
-.modes {
-    margin-right: 1rem;
-}
-
-[data-mode] {
-    display: inline-block;
-    cursor: pointer;
-    border-radius: calc(.5rem / 2);
-    padding: .2rem .4rem;
-}
-[data-mode].active {
-    color: #ffffff;
-    background-color: #8fc19a;
-}
\ No newline at end of file
diff --git a/assets/css/dark.css b/assets/css/dark.css
index 77f96877..afb5bf92 100644
--- a/assets/css/dark.css
+++ b/assets/css/dark.css
@@ -3,7 +3,7 @@
     --primary-color: #eee;
 }
 
-[data-theme] {
+[data-theme="dark"] {
     --background-color: #121212;
     --primary-color: #eee;
 }
@@ -84,147 +84,147 @@
     border: 3px solid transparent;
 }
 
-[data-theme] .phalcon-blog,
-[data-theme] body,
-[data-theme] .base-info {
+[data-theme="dark"] .phalcon-blog,
+[data-theme="dark"] body,
+[data-theme="dark"] .base-info {
     background-color: #1e2129;
 }
 
-[data-theme] h1,
-[data-theme] h2,
-[data-theme] h3,
-[data-theme] h4,
-[data-theme] h5,
-[data-theme] h6,
-[data-theme] p ,
-[data-theme] ul li,
-[data-theme] ol li,
-[data-theme] .phalcon-blog__title,
-[data-theme] .phalcon-blog__projects-text,
-[data-theme] .phalcon-blog__main-title,
-[data-theme] .header-dropdown li a,
-[data-theme] .tag-button,
-[data-theme] .phalcon-blog-detail table th,
-[data-theme] .phalcon-blog-detail table td,
-[data-theme] .base-info-descr__first,
-[data-theme] .base-info-descr__second,
-[data-theme] .watch-demo__title,
-[data-theme] .watch-demo__descr,
-[data-theme] .join__title,
-[data-theme] .join__descr,
-[data-theme] .contributors__top,
-[data-theme] .feature__title,
-[data-theme] .feature__descr,
-[data-theme] .buildwith-nav__list a,
-[data-theme] .features-nav__list li {
+[data-theme="dark"] h1,
+[data-theme="dark"] h2,
+[data-theme="dark"] h3,
+[data-theme="dark"] h4,
+[data-theme="dark"] h5,
+[data-theme="dark"] h6,
+[data-theme="dark"] p ,
+[data-theme="dark"] ul li,
+[data-theme="dark"] ol li,
+[data-theme="dark"] .phalcon-blog__title,
+[data-theme="dark"] .phalcon-blog__projects-text,
+[data-theme="dark"] .phalcon-blog__main-title,
+[data-theme="dark"] .header-dropdown li a,
+[data-theme="dark"] .tag-button,
+[data-theme="dark"] .phalcon-blog-detail table th,
+[data-theme="dark"] .phalcon-blog-detail table td,
+[data-theme="dark"] .base-info-descr__first,
+[data-theme="dark"] .base-info-descr__second,
+[data-theme="dark"] .watch-demo__title,
+[data-theme="dark"] .watch-demo__descr,
+[data-theme="dark"] .join__title,
+[data-theme="dark"] .join__descr,
+[data-theme="dark"] .contributors__top,
+[data-theme="dark"] .feature__title,
+[data-theme="dark"] .feature__descr,
+[data-theme="dark"] .buildwith-nav__list a,
+[data-theme="dark"] .features-nav__list li {
     color: #e2e4e9d1;
 }
 
-[data-theme] .phalcon-blog a,
-[data-theme] main a {
+[data-theme="dark"] .phalcon-blog a,
+[data-theme="dark"] main a {
     color: #00bda4;
 }
 
-[data-theme] .phalcon-blog__sponsors-item,
-[data-theme] .sponsors__item {
+[data-theme="dark"] .phalcon-blog__sponsors-item,
+[data-theme="dark"] .sponsors__item {
     background-color: #ffffffb3;
 }
 
-[data-theme] .footer {
+[data-theme="dark"] .footer {
     background-color: #17191e;
 }
 
-[data-theme] .footer__license,
-[data-theme] .footer__supported span,
-[data-theme] .footer-nav li a,
-[data-theme] .previous,
-[data-theme] .page_number,
-[data-theme] .next,
-[data-theme] .green-button,
-[data-theme] .features-nav__list li.active,
-[data-theme] .info .buildwith-nav__list li.active a,
-[data-theme] .header-nav--mobile a,
-[data-theme] .alert-warning,
-[data-theme] .info blockquote cite,
-[data-theme] .features-accordion__trigger {
+[data-theme="dark"] .footer__license,
+[data-theme="dark"] .footer__supported span,
+[data-theme="dark"] .footer-nav li a,
+[data-theme="dark"] .previous,
+[data-theme="dark"] .page_number,
+[data-theme="dark"] .next,
+[data-theme="dark"] .green-button,
+[data-theme="dark"] .features-nav__list li.active,
+[data-theme="dark"] .info .buildwith-nav__list li.active a,
+[data-theme="dark"] .header-nav--mobile a,
+[data-theme="dark"] .alert-warning,
+[data-theme="dark"] .info blockquote cite,
+[data-theme="dark"] .features-accordion__trigger {
     color: #ffffff;
 }
 
-[data-theme] .footer__supported-logo svg,
-[data-theme] .footer__supported-logo svg path {
+[data-theme="dark"] .footer__supported-logo svg,
+[data-theme="dark"] .footer__supported-logo svg path {
     stroke: #ffffff;
 }
 
-[data-theme] .phalcon-blog__sponsors-item:hover,
-[data-theme] .header-dropdown li a:hover {
+[data-theme="dark"] .phalcon-blog__sponsors-item:hover,
+[data-theme="dark"] .header-dropdown li a:hover {
     border-color: #00bda4;
 }
 
-[data-theme] .phalcon-blog__sponsors-item span {
+[data-theme="dark"] .phalcon-blog__sponsors-item span {
     color: #000000;
 }
 
-[data-theme] .header-dropdown--eco {
+[data-theme="dark"] .header-dropdown--eco {
     background-color: #1e2129;
     border-color: #1e2129;
 }
 
-[data-theme] .header-nav>li a,
-[data-theme] .footer-nav li a {
+[data-theme="dark"] .header-nav>li a,
+[data-theme="dark"] .footer-nav li a {
     opacity: 0.7;
 }
 
-[data-theme] .header a:hover,
-[data-theme] .header-nav>li.active>a,
-[data-theme] .header-nav>li:hover>a,
-[data-theme] .header-dropdown li a:hover,
-[data-theme] .footer-nav li a:hover {
+[data-theme="dark"] .header a:hover,
+[data-theme="dark"] .header-nav>li.active>a,
+[data-theme="dark"] .header-nav>li:hover>a,
+[data-theme="dark"] .header-dropdown li a:hover,
+[data-theme="dark"] .footer-nav li a:hover {
     opacity: 1;
     color: #ffffff;
 }
 
-[data-theme] .light-dark-auto-button:hover {
+[data-theme="dark"] .light-dark-auto-button:hover {
     color: #00bda4 !important;
 }
 
-[data-theme] .phalcon-blog__item-date,
-[data-theme] .phalcon-blog__item-author {
+[data-theme="dark"] .phalcon-blog__item-date,
+[data-theme="dark"] .phalcon-blog__item-author {
     color: #bfbfbfd1;
 }
 
-[data-theme] .phalcon-blog__tags-item span:first-child {
+[data-theme="dark"] .phalcon-blog__tags-item span:first-child {
     color: #e2e4e98f;
 }
 
-[data-theme] .phalcon-blog__right .phalcon-blog__tags-items .phalcon-blog__tags-item {
+[data-theme="dark"] .phalcon-blog__right .phalcon-blog__tags-items .phalcon-blog__tags-item {
     border-color: #385b56;
 }
 
-[data-theme] .phalcon-blog-detail table td {
+[data-theme="dark"] .phalcon-blog-detail table td {
     border-color: #e2e4e9d1;
 }
 
-[data-theme] .buildwith-nav__list li.active hr,
-[data-theme] .features-nav__list li.active hr{
+[data-theme="dark"] .buildwith-nav__list li.active hr,
+[data-theme="dark"] .features-nav__list li.active hr{
     background-color: #ffffff;
 }
 
-[data-theme] .buildwith-nav__list li.active:hover hr,
-[data-theme] .features-nav__list li:hover hr,
-[data-theme] .buildwith-nav__list li:hover hr {
+[data-theme="dark"] .buildwith-nav__list li.active:hover hr,
+[data-theme="dark"] .features-nav__list li:hover hr,
+[data-theme="dark"] .buildwith-nav__list li:hover hr {
     background-color: #ffffff;
 }
 
-[data-theme] .info .buildwith-nav__list li:hover a,
-[data-theme] .features-nav__list li span:hover {
+[data-theme="dark"] .info .buildwith-nav__list li:hover a,
+[data-theme="dark"] .features-nav__list li span:hover {
     color: #ffffff;
 }
 
-[data-theme] .header-dropdown--lang {
+[data-theme="dark"] .header-dropdown--lang {
     background-color: #1e2129;
     border-color: #1e2129;
 }
 
-[data-theme] .info-block__img img {
+[data-theme="dark"] .info-block__img img {
     background-color: #ffffff;
 }