diff --git a/src/components/app/MessageTemplate.vue b/src/components/app/MessageTemplate.vue
index 1a42805..9609f27 100644
--- a/src/components/app/MessageTemplate.vue
+++ b/src/components/app/MessageTemplate.vue
@@ -21,7 +21,6 @@
           <div class="username" @click="openUserInformation">{{ this.$props.username }}</div>
           <div class="date">{{ getDate }}</div>
         </div>
-        <!-- <div class="content-message" v-html="formatMessage" /> -->
         <SimpleMarkdown class="content-message" :message="message" />
         <div class="file-content" v-if="getFile">
           <div class="icon">
diff --git a/src/utils/markdown-rules/codeblock.js b/src/utils/markdown-rules/codeblock.js
index 26c1b62..7f5d1bf 100644
--- a/src/utils/markdown-rules/codeblock.js
+++ b/src/utils/markdown-rules/codeblock.js
@@ -1,4 +1,5 @@
 import * as SimpleMarkdown from 'simple-markdown'
+import hljs from 'highlight.js'
 
 export default (order) => { return {
 	order: order++,
@@ -16,7 +17,13 @@ export default (order) => { return {
 	html: function(node, output) {
 		const className = node.lang ? `language-${node.lang}` : undefined
 
-		const codeblock = SimpleMarkdown.htmlTag("div", SimpleMarkdown.sanitizeText(node.content), {
+		let content = SimpleMarkdown.sanitizeText(node.content)
+		if(node.lang) {
+			content = hljs.highlight(node.lang, node.content, true).value
+		}
+
+
+		const codeblock = SimpleMarkdown.htmlTag("div", content, {
 			class: "codeblock"
 		})