From 8f62904a343e2c246c624247eafe21b1f6734a12 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Fri, 1 Apr 2016 11:53:32 +0200
Subject: [PATCH] Work on msg viewing.

---
 resources/binaries                   |  2 +-
 resources/skins/base/blau-green.xml  |  3 --
 resources/skins/base/blau-yellow.xml |  3 --
 resources/skins/base/blau.xml        |  3 --
 resources/skins/base/greeen.xml      |  3 --
 resources/skins/base/solarized.xml   |  3 --
 resources/skins/base/vergilius.xml   |  3 --
 resources/text/CHANGELOG             |  6 +--
 src/gui/feedmessageviewer.cpp        | 10 ++---
 src/gui/messagepreviewer.cpp         | 57 +++++++++++++++++++++++-----
 src/gui/messagepreviewer.h           | 21 +++++++++-
 src/gui/messagepreviewer.ui          | 26 +++++++++++--
 src/gui/messagesview.cpp             |  2 +-
 src/gui/messagesview.h               |  2 +-
 src/miscellaneous/skinfactory.cpp    | 16 +-------
 src/miscellaneous/skinfactory.h      |  3 --
 16 files changed, 99 insertions(+), 64 deletions(-)

diff --git a/resources/binaries b/resources/binaries
index 176715f7b..9ac6aeaba 160000
--- a/resources/binaries
+++ b/resources/binaries
@@ -1 +1 @@
-Subproject commit 176715f7b3229289e2fb0dffb000c436664a26ff
+Subproject commit 9ac6aeabaae34afe02602f51dae7fc181aff49dd
diff --git a/resources/skins/base/blau-green.xml b/resources/skins/base/blau-green.xml
index 1fc6393c6..15dff03cb 100644
--- a/resources/skins/base/blau-green.xml
+++ b/resources/skins/base/blau-green.xml
@@ -6,8 +6,5 @@
     <email>rotter.martinos@gmail.com</email>
   </author>
   <style>fusion,plastique</style>
-  <markup_wrapper>PGh0bWw+DQogIDxoZWFkPg0KICAgIDxzdHlsZT4NCiAgICAgIDo6LXdlYmtpdC1zY3JvbGxiYXIgew0KICAgICAgICB3aWR0aDogMjBweDsNCiAgICAgICAgaGVpZ2h0OiAyMHB4Ow0KICAgICAgfQ0KICAgICAgDQogICAgICA6Oi13ZWJraXQtc2Nyb2xsYmFyLXRodW1iIHsNCiAgICAgICAgaGVpZ2h0OiAxNHB4Ow0KICAgICAgICBib3JkZXI6IDRweCBzb2xpZCByZ2JhKDAsIDAsIDAsIDApOw0KICAgICAgICBiYWNrZ3JvdW5kLWNsaXA6IHBhZGRpbmctYm94Ow0KICAgICAgICAtd2Via2l0LWJvcmRlci1yYWRpdXM6IDFweDsNCiAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogIzhiYmYwYTsNCiAgICAgICAgLXdlYmtpdC1ib3gtc2hhZG93OiBpbnNldCAtMXB4IC0xcHggMHB4IHJnYmEoMCwgMCwgMCwgMC4wNSksIGluc2V0IDFweCAxcHggMHB4IHJnYmEoMCwgMCwgMCwgMC4wNSk7DQogICAgICB9DQogICAgICANCiAgICAgIDo6LXdlYmtpdC1zY3JvbGxiYXItYnV0dG9uIHsNCiAgICAgICAgd2lkdGg6IDA7DQogICAgICAgIGhlaWdodDogMDsNCiAgICAgICAgZGlzcGxheTogbm9uZTsNCiAgICAgIH0NCiAgICAgIA0KICAgICAgOjotd2Via2l0LXNjcm9sbGJhci1jb3JuZXIgew0KICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiB0cmFuc3BhcmVudDsNCiAgICAgIH0NCiAgICANCiAgICAgIGJvZHkgew0KICAgICAgICBtYXJnaW46IDBweDsNCiAgICAgICAgcGFkZGluZzogMHB4Ow0KICAgICAgfQ0KICAgIA0KICAgICAgcHJlIHsNCiAgICAgICAgd2hpdGUtc3BhY2U6IHByZS13cmFwOw0KICAgICAgfQ0KDQogICAgICAuaGVhZGVydGV4dCB7DQogICAgICAgIGZvbnQtc2l6ZTogMjBweDsNCiAgICAgICAgbWFyZ2luLWJvdHRvbTogMTBweDsNCiAgICAgIH0NCg0KICAgICAgLmhlYWRlciB7DQogICAgICAgIGZvbnQtc2l6ZTogMTdweDsNCiAgICAgICAgYmFja2dyb3VuZDogLXdlYmtpdC1ncmFkaWVudChsaW5lYXIsIGxlZnQgdG9wLCBsZWZ0IGJvdHRvbSwgY29sb3Itc3RvcCgwJSwgIzhiYmYwYSksIGNvbG9yLXN0b3AoMTAwJSwgIzk4ZDEwYikpOw0KICAgICAgICBwYWRkaW5nOiA2cHg7DQogICAgICAgIG1hcmdpbjogMHB4IGF1dG87DQogICAgICAgIGNvbG9yOiBibGFjazsNCiAgICAgICAgYm9yZGVyOiAwLjVweCBzb2xpZCBibGFjazsNCiAgICAgIH0NCg0KICAgICAgLmhlYWRlciBhIHsNCiAgICAgICAgY29sb3I6IHdoaXRlOw0KICAgICAgfQ0KDQogICAgICAuY29udGVudCB7DQogICAgICAgIGJvcmRlci10b3A6IDFweCBzb2xpZCBncmF5Ow0KICAgICAgICBmb250LXNpemU6IDE2cHg7DQogICAgICAgIGNvbG9yOiAjZWVlZWVlOw0KICAgICAgICBtYXJnaW46IDBweCBhdXRvOw0KICAgICAgICBwYWRkaW5nOiA2cHg7DQogICAgICAgIHBhZGRpbmctdG9wOiAxMnB4Ow0KICAgICAgfQ0KICAgICAgDQogICAgICAuY29udGFpbmVyIHsNCiAgICAgICAgYm9yZGVyOiAxcHggc29saWQgZ3JheTsNCiAgICAgICAgLXdlYmtpdC1ib3JkZXItcmFkaXVzOiAycHg7DQogICAgICAgIG1hcmdpbjogMTBweDsNCiAgICAgICAgLXdlYmtpdC1ib3gtc2hhZG93OiAycHggMnB4IDE2cHggMHB4IHJnYmEoNTAsIDUwLCA1MCwgMC42Mik7DQogICAgICB9DQogICAgPC9zdHlsZT4NCiAgICA8dGl0bGU+DQogICAgICAlMQ0KICAgIDwvdGl0bGU+DQogIDwvaGVhZD4NCiAgPGJvZHk+DQogICAgJTINCiAgPC9ib2R5Pg0KPC9odG1sPg==</markup_wrapper>
-  <markup>PGRpdiBjbGFzcz0iY29udGFpbmVyIj4NCiAgICAgIDxkaXYgY2xhc3M9ImhlYWRlciI+DQogICAgICAgIDxkaXYgY2xhc3M9ImhlYWRlcnRleHQiPg0KICAgICAgICAgICUxDQogICAgICAgIDwvZGl2Pg0KICAgICAgICAlMiAoJTUpDQogICAgICAgIDxicj4NCiAgICAgICAgPGEgaHJlZj0iJTMiPiUzPC9hPg0KICAgICAgICAlNg0KICAgICAgPC9kaXY+DQogICAgICA8ZGl2IGNsYXNzPSJjb250ZW50Ij4NCiAgICAgICAgJTQgDQogICAgICA8L2Rpdj4NCiAgICA8L2Rpdj4=</markup>
-  <markup_enclosure>PGEgY2xhc3M9ImVuY2xvc3VyZSIgaHJlZj0iJTMiPiUzPC9hPg==</markup_enclosure>
   <data>/* QWidget */
QWidget {
  color: #cccccc;
  background-color: #323232;
}

QWidget::item:hover {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #98d10b, stop: 1 #8bbf0a);
  color: #000000;
}

QWidget:disabled {
  color: #777777;
  background-color: #323232;
}

/* QToolButton */
  QToolButton , QToolButton:disabled {
  border: none;
  padding: 0px;
  background: transparent;
}

QToolButton:hover, QToolButton:pressed {
  border-radius: 2px;
  border: 1px solid gray;
}

QToolButton[popupMode="1"] {
  padding-right: 16px;
}

QToolButton::menu-button {
  border: 1px solid gray;
  border-top-right-radius: 2px;
  border-bottom-right-radius: 2px;
  width: 14px;
}

QToolButton::menu-arrow {
  image: url(##/images/down_arrow.png);
}

QToolButton::menu-arrow:open {
  top: 1px; left: 1px;
}

/* QStatusBar */
QStatusBar QToolButton {
  margin-left: 5px;
  margin-right: 5px;
}

QStatusBar::item {
  border: transparent;
}

/* QToolBar */
QToolBar::separator {
  width: 1px;
  background-color: #595959;

  margin-left: 5px;
  margin-right: 5px;
}

QToolBar {
  padding-left: 5px;
  padding-right: 5px;
}

/* QToolTip */
QToolTip {
  border: 1px solid black;
  background-color: #98d10b;
  color: black;
  border-radius: 1px;
  opacity: 220;
}

/* QMenuBar */
QMenuBar::item {
  background: transparent
}

QMenuBar::item:selected {
  background: transparent;
  border: 1px solid #8bbf0a;
}

QMenuBar::item:pressed {
  background: #444;
  color: black;
  border: 1px solid #000;
  background-color: QLinearGradient( x1:0, y1:0, x2:0, y2:1, stop:1 #98d10b, stop:0.4 #8bbf0a );
  margin-bottom: -1px;
  padding-bottom: 1px;
}

/* QMenu */
QMenu {
  border: 1px solid #000;
}

QMenu::item {
  padding: 2px 10px 2px 23px;
}

QMenu::icon {
  padding-left: 4px;
}

QMenu::item:selected {
  color: black;
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #98d10b, stop: 1 #8bbf0a);
}

QMenu::separator {
  height: 1px;
  background-color: #595959;
  color: white;
  margin-top: 3px;
  margin-bottom: 3px;
  margin-left: 5px;
  margin-right: 5px;
}

/* QPushButton */
QPushButton {
  color: #b1b1b1;
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #565656, stop: 0.1 #525252, stop: 0.5 #4e4e4e, stop: 0.9 #4a4a4a, stop: 1 #464646);
  border: 1px solid #1e1e1e;
  border-radius: 1px;
  padding: 3px;
  font-size: 12px;
  padding-left: 6px;
  padding-right: 6px;
  min-width: 30px;
}

QPushButton:pressed {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #2d2d2d, stop: 0.1 #2b2b2b, stop: 0.5 #292929, stop: 0.9 #282828, stop: 1 #252525)
}

QPushButton#m_btnInsertSeparator, QPushButton#m_btnInsertSpacer {
  min-width: 130px;
}

/* QComboBox */
QComboBox {
  selection-background-color: #8bbf0a;
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #565656, stop: 0.1 #525252, stop: 0.5 #4e4e4e, stop: 0.9 #4a4a4a, stop: 1 #464646);
  border: 1px solid #1e1e1e;
  border-radius: 1px;
  padding: 2px;
  padding-top: 1px;
  padding-bottom: 1px;
  padding-left: 4px;
}

QComboBox:hover, QPushButton:hover {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #98d10b, stop: 1 #8bbf0a);
  color: black;
}

QComboBox:on {
  padding: 1px;
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #2d2d2d, stop: 0.1 #2b2b2b, stop: 0.5 #292929, stop: 0.9 #282828, stop: 1 #252525);
}

QComboBox QAbstractItemView {
  border: 1px solid QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #98d10b, stop: 1 #8bbf0a);
  selection-background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #98d10b, stop: 1 #8bbf0a);
}

QComboBox::drop-down {
  subcontrol-origin: padding;
  subcontrol-position: top right;
  width: 15px;
  border-left-width: 0px;
  border-left-color: darkgray;
  border-left-style: solid;
  border-top-right-radius: 1px;
  border-bottom-right-radius: 1px;
}

QComboBox::down-arrow {
  image: url(##/images/down_arrow.png)
}

/* QScrollBar */
QScrollBar:horizontal {
  border: 1px solid #222222;
  background: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0.0 #121212, stop: 0.2 #282828, stop: 1 #484848);
  height: 13px;
  margin: 0px 16px 0 16px;
}

QScrollBar::handle:horizontal {
  background: QLinearGradient( x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #98d10b, stop: 0.5 #8bbf0a, stop: 1 #98d10b);
  min-height: 20px;
  border-radius: 1px;
}

QScrollBar::add-line:horizontal {
  border: 1px solid #1b1b19;
  border-radius: 1px;
  background: QLinearGradient( x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #98d10b, stop: 1 #8bbf0a);
  width: 13px;
  subcontrol-position: right;
  subcontrol-origin: margin;
}

QScrollBar::sub-line:horizontal {
  border: 1px solid #1b1b19;
  border-radius: 1px;
  background: QLinearGradient( x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #98d10b, stop: 1 #8bbf0a);
  width: 13px;
  subcontrol-position: left;
  subcontrol-origin: margin;
}

QScrollBar::right-arrow:horizontal, QScrollBar::left-arrow:horizontal {
  border: 1px solid black;
  width: 1px;
  height: 1px;
  background: white;
}

QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal {
  background: none
}

QScrollBar:vertical {
  background: QLinearGradient( x1: 0, y1: 0, x2: 1, y2: 0, stop: 0.0 #121212, stop: 0.2 #282828, stop: 1 #484848);
  width: 13px;
  margin: 16px 0 16px 0;
  border: 1px solid #222222;
}

QScrollBar::handle:vertical {
  background: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #98d10b, stop: 0.5 #8bbf0a, stop: 1 #98d10b);
  min-height: 20px;
  border-radius: 1px;
}
QScrollBar::add-line:vertical {
  border: 1px solid #1b1b19;
  border-radius: 1px;
  background: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #98d10b, stop: 1 #8bbf0a);
  height: 13px;
  subcontrol-position: bottom;
  subcontrol-origin: margin;
}

QScrollBar::sub-line:vertical {
  border: 1px solid #1b1b19;
  border-radius: 1px;
  background: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #98d10b, stop: 1 #8bbf0a);
  height: 13px;
  subcontrol-position: top;
  subcontrol-origin: margin;
}

QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical {
  border: 1px solid black;
  width: 1px;
  height: 1px;
  background: white;
}

QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {
  background: none;
}

/* QSplitter */
QSplitter::handle {
  background-color: #4e4e4e;
}

/* QHeaderView */
QHeaderView {
  background-color: transparent;
  color: #cccccc;
}

QHeaderView::section {
  min-height: 20px;
  border: 0.5 px solid #595959;
  border-right: 0.5 solid #707070;
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #565656, stop: 0.1 #525252, stop: 0.5 #4e4e4e, stop: 0.9 #4a4a4a, stop: 1 #464646);
}

QHeaderView::section:first {
  padding-left: 4px;
  padding-right: 2px;
}

QHeaderView::section:!first {
  padding-left: 2px;
  padding-right: 2px;
}

QHeaderView::section:hover {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #565656, stop: 0.1 #505050, stop: 0.5 #4e4e4e, stop: 0.9 #404040, stop: 1 #404040);
}

/* QTreeView */
QTreeView::branch:has-siblings:!adjoins-item  {
  border-image: url(qss/dummy.png) 0;
}

QTreeView::branch:has-siblings:adjoins-item {
  border-image: url(qss/dummy.png) 0;
}

QTreeView::branch:!has-children:!has-siblings:adjoins-item  {
  border-image: url(qss/dummy.png) 0;
}

QTreeView::branch:has-children:!has-siblings:closed,
QTreeView::branch:closed:has-children:has-siblings  {
  border-image: none;
  image: url(qss/branch-closed.png);
}

QTreeView::branch:open:has-children:!has-siblings,
QTreeView::branch:open:has-children:has-siblings  {
  border-image: none;
  image: url(qss/branch-open.png);
}

QTreeView::item {
  padding: 1px;
} 

QTreeView[hideTree="true"]::branch:!has-chlidren:hasSiblings {
  border-image: none;
  image: none;
}

QTreeView::item:selected, QTreeView::branch:selected, QTreeView::item:selected:active, QTreeView::item:selected:!active, QTreeView::item:hover {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #98d10b, stop: 1 #8bbf0a);
  color: #000000;
}

/* QListView */
QListView  {
  show-decoration-selected: 1;
}
 
QListView::item:selected, QListView::item:selected:!active, QListView::item:selected:active, QListView::item:hover {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #98d10b, stop: 1 #8bbf0a);
  color: #000000;
}

/* QTextEdit, QPlainTextEdit */
QTextEdit:focus, QPlainTextEdit:focus, QLineEdit:focus {
  border: 1px solid QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #98d10b, stop: 1 #8bbf0a)
}

QTextEdit, QPlainTextEdit {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4d4d4d, stop: 0 #646464, stop: 1 #5d5d5d)
}

/* QLineEdit */
QLineEdit {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4d4d4d, stop: 0 #646464, stop: 1 #5d5d5d);
  padding: 1px;
  border-style: solid;
  border: 1px solid #595959;
  border-radius: 0px;
}

/* QProgressBar */
QProgressBar {
  border: transparent;
  border-radius: 1px;
  text-align: center;
}
QProgressBar::chunk {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #98d10b, stop: 1 #8bbf0a);
  width: 3px;
  margin: 0.5px;
}

/* QCheckBox */
QCheckBox::indicator {
  color: #b1b1b1;
  background-color: #323232;
  border: 1px solid #b1b1b1;
  width: 9px;
  height: 9px;
}

QCheckBox::indicator:checked {
  image: url(##/images/checkbox.png)
}

QCheckBox::indicator:disabled {
  border: 1px solid #444
}

/* QRadioButton */
QRadioButton::indicator:disabled {
  border: 1px solid #444
}

QRadioButton::indicator {
  border-radius: 6px
}

QRadioButton::indicator:checked, QRadioButton::indicator:unchecked {
  color: #b1b1b1;
  background-color: #323232;
  border: 1px solid #b1b1b1;
}

QRadioButton::indicator:checked {
  background-color: qradialgradient( cx: 0.5, cy: 0.5, fx: 0.5, fy: 0.5, radius: 1.0, stop: 0.25 #98d10b, stop: 0.3 #323232 )
}

QRadioButton::indicator:hover, QCheckBox::indicator:hover {
  border: 1px solid #98d10b;
}</data>
 </skin>
\ No newline at end of file
diff --git a/resources/skins/base/blau-yellow.xml b/resources/skins/base/blau-yellow.xml
index 3adc64177..086fb94a3 100644
--- a/resources/skins/base/blau-yellow.xml
+++ b/resources/skins/base/blau-yellow.xml
@@ -6,8 +6,5 @@
     <email>rotter.martinos@gmail.com</email>
   </author>
   <style>fusion,plastique</style>
-  <markup_wrapper>PGh0bWw+DQogIDxoZWFkPg0KICAgIDxzdHlsZT4NCiAgICAgIDo6LXdlYmtpdC1zY3JvbGxiYXIgew0KICAgICAgICB3aWR0aDogMjBweDsNCiAgICAgICAgaGVpZ2h0OiAyMHB4Ow0KICAgICAgfQ0KICAgICAgDQogICAgICA6Oi13ZWJraXQtc2Nyb2xsYmFyLXRodW1iIHsNCiAgICAgICAgaGVpZ2h0OiAxNHB4Ow0KICAgICAgICBib3JkZXI6IDRweCBzb2xpZCByZ2JhKDAsIDAsIDAsIDApOw0KICAgICAgICBiYWNrZ3JvdW5kLWNsaXA6IHBhZGRpbmctYm94Ow0KICAgICAgICAtd2Via2l0LWJvcmRlci1yYWRpdXM6IDFweDsNCiAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogI0Y1RjEwNTsNCiAgICAgICAgLXdlYmtpdC1ib3gtc2hhZG93OiBpbnNldCAtMXB4IC0xcHggMHB4IHJnYmEoMCwgMCwgMCwgMC4wNSksIGluc2V0IDFweCAxcHggMHB4IHJnYmEoMCwgMCwgMCwgMC4wNSk7DQogICAgICB9DQogICAgICANCiAgICAgIDo6LXdlYmtpdC1zY3JvbGxiYXItYnV0dG9uIHsNCiAgICAgICAgd2lkdGg6IDA7DQogICAgICAgIGhlaWdodDogMDsNCiAgICAgICAgZGlzcGxheTogbm9uZTsNCiAgICAgIH0NCiAgICAgIA0KICAgICAgOjotd2Via2l0LXNjcm9sbGJhci1jb3JuZXIgew0KICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiB0cmFuc3BhcmVudDsNCiAgICAgIH0NCiAgICANCiAgICAgIGJvZHkgew0KICAgICAgICBtYXJnaW46IDBweDsNCiAgICAgICAgcGFkZGluZzogMHB4Ow0KICAgICAgfQ0KICAgIA0KICAgICAgcHJlIHsNCiAgICAgICAgd2hpdGUtc3BhY2U6IHByZS13cmFwOw0KICAgICAgfQ0KDQogICAgICAuaGVhZGVydGV4dCB7DQogICAgICAgIGZvbnQtc2l6ZTogMjBweDsNCiAgICAgICAgbWFyZ2luLWJvdHRvbTogMTBweDsNCiAgICAgIH0NCg0KICAgICAgLmhlYWRlciB7DQogICAgICAgIGZvbnQtc2l6ZTogMTdweDsNCiAgICAgICAgYmFja2dyb3VuZDogdHJhbnNwYXJlbnQ7DQogICAgICAgIHBhZGRpbmc6IDZweDsNCiAgICAgICAgbWFyZ2luOiAwcHggYXV0bzsNCiAgICAgICAgY29sb3I6ICNGNUYxMDU7DQogICAgICAgIGJvcmRlcjogMC41cHggc29saWQgI0Y1RjEwNTsNCiAgICAgIH0NCg0KICAgICAgLmhlYWRlciBhIHsNCiAgICAgICAgY29sb3I6IHdoaXRlOw0KICAgICAgfQ0KDQogICAgICAuY29udGVudCB7DQogICAgICAgIGJhY2tncm91bmQ6IC13ZWJraXQtZ3JhZGllbnQobGluZWFyLCBsZWZ0IHRvcCwgbGVmdCBib3R0b20sIGNvbG9yLXN0b3AoMCUsICNGNUYxMDUpLCBjb2xvci1zdG9wKDEwMCUsICNGMkVBMDUpKTsNCiAgICAgICAgYm9yZGVyLXRvcDogMXB4IHNvbGlkIGdyYXk7DQogICAgICAgIGZvbnQtc2l6ZTogMTZweDsNCiAgICAgICAgY29sb3I6IGJsYWNrOw0KICAgICAgICBtYXJnaW46IDBweCBhdXRvOw0KICAgICAgICBwYWRkaW5nOiA2cHg7DQogICAgICAgIHBhZGRpbmctdG9wOiAxMnB4Ow0KICAgICAgfQ0KICAgICAgDQogICAgICAuY29udGFpbmVyIHsNCiAgICAgICAgYm9yZGVyOiAxcHggc29saWQgYmxhY2s7DQogICAgICAgIC13ZWJraXQtYm9yZGVyLXJhZGl1czogMnB4Ow0KICAgICAgICBtYXJnaW46IDEwcHg7DQogICAgICAgIC13ZWJraXQtYm94LXNoYWRvdzogMnB4IDJweCAxNnB4IDBweCByZ2JhKDUwLCA1MCwgNTAsIDAuNjIpOw0KICAgICAgfQ0KICAgIDwvc3R5bGU+DQogICAgPHRpdGxlPg0KICAgICAgJTENCiAgICA8L3RpdGxlPg0KICA8L2hlYWQ+DQogIDxib2R5Pg0KICAgICUyDQogIDwvYm9keT4NCjwvaHRtbD4=</markup_wrapper>
-  <markup>PGRpdiBjbGFzcz0iY29udGFpbmVyIj4NCiAgICAgIDxkaXYgY2xhc3M9ImhlYWRlciI+DQogICAgICAgIDxkaXYgY2xhc3M9ImhlYWRlcnRleHQiPg0KICAgICAgICAgICUxDQogICAgICAgIDwvZGl2Pg0KICAgICAgICAlMiAoJTUpDQogICAgICAgIDxicj4NCiAgICAgICAgPGEgaHJlZj0iJTMiPiUzPC9hPg0KICAgICAgICAlNg0KICAgICAgPC9kaXY+DQogICAgICA8ZGl2IGNsYXNzPSJjb250ZW50Ij4NCiAgICAgICAgJTQgDQogICAgICA8L2Rpdj4NCiAgICA8L2Rpdj4=</markup>
-  <markup_enclosure>PGEgY2xhc3M9ImVuY2xvc3VyZSIgaHJlZj0iJTMiPiUzPC9hPg==</markup_enclosure>
   <data>/* QWidget */
QWidget {
  color: #cccccc;
  background-color: #323232;
}

QWidget::item:hover {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F5F105, stop: 1 #F2EA05);
  color: #000000;
}

QWidget:disabled {
  color: #777777;
  background-color: #323232;
}

/* QToolButton */
QToolButton , QToolButton:disabled {
  border: none;
  padding: 0px;
  background: transparent;
}

QToolButton:hover, QToolButton:pressed {
  border-radius: 2px;
  border: 1px solid gray;
}

QToolButton[popupMode="1"] {
  padding-right: 16px;
}

QToolButton::menu-button {
  border: 1px solid gray;
  border-top-right-radius: 2px;
  border-bottom-right-radius: 2px;
  width: 14px;
}

QToolButton::menu-arrow {
  image: url(##/images/down_arrow.png);
}

QToolButton::menu-arrow:open {
  top: 1px; left: 1px;
}

/* QStatusBar */
QStatusBar QToolButton {
  margin-left: 5px;
  margin-right: 5px;
}

QStatusBar::item {
  border: transparent;
}

/* QToolBar */
QToolBar::separator {
  width: 1px;
  background-color: #F2EA05;

  margin-left: 5px;
  margin-right: 5px;
}

QToolBar {
  padding-left: 5px;
  padding-right: 5px;
}

/* QToolTip */
QToolTip {
  border: 1px solid black;
  background-color: #F5F105;
  color: black;
  border-radius: 1px;
  opacity: 220;
}

/* QMenuBar */
QMenuBar::item {
  background: transparent
}

QMenuBar::item:selected {
  background: transparent;
  border: 1px solid #F2EA05;
}

QMenuBar::item:pressed {
  background: #444;
  color: black;
  border: 1px solid #000;
  background-color: QLinearGradient( x1:0, y1:0, x2:0, y2:1, stop:1 #F5F105, stop:0.4 #F2EA05 );
  margin-bottom: -1px;
  padding-bottom: 1px;
}

/* QMenu */
QMenu {
  border: 1px solid #000;
}

QMenu::item {
  padding: 2px 10px 2px 23px;
}

QMenu::icon {
  padding-left: 4px;
}

QMenu::item:selected {
  color: black;
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F5F105, stop: 1 #F2EA05);
}

QMenu::separator {
  height: 1px;
  background-color: #595959;
  color: #F2EA05;
  margin-top: 3px;
  margin-bottom: 3px;
  margin-left: 5px;
  margin-right: 5px;
}

/* QPushButton */
QPushButton {
  color: #b1b1b1;
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #565656, stop: 0.1 #525252, stop: 0.5 #4e4e4e, stop: 0.9 #4a4a4a, stop: 1 #464646);
  border: 1px solid #1e1e1e;
  border-radius: 1px;
  padding: 3px;
  font-size: 12px;
  padding-left: 6px;
  padding-right: 6px;
  min-width: 30px;
}

QPushButton:pressed {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #2d2d2d, stop: 0.1 #2b2b2b, stop: 0.5 #292929, stop: 0.9 #282828, stop: 1 #252525)
}

QPushButton#m_btnInsertSeparator, QPushButton#m_btnInsertSpacer {
  min-width: 130px;
}

/* QComboBox */
QComboBox {
  selection-background-color: #F2EA05;
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #565656, stop: 0.1 #525252, stop: 0.5 #4e4e4e, stop: 0.9 #4a4a4a, stop: 1 #464646);
  border: 1px solid #1e1e1e;
  border-radius: 1px;
  padding: 2px;
  padding-top: 1px;
  padding-bottom: 1px;
  padding-left: 4px;
}

QComboBox:hover, QPushButton:hover {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F5F105, stop: 1 #F2EA05);
  color: black;
}

QComboBox:on {
  padding: 1px;
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #2d2d2d, stop: 0.1 #2b2b2b, stop: 0.5 #292929, stop: 0.9 #282828, stop: 1 #252525);
}

QComboBox QAbstractItemView {
  border: 1px solid QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F5F105, stop: 1 #F2EA05);
  selection-background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F5F105, stop: 1 #F2EA05);
}

QComboBox::drop-down {
  subcontrol-origin: padding;
  subcontrol-position: top right;
  width: 15px;
  border-left-width: 0px;
  border-left-color: darkgray;
  border-left-style: solid;
  border-top-right-radius: 1px;
  border-bottom-right-radius: 1px;
}

QComboBox::down-arrow {
  image: url(##/images/down_arrow.png)
}

/* QScrollBar */
QScrollBar:horizontal {
  border: 1px solid #222222;
  background: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0.0 #121212, stop: 0.2 #282828, stop: 1 #484848);
  height: 13px;
  margin: 0px 16px 0 16px;
}

QScrollBar::handle:horizontal {
  background: QLinearGradient( x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #F5F105, stop: 0.5 #F2EA05, stop: 1 #F5F105);
  min-height: 20px;
  border-radius: 1px;
}

QScrollBar::add-line:horizontal {
  border: 1px solid #1b1b19;
  border-radius: 1px;
  background: QLinearGradient( x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #F5F105, stop: 1 #F2EA05);
  width: 13px;
  subcontrol-position: right;
  subcontrol-origin: margin;
}

QScrollBar::sub-line:horizontal {
  border: 1px solid #1b1b19;
  border-radius: 1px;
  background: QLinearGradient( x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #F5F105, stop: 1 #F2EA05);
  width: 13px;
  subcontrol-position: left;
  subcontrol-origin: margin;
}

QScrollBar::right-arrow:horizontal, QScrollBar::left-arrow:horizontal {
  border: 1px solid black;
  width: 1px;
  height: 1px;
  background: white;
}

QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal {
  background: none
}

QScrollBar:vertical {
  background: QLinearGradient( x1: 0, y1: 0, x2: 1, y2: 0, stop: 0.0 #121212, stop: 0.2 #282828, stop: 1 #484848);
  width: 13px;
  margin: 16px 0 16px 0;
  border: 1px solid #222222;
}

QScrollBar::handle:vertical {
  background: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F5F105, stop: 0.5 #F2EA05, stop: 1 #F5F105);
  min-height: 20px;
  border-radius: 1px;
}
QScrollBar::add-line:vertical {
  border: 1px solid #1b1b19;
  border-radius: 1px;
  background: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F5F105, stop: 1 #F2EA05);
  height: 13px;
  subcontrol-position: bottom;
  subcontrol-origin: margin;
}

QScrollBar::sub-line:vertical {
  border: 1px solid #1b1b19;
  border-radius: 1px;
  background: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F5F105, stop: 1 #F2EA05);
  height: 13px;
  subcontrol-position: top;
  subcontrol-origin: margin;
}

QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical {
  border: 1px solid black;
  width: 1px;
  height: 1px;
  background: white;
}

QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {
  background: none;
}

/* QSplitter */
QSplitter::handle {
  background-color: #4e4e4e;
}

/* QHeaderView */
QHeaderView {
  background-color: transparent;
  color: #cccccc;
}

QHeaderView::section {
  min-height: 20px;
  border: 0.5 px solid #595959;
  border-right: 0.5 solid #707070;
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #565656, stop: 0.1 #525252, stop: 0.5 #4e4e4e, stop: 0.9 #4a4a4a, stop: 1 #464646);
}

QHeaderView::section:first {
  padding-left: 4px;
  padding-right: 2px;
}

QHeaderView::section:!first {
  padding-left: 2px;
  padding-right: 2px;
}

QHeaderView::section:hover {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #565656, stop: 0.1 #505050, stop: 0.5 #4e4e4e, stop: 0.9 #404040, stop: 1 #404040);
}

/* QTreeView */
QTreeView::branch:has-siblings:!adjoins-item  {
  border-image: url(qss/dummy.png) 0;
}

QTreeView::branch:has-siblings:adjoins-item {
  border-image: url(qss/dummy.png) 0;
}

QTreeView::branch:!has-children:!has-siblings:adjoins-item  {
  border-image: url(qss/dummy.png) 0;
}

QTreeView::branch:has-children:!has-siblings:closed,
QTreeView::branch:closed:has-children:has-siblings  {
  border-image: none;
  image: url(qss/branch-closed.png);
}

QTreeView::branch:open:has-children:!has-siblings,
QTreeView::branch:open:has-children:has-siblings  {
  border-image: none;
  image: url(qss/branch-open.png);
}

QTreeView::item {
  padding: 1px;
} 

QTreeView[hideTree="true"]::branch:!has-chlidren:hasSiblings {
  border-image: none;
  image: none;
}

QTreeView::item:selected, QTreeView::branch:selected, QTreeView::item:selected:active, QTreeView::item:selected:!active, QTreeView::item:hover {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F5F105, stop: 1 #F2EA05);
  color: #000000;
}

/* QListView */
QListView  {
  show-decoration-selected: 1;
}
 
QListView::item:selected, QListView::item:selected:!active, QListView::item:selected:active, QListView::item:hover {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F5F105, stop: 1 #F2EA05);
  color: #000000;
}

/* QTextEdit, QPlainTextEdit */
QTextEdit:focus, QPlainTextEdit:focus, QLineEdit:focus {
  border: 1px solid QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F5F105, stop: 1 #F2EA05)
}

QTextEdit, QPlainTextEdit {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4d4d4d, stop: 0 #646464, stop: 1 #5d5d5d)
}

/* QLineEdit */
QLineEdit {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4d4d4d, stop: 0 #646464, stop: 1 #5d5d5d);
  padding: 1px;
  border-style: solid;
  border: 1px solid #595959;
  border-radius: 0px;
}

/* QProgressBar */
QProgressBar {
  border: transparent;
  border-radius: 1px;
  text-align: center;
}
QProgressBar::chunk {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F5F105, stop: 1 #F2EA05);
  width: 3px;
  margin: 0.5px;
}

/* QCheckBox */
QCheckBox::indicator {
  color: #b1b1b1;
  background-color: #323232;
  border: 1px solid #b1b1b1;
  width: 9px;
  height: 9px;
}

QCheckBox::indicator:checked {
  image: url(##/images/checkbox.png)
}

QCheckBox::indicator:disabled {
  border: 1px solid #444
}

/* QRadioButton */
QRadioButton::indicator:disabled {
  border: 1px solid #444
}

QRadioButton::indicator {
  border-radius: 6px
}

QRadioButton::indicator:checked, QRadioButton::indicator:unchecked {
  color: #b1b1b1;
  background-color: #323232;
  border: 1px solid #b1b1b1;
}

QRadioButton::indicator:checked {
  background-color: qradialgradient( cx: 0.5, cy: 0.5, fx: 0.5, fy: 0.5, radius: 1.0, stop: 0.25 #F5F105, stop: 0.3 #323232 )
}

QRadioButton::indicator:hover, QCheckBox::indicator:hover {
  border: 1px solid #F5F105;
}</data>
 </skin>
\ No newline at end of file
diff --git a/resources/skins/base/blau.xml b/resources/skins/base/blau.xml
index 7c87c6c3a..6c0d24560 100644
--- a/resources/skins/base/blau.xml
+++ b/resources/skins/base/blau.xml
@@ -6,8 +6,5 @@
     <email>rotter.martinos@gmail.com</email>
   </author>
   <style>fusion,plastique</style>
-  <markup_wrapper>PGh0bWw+DQogIDxoZWFkPg0KICAgIDxzdHlsZT4NCiAgICAgIDo6LXdlYmtpdC1zY3JvbGxiYXIgew0KICAgICAgICB3aWR0aDogMjBweDsNCiAgICAgICAgaGVpZ2h0OiAyMHB4Ow0KICAgICAgfQ0KICAgICAgOjotd2Via2l0LXNjcm9sbGJhci10aHVtYiB7DQogICAgICAgIGhlaWdodDogMTRweDsNCiAgICAgICAgYm9yZGVyOiA0cHggc29saWQgcmdiYSgwLCAwLCAwLCAwKTsNCiAgICAgICAgYmFja2dyb3VuZC1jbGlwOiBwYWRkaW5nLWJveDsNCiAgICAgICAgLXdlYmtpdC1ib3JkZXItcmFkaXVzOiAxcHg7DQogICAgICAgIGJhY2tncm91bmQtY29sb3I6ICM1NjlkZTU7DQogICAgICAgIC13ZWJraXQtYm94LXNoYWRvdzogaW5zZXQgLTFweCAtMXB4IDBweCByZ2JhKDAsIDAsIDAsIDAuMDUpLCBpbnNldCAxcHggMXB4IDBweCByZ2JhKDAsIDAsIDAsIDAuMDUpOw0KICAgICAgfQ0KICAgICAgDQogICAgICA6Oi13ZWJraXQtc2Nyb2xsYmFyLWJ1dHRvbiB7DQogICAgICAgIHdpZHRoOiAwOw0KICAgICAgICBoZWlnaHQ6IDA7DQogICAgICAgIGRpc3BsYXk6IG5vbmU7DQogICAgICB9DQogICAgICANCiAgICAgIDo6LXdlYmtpdC1zY3JvbGxiYXItY29ybmVyIHsNCiAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogdHJhbnNwYXJlbnQ7DQogICAgICB9DQogICAgDQogICAgICBib2R5IHsNCiAgICAgICAgbWFyZ2luOiAwcHg7DQogICAgICAgIHBhZGRpbmc6IDBweDsNCiAgICAgIH0NCiAgICANCiAgICAgIHByZSB7DQogICAgICAgIHdoaXRlLXNwYWNlOiBwcmUtd3JhcDsNCiAgICAgIH0NCg0KICAgICAgLmhlYWRlcnRleHQgew0KICAgICAgICBmb250LXNpemU6IDIwcHg7DQogICAgICAgIG1hcmdpbi1ib3R0b206IDEwcHg7DQogICAgICB9DQoNCiAgICAgIC5oZWFkZXIgew0KICAgICAgICBmb250LXNpemU6IDE3cHg7DQogICAgICAgIGJhY2tncm91bmQ6IC13ZWJraXQtZ3JhZGllbnQobGluZWFyLCBsZWZ0IHRvcCwgbGVmdCBib3R0b20sIGNvbG9yLXN0b3AoMCUscmdiYSg5OSwxMzUsMjI5LDEpKSwgY29sb3Itc3RvcCgxMDAlLHJnYmEoNjQsMTA5LDIzNiwxKSkpOw0KICAgICAgICBwYWRkaW5nOiA2cHg7DQogICAgICAgIG1hcmdpbjogMHB4IGF1dG87DQogICAgICAgIGNvbG9yOiB3aGl0ZTsNCiAgICAgICAgYm9yZGVyOiAwLjVweCBzb2xpZCBibGFjazsNCiAgICAgIH0NCg0KICAgICAgLmhlYWRlciBhIHsNCiAgICAgICAgY29sb3I6IHdoaXRlOw0KICAgICAgfQ0KDQogICAgICAuY29udGVudCB7DQogICAgICAgIGJvcmRlci10b3A6IDFweCBzb2xpZCBncmF5Ow0KICAgICAgICBmb250LXNpemU6IDE2cHg7DQogICAgICAgIGNvbG9yOiAjZWVlZWVlOw0KICAgICAgICBtYXJnaW46IDBweCBhdXRvOw0KICAgICAgICBwYWRkaW5nOiA2cHg7DQogICAgICAgIHBhZGRpbmctdG9wOiAxMnB4Ow0KICAgICAgfQ0KICAgICAgDQogICAgICAuY29udGFpbmVyIHsNCiAgICAgICAgYm9yZGVyOiAxcHggc29saWQgZ3JheTsNCiAgICAgICAgLXdlYmtpdC1ib3JkZXItcmFkaXVzOiAycHg7DQogICAgICAgIG1hcmdpbjogMTBweDsNCiAgICAgICAgLXdlYmtpdC1ib3gtc2hhZG93OiAycHggMnB4IDE2cHggMHB4IHJnYmEoNTAsIDUwLCA1MCwgMC42Mik7DQogICAgICB9DQogICAgPC9zdHlsZT4NCiAgICA8dGl0bGU+DQogICAgICAlMQ0KICAgIDwvdGl0bGU+DQogIDwvaGVhZD4NCiAgPGJvZHk+DQogICAgJTINCiAgPC9ib2R5Pg0KPC9odG1sPg==</markup_wrapper>
-  <markup>PGRpdiBjbGFzcz0iY29udGFpbmVyIj4NCiAgICAgIDxkaXYgY2xhc3M9ImhlYWRlciI+DQogICAgICAgIDxkaXYgY2xhc3M9ImhlYWRlcnRleHQiPg0KICAgICAgICAgICUxDQogICAgICAgIDwvZGl2Pg0KICAgICAgICAlMiAoJTUpDQogICAgICAgIDxicj4NCiAgICAgICAgPGEgaHJlZj0iJTMiPiUzPC9hPg0KICAgICAgICAlNg0KICAgICAgPC9kaXY+DQogICAgICA8ZGl2IGNsYXNzPSJjb250ZW50Ij4NCiAgICAgICAgJTQgDQogICAgICA8L2Rpdj4NCiAgICA8L2Rpdj4=</markup>
-  <markup_enclosure>PGEgY2xhc3M9ImVuY2xvc3VyZSIgaHJlZj0iJTMiPiUzPC9hPg==</markup_enclosure>
   <data>/* QWidget */
QWidget {
  color: #cccccc;
  background-color: #323232;
}

QWidget::item:hover {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #569de5, stop: 1 #4b8ac9);
  color: #000000;
}

QWidget:disabled {
  color: #777777;
  background-color: #323232;
}

/* QToolButton */
QToolButton , QToolButton:disabled {
  border: none;
  padding: 0px;
  background: transparent;
}

QToolButton:hover, QToolButton:pressed {
  border-radius: 2px;
  border: 1px solid gray;
}

QToolButton[popupMode="1"] {
  padding-right: 16px;
}

QToolButton::menu-button {
  border: 1px solid gray;
  border-top-right-radius: 2px;
  border-bottom-right-radius: 2px;
  width: 14px;
}

QToolButton::menu-arrow {
  image: url(##/images/down_arrow.png);
}

QToolButton::menu-arrow:open {
  top: 1px; left: 1px;
}

/* QStatusBar */
QStatusBar QToolButton {
  margin-left: 5px;
  margin-right: 5px;
}

QStatusBar::item {
  border: transparent;
}

/* QToolBar */
QToolBar::separator {
  width: 1px;
  background-color: #595959;

  margin-left: 5px;
  margin-right: 5px;
}

QToolBar {
  padding-left: 5px;
  padding-right: 5px;
}

/* QToolTip */
QToolTip {
  border: 1px solid black;
  background-color: #569de5;
  color: black;
  border-radius: 1px;
  opacity: 220;
}

/* QMenuBar */
QMenuBar::item {
  background: transparent
}

QMenuBar::item:selected {
  background: transparent;
  border: 1px solid #569de5;
}

QMenuBar::item:pressed {
  background: #444;
  border: 1px solid #000;
  background-color: QLinearGradient( x1:0, y1:0, x2:0, y2:1, stop:1 #212121, stop:0.4 #343434 );
  margin-bottom: -1px;
  padding-bottom: 1px;
}

/* QMenu */
QMenu {
  border: 1px solid #000;
}

QMenu::item {
  padding: 2px 10px 2px 23px;
}

QMenu::icon {
  padding-left: 4px;
}

QMenu::item:selected {
  color: #000000;
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #569de5, stop: 1 #447cb5);
}

QMenu::separator {
  height: 1px;
  background-color: #595959;
  color: white;
  margin-top: 3px;
  margin-bottom: 3px;
  margin-left: 5px;
  margin-right: 5px;
}

/* QPushButton */
QPushButton {
  color: #b1b1b1;
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #565656, stop: 0.1 #525252, stop: 0.5 #4e4e4e, stop: 0.9 #4a4a4a, stop: 1 #464646);
  border: 1px solid #1e1e1e;
  border-radius: 1px;
  padding: 3px;
  font-size: 12px;
  padding-left: 6px;
  padding-right: 6px;
  min-width: 30px;
}

QPushButton:pressed {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #2d2d2d, stop: 0.1 #2b2b2b, stop: 0.5 #292929, stop: 0.9 #282828, stop: 1 #252525)
}

QPushButton#m_btnInsertSeparator, QPushButton#m_btnInsertSpacer {
  min-width: 130px;
}

/* QComboBox */
QComboBox {
  selection-background-color: #569de5;
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #565656, stop: 0.1 #525252, stop: 0.5 #4e4e4e, stop: 0.9 #4a4a4a, stop: 1 #464646);
  border: 1px solid #1e1e1e;
  border-radius: 1px;
  padding: 2px;
  padding-top: 1px;
  padding-bottom: 1px;
  padding-left: 4px;
}

QComboBox:hover, QPushButton:hover {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #569de5, stop: 1 #447cb5);
  color: black;
}

QComboBox:on {
  padding: 1px;
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #2d2d2d, stop: 0.1 #2b2b2b, stop: 0.5 #292929, stop: 0.9 #282828, stop: 1 #252525);
}

QComboBox QAbstractItemView {
  border: 1px solid QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #569de5, stop: 1 #447cb5);
  selection-background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #569de5, stop: 1 #447cb5);
}

QComboBox::drop-down {
  subcontrol-origin: padding;
  subcontrol-position: top right;
  width: 15px;
  border-left-width: 0px;
  border-left-color: darkgray;
  border-left-style: solid;
  border-top-right-radius: 1px;
  border-bottom-right-radius: 1px;
}

QComboBox::down-arrow {
  image: url(##/images/down_arrow.png)
}

/* QScrollBar */
QScrollBar:horizontal {
  border: 1px solid #222222;
  background: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0.0 #121212, stop: 0.2 #282828, stop: 1 #484848);
  height: 13px;
  margin: 0px 16px 0 16px;
}

QScrollBar::handle:horizontal {
  background: QLinearGradient( x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #569de5, stop: 0.5 #447cb5, stop: 1 #569de5);
  min-height: 20px;
  border-radius: 1px;
}

QScrollBar::add-line:horizontal {
  border: 1px solid #1b1b19;
  border-radius: 1px;
  background: QLinearGradient( x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #569de5, stop: 1 #447cb5);
  width: 13px;
  subcontrol-position: right;
  subcontrol-origin: margin;
}

QScrollBar::sub-line:horizontal {
  border: 1px solid #1b1b19;
  border-radius: 1px;
  background: QLinearGradient( x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #569de5, stop: 1 #447cb5);
  width: 13px;
  subcontrol-position: left;
  subcontrol-origin: margin;
}

QScrollBar::right-arrow:horizontal, QScrollBar::left-arrow:horizontal {
  border: 1px solid black;
  width: 1px;
  height: 1px;
  background: white;
}

QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal {
  background: none
}

QScrollBar:vertical {
  background: QLinearGradient( x1: 0, y1: 0, x2: 1, y2: 0, stop: 0.0 #121212, stop: 0.2 #282828, stop: 1 #484848);
  width: 13px;
  margin: 16px 0 16px 0;
  border: 1px solid #222222;
}

QScrollBar::handle:vertical {
  background: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #569de5, stop: 0.5 #447cb5, stop: 1 #569de5);
  min-height: 20px;
  border-radius: 1px;
}
QScrollBar::add-line:vertical {
  border: 1px solid #1b1b19;
  border-radius: 1px;
  background: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #569de5, stop: 1 #447cb5);
  height: 13px;
  subcontrol-position: bottom;
  subcontrol-origin: margin;
}

QScrollBar::sub-line:vertical {
  border: 1px solid #1b1b19;
  border-radius: 1px;
  background: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #569de5, stop: 1 #447cb5);
  height: 13px;
  subcontrol-position: top;
  subcontrol-origin: margin;
}

QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical {
  border: 1px solid black;
  width: 1px;
  height: 1px;
  background: white;
}

QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {
  background: none;
}

/* QSplitter */
QSplitter::handle {
  background-color: #4e4e4e;
}

/* QHeaderView */
QHeaderView {
  background-color: transparent;
  color: #cccccc;
}

QHeaderView::section {
  min-height: 20px;
  border: 0.5 px solid #595959;
  border-right: 0.5 solid #707070;
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #565656, stop: 0.1 #525252, stop: 0.5 #4e4e4e, stop: 0.9 #4a4a4a, stop: 1 #464646);
}

QHeaderView::section:first {
  padding-left: 4px;
  padding-right: 2px;
}

QHeaderView::section:!first {
  padding-left: 2px;
  padding-right: 2px;
}

QHeaderView::section:hover {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #565656, stop: 0.1 #505050, stop: 0.5 #4e4e4e, stop: 0.9 #404040, stop: 1 #404040);
}

/* QTreeView */
QTreeView::branch:has-siblings:!adjoins-item  {
  border-image: url(qss/dummy.png) 0;
}

QTreeView::branch:has-siblings:adjoins-item {
  border-image: url(qss/dummy.png) 0;
}

QTreeView::branch:!has-children:!has-siblings:adjoins-item  {
  border-image: url(qss/dummy.png) 0;
}

QTreeView::branch:has-children:!has-siblings:closed,
QTreeView::branch:closed:has-children:has-siblings  {
  border-image: none;
  image: url(qss/branch-closed.png);
}

QTreeView::branch:open:has-children:!has-siblings,
QTreeView::branch:open:has-children:has-siblings  {
  border-image: none;
  image: url(qss/branch-open.png);
}

QTreeView::item {
  padding: 1px;
} 

QTreeView[hideTree="true"]::branch:!has-chlidren:hasSiblings {
  border-image: none;
  image: none;
}

QTreeView::item:selected, QTreeView::branch:selected, QTreeView::item:selected:active, QTreeView::item:selected:!active, QTreeView::item:hover {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #569de5, stop: 1 #4b8ac9);
  color: #000000;
}

/* QListView */
QListView  {
  show-decoration-selected: 1;
}
 
QListView::item:selected, QListView::item:selected:!active, QListView::item:selected:active, QListView::item:hover {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #569de5, stop: 1 #4b8ac9);
  color: #000000;
}

/* QTextEdit, QPlainTextEdit */
QTextEdit:focus, QPlainTextEdit:focus, QLineEdit:focus {
  border: 1px solid QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #569de5, stop: 1 #447cb5)
}

QTextEdit, QPlainTextEdit {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4d4d4d, stop: 0 #646464, stop: 1 #5d5d5d)
}

/* QLineEdit */
QLineEdit {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4d4d4d, stop: 0 #646464, stop: 1 #5d5d5d);
  padding: 1px;
  border-style: solid;
  border: 1px solid #595959;
  border-radius: 0px;
}

/* QProgressBar */
QProgressBar {
  border: transparent;
  border-radius: 1px;
  text-align: center;
}
QProgressBar::chunk {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #569de5, stop: 1 #4b8ac9);
  width: 3px;
  margin: 0.5px;
}

/* QCheckBox */
QCheckBox::indicator {
  color: #b1b1b1;
  background-color: #323232;
  border: 1px solid #b1b1b1;
  width: 9px;
  height: 9px;
}

QCheckBox::indicator:checked {
  image: url(##/images/checkbox.png)
}

QCheckBox::indicator:disabled {
  border: 1px solid #444
}

/* QRadioButton */
QRadioButton::indicator:disabled {
  border: 1px solid #444
}

QRadioButton::indicator {
  border-radius: 6px
}

QRadioButton::indicator:checked, QRadioButton::indicator:unchecked {
  color: #b1b1b1;
  background-color: #323232;
  border: 1px solid #b1b1b1;
}

QRadioButton::indicator:checked {
  background-color: qradialgradient( cx: 0.5, cy: 0.5, fx: 0.5, fy: 0.5, radius: 1.0, stop: 0.25 #569de5, stop: 0.3 #323232 )
}

QRadioButton::indicator:hover, QCheckBox::indicator:hover {
  border: 1px solid #569de5
}</data>
 </skin>
\ No newline at end of file
diff --git a/resources/skins/base/greeen.xml b/resources/skins/base/greeen.xml
index 0f7371563..9973ac7f3 100644
--- a/resources/skins/base/greeen.xml
+++ b/resources/skins/base/greeen.xml
@@ -6,8 +6,5 @@
     <email>rotter.martinos@gmail.com</email>
   </author>
   <style></style>
-  <markup_wrapper>PGh0bWw+DQogIDxoZWFkPg0KICAgIDxzdHlsZT4gICANCiAgICAgIGJvZHkgeyAgICAgDQogICAgICAgIG1hcmdpbjogMHB4Ow0KICAgICAgICBwYWRkaW5nOiAwcHg7DQogICAgICB9DQogICAgDQogICAgICBwcmUgew0KICAgICAgICB3aGl0ZS1zcGFjZTogcHJlLXdyYXA7DQogICAgICB9DQoNCiAgICAgIC5oZWFkZXJ0ZXh0IHsNCiAgICAgICAgZm9udC1zaXplOiAyMHB4Ow0KICAgICAgICBtYXJnaW4tYm90dG9tOiAxMHB4Ow0KICAgICAgfQ0KDQogICAgICAuaGVhZGVyIHsNCiAgICAgICAgZm9udC1zaXplOiAxN3B4Ow0KICAgICAgICBiYWNrZ3JvdW5kOiAtd2Via2l0LWdyYWRpZW50KGxpbmVhciwgbGVmdCB0b3AsIGxlZnQgYm90dG9tLCBjb2xvci1zdG9wKDAlLHJnYmEoODQsIDEzMiwgNTMsIDEpKSwgY29sb3Itc3RvcCgxMDAlLHJnYmEoODQsIDE0MCwgNTMsIDEpKSk7DQogICAgICAgIHBhZGRpbmc6IDZweDsNCiAgICAgICAgbWFyZ2luOiAwcHggYXV0bzsNCiAgICAgICAgY29sb3I6IHdoaXRlOw0KICAgICAgICBib3JkZXI6IDAuNXB4IHNvbGlkIGJsYWNrOw0KICAgICAgfQ0KDQogICAgICAuaGVhZGVyIGEgew0KICAgICAgICBjb2xvcjogd2hpdGU7DQogICAgICB9DQogICAgICANCiAgICAgIC5oZWFkZXIgLmVuY2xvc3VyZSB7DQogICAgICAgIGNvbG9yOiBibGFjazsNCiAgICAgIH0NCg0KICAgICAgLmNvbnRlbnQgew0KICAgICAgICBib3JkZXItdG9wOiAxcHggc29saWQgZ3JheTsNCiAgICAgICAgZm9udC1zaXplOiAxNnB4Ow0KICAgICAgICBtYXJnaW46IDBweCBhdXRvOw0KICAgICAgICBwYWRkaW5nOiA2cHg7DQogICAgICAgIHBhZGRpbmctdG9wOiAxMnB4Ow0KICAgICAgfQ0KICAgICAgDQogICAgICAuY29udGFpbmVyIHsNCiAgICAgICAgYm9yZGVyOiAxcHggc29saWQgZ3JheTsNCiAgICAgICAgLXdlYmtpdC1ib3JkZXItcmFkaXVzOiAycHg7DQogICAgICAgIG1hcmdpbjogMTBweDsNCiAgICAgICAgLXdlYmtpdC1ib3gtc2hhZG93OiAycHggMnB4IDhweCAwcHggcmdiYSg1MCwgNTAsIDUwLCAwLjYyKTsNCiAgICAgIH0NCiAgICA8L3N0eWxlPg0KICAgIDx0aXRsZT4NCiAgICAgICUxDQogICAgPC90aXRsZT4NCiAgPC9oZWFkPg0KICA8Ym9keT4NCiAgICAlMg0KICA8L2JvZHk+DQo8L2h0bWw+</markup_wrapper>
-  <markup>PGRpdiBjbGFzcz0iY29udGFpbmVyIj4NCiAgICAgIDxkaXYgY2xhc3M9ImhlYWRlciI+DQogICAgICAgIDxkaXYgY2xhc3M9ImhlYWRlcnRleHQiPg0KICAgICAgICAgICUxDQogICAgICAgIDwvZGl2Pg0KICAgICAgICAlMiAoJTUpDQogICAgICAgIDxicj4NCiAgICAgICAgPGEgaHJlZj0iJTMiPiUzPC9hPg0KICAgICAgICAlNg0KICAgICAgPC9kaXY+DQogICAgICA8ZGl2IGNsYXNzPSJjb250ZW50Ij4NCiAgICAgICAgJTQgDQogICAgICA8L2Rpdj4NCiAgICA8L2Rpdj4=</markup>
-  <markup_enclosure>PGEgY2xhc3M9ImVuY2xvc3VyZSIgaHJlZj0iJTMiPiUzPC9hPg==</markup_enclosure>
   <data>LyoNCiAqIEluc3BpcmVkIGJ5IFF1aXRlUlNTICJncmVlbiIgc2tpbi4NCiAqIENvcHlyaWdodCAoQykgPD0gMjAxMyBieSBRdWl0ZVJTUyB0ZWFtDQogKiBDb3B5cmlnaHQgKEMpIDIwMTQgYnkgTWFydGluIFJvdHRlciA8cm90dGVyLm1hcnRpbm9zQGdtYWlsLmNvbT4NCiAqLw0KICANClFUcmVlVmlldzo6YnJhbmNoOmhhcy1zaWJsaW5nczohYWRqb2lucy1pdGVtICB7DQogIGJvcmRlci1pbWFnZTogdXJsKHFzcy9kdW1teS5wbmcpIDA7DQp9DQoNClFUcmVlVmlldzo6YnJhbmNoOmhhcy1zaWJsaW5nczphZGpvaW5zLWl0ZW0gew0KICBib3JkZXItaW1hZ2U6IHVybChxc3MvZHVtbXkucG5nKSAwOw0KfQ0KDQpRVHJlZVZpZXc6OmJyYW5jaDohaGFzLWNoaWxkcmVuOiFoYXMtc2libGluZ3M6YWRqb2lucy1pdGVtICB7DQogIGJvcmRlci1pbWFnZTogdXJsKHFzcy9kdW1teS5wbmcpIDA7DQp9DQoNClFUcmVlVmlldzo6YnJhbmNoOmhhcy1jaGlsZHJlbjohaGFzLXNpYmxpbmdzOmNsb3NlZCwNClFUcmVlVmlldzo6YnJhbmNoOmNsb3NlZDpoYXMtY2hpbGRyZW46aGFzLXNpYmxpbmdzICB7DQogIGJvcmRlci1pbWFnZTogbm9uZTsNCiAgaW1hZ2U6IHVybChxc3MvYnJhbmNoLWNsb3NlZC5wbmcpOw0KfQ0KDQpRVHJlZVZpZXc6OmJyYW5jaDpvcGVuOmhhcy1jaGlsZHJlbjohaGFzLXNpYmxpbmdzLA0KUVRyZWVWaWV3OjpicmFuY2g6b3BlbjpoYXMtY2hpbGRyZW46aGFzLXNpYmxpbmdzICB7DQogIGJvcmRlci1pbWFnZTogbm9uZTsNCiAgaW1hZ2U6IHVybChxc3MvYnJhbmNoLW9wZW4ucG5nKTsNCn0NCg0KUVRyZWVWaWV3OjppdGVtIHsNCiAgcGFkZGluZzogMXB4IDFweCAxcHggMXB4Ow0KfSANCg0KUVRyZWVWaWV3W2hpZGVUcmVlPSJ0cnVlIl06OmJyYW5jaDohaGFzLWNobGlkcmVuOmhhc1NpYmxpbmdzIHsNCiAgYm9yZGVyLWltYWdlOiBub25lOw0KICBpbWFnZTogbm9uZTsNCn0NCg0KUVN0YXR1c0Jhcjo6aXRlbSB7DQogIGJvcmRlcjogbm9uZTsNCn0NCg0KV2ViQnJvd3NlciBRUHJvZ3Jlc3NCYXIgew0KICBib3JkZXI6IDFweCBzb2xpZCAjQTVBNUE1Ow0KICB0ZXh0LWFsaWduOiBjZW50ZXI7DQogIGJvcmRlci1sZWZ0OiBub25lOw0KICBib3JkZXItcmlnaHQ6IG5vbmU7DQogIGJhY2tncm91bmQ6IHFsaW5lYXJncmFkaWVudCh4MTowLCB5MTowLCB4MjowLCB5MjoxLCBzdG9wOjAgI2Y0ZjRmNCwgc3RvcDowLjQgI0VDRUNFQyBzdG9wOjAuNSAjREVERURFLCBzdG9wOjEgI2Y0ZjRmNCk7DQp9DQoNCldlYkJyb3dzZXIgUVByb2dyZXNzQmFyOjpjaHVuayB7DQogIGJhY2tncm91bmQ6IHFsaW5lYXJncmFkaWVudCh4MTowLCB5MTowLCB4MjowLCB5MjoxLCBzdG9wOjAgIzkwRTg5MCwgc3RvcDowLjQgIzdDRDA3Qywgc3RvcDowLjUgIzYwQzA2MCwgc3RvcDoxICM2MEQwNjApOw0KICB3aWR0aDogMXB4Ow0KfQ0KDQpRTWVudUJhciB7DQogIGJhY2tncm91bmQ6IHFsaW5lYXJncmFkaWVudCh4MTowLCB5MTowLCB4MjowLCB5MjoxLCBzdG9wOjAgI2UwZWVlMCwgc3RvcDowLjQgI2Q4ZWVkOCwgc3RvcDowLjUgI2NjZWVjYywgc3RvcDoxICNlMGVlZTApOw0KICBjb2xvcjogIzAwMDAwMDsNCiAgcGFkZGluZzogMXB4Ow0KfQ0KDQpRTWVudUJhcjo6aXRlbSB7DQogIHBhZGRpbmc6IDNweCA2cHg7DQogIGJhY2tncm91bmQ6IHRyYW5zcGFyZW50Ow0KfQ0KDQpRTWVudUJhcjo6aXRlbTpzZWxlY3RlZCB7DQogIGJvcmRlcjogMXB4IHNvbGlkICM4NGNjODQ7DQogIGJhY2tncm91bmQ6IHFsaW5lYXJncmFkaWVudCh4MTowLCB5MTowLCB4MjowLCB5MjoxLCBzdG9wOjAgI2U5ZmZlOSwgc3RvcDowLjQgI2UxZWVlMSwgc3RvcDowLjUgI2Q5ZWVkOSwgc3RvcDoxICNlOWZmZTkpOw0KfQ0KDQpRTWVudUJhcjo6aXRlbTpwcmVzc2VkIHsNCiAgYm9yZGVyOiAxcHggc29saWQgIzM0YWEzNDsNCiAgYm9yZGVyLWJvdHRvbTogbm9uZTsNCiAgYmFja2dyb3VuZDogcWxpbmVhcmdyYWRpZW50KHgxOjAsIHkxOjAsIHgyOjAsIHkyOjEsIHN0b3A6MCAjN2FjYzdhLCBzdG9wOjAuNCAjNzBjODcwLCBzdG9wOjAuNSAjNjBjNDYwLCBzdG9wOjEgIzdhY2M3YSk7DQogIGNvbG9yOiB3aGl0ZTsNCn0=</data>
 </skin>
\ No newline at end of file
diff --git a/resources/skins/base/solarized.xml b/resources/skins/base/solarized.xml
index 6df800ed7..6310db878 100644
--- a/resources/skins/base/solarized.xml
+++ b/resources/skins/base/solarized.xml
@@ -6,8 +6,5 @@
     <email>rotter.martinos@gmail.com</email>
   </author>
   <style>plastique,fusion</style>
-  <markup_wrapper>PGh0bWw+DQogIDxoZWFkPg0KICAgIDxzdHlsZT4gICANCiAgICAgIGJvZHkgeyAgDQogICAgICAgIG1hcmdpbjogMHB4Ow0KICAgICAgICBwYWRkaW5nOiAwcHg7DQogICAgICAgIGJhY2tncm91bmQtY29sb3I6ICNmZGY2ZTM7DQogICAgICB9DQogICAgDQogICAgICBwcmUgew0KICAgICAgICB3aGl0ZS1zcGFjZTogcHJlLXdyYXA7DQogICAgICB9DQogICAgICANCiAgICAgIC5jb250YWluZXIgew0KICAgICAgICBjb2xvcjogIzY1N2I4MzsNCiAgICAgIH0NCg0KICAgICAgLmhlYWRlcnRleHQgew0KICAgICAgICBmb250LXNpemU6IDIwcHg7DQogICAgICB9DQoNCiAgICAgIC5oZWFkZXIgew0KICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiAjMDAyYjM2OyAvKiBSZW1vdmUgdG8gZ2V0IHJpZCBvZiBzcGVjaWFsIGNvbG9yIGZvciBoZWFkZXIuICovDQogICAgICAgIGNvbG9yOiAjODM5NDk2OyAvKiBSZW1vdmUgdG8gZ2V0IHJpZCBvZiBzcGVjaWFsIGNvbG9yIGZvciBoZWFkZXIuICovDQogICAgICAgIGJvcmRlcjogMC41cHggc29saWQgYmxhY2s7DQogICAgICAgIGZvbnQtc2l6ZTogMTZweDsNCiAgICAgICAgcGFkZGluZzogNnB4Ow0KICAgICAgfQ0KDQogICAgICBhLCBhOmFjdGl2ZSwgYTp2aXNpdGVkIHsNCiAgICAgICAgY29sb3I6ICMyNjhiZDI7DQogICAgICAgIHdvcmQtd3JhcDogYnJlYWstd29yZDsNCiAgICAgIH0NCiAgICAgIA0KICAgICAgYTpob3ZlciB7DQogICAgICAgIGNvbG9yOiAjODM5NDk2Ow0KICAgICAgfQ0KICAgICAgDQogICAgICA6OnNlbGVjdGlvbiB7DQogICAgICAgIGJhY2tncm91bmQtY29sb3I6ICMwNzM2NDI7DQogICAgICB9DQoNCiAgICAgIC5jb250ZW50IHsNCiAgICAgICAgYm9yZGVyOiAwLjVweCBzb2xpZCBibGFjazsNCiAgICAgICAgcGFkZGluZzogMTJweDsNCiAgICAgICAgZm9udC1zaXplOiAxMnB4Ow0KICAgICAgfQ0KICAgIDwvc3R5bGU+DQogICAgPHRpdGxlPg0KICAgICAgJTENCiAgICA8L3RpdGxlPg0KICA8L2hlYWQ+DQogIDxib2R5Pg0KICAgICUyDQogIDwvYm9keT4NCjwvaHRtbD4=</markup_wrapper>
-  <markup>PGRpdiBjbGFzcz0iY29udGFpbmVyIj4NCiAgICAgIDxkaXYgY2xhc3M9ImhlYWRlciI+DQogICAgICAgIDxkaXYgY2xhc3M9ImhlYWRlcnRleHQiPiUxPC9kaXY+DQogICAgICAgICUyLCAlNQ0KICAgICAgICA8YnIvPg0KICAgICAgICA8YSBocmVmPSIlMyI+JTM8L2E+DQogICAgICAgICU2DQogICAgICA8L2Rpdj4NCiAgICAgIDxkaXYgY2xhc3M9ImNvbnRlbnQiPiU0PC9kaXY+DQogICAgPC9kaXY+</markup>
-  <markup_enclosure>PGEgY2xhc3M9ImVuY2xvc3VyZSIgaHJlZj0iJTMiPiUzPC9hPg==</markup_enclosure>
   <data>QWidget {
  color: #657b83;
  background-color: #fdf6e3;
}

QWidget::item:hover {
  background-color: #eee8d5;
  color: #657b83;
}

QWidget:disabled {
  color: gray;
  background-color: #fdf6e3;
}

QFrame[frameShape="6"] {
  border: 1px solid #88a6b1;
}

QTreeView::branch:has-siblings:!adjoins-item  {
  border-image: url(qss/dummy.png) 0;
}

QTreeView::branch:has-siblings:adjoins-item {
  border-image: url(qss/dummy.png) 0;
}

QTreeView::branch:!has-children:!has-siblings:adjoins-item  {
  border-image: url(qss/dummy.png) 0;
}

QTreeView::branch:has-children:!has-siblings:closed,
QTreeView::branch:closed:has-children:has-siblings  {
  border-image: none;
  image: url(qss/branch-closed.png);
}

QTreeView::branch:open:has-children:!has-siblings,
QTreeView::branch:open:has-children:has-siblings  {
  border-image: none;
  image: url(qss/branch-open.png);
}

QTreeView::item {
  padding: 1px;
} 

QTreeView[hideTree="true"]::branch:!has-chlidren:hasSiblings {
  border-image: none;
  image: none;
}

QTreeView::item:selected, QTreeView::branch:selected, QTreeView::item:selected:active, QTreeView::item:selected:!active, QTreeView::item:hover, QListView::item:selected, QListView::item:selected:!active, QListView::item:selected:active, QListView::item:hover {
  background-color: #073642;
  color: #839496;
}

QToolTip {
  border: 1px solid #88a6b1;
  background-color: #fdf6e3;
  color: #657b83;
  border-radius: 1px;
  opacity: 220;
  padding: 2px;
}
 
QStatusBar::item {
  border: none;
}

QSplitter::handle {
  width: 1px;
  background-color: #88a6b1;
}

QSplitter::handle:vertical {
  margin: 1px 0px 0px 0px;
}

QSplitter::handle:horizontal {
  margin: 0px 1px 0px 1px;
}

QStatusBar QToolButton {
  margin-left: 5px;
  margin-right: 5px;
}

QStatusBar::item {
  border: transparent;
}

QProgressBar {
  border: transparent;
  text-align: center;
}

QProgressBar::chunk {
  background-color: #839496;
  width: 1px;
  margin: 0px;
}

QProgressBar QLabel {
  color: #002b36;
  background: transparent;
}

QToolButton, QToolButton:disabled {
  border: none;
  padding: 0px;
  background: transparent;
}

QToolButton:hover, QToolButton:pressed {
  border: 1px solid #eee8d5;
}

QToolButton[popupMode="1"] {
  padding-right: 11px;
}

QToolButton::menu-button {
  border-top-right-radius: 0px;
  border-bottom-right-radius: 0px;
  width: 11px;
}

QToolButton::menu-button:hover, QToolButton::menu-button:pressed {
  background-color: #073642;
}

QToolButton::menu-arrow {
  image: url(##/images/down_arrow_dark.png);
}

QToolBar::separator {
  width: 1px;
  background-color: #88a6b1;
  margin-left: 5px;
  margin-right: 5px;
}

QToolBar {
  padding-left: 5px;
  padding-right: 5px;
}

QMenuBar {
  color: #657b83;
  background-color: #fdf6e3;
  padding: 1px;
}

QMenuBar::item {
  padding: 3px 6px;
  background: transparent;
}

QMenuBar::item:selected, QMenuBar::item:pressed {
  border: none;
  color: #839496;
  background: #073642;
}

QMenu {
  border: 1px solid #073642;
}

QMenu::item {
  padding: 2px 10px 2px 23px;
}

QMenu::icon {
  padding-left: 4px;
}

QMenu::item:selected {
  background-color: #073642;
  color: #839496;
}

QMenu::separator {
  height: 1px;
  background-color: #657b83;
  color: white;
  margin-top: 3px;
  margin-bottom: 3px;
  margin-left: 5px;
  margin-right: 5px;
}

QScrollBar:vertical {
  background: #fdf6e3;
  width: 14px;
  margin: 16px 0px 16px 0px;
  border: 1px solid #fdf6e3;
}

QScrollBar:horizontal {
  background: #fdf6e3;
  height: 14px;
  margin: 0px 16px 0px 16px;
  border: 1px solid #fdf6e3;
}

QScrollBar::handle:vertical, QScrollBar::handle:horizontal {
  background: #073642;
  min-height: 20px;
  border-radius: 0px;
}

QScrollBar::handle:horizontal {
  background: #073642;
  min-width: 20px;
  border-radius: 0px;
}

QScrollBar::add-line:vertical {
  border: 1px solid #fdf6e3;
  border-radius: 0px;
  background: #073642;
  height: 14px;
  subcontrol-position: bottom;
  subcontrol-origin: margin;
}

QScrollBar::sub-line:vertical {
  border: 1px solid #fdf6e3;
  border-radius: 0px;
  background: #073642;
  height: 14px;
  subcontrol-position: top;
  subcontrol-origin: margin;
}

QScrollBar::add-line:horizontal {
  border: 1px solid #fdf6e3;
  border-radius: 0px;
  background: #073642;
  width: 14px;
  subcontrol-position: right;
  subcontrol-origin: margin;
}

QScrollBar::sub-line:horizontal {
  border: 1px solid #fdf6e3;
  border-radius: 0px;
  background: #073642;
  width: 14px;
  subcontrol-position: left;
  subcontrol-origin: margin;
}

QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical, QScrollBar::right-arrow:horizontal, QScrollBar::left-arrow:horizontal {
  border: none;
  background: none;
  width: 0px;
  height: 0px;
}

QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical, QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal {
  background: none;
}

QHeaderView {
  color: #657b83;
  background-color: #fdf6e3;
}

QHeaderView::section, QHeaderView::section:hover {
  min-height: 20px;
  border: 0.5px solid #eee8d5;
  background-color: #fdf6e3;
}

QHeaderView::section:first {
  padding-left: 4px;
  padding-right: 2px;
  border-left: none;
}

QHeaderView::section:!first {
  padding-left: 2px;
  padding-right: 2px;
}

QPushButton {
  color: #657b83;
  background-color: #fdf6e3;
  border: 1px solid #657b83;
  border-radius: 1px;
  padding: 3px;
  font-size: 12px;
  padding-left: 6px;
  padding-right: 6px;
}

QPushButton:pressed, QPushButton:hover {
  background-color: #073642;
  color: #839496;
  border: 1px solid #657b83;
}

QCheckBox::indicator {
  color: #073642;
  background-color: #fdf6e3;
  border: 1px solid #073642;
  width: 13px;
  height: 13px;
}

QCheckBox::indicator:checked {
  image: url(##/images/checkbox_dark.png)
}

QCheckBox::indicator:disabled {
  border: 1px solid gray;
  background-color: gray;
}



QTextEdit:focus, QPlainTextEdit:focus, QLineEdit:focus {
  border: 1px solid #073642;
}

QTextEdit, QPlainTextEdit {
  background-color: #fcf9f0;
}

QLineEdit {
  color: #657b83;
  background-color: #fcf9f0;
  padding: 1px;
  border: 1px solid #073642;
  border-radius: 0px;
}

QComboBox {
  color: #657b83;
  background-color: #fcf9f0;
  selection-background-color: #073642;
  border: 1px solid #073642;
  border-radius: 0px;
  padding: 2px;
  padding-top: 1px;
  padding-bottom: 1px;
  padding-left: 4px;
}

QComboBox::drop-down {
  subcontrol-origin: padding;
  subcontrol-position: top right;
  width: 15px;
  border-left-width: 0px;
  border-left-color: darkgray;
  border-left-style: solid;
  border-top-right-radius: 1px;
  border-bottom-right-radius: 1px;
}

QComboBox QAbstractItemView {
  color: #657b83;
  background-color: #fcf9f0;
  border: 1px solid #073642;
  selection-background-color: #073642;
}

QComboBox::down-arrow {
  image: url(##/images/down_arrow_dark.png)
}</data>
 </skin>
\ No newline at end of file
diff --git a/resources/skins/base/vergilius.xml b/resources/skins/base/vergilius.xml
index 320ef2120..c11594588 100644
--- a/resources/skins/base/vergilius.xml
+++ b/resources/skins/base/vergilius.xml
@@ -6,8 +6,5 @@
     <email>rotter.martinos@gmail.com</email>
   </author>
   <style/>
-  <markup_wrapper>PGh0bWw+DQogIDxoZWFkPg0KICAgIDxzdHlsZT4NCiAgICAgIGJvZHkgew0KICAgICAgICBtYXJnaW46IDBweDsNCiAgICAgICAgcGFkZGluZzogMHB4Ow0KICAgICAgfQ0KICAgIA0KICAgICAgcHJlIHsNCiAgICAgICAgd2hpdGUtc3BhY2U6IHByZS13cmFwOw0KICAgICAgfQ0KDQogICAgICAuaGVhZGVydGV4dCB7DQogICAgICAgIGZvbnQtc2l6ZTogMjBweDsNCiAgICAgICAgbWFyZ2luLWJvdHRvbTogMTBweDsNCiAgICAgIH0NCg0KICAgICAgLmhlYWRlciB7DQogICAgICAgIGZvbnQtc2l6ZTogMTdweDsNCiAgICAgICAgYmFja2dyb3VuZDogLXdlYmtpdC1ncmFkaWVudChsaW5lYXIsIGxlZnQgdG9wLCBsZWZ0IGJvdHRvbSwgY29sb3Itc3RvcCgwJSxyZ2JhKDk5LDEzNSwyMjksMSkpLCBjb2xvci1zdG9wKDEwMCUscmdiYSg2NCwxMDksMjM2LDEpKSk7DQogICAgICAgIHBhZGRpbmc6IDZweDsNCiAgICAgICAgbWFyZ2luOiAwcHggYXV0bzsNCiAgICAgICAgY29sb3I6IHdoaXRlOw0KICAgICAgICBib3JkZXI6IDAuNXB4IHNvbGlkIGJsYWNrOw0KICAgICAgfQ0KDQogICAgICAuaGVhZGVyIGEgew0KICAgICAgICB0ZXh0LWRlY29yYXRpb246IG5vbmU7DQogICAgICAgIGNvbG9yOiB3aGl0ZTsNCiAgICAgICAgd29yZC13cmFwOiBicmVhay13b3JkOw0KICAgICAgfQ0KICAgICAgDQogICAgICAuaGVhZGVyIC5lbmNsb3N1cmUgew0KICAgICAgICB0ZXh0LWRlY29yYXRpb246IG5vbmU7DQogICAgICAgIGNvbG9yOiBibGFjazsNCiAgICAgICAgd29yZC13cmFwOiBicmVhay13b3JkOw0KICAgICAgfQ0KICAgICAgDQogICAgICAuZW5jbG9zdXJlOmhvdmVyLCAuaGVhZGVyIGE6aG92ZXIgew0KICAgICAgICB0ZXh0LWRlY29yYXRpb246IHVuZGVybGluZTsNCiAgICAgIH0NCg0KICAgICAgLmNvbnRlbnQgew0KICAgICAgICBib3JkZXItdG9wOiAxcHggc29saWQgZ3JheTsNCiAgICAgICAgZm9udC1zaXplOiAxNnB4Ow0KICAgICAgICBtYXJnaW46IDBweCBhdXRvOw0KICAgICAgICBwYWRkaW5nOiA2cHg7DQogICAgICAgIHBhZGRpbmctdG9wOiAxMnB4Ow0KICAgICAgfQ0KICAgICAgDQogICAgICAuY29udGFpbmVyIHsNCiAgICAgICAgYm9yZGVyOiAxcHggc29saWQgZ3JheTsNCiAgICAgICAgLXdlYmtpdC1ib3JkZXItcmFkaXVzOiAycHg7DQogICAgICAgIG1hcmdpbjogMTBweDsNCiAgICAgICAgLXdlYmtpdC1ib3gtc2hhZG93OiAycHggMnB4IDE2cHggMHB4IHJnYmEoNTAsIDUwLCA1MCwgMC42Mik7DQogICAgICB9DQogICAgPC9zdHlsZT4NCiAgICA8dGl0bGU+DQogICAgICAlMQ0KICAgIDwvdGl0bGU+DQogIDwvaGVhZD4NCiAgPGJvZHk+DQogICAgJTINCiAgPC9ib2R5Pg0KPC9odG1sPg==</markup_wrapper>
-  <markup>PGRpdiBjbGFzcz0iY29udGFpbmVyIj4NCiAgICAgIDxkaXYgY2xhc3M9ImhlYWRlciI+DQogICAgICAgIDxkaXYgY2xhc3M9ImhlYWRlcnRleHQiPg0KICAgICAgICAgICUxDQogICAgICAgIDwvZGl2Pg0KICAgICAgICAlMiAoJTUpDQogICAgICAgIDxicj4NCiAgICAgICAgPGEgaHJlZj0iJTMiPiUzPC9hPg0KICAgICAgICAlNg0KICAgICAgPC9kaXY+DQogICAgICA8ZGl2IGNsYXNzPSJjb250ZW50Ij4NCiAgICAgICAgJTQgDQogICAgICA8L2Rpdj4NCiAgICA8L2Rpdj4=</markup>
-  <markup_enclosure>PGEgY2xhc3M9ImVuY2xvc3VyZSIgaHJlZj0iJTMiPiUzPC9hPg==</markup_enclosure>
   <data>UVRyZWVWaWV3OjpicmFuY2g6aGFzLXNpYmxpbmdzOiFhZGpvaW5zLWl0ZW0gIHsNCiAgYm9yZGVyLWltYWdlOiB1cmwocXNzL2R1bW15LnBuZykgMDsNCn0NCg0KUVRyZWVWaWV3OjpicmFuY2g6aGFzLXNpYmxpbmdzOmFkam9pbnMtaXRlbSB7DQogIGJvcmRlci1pbWFnZTogdXJsKHFzcy9kdW1teS5wbmcpIDA7DQp9DQoNClFUcmVlVmlldzo6YnJhbmNoOiFoYXMtY2hpbGRyZW46IWhhcy1zaWJsaW5nczphZGpvaW5zLWl0ZW0gIHsNCiAgYm9yZGVyLWltYWdlOiB1cmwocXNzL2R1bW15LnBuZykgMDsNCn0NCg0KUVRyZWVWaWV3OjpicmFuY2g6aGFzLWNoaWxkcmVuOiFoYXMtc2libGluZ3M6Y2xvc2VkLA0KUVRyZWVWaWV3OjpicmFuY2g6Y2xvc2VkOmhhcy1jaGlsZHJlbjpoYXMtc2libGluZ3MgIHsNCiAgYm9yZGVyLWltYWdlOiBub25lOw0KICBpbWFnZTogdXJsKHFzcy9icmFuY2gtY2xvc2VkLnBuZyk7DQp9DQoNClFUcmVlVmlldzo6YnJhbmNoOm9wZW46aGFzLWNoaWxkcmVuOiFoYXMtc2libGluZ3MsDQpRVHJlZVZpZXc6OmJyYW5jaDpvcGVuOmhhcy1jaGlsZHJlbjpoYXMtc2libGluZ3MgIHsNCiAgYm9yZGVyLWltYWdlOiBub25lOw0KICBpbWFnZTogdXJsKHFzcy9icmFuY2gtb3Blbi5wbmcpOw0KfQ0KDQpRVHJlZVZpZXc6Oml0ZW0gew0KICBwYWRkaW5nOiAxcHggMXB4IDFweCAxcHg7DQp9IA0KDQpRVHJlZVZpZXdbaGlkZVRyZWU9InRydWUiXTo6YnJhbmNoOiFoYXMtY2hsaWRyZW46aGFzU2libGluZ3Mgew0KICBib3JkZXItaW1hZ2U6IG5vbmU7DQogIGltYWdlOiBub25lOw0KfQ0KDQpRU3RhdHVzQmFyOjppdGVtIHsNCiAgYm9yZGVyOiBub25lOw0KfQ==</data>
 </skin>
\ No newline at end of file
diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG
index cde7ce5ea..8b3a54d5f 100755
--- a/resources/text/CHANGELOG
+++ b/resources/text/CHANGELOG
@@ -3,8 +3,8 @@
 
 Main:
 
-▪ Internal web browser and message preview window now use component based on Chromium/Blink (QtWebEngine). Note that new QtWebEngine lacks some features and those were thus removed from RSS Guard, including Adblock, mouse gestures and some other features. Note that I was force to switch to this component because old Qt WebKit component will be removed from Qt.
-▪ RSS Guard now uses only Qt 5.6 or higher.
+▪ Internal web browser was REMOVED. This is because old Qt WebKit web component will be removed from Qt and new Qt component for web viewing is based on Chromium, which is fucking joke. Some people hate Chromium because of many (technocal, philosophical, etical) reasons. Moreover, it lacks some useful features and is memory hungry. It is also very buggy in Qt now. Therefore now internal web browser is gone. Message preview component now uses much lighter solution and still can display certain HTML subset. RSS Guard was tweaked to be more friendly to external web browser. Double-clicking any message results in it being opened via external web browser.
+▪ RSS Guard now depends only Qt 5.6 or higher.
 
 Added:
 
@@ -16,13 +16,11 @@ Added:
 Fixed:
 
 ▪ Download manager now correctly displays download progress/info.
-▪ When user selects "Save as..." for some file from internal web browser, file selection dialog is always shown. (bug #174)
 ▪ Better detection of MySQL server status. (bug #169)
 ▪ Ordering of messages is now done on SQL server (stands for both MySQL and SQLite). (bug #172)
 ▪ Now title of the RSS/ATOM message is taken into account when deciding message "uniqueness". (bug #171)
 ▪ MySQL scripts improved. (bug #170)
 ▪ Fixed little problem with feed list hiding. (bug #163)
-▪ Web browser search context menu item now trims the searched string. (bug #168)
 
 Changed:
 
diff --git a/src/gui/feedmessageviewer.cpp b/src/gui/feedmessageviewer.cpp
index f6c6f0ea7..18d0fe1e1 100755
--- a/src/gui/feedmessageviewer.cpp
+++ b/src/gui/feedmessageviewer.cpp
@@ -240,9 +240,9 @@ void FeedMessageViewer::createConnections() {
   
   // Message changers.
   connect(m_messagesView, SIGNAL(currentMessageRemoved()), m_messagesBrowser, SLOT(clear()));
-  connect(m_messagesView, SIGNAL(currentMessageChanged(Message)), m_messagesBrowser, SLOT(loadMessage(Message)));
+  connect(m_messagesView, SIGNAL(currentMessageChanged(Message,RootItem*)), m_messagesBrowser, SLOT(loadMessage(Message,RootItem*)));
   connect(m_messagesView, SIGNAL(currentMessageRemoved()), this, SLOT(updateMessageButtonsAvailability()));
-  connect(m_messagesView, SIGNAL(currentMessageChanged(Message)), this, SLOT(updateMessageButtonsAvailability()));
+  connect(m_messagesView, SIGNAL(currentMessageChanged(Message,RootItem*)), this, SLOT(updateMessageButtonsAvailability()));
   
   connect(m_feedsView, SIGNAL(itemSelected(RootItem*)), this, SLOT(updateFeedButtonsAvailability()));
   connect(qApp->feedUpdateLock(), SIGNAL(locked()), this, SLOT(updateFeedButtonsAvailability()));
@@ -253,16 +253,14 @@ void FeedMessageViewer::createConnections() {
   
   // State of many messages is changed, then we need
   // to reload selections.
-  connect(m_feedsView->sourceModel(), SIGNAL(reloadMessageListRequested(bool)), m_messagesView, SLOT(reloadSelections(bool)));
+  connect(m_feedsView->sourceModel(), SIGNAL(reloadMessageListRequested(bool)),
+          m_messagesView, SLOT(reloadSelections(bool)));
   connect(m_feedsView->sourceModel(), SIGNAL(feedsUpdateFinished()), this, SLOT(onFeedsUpdateFinished()));
   connect(m_feedsView->sourceModel(), SIGNAL(feedsUpdateStarted()), this, SLOT(onFeedsUpdateStarted()));
 
   // Message openers.
-  connect(m_messagesView, SIGNAL(openLinkMiniBrowser(QString)), m_messagesBrowser, SLOT(navigateToUrl(QString)));
   connect(m_messagesView, SIGNAL(openMessagesInNewspaperView(QList<Message>)),
           form_main->m_ui->m_tabWidget, SLOT(addBrowserWithMessages(QList<Message>)));
-  connect(m_messagesView, SIGNAL(openLinkNewTab(QString)),
-          form_main->m_ui->m_tabWidget, SLOT(addLinkedBrowser(QString)));
   connect(m_feedsView, SIGNAL(openMessagesInNewspaperView(QList<Message>)),
           form_main->m_ui->m_tabWidget, SLOT(addBrowserWithMessages(QList<Message>)));
   
diff --git a/src/gui/messagepreviewer.cpp b/src/gui/messagepreviewer.cpp
index ef0ef8d25..a511bd6da 100644
--- a/src/gui/messagepreviewer.cpp
+++ b/src/gui/messagepreviewer.cpp
@@ -23,6 +23,7 @@
 #include "gui/dialogs/formmain.h"
 
 #include <QScrollBar>
+#include <QToolBar>
 
 
 MessagePreviewer::MessagePreviewer(QWidget *parent) : QWidget(parent),
@@ -49,12 +50,29 @@ MessagePreviewer::MessagePreviewer(QWidget *parent) : QWidget(parent),
     }
   });
 
+  m_toolBar = new QToolBar(this);
+  m_toolBar->setOrientation(Qt::Vertical);
+  m_ui->m_layout->addWidget(m_toolBar, 0, 0, -1, 1);
+
+  connect(m_actionMarkRead = m_toolBar->addAction(qApp->icons()->fromTheme("mail-mark-read"), tr("Mark message as read")),
+          &QAction::triggered,
+          this,
+          &MessagePreviewer::markMessageAsRead);
+  connect(m_actionMarkUnread = m_toolBar->addAction(qApp->icons()->fromTheme("mail-mark-unread"), tr("Mark message as unread")),
+          &QAction::triggered,
+          this,
+          &MessagePreviewer::markMessageAsUnread);
+  connect(m_actionSwitchImportance = m_toolBar->addAction(qApp->icons()->fromTheme("mail-mark-favorite"), tr("Switch message importance")),
+          &QAction::triggered,
+          this,
+          &MessagePreviewer::switchMessageImportance);
+
+  m_actionSwitchImportance->setCheckable(true);
+
   clear();
 }
 
-
 MessagePreviewer::~MessagePreviewer() {
-  delete m_ui;
 }
 
 void MessagePreviewer::clear() {
@@ -64,19 +82,40 @@ void MessagePreviewer::clear() {
   hide();
 }
 
-void MessagePreviewer::loadMessage(const Message &message) {
-  m_ui->m_lblTitle->setText(message.m_title);
-  m_ui->m_txtMessage->setHtml(prepareHtmlForMessage(message));
-  show();
+void MessagePreviewer::loadMessage(const Message &message, RootItem *root) {
+  m_message = message;
+  m_root = root;
+
+  m_actionMarkRead->setEnabled(!message.m_isRead);
+  m_actionMarkUnread->setEnabled(message.m_isRead);
+  m_actionSwitchImportance->setChecked(message.m_isImportant);
+
+  if (!m_root.isNull()) {
+    m_ui->m_lblTitle->setText(message.m_title);
+    m_ui->m_txtMessage->setHtml(prepareHtmlForMessage(message));
+    show();
+
+    m_ui->m_txtMessage->verticalScrollBar()->triggerAction(QScrollBar::SliderToMinimum);
+  }
+}
+
+void MessagePreviewer::markMessageAsRead() {
+
+}
+
+void MessagePreviewer::markMessageAsUnread() {
+
+}
+
+void MessagePreviewer::switchMessageImportance(bool checked) {
 
-  m_ui->m_txtMessage->verticalScrollBar()->triggerAction(QScrollBar::SliderToMinimum);
 }
 
 QString MessagePreviewer::prepareHtmlForMessage(const Message &message) {
-  QString html = QString("<p><a href=\"%1\">%1</a><p/>").arg(message.m_url);
+  QString html = QString("<p>[url] <a href=\"%1\">%1</a></p>").arg(message.m_url);
 
   foreach (const Enclosure &enc, message.m_enclosures) {
-    html += QString("<p>[%2] <a href=\"%1\">%1</a><p/>").arg(enc.m_url, enc.m_mimeType);
+    html += QString("<p>[%2] <a href=\"%1\">%1</a></p>").arg(enc.m_url, enc.m_mimeType);
   }
 
   if (!message.m_enclosures.isEmpty()) {
diff --git a/src/gui/messagepreviewer.h b/src/gui/messagepreviewer.h
index eb9dee1d4..f8e9a3e3f 100644
--- a/src/gui/messagepreviewer.h
+++ b/src/gui/messagepreviewer.h
@@ -23,12 +23,17 @@
 #include "ui_messagepreviewer.h"
 
 #include "core/message.h"
+#include "services/abstract/rootitem.h"
+
+#include <QPointer>
 
 
 namespace Ui {
   class MessagePreviewer;
 }
 
+class QToolBar;
+
 class MessagePreviewer : public QWidget {
     Q_OBJECT
 
@@ -38,12 +43,24 @@ class MessagePreviewer : public QWidget {
 
   public slots:
     void clear();
-    void loadMessage(const Message &message);
+    void loadMessage(const Message &message, RootItem *root);
+
+  private slots:
+    void markMessageAsRead();
+    void markMessageAsUnread();
+    void switchMessageImportance(bool checked);
 
   private:
     QString prepareHtmlForMessage(const Message &message);
 
-    Ui::MessagePreviewer *m_ui;
+    QToolBar *m_toolBar;
+    QScopedPointer<Ui::MessagePreviewer> m_ui;
+    Message m_message;
+    QPointer<RootItem> m_root;
+
+    QAction *m_actionMarkRead;
+    QAction *m_actionMarkUnread;
+    QAction *m_actionSwitchImportance;
 };
 
 #endif // MESSAGEPREVIEWER_H
diff --git a/src/gui/messagepreviewer.ui b/src/gui/messagepreviewer.ui
index 87a091655..2965eddf7 100644
--- a/src/gui/messagepreviewer.ui
+++ b/src/gui/messagepreviewer.ui
@@ -16,8 +16,17 @@
   <property name="autoFillBackground">
    <bool>true</bool>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
+  <layout class="QGridLayout" name="m_layout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item row="0" column="1">
     <widget class="QLabel" name="m_lblTitle">
      <property name="font">
       <font>
@@ -28,7 +37,7 @@
       <bool>true</bool>
      </property>
      <property name="text">
-      <string>avas</string>
+      <string/>
      </property>
      <property name="alignment">
       <set>Qt::AlignCenter</set>
@@ -36,9 +45,15 @@
      <property name="wordWrap">
       <bool>true</bool>
      </property>
+     <property name="margin">
+      <number>0</number>
+     </property>
+     <property name="textInteractionFlags">
+      <set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+     </property>
     </widget>
    </item>
-   <item>
+   <item row="1" column="1">
     <widget class="QTextBrowser" name="m_txtMessage">
      <property name="autoFillBackground">
       <bool>true</bool>
@@ -49,6 +64,9 @@
      <property name="frameShadow">
       <enum>QFrame::Plain</enum>
      </property>
+     <property name="tabChangesFocus">
+      <bool>true</bool>
+     </property>
      <property name="openLinks">
       <bool>false</bool>
      </property>
diff --git a/src/gui/messagesview.cpp b/src/gui/messagesview.cpp
index aa742e39c..57ac3d6d5 100755
--- a/src/gui/messagesview.cpp
+++ b/src/gui/messagesview.cpp
@@ -203,7 +203,7 @@ void MessagesView::selectionChanged(const QItemSelection &selected, const QItemS
       m_sourceModel->setMessageRead(mapped_current_index.row(), RootItem::Read);
     }
 
-    emit currentMessageChanged(message);
+    emit currentMessageChanged(message, m_sourceModel->loadedItem());
   }
   else {
     emit currentMessageRemoved();
diff --git a/src/gui/messagesview.h b/src/gui/messagesview.h
index 2cc069e2a..2f79d0c9f 100755
--- a/src/gui/messagesview.h
+++ b/src/gui/messagesview.h
@@ -95,7 +95,7 @@ class MessagesView : public QTreeView {
     void openMessagesInNewspaperView(const QList<Message> &messages);
 
     // Notify others about message selections.
-    void currentMessageChanged(const Message &message);
+    void currentMessageChanged(const Message &message, RootItem *root);
     void currentMessageRemoved();
 
   private:
diff --git a/src/miscellaneous/skinfactory.cpp b/src/miscellaneous/skinfactory.cpp
index 15c50050f..b837fabb2 100755
--- a/src/miscellaneous/skinfactory.cpp
+++ b/src/miscellaneous/skinfactory.cpp
@@ -135,19 +135,6 @@ Skin SkinFactory::skinInfo(const QString &skin_name, bool *ok) const {
 
   // Obtain version.
   skin.m_version = skin_node.attributes().namedItem(QSL("version")).toAttr().value();
-
-  // Obtain layout markup wrapper.
-  skin.m_layoutMarkupWrapper = skin_node.namedItem(QSL("markup_wrapper")).toElement().text();
-  skin.m_layoutMarkupWrapper = QByteArray::fromBase64(skin.m_layoutMarkupWrapper.toLocal8Bit());
-
-  // Obtain layout markup.
-  skin.m_layoutMarkup = skin_node.namedItem(QSL("markup")).toElement().text();
-  skin.m_layoutMarkup = QByteArray::fromBase64(skin.m_layoutMarkup.toLocal8Bit());
-
-  // Obtain enclosure hyperlink wrapper.
-  skin.m_enclosureMarkup = skin_node.namedItem(QSL("markup_enclosure")).toElement().text();
-  skin.m_enclosureMarkup = QByteArray::fromBase64(skin.m_enclosureMarkup.toLocal8Bit());
-
   // Obtain other information.
   skin.m_baseName = QString(skin_name).replace(QDir::separator(), '/');
 
@@ -157,8 +144,7 @@ Skin SkinFactory::skinInfo(const QString &skin_name, bool *ok) const {
 
   if (ok != NULL) {
     *ok = !skin.m_author.isEmpty() && !skin.m_version.isEmpty() &&
-          !skin.m_baseName.isEmpty() && !skin.m_email.isEmpty() &&
-          !skin.m_layoutMarkup.isEmpty();
+          !skin.m_baseName.isEmpty() && !skin.m_email.isEmpty();
   }
 
   return skin;
diff --git a/src/miscellaneous/skinfactory.h b/src/miscellaneous/skinfactory.h
index ca62e670f..423b2d29c 100755
--- a/src/miscellaneous/skinfactory.h
+++ b/src/miscellaneous/skinfactory.h
@@ -32,9 +32,6 @@ struct Skin {
     QString m_email;
     QString m_version;
     QString m_rawData;
-    QString m_layoutMarkupWrapper;
-    QString m_layoutMarkup;
-    QString m_enclosureMarkup;
 };
 
 Q_DECLARE_METATYPE(Skin)