diff --git a/src/resources/themes/v_moonlight/v_moonlight.palette b/src/resources/themes/v_moonlight/v_moonlight.palette
index 06e194b4..3bfa7620 100644
--- a/src/resources/themes/v_moonlight/v_moonlight.palette
+++ b/src/resources/themes/v_moonlight/v_moonlight.palette
@@ -7,7 +7,7 @@ mdhl_file=v_moonlight.mdhl
 css_file=v_moonlight.css
 codeblock_css_file=v_moonlight_codeblock.css
 mermaid_css_file=v_moonlight_mermaid.css
-version=7
+version=8
 
 ; This mapping will be used to translate colors when the content of HTML is copied
 ; without background. You could just specify the foreground colors mapping here.
@@ -356,6 +356,7 @@ progressbar_bg=@edit_bg
 progressbar_border_bg=@border_bg
 progressbar_chunk_bg=@master_dark_bg
 
+universalentry_bg=@base_bg
 universalentry_border_bg=@border_bg
 
 doublerowitem_second_row_label_fg=#6C6C6C
diff --git a/src/resources/themes/v_moonlight/v_moonlight.qss b/src/resources/themes/v_moonlight/v_moonlight.qss
index b2f054e9..15ae9046 100644
--- a/src/resources/themes/v_moonlight/v_moonlight.qss
+++ b/src/resources/themes/v_moonlight/v_moonlight.qss
@@ -5,26 +5,6 @@ QToolTip
     color: @tooltip_fg;
 }
 
-/* QWidget */
-QWidget#FindReplaceTitleWidget {
-    background: @title_bg;
-}
-
-QWidget[ToolBoxTitle="true"] {
-    border-bottom: 2px solid @toolbox_title_border;
-}
-
-QWidget[MainEditor="true"] {
-    border: none;
-}
-
-QWidget
-{
-    color: @widget_fg;
-    font-family: "Hiragino Sans GB", "冬青黑体", "Microsoft YaHei", "微软雅黑", "Microsoft YaHei UI", "WenQuanYi Micro Hei", "文泉驿雅黑", "Dengxian", "等线体", "STXihei", "华文细黑", "Liberation Sans", "Droid Sans", "NSimSun", "新宋体", "SimSun", "宋体", "Helvetica", "sans-serif", "Tahoma", "Arial", "Verdana", "Geneva", "Georgia", "Times New Roman";
-}
-/* End QWidget */
-
 /* QMainWindow */
 QMainWindow {
     color: @base_fg;
@@ -590,12 +570,21 @@ VTabIndicator QLabel[TabIndicatorLabel="true"] {
     background: transparent;
 }
 
+VSelectorItemWidget QLabel[SelectorItemShortcutLabel="true"] {
+    font: bold;
+    border: $2px solid @selectoritem_border;
+    padding: 3px;
+    border-radius: 5px;
+    background-color: @selectoritem_bg;
+    color: @selectoritem_fg;
+}
+
 VDoubleRowItemWidget QLabel[FirstRowLabel="true"] {
     font-size: 10pt;
 }
 
 VDoubleRowItemWidget QLabel[SecondRowLabel="true"] {
-    font-size: 8pt;
+    font-size: 9pt;
     color: @doublerowitem_second_row_label_fg;
 }
 
@@ -738,20 +727,6 @@ QTabBar QToolButton::left-arrow:disabled {
 }
 /* End QTabBar */
 
-VSelectorItemWidget QLabel[SelectorItemShortcutLabel="true"] {
-    font: bold;
-    border: $2px solid @selectoritem_border;
-    padding: 3px;
-    border-radius: 5px;
-    background-color: @selectoritem_bg;
-    color: @selectoritem_fg;
-}
-
-VInsertSelector {
-    border: none;
-    background: @insertselector_bg;
-}
-
 /* QTreeView */
 QTreeView[ItemBorder="true"]::item {
     padding-top: 5px;
@@ -1265,7 +1240,32 @@ QProgressBar::chunk {
 }
 /* End QProgressBar */
 
+/* QWidget */
+QWidget#FindReplaceTitleWidget {
+    background: @title_bg;
+}
+
+QWidget[ToolBoxTitle="true"] {
+    border-bottom: 2px solid @toolbox_title_border;
+}
+
+QWidget[MainEditor="true"] {
+    border: none;
+}
+
+QWidget
+{
+    color: @widget_fg;
+    font-family: "Hiragino Sans GB", "冬青黑体", "Microsoft YaHei", "微软雅黑", "Microsoft YaHei UI", "WenQuanYi Micro Hei", "文泉驿雅黑", "Dengxian", "等线体", "STXihei", "华文细黑", "Liberation Sans", "Droid Sans", "NSimSun", "新宋体", "SimSun", "宋体", "Helvetica", "sans-serif", "Tahoma", "Arial", "Verdana", "Geneva", "Georgia", "Times New Roman";
+}
+
+VInsertSelector {
+    border: none;
+    background: @insertselector_bg;
+}
+
 VUniversalEntry {
     background: transparent;
     border: 1px solid @universalentry_border_bg;
 }
+/* End QWidget */
diff --git a/src/resources/themes/v_native/v_native.palette b/src/resources/themes/v_native/v_native.palette
index a851ab94..d87dee19 100644
--- a/src/resources/themes/v_native/v_native.palette
+++ b/src/resources/themes/v_native/v_native.palette
@@ -7,7 +7,7 @@ mdhl_file=v_native.mdhl
 css_file=v_native.css
 codeblock_css_file=v_native_codeblock.css
 mermaid_css_file=v_native_mermaid.css
-version=7
+version=8
 
 [phony]
 ; Abstract color attributes.
@@ -154,6 +154,7 @@ label_titlelabel_fg=@title_fg
 label_titlelabel_bg=@title_bg
 
 ; LineEdit.
+lineedit_border=@border_bg
 lineedit_fg=@content_fg
 lineedit_bg=@content_bg
 
diff --git a/src/resources/themes/v_native/v_native.qss b/src/resources/themes/v_native/v_native.qss
index aa16633c..816f644d 100644
--- a/src/resources/themes/v_native/v_native.qss
+++ b/src/resources/themes/v_native/v_native.qss
@@ -1,11 +1,3 @@
-/* QWidget */
-QWidget
-{
-    color: @widget_fg;
-    font-family: "Hiragino Sans GB", "冬青黑体", "Microsoft YaHei", "微软雅黑", "Microsoft YaHei UI", "WenQuanYi Micro Hei", "文泉驿雅黑", "Dengxian", "等线体", "STXihei", "华文细黑", "Liberation Sans", "Droid Sans", "NSimSun", "新宋体", "SimSun", "宋体", "Helvetica", "sans-serif", "Tahoma", "Arial", "Verdana", "Geneva", "Georgia", "Times New Roman";
-}
-/* End QWidget */
-
 /* QMenuBar */
 QMenuBar {
     border: none;
@@ -420,6 +412,19 @@ VTabIndicator QLabel[TabIndicatorLabel="true"] {
     color: @tab_indicator_label_fg;
     background: transparent;
 }
+
+VSelectorItemWidget QLabel[SelectorItemShortcutLabel="true"] {
+    font: bold;
+    border: $2px solid @selectoritem_border;
+    padding: 3px;
+    border-radius: 5px;
+    background-color: @selectoritem_bg;
+    color: @selectoritem_fg;
+}
+
+VDoubleRowItemWidget QLabel[FirstRowLabel="true"] {
+    font: bold;
+}
 /* End QLabel */
 
 /* QLineEdit */
@@ -430,6 +435,10 @@ QLineEdit[VimCommandLine="true"] {
     color: @lineedit_fg;
     background: @lineedit_bg;
 }
+
+VUniversalEntry VMetaWordLineEdit {
+    border: 1px solid @lineedit_border;
+}
 /* End QLineEdit */
 
 /* QTabBar */
@@ -448,20 +457,6 @@ QTabBar::close-button:hover {
 }
 /* End QTabBar */
 
-VSelectorItemWidget QLabel[SelectorItemShortcutLabel="true"] {
-    font: bold;
-    border: $2px solid @selectoritem_border;
-    padding: 3px;
-    border-radius: 5px;
-    background-color: @selectoritem_bg;
-    color: @selectoritem_fg;
-}
-
-VInsertSelector {
-    border: none;
-    background: @insertselector_bg;
-}
-
 /* QTreeView */
 QTreeView {
     border: none;
@@ -502,6 +497,19 @@ QSplitter::handle:horizontal {
 }
 /* End QSplitter */
 
+/* QWidget */
 QWidget#FindReplaceTitleWidget {
     background: @title_bg;
 }
+
+QWidget
+{
+    color: @widget_fg;
+    font-family: "Hiragino Sans GB", "冬青黑体", "Microsoft YaHei", "微软雅黑", "Microsoft YaHei UI", "WenQuanYi Micro Hei", "文泉驿雅黑", "Dengxian", "等线体", "STXihei", "华文细黑", "Liberation Sans", "Droid Sans", "NSimSun", "新宋体", "SimSun", "宋体", "Helvetica", "sans-serif", "Tahoma", "Arial", "Verdana", "Geneva", "Georgia", "Times New Roman";
+}
+
+VInsertSelector {
+    border: none;
+    background: @insertselector_bg;
+}
+/* End QWidget */
diff --git a/src/resources/themes/v_pure/v_pure.palette b/src/resources/themes/v_pure/v_pure.palette
index 2728965f..4edfb18f 100644
--- a/src/resources/themes/v_pure/v_pure.palette
+++ b/src/resources/themes/v_pure/v_pure.palette
@@ -7,7 +7,7 @@ mdhl_file=v_pure.mdhl
 css_file=v_pure.css
 codeblock_css_file=v_pure_codeblock.css
 mermaid_css_file=v_pure_mermaid.css
-version=7
+version=8
 
 [phony]
 ; Abstract color attributes.
@@ -349,6 +349,7 @@ progressbar_bg=@edit_bg
 progressbar_border_bg=@border_bg
 progressbar_chunk_bg=@master_light_bg
 
+universalentry_bg=@base_bg
 universalentry_border_bg=@border_bg
 
 doublerowitem_second_row_label_fg=#6C6C6C
diff --git a/src/resources/themes/v_pure/v_pure.qss b/src/resources/themes/v_pure/v_pure.qss
index dcbc20d4..ee21836a 100644
--- a/src/resources/themes/v_pure/v_pure.qss
+++ b/src/resources/themes/v_pure/v_pure.qss
@@ -5,26 +5,6 @@ QToolTip
     color: @tooltip_fg;
 }
 
-/* QWidget */
-QWidget#FindReplaceTitleWidget {
-    background: @title_bg;
-}
-
-QWidget[ToolBoxTitle="true"] {
-    border-bottom: $2px solid @toolbox_title_border;
-}
-
-QWidget[MainEditor="true"] {
-    border: none;
-}
-
-QWidget
-{
-    color: @widget_fg;
-    font-family: "Hiragino Sans GB", "冬青黑体", "Microsoft YaHei", "微软雅黑", "Microsoft YaHei UI", "WenQuanYi Micro Hei", "文泉驿雅黑", "Dengxian", "等线体", "STXihei", "华文细黑", "Liberation Sans", "Droid Sans", "NSimSun", "新宋体", "SimSun", "宋体", "Helvetica", "sans-serif", "Tahoma", "Arial", "Verdana", "Geneva", "Georgia", "Times New Roman";
-}
-/* End QWidget */
-
 /* QMainWindow */
 QMainWindow {
     color: @base_fg;
@@ -590,12 +570,21 @@ VTabIndicator QLabel[TabIndicatorLabel="true"] {
     background: transparent;
 }
 
+VSelectorItemWidget QLabel[SelectorItemShortcutLabel="true"] {
+    font: bold;
+    border: $2px solid @selectoritem_border;
+    padding: 3px;
+    border-radius: 5px;
+    background-color: @selectoritem_bg;
+    color: @selectoritem_fg;
+}
+
 VDoubleRowItemWidget QLabel[FirstRowLabel="true"] {
     font-size: 10pt;
 }
 
 VDoubleRowItemWidget QLabel[SecondRowLabel="true"] {
-    font-size: 8pt;
+    font-size: 9pt;
     color: @doublerowitem_second_row_label_fg;
 }
 
@@ -738,20 +727,6 @@ QTabBar QToolButton::left-arrow:disabled {
 }
 /* End QTabBar */
 
-VSelectorItemWidget QLabel[SelectorItemShortcutLabel="true"] {
-    font: bold;
-    border: $2px solid @selectoritem_border;
-    padding: 3px;
-    border-radius: 5px;
-    background-color: @selectoritem_bg;
-    color: @selectoritem_fg;
-}
-
-VInsertSelector {
-    border: none;
-    background: @insertselector_bg;
-}
-
 /* QTreeView */
 QTreeView[ItemBorder="true"]::item {
     padding-top: 5px;
@@ -1264,7 +1239,32 @@ QProgressBar::chunk {
 }
 /* End QProgressBar */
 
+/* QWidget */
+QWidget#FindReplaceTitleWidget {
+    background: @title_bg;
+}
+
+QWidget[ToolBoxTitle="true"] {
+    border-bottom: $2px solid @toolbox_title_border;
+}
+
+QWidget[MainEditor="true"] {
+    border: none;
+}
+
+QWidget
+{
+    color: @widget_fg;
+    font-family: "Hiragino Sans GB", "冬青黑体", "Microsoft YaHei", "微软雅黑", "Microsoft YaHei UI", "WenQuanYi Micro Hei", "文泉驿雅黑", "Dengxian", "等线体", "STXihei", "华文细黑", "Liberation Sans", "Droid Sans", "NSimSun", "新宋体", "SimSun", "宋体", "Helvetica", "sans-serif", "Tahoma", "Arial", "Verdana", "Geneva", "Georgia", "Times New Roman";
+}
+
+VInsertSelector {
+    border: none;
+    background: @insertselector_bg;
+}
+
 VUniversalEntry {
-    background: transparent;
+    background: @universalentry_bg;
     border: 1px solid @universalentry_border_bg;
 }
+/* End QWidget */
diff --git a/src/vdoublerowitemwidget.cpp b/src/vdoublerowitemwidget.cpp
index 058223d0..465c3301 100644
--- a/src/vdoublerowitemwidget.cpp
+++ b/src/vdoublerowitemwidget.cpp
@@ -18,7 +18,6 @@ VDoubleRowItemWidget::VDoubleRowItemWidget(QWidget *p_parent)
     layout->addWidget(m_secondLabel);
     layout->addStretch();
     layout->setContentsMargins(3, 0, 0, 0);
-    layout->setSpacing(0);
 
     setLayout(layout);
 }