diff --git a/Projects/Superalgos/Schemas/Docs-Topics/docs-paragraph-styles-023-docs-include-style.json b/Projects/Superalgos/Schemas/Docs-Topics/docs-paragraph-styles-023-docs-include-style.json
index f34b2aa6a..670860ac0 100644
--- a/Projects/Superalgos/Schemas/Docs-Topics/docs-paragraph-styles-023-docs-include-style.json
+++ b/Projects/Superalgos/Schemas/Docs-Topics/docs-paragraph-styles-023-docs-include-style.json
@@ -23,12 +23,13 @@
         },
         {
             "style": "List",
-            "text": "Project : Is the project where the Docs Page belongs to.",
-            "updated": 1609259672503
+            "text": "Project: Is the project where the Docs Page belongs to.",
+            "updated": 1609777972700
         },
         {
             "style": "List",
-            "text": "Docs Page Category : Node, Concept or Topic."
+            "text": "Docs Page Category: Node, Concept or Topic.",
+            "updated": 1609777966388
         },
         {
             "style": "List",
@@ -46,13 +47,13 @@
         },
         {
             "style": "Javascript",
-            "text": "docs.goto Superalgos->Node->Task->Block Intro",
-            "updated": 1609259810378
+            "text": "Superalgos->Node->Task->Block Intro",
+            "updated": 1609777998302
         },
         {
             "style": "Javascript",
-            "text": "docs.goto Superalgos->Topic->Docs Text Style->Block1",
-            "updated": 1609259792093
+            "text": "Superalgos->Topic->Docs Text Style->Block1",
+            "updated": 1609778004235
         }
     ]
 }
\ No newline at end of file
diff --git a/Projects/Superalgos/UI/Spaces/Docs-Space/DocumentPage.js b/Projects/Superalgos/UI/Spaces/Docs-Space/DocumentPage.js
index 9d461bee4..616f23adc 100644
--- a/Projects/Superalgos/UI/Spaces/Docs-Space/DocumentPage.js
+++ b/Projects/Superalgos/UI/Spaces/Docs-Space/DocumentPage.js
@@ -244,11 +244,11 @@ function newSuperalgosDocsDocumentPage() {
 
                         HTML = HTML + '<p><center>'
                         if (previousPage !== undefined) {
-                            HTML = HTML + '(Previous) <a class="docs-link" onClick="UI.projects.superalgos.spaces.docsSpace.navigateTo(\'' + UI.projects.superalgos.spaces.docsSpace.currentDocumentBeingRendered.project + '\', \'' + 'Topic' + '\', \'' + previousPage.type.replace(/'/g, 'AMPERSAND') + '\')">' + previousPage.type + '</a>'
+                            HTML = HTML + '<a class="docs-link" onClick="UI.projects.superalgos.spaces.docsSpace.navigateTo(\'' + UI.projects.superalgos.spaces.docsSpace.currentDocumentBeingRendered.project + '\', \'' + 'Topic' + '\', \'' + previousPage.type.replace(/'/g, 'AMPERSAND') + '\')">' + previousPage.type + '</a> << '
                         }
                         HTML = HTML + ' Current Page: ' + thisObject.docsSchemaDocument.pageNumber + ' '
                         if (nextPage !== undefined) {
-                            HTML = HTML + '<a class="docs-link" onClick="UI.projects.superalgos.spaces.docsSpace.navigateTo(\'' + UI.projects.superalgos.spaces.docsSpace.currentDocumentBeingRendered.project + '\', \'' + 'Topic' + '\', \'' + nextPage.type.replace(/'/g, 'AMPERSAND') + '\')">' + nextPage.type + '</a> (Next)'
+                            HTML = HTML + ' >> <a class="docs-link" onClick="UI.projects.superalgos.spaces.docsSpace.navigateTo(\'' + UI.projects.superalgos.spaces.docsSpace.currentDocumentBeingRendered.project + '\', \'' + 'Topic' + '\', \'' + nextPage.type.replace(/'/g, 'AMPERSAND') + '\')">' + nextPage.type + '</a>'
                         }
                         HTML = HTML + '</center></p>'
                         return
@@ -1194,8 +1194,8 @@ function newSuperalgosDocsDocumentPage() {
                         innerHTML = UI.projects.superalgos.utilities.docs.getTextBasedOnLanguage(paragraph)
                         innerHTML = UI.projects.superalgos.utilities.docs.addCodeToCamelCase(innerHTML)
                         innerHTML = UI.projects.superalgos.utilities.docs.addCodeToWhiteList(innerHTML)
-                        innerHTML = UI.projects.superalgos.utilities.docs.addToolTips(innerHTML, UI.projects.superalgos.spaces.docsSpace.currentDocumentBeingRendered.type)
                         innerHTML = UI.projects.superalgos.utilities.docs.addItalics(innerHTML)
+                        innerHTML = UI.projects.superalgos.utilities.docs.addToolTips(innerHTML, UI.projects.superalgos.spaces.docsSpace.currentDocumentBeingRendered.type)
                         innerHTML = innerHTML + UI.projects.superalgos.utilities.docs.addWarningIfTranslationIsOutdated(paragraph)
                         break
                     }
@@ -1223,8 +1223,8 @@ function newSuperalgosDocsDocumentPage() {
                         role = 'role="alert"'
                         key = key + '-note'
                         innerHTML = UI.projects.superalgos.utilities.docs.getTextBasedOnLanguage(paragraph)
-                        innerHTML = UI.projects.superalgos.utilities.docs.addToolTips(innerHTML, UI.projects.superalgos.spaces.docsSpace.currentDocumentBeingRendered.type)
                         innerHTML = UI.projects.superalgos.utilities.docs.addItalics(innerHTML)
+                        innerHTML = UI.projects.superalgos.utilities.docs.addToolTips(innerHTML, UI.projects.superalgos.spaces.docsSpace.currentDocumentBeingRendered.type)
                         innerHTML = innerHTML + UI.projects.superalgos.utilities.docs.addWarningIfTranslationIsOutdated(paragraph)
                         break
                     }
@@ -1234,8 +1234,8 @@ function newSuperalgosDocsDocumentPage() {
                         role = 'role="alert"'
                         key = key + '-success'
                         innerHTML = UI.projects.superalgos.utilities.docs.getTextBasedOnLanguage(paragraph)
-                        innerHTML = UI.projects.superalgos.utilities.docs.addToolTips(innerHTML, UI.projects.superalgos.spaces.docsSpace.currentDocumentBeingRendered.type)
                         innerHTML = UI.projects.superalgos.utilities.docs.addItalics(innerHTML)
+                        innerHTML = UI.projects.superalgos.utilities.docs.addToolTips(innerHTML, UI.projects.superalgos.spaces.docsSpace.currentDocumentBeingRendered.type)
                         innerHTML = innerHTML + UI.projects.superalgos.utilities.docs.addWarningIfTranslationIsOutdated(paragraph)
                         break
                     }
@@ -1245,8 +1245,8 @@ function newSuperalgosDocsDocumentPage() {
                         role = 'role="alert"'
                         key = key + '-important'
                         innerHTML = UI.projects.superalgos.utilities.docs.getTextBasedOnLanguage(paragraph)
-                        innerHTML = UI.projects.superalgos.utilities.docs.addToolTips(innerHTML, UI.projects.superalgos.spaces.docsSpace.currentDocumentBeingRendered.type)
                         innerHTML = UI.projects.superalgos.utilities.docs.addItalics(innerHTML)
+                        innerHTML = UI.projects.superalgos.utilities.docs.addToolTips(innerHTML, UI.projects.superalgos.spaces.docsSpace.currentDocumentBeingRendered.type)
                         innerHTML = innerHTML + UI.projects.superalgos.utilities.docs.addWarningIfTranslationIsOutdated(paragraph)
                         break
                     }
@@ -1256,8 +1256,8 @@ function newSuperalgosDocsDocumentPage() {
                         role = 'role="alert"'
                         key = key + '-warning'
                         innerHTML = UI.projects.superalgos.utilities.docs.getTextBasedOnLanguage(paragraph)
-                        innerHTML = UI.projects.superalgos.utilities.docs.addToolTips(innerHTML, UI.projects.superalgos.spaces.docsSpace.currentDocumentBeingRendered.type)
                         innerHTML = UI.projects.superalgos.utilities.docs.addItalics(innerHTML)
+                        innerHTML = UI.projects.superalgos.utilities.docs.addToolTips(innerHTML, UI.projects.superalgos.spaces.docsSpace.currentDocumentBeingRendered.type)
                         innerHTML = innerHTML + UI.projects.superalgos.utilities.docs.addWarningIfTranslationIsOutdated(paragraph)
                         break
                     }
@@ -1277,8 +1277,8 @@ function newSuperalgosDocsDocumentPage() {
                         role = ''
                         key = key + '-callout'
                         innerHTML = UI.projects.superalgos.utilities.docs.getTextBasedOnLanguage(paragraph)
-                        innerHTML = UI.projects.superalgos.utilities.docs.addToolTips(innerHTML, UI.projects.superalgos.spaces.docsSpace.currentDocumentBeingRendered.type)
                         innerHTML = UI.projects.superalgos.utilities.docs.addItalics(innerHTML)
+                        innerHTML = UI.projects.superalgos.utilities.docs.addToolTips(innerHTML, UI.projects.superalgos.spaces.docsSpace.currentDocumentBeingRendered.type)
                         innerHTML = innerHTML + UI.projects.superalgos.utilities.docs.addWarningIfTranslationIsOutdated(paragraph)
                         break
                     }
@@ -1288,8 +1288,8 @@ function newSuperalgosDocsDocumentPage() {
                         role = ''
                         key = key + '-summary'
                         innerHTML = UI.projects.superalgos.utilities.docs.getTextBasedOnLanguage(paragraph)
-                        innerHTML = UI.projects.superalgos.utilities.docs.addToolTips(innerHTML, UI.projects.superalgos.spaces.docsSpace.currentDocumentBeingRendered.type)
                         innerHTML = UI.projects.superalgos.utilities.docs.addItalics(innerHTML)
+                        innerHTML = UI.projects.superalgos.utilities.docs.addToolTips(innerHTML, UI.projects.superalgos.spaces.docsSpace.currentDocumentBeingRendered.type)
                         innerHTML = innerHTML + UI.projects.superalgos.utilities.docs.addWarningIfTranslationIsOutdated(paragraph)
                         break
                     }
@@ -1300,7 +1300,6 @@ function newSuperalgosDocsDocumentPage() {
                         key = key + '-section'
                         innerHTML = UI.projects.superalgos.utilities.docs.getTextBasedOnLanguage(paragraph)
                         innerHTML = UI.projects.superalgos.utilities.docs.addToolTips(innerHTML, UI.projects.superalgos.spaces.docsSpace.currentDocumentBeingRendered.type)
-                        innerHTML = UI.projects.superalgos.utilities.docs.addItalics(innerHTML)
                         innerHTML = innerHTML + UI.projects.superalgos.utilities.docs.addWarningIfTranslationIsOutdated(paragraph)
                         break
                     }
@@ -1312,9 +1311,9 @@ function newSuperalgosDocsDocumentPage() {
                         key = key + '-list'
                         innerHTML = UI.projects.superalgos.utilities.docs.getTextBasedOnLanguage(paragraph)
                         innerHTML = UI.projects.superalgos.utilities.docs.addCodeToCamelCase(innerHTML)
-                        innerHTML = UI.projects.superalgos.utilities.docs.addToolTips(innerHTML, UI.projects.superalgos.spaces.docsSpace.currentDocumentBeingRendered.type)
                         innerHTML = UI.projects.superalgos.utilities.docs.addBold(innerHTML)
                         innerHTML = UI.projects.superalgos.utilities.docs.addItalics(innerHTML)
+                        innerHTML = UI.projects.superalgos.utilities.docs.addToolTips(innerHTML, UI.projects.superalgos.spaces.docsSpace.currentDocumentBeingRendered.type)
                         innerHTML = innerHTML + UI.projects.superalgos.utilities.docs.addWarningIfTranslationIsOutdated(paragraph)
                         break
                     }
diff --git a/Projects/Superalgos/UI/Utilities/Docs.js b/Projects/Superalgos/UI/Utilities/Docs.js
index 85a61cb26..6ec464072 100644
--- a/Projects/Superalgos/UI/Utilities/Docs.js
+++ b/Projects/Superalgos/UI/Utilities/Docs.js
@@ -198,7 +198,7 @@ function newSuperalgosUtilitiesDocs() {
         let HTML = ''
         let splittedText = text.split('->')
         if (splittedText.length < 1) { return }
-        HTML = '<a  params="' + text + '" onClick="UI.projects.superalgos.spaces.docsSpace.navigateTo(\''+ splittedText[0] + '\', \'Topic\', \''+ splittedText[1] +'\')" class="docs-chapter-link">' + splittedText[1] + '</a>'
+        HTML = '<a  params="' + text + '" onClick="UI.projects.superalgos.spaces.docsSpace.navigateTo(\'' + splittedText[0] + '\', \'Topic\', \'' + splittedText[1] + '\')" class="docs-chapter-link">' + splittedText[1] + '</a>'
         return HTML
     }
 
@@ -440,6 +440,9 @@ function newSuperalgosUtilitiesDocs() {
     /* Private Functions follow */
     function tagDefinedTypes(text, excludedType) {
         let cleanText = text.replace(/'/g, ' AMPERSAND ') // scaping ampersands, separating them from other words
+            .replaceAll('<', ' < ')
+            .replaceAll('>', ' > ')
+            .replaceAll(':', ' : ')
         let words = cleanText.split(' ')
         let taggedText = ''
         for (let i = 0; i < words.length; i++) {
@@ -670,6 +673,9 @@ function newSuperalgosUtilitiesDocs() {
             }
         }
         taggedText = taggedText.replaceAll(' AMPERSAND ', '\'')
+            .replaceAll(' < ', '<')
+            .replaceAll(' > ', '>')
+            .replaceAll(' : ', ':')
         return taggedText
     }