diff --git a/src/resources/themes/v_pure/v_pure.qss b/src/resources/themes/v_pure/v_pure.qss
index 7ab54906..c42f8b35 100644
--- a/src/resources/themes/v_pure/v_pure.qss
+++ b/src/resources/themes/v_pure/v_pure.qss
@@ -679,6 +679,10 @@ QLineEdit[VimCommandLine="true"] {
     color: @lineedit_fg;
     background: @lineedit_bg;
 }
+
+QLineEdit[VimCommandLine="true"]:focus {
+    background: @lineedit_focus_bg;
+}
 /* End QLineEdit */
 
 /* QPlainTextEdit QTextEdit */
diff --git a/src/resources/themes/v_pure/v_pure_codeblock.css b/src/resources/themes/v_pure/v_pure_codeblock.css
index d5bd1d2a..fdf954d5 100644
--- a/src/resources/themes/v_pure/v_pure_codeblock.css
+++ b/src/resources/themes/v_pure/v_pure_codeblock.css
@@ -1,20 +1,6 @@
 /*
 
-Atom One Light by Daniel Gamage
-Original One Light Syntax theme from https://github.com/atom/one-light-syntax
-
-base:    #fafafa
-mono-1:  #383a42
-mono-2:  #686b77
-mono-3:  #a0a1a7
-hue-1:   #0184bb
-hue-2:   #4078f2
-hue-3:   #a626a4
-hue-4:   #50a14f
-hue-5:   #e45649
-hue-5-2: #c91243
-hue-6:   #986801
-hue-6-2: #c18401
+Original highlight.js style (c) Ivan Sagalaev <maniac@softwaremaniacs.org>
 
 */
 
@@ -22,67 +8,88 @@ hue-6-2: #c18401
   display: block;
   overflow-x: auto;
   padding: 0.5em;
-  color: #383a42;
-  background: #fafafa;
+  background: #E0E0E0;
 }
 
-.hljs-comment,
-.hljs-quote {
-  color: #a0a1a7;
-  font-style: italic;
-}
 
-.hljs-doctag,
-.hljs-keyword,
-.hljs-formula {
-  color: #a626a4;
-}
+/* Base color: saturation 0; */
 
-.hljs-section,
-.hljs-name,
-.hljs-selector-tag,
-.hljs-deletion,
+.hljs,
 .hljs-subst {
-  color: #e45649;
+  color: #363636;
 }
 
+.hljs-comment {
+  color: #767676;
+}
+
+.hljs-keyword,
+.hljs-attribute,
+.hljs-selector-tag,
+.hljs-meta-keyword,
+.hljs-doctag,
+.hljs-name {
+  color: #0000ee;
+}
+
+
+/* User color: hue: 0 */
+
+.hljs-type,
+.hljs-string,
+.hljs-number,
+.hljs-selector-id,
+.hljs-selector-class,
+.hljs-quote,
+.hljs-template-tag,
+.hljs-deletion {
+  color: #880000;
+}
+
+.hljs-title,
+.hljs-section {
+  color: #880000;
+  font-weight: bold;
+}
+
+.hljs-regexp,
+.hljs-symbol,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-link,
+.hljs-selector-attr,
+.hljs-selector-pseudo {
+  color: #BC6060;
+}
+
+
+/* Language color: hue: 90; */
+
 .hljs-literal {
-  color: #0184bb;
-}
-
-.hljs-string,
-.hljs-regexp,
-.hljs-addition,
-.hljs-attribute,
-.hljs-meta-string {
-  color: #50a14f;
+  color: #af00d7;
 }
 
 .hljs-built_in,
-.hljs-class .hljs-title {
-  color: #c18401;
-}
-
-.hljs-attr,
-.hljs-variable,
-.hljs-template-variable,
-.hljs-type,
-.hljs-selector-class,
-.hljs-selector-attr,
-.hljs-selector-pseudo,
-.hljs-number {
-  color: #986801;
-}
-
-.hljs-symbol,
 .hljs-bullet,
-.hljs-link,
-.hljs-meta,
-.hljs-selector-id,
-.hljs-title {
-  color: #4078f2;
+.hljs-code,
+.hljs-addition {
+  color: #008700;
 }
 
+
+/* Meta color: hue: 200 */
+
+.hljs-meta {
+  color: #1f7199;
+}
+
+.hljs-meta-string {
+  color: #4d99bf;
+}
+
+
+/* Misc effects */
+
 .hljs-emphasis {
   font-style: italic;
 }
@@ -90,7 +97,3 @@ hue-6-2: #c18401
 .hljs-strong {
   font-weight: bold;
 }
-
-.hljs-link {
-  text-decoration: underline;
-}
diff --git a/src/resources/themes/v_white/v_white_codeblock.css b/src/resources/themes/v_white/v_white_codeblock.css
index 48945394..fdf954d5 100644
--- a/src/resources/themes/v_white/v_white_codeblock.css
+++ b/src/resources/themes/v_white/v_white_codeblock.css
@@ -8,7 +8,7 @@ Original highlight.js style (c) Ivan Sagalaev <maniac@softwaremaniacs.org>
   display: block;
   overflow-x: auto;
   padding: 0.5em;
-  background: #F0F0F0;
+  background: #E0E0E0;
 }
 
 
diff --git a/src/vmdeditor.cpp b/src/vmdeditor.cpp
index daca9018..b971cdd8 100644
--- a/src/vmdeditor.cpp
+++ b/src/vmdeditor.cpp
@@ -116,6 +116,7 @@ void VMdEditor::beginEdit()
 
     if (m_freshEdit) {
         m_mdHighlighter->updateHighlight();
+        relayout();
     } else {
         updateHeaders(m_mdHighlighter->getHeaderRegions());
     }
diff --git a/src/vtextedit.cpp b/src/vtextedit.cpp
index 7c8e73a2..c8004c07 100644
--- a/src/vtextedit.cpp
+++ b/src/vtextedit.cpp
@@ -383,3 +383,8 @@ void VTextEdit::setCursorLineBlockBg(const QColor &p_bg)
 {
     getLayout()->setCursorLineBlockBg(p_bg);
 }
+
+void VTextEdit::relayout()
+{
+    getLayout()->relayout();
+}
diff --git a/src/vtextedit.h b/src/vtextedit.h
index 03df606b..e34ed263 100644
--- a/src/vtextedit.h
+++ b/src/vtextedit.h
@@ -63,6 +63,8 @@ public:
 
     void setCursorLineBlockBg(const QColor &p_bg);
 
+    void relayout();
+
 protected:
     void resizeEvent(QResizeEvent *p_event) Q_DECL_OVERRIDE;
 
@@ -108,5 +110,4 @@ inline void VTextEdit::setLineNumberColor(const QColor &p_foreground,
     m_lineNumberArea->setForegroundColor(p_foreground);
     m_lineNumberArea->setBackgroundColor(p_background);
 }
-
 #endif // VTEXTEDIT_H