diff --git a/Source/assets/html/TOS.twig b/Source/assets/html/TOS.twig
index 996f67e..9f9406e 100644
--- a/Source/assets/html/TOS.twig
+++ b/Source/assets/html/TOS.twig
@@ -3,16 +3,49 @@
     <div class="container justified" style="font-size: 12pt">
         <h4 style="text-align: center">Terms of service</h4>
         <h4 class="docheader top10">Definitions</h4>
-        <ul><li><p>Solution: Any code snippet and its enclosed information</p></li></ul>
+        <ul>
+            <li><p>Solution: Any code snippet and its enclosed information</p></li>
+        </ul>
         <h4 class="docheader top10">Privacy</h4>
-        <p>All personal data bring to JKA Network in registration form are save under Spanish's law of data protection (LO 15/1999).
-        You can claim your right through JKA Network email <a href="mailto:contacto@jkanetwork.com">contacto@jkanetwork.com</a> </p>
+        <p>All personal data bring to JKA Network in registration form are save under Spanish's law of data protection
+            (LO 15/1999).
+            You can claim your right through JKA Network email <a href="mailto:contacto@jkanetwork.com">contacto@jkanetwork.com</a>
+        </p>
         <h4 class="docheader top10">About content upload to CodeShare</h4>
-        <p>All content which the user upload to CodeShare except his email, password or comments are ceded with their all rights to JKA Network and immediately JKA Network will prescind from with their rights on these putting them under the public domain<br>
+        <p>All content which the user upload to CodeShare except his email, password or comments are ceded with their
+            all rights to JKA Network and immediately JKA Network will prescind from with their rights on these putting
+            them under the public domain<br>
             Only JKA Network can remove comment or solutions hosted in CodeShare</p>
         <h4 class="docheader top10">About user's account</h4>
-        <p>The registered user in all moment can close their account but all data hosted in CodeShare will remain hosted.
-            <br>JKA Network is reserved the right to ban the access to account of any user who engage <a href="index.php?page=doc#vandalism">vandalism</a></p>
-
+        <p>The registered user in all moment can close their account but all data hosted in CodeShare will remain
+            hosted.
+            <br>JKA Network is reserved the right to ban the access to account of any user who engage <a
+                    href="index.php?page=doc#vandalism">vandalism</a></p>
+        <h4 class="docheader top10" id="cookiePolicy">Cookie policiy</h4>
+        <p>In CodeShare are used three differents cookies, two for login system and one for cookies' consent. You can
+            block CodeShare cookies but you cannot log in because we cannot check if login was right.
+            <br>The differents cookies are:</p>
+        <table class="table table-striped table-hover" style="width: 50%">
+            <thead>
+            <tr class="active">
+                <th>Cookie name</th>
+                <th>Functions</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr class="active">
+                <td>sessionID</td>
+                <td>User identifier</td>
+            </tr>
+            <tr class="active">
+                <td>Token</td>
+                <td>Unique user token for this session</td>
+            </tr>
+            <tr class="active">
+                <td>cookieconsent_status</td>
+                <td>Cookie alert visibility</td>
+            </tr>
+            </tbody>
+        </table>
     </div>
 {% endblock %}
\ No newline at end of file
diff --git a/Source/assets/html/about.twig b/Source/assets/html/about.twig
index b5526be..78a2d0d 100644
--- a/Source/assets/html/about.twig
+++ b/Source/assets/html/about.twig
@@ -4,13 +4,17 @@
         <div class="row" style="text-align: center">
             <h4>About CodeShare</h4>
             <div class="col-lg-12">
+                <h5>Source</h5>
+                <p>CodeShare is an open source platform licensed under Apache 2.0. All code are hosted in <a href="https://gitlab.com/CodeSolutionsProject/CodeShare">GitLab</a></p>
                 <h5>Developers</h5>
-                <p>Developed by JKA Network's Team</p>
+                <p>Developed by Code Solutions Project, JKA Network's Group <a href="mailto:contacto@jkanetwork.com">&lt;contacto@jkanetwork.com&gt;</a></p>
+                <p>Maintenance by Jose Luis Garrido Labrador <a href="mailto:jlgarrido97@gmail.com">&lt;jlgarrido97@gmail.com&gt;</a></p>
                 <h5>Open source licenses</h5>
                 <p><a href="http://getbootstrap.com/"><strong>Bootstrap 3</strong> by Twitter - Licensed under MIT</a></p>
                 <p><a href="https://bootswatch.com/"><strong>Paper theme to Boostrap 3</strong> by Bootswatch - Licensed under MIT</a></p>
-                <p><a href="https://jquery.com/"><strong>jQuery 3.2.1</strong> by jQuery - Licensed under custom license</a></p>
-                <p><a href="https://highlightjs.org/"><strong>Highlight.js</strong> by Ivan Sagalev Licensed under BSD</a></p>
+                <p><a href="https://jquery.com/"><strong>jQuery 3.2.1</strong> by jQuery - Licensed under MIT</a></p>
+                <p><a href="https://highlightjs.org/"><strong>Highlight.js</strong> by Ivan Sagalev - Licensed under BSD</a></p>
+                <p><a href="https://cookieconsent.insites.com"><strong>Cookie Consent</strong> by Insites - Licensed under MIT</a></p>
             </div>
         </div>
     </div>
diff --git a/Source/assets/html/base.twig b/Source/assets/html/base.twig
index aa20bb6..db270e0 100644
--- a/Source/assets/html/base.twig
+++ b/Source/assets/html/base.twig
@@ -30,5 +30,25 @@
     <script>hljs.initHighlightingOnLoad();</script>
 {% endblock %}
 
-
+<link rel="stylesheet" type="text/css" href="//cdnjs.cloudflare.com/ajax/libs/cookieconsent2/3.0.3/cookieconsent.min.css" />
+<script src="//cdnjs.cloudflare.com/ajax/libs/cookieconsent2/3.0.3/cookieconsent.min.js"></script>
+<script>
+    window.addEventListener("load", function(){
+        window.cookieconsent.initialise({
+            "palette": {
+                "popup": {
+                    "background": "#2196f3",
+                    "text": "#b2dbfb"
+                },
+                "button": {
+                    "background": "transparent",
+                    "text": "#b2dbfb",
+                    "border": "#b2dbfb"
+                }
+            },
+            "content": {
+                "href": "http://localhost:8080/?page=tos#cookiePolicy"
+            }
+        })});
+</script>
 </body>