diff --git a/patches/0090-psiplus-more-compatibility-with-skinsplugin.diff b/patches/0090-psiplus-more-compatibility-with-skinsplugin.diff
deleted file mode 100644
index 424b9a1..0000000
--- a/patches/0090-psiplus-more-compatibility-with-skinsplugin.diff
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/src/mainwin.cpp
-+++ b/src/mainwin.cpp
-@@ -339,6 +339,8 @@ MainWin::MainWin(bool _onTop, bool _asTool, PsiCon* psi)
- } else
- setCentralWidget(rosterBar);
-
-+ connect(PsiOptions::instance(), SIGNAL(optionChanged(const QString&)), SLOT(optionChanged(const QString&)));
-+
- d->vb_roster = new QVBoxLayout(rosterBar);
- d->rosterWidget_ = new PsiRosterWidget(rosterBar);
- d->rosterWidget_->setContactList(psi->contactList());
-@@ -544,6 +546,14 @@ void MainWin::splitterMoved()
- d->tabsSize = d->isLeftRoster ? list.last() : list.first();
- }
-
-+void MainWin::optionChanged(const QString& option)
-+{
-+ if (option == toolbarsStateOptionPath) { //for compatibility with skins plugin
-+ loadToolbarsState();
-+ //buildToolbars(); //FIXME!!! not a very good solution
-+ }
-+}
-+
- void MainWin::registerAction( IconAction* action )
- {
- const char *activated = SIGNAL( triggered() );
---- a/src/mainwin.h
-+++ b/src/mainwin.h
-@@ -166,6 +166,8 @@ private slots:
-
- void hideTimerTimeout();
-
-+ void optionChanged(const QString&);
-+
- public slots:
- void setWindowIcon(const QPixmap&);
- void showNoFocus();
diff --git a/patches/0100-psi-css-style-sheet.diff b/patches/0100-psi-css-style-sheet.diff
deleted file mode 100644
index 7a43899..0000000
--- a/patches/0100-psi-css-style-sheet.diff
+++ /dev/null
@@ -1,270 +0,0 @@
---- a/options/default.xml
-+++ b/options/default.xml
-@@ -123,6 +123,7 @@
- false
- true
- true
-+
- false
- false
- auto
-@@ -147,6 +148,7 @@
- false
-
-
-+
- true
- true
- true
-@@ -421,6 +423,7 @@ QLineEdit#le_status_text {
- Sans Serif,9,-1,5,50,0,0,0,0,0
- Sans Serif,7,-1,5,50,0,0,0,0,0
-
-+
-
-
- true
-@@ -437,6 +440,7 @@ QLineEdit#le_status_text {
- 2000
-
- false
-+
- false
- false
- true
---- a/src/gcuserview.cpp
-+++ b/src/gcuserview.cpp
-@@ -741,6 +741,10 @@ void GCUserView::doContextMenu(QTreeWidgetItem *i)
- pm->addAction(act);
- act->setData(3);
-
-+ const QString css = PsiOptions::instance()->getOption("options.ui.chat.css").toString();
-+ if (!css.isEmpty()) {
-+ pm->setStyleSheet(css);
-+ }
- int x = -1;
- bool enabled = false;
- act = pm->exec(QCursor::pos());
---- a/src/groupchatdlg.cpp
-+++ b/src/groupchatdlg.cpp
-@@ -1981,6 +1981,11 @@ QString GCMainDlg::desiredCaption() const
-
- void GCMainDlg::setLooks()
- {
-+ const QString css = PsiOptions::instance()->getOption("options.ui.chat.css").toString();
-+ if (!css.isEmpty()) {
-+ setStyleSheet(css);
-+ d->mle()->setCssString(css);
-+ }
- ui_.vsplitter->optionsChanged();
- ui_.mle->optionsChanged();
-
---- a/src/mainwin.cpp
-+++ b/src/mainwin.cpp
-@@ -562,6 +562,7 @@ MainWin::MainWin(bool _onTop, bool _asTool, PsiCon* psi)
-
- /*QShortcut *sp_ss = new QShortcut(QKeySequence(tr("Ctrl+Shift+N")), this);
- connect(sp_ss, SIGNAL(triggered()), SLOT(avcallConfig()));*/
-+ optionChanged("options.ui.contactlist.css");
-
- reinitAutoHide();
- }
-@@ -596,6 +597,12 @@ void MainWin::optionChanged(const QString& option)
- loadToolbarsState();
- //buildToolbars(); //FIXME!!! not a very good solution
- }
-+ else if (option == "options.ui.contactlist.css") {
-+ const QString css = PsiOptions::instance()->getOption("options.ui.contactlist.css").toString();
-+ if (!css.isEmpty()) {
-+ setStyleSheet(css);
-+ }
-+ }
- }
-
- void MainWin::registerAction( IconAction* action )
---- a/src/psichatdlg.cpp
-+++ b/src/psichatdlg.cpp
-@@ -289,6 +289,11 @@ void PsiChatDlg::setLooks()
- {
- ChatDlg::setLooks();
-
-+ const QString css = PsiOptions::instance()->getOption("options.ui.chat.css").toString();
-+ if (!css.isEmpty()) {
-+ setStyleSheet(css);
-+ chatEdit()->setCssString(css);
-+ }
- ui_.splitter->optionsChanged();
- ui_.mle->optionsChanged();
-
---- a/src/psicon.cpp
-+++ b/src/psicon.cpp
-@@ -514,6 +514,10 @@ bool PsiCon::init()
- d->iconSelect = new IconSelectPopup(0);
- connect(PsiIconset::instance(), SIGNAL(emoticonsChanged()), d, SLOT(updateIconSelect()));
-
-+ const QString css = options->getOption("options.ui.chat.css").toString();
-+ if (!css.isEmpty())
-+ d->iconSelect->setStyleSheet(css);
-+
- // first thing, try to load the iconset
- bool result = true;;
- if( !PsiIconset::instance()->loadAll() ) {
-@@ -1437,6 +1441,13 @@ void PsiCon::optionChanged(const QString& option)
- s5b_init();
- }
-
-+ if (option == "options.ui.chat.css") {
-+ QString css = PsiOptions::instance()->getOption(option).toString();
-+ if (!css.isEmpty())
-+ d->iconSelect->setStyleSheet(css);
-+ return;
-+ }
-+
- if (option == "options.ui.spell-check.langs") {
- QStringList langs = PsiOptions::instance()->getOption(option).toString().split(QRegExp("\\s+"), QString::SkipEmptyParts);
- if(langs.isEmpty()) {
---- a/src/statusmenu.cpp
-+++ b/src/statusmenu.cpp
-@@ -36,6 +36,10 @@
- StatusMenu::StatusMenu(QWidget* parent, PsiCon* _psi )
- : QMenu(parent), psi(_psi)
- {
-+ const QString css = PsiOptions::instance()->getOption("options.ui.contactlist.css").toString();
-+ if (!css.isEmpty()) {
-+ setStyleSheet(css);
-+ }
- connect(psi, SIGNAL(statusPresetsChanged()), this, SLOT(presetsChanged()));
- installEventFilter(this);
- }
-@@ -65,6 +69,10 @@ void StatusMenu::fill()
- IconActionGroup* submenu = new IconActionGroup(this);
- submenu->setText(tr("Presets"));
- submenu->setPsiIcon("psi/action_templates");
-+ const QString css = o->getOption("options.ui.contactlist.css").toString();
-+ if (!css.isEmpty()) {
-+ submenu->popup()->setStyleSheet(css);
-+ }
- addPresets(submenu);
- submenu->popup()->installEventFilter(this);
- }
---- a/src/tabs/tabdlg.cpp
-+++ b/src/tabs/tabdlg.cpp
-@@ -374,6 +374,11 @@ void TabDlg::setLooks()
- tabWidget_->setTabPosition(QTabWidget::South);
-
- setWindowOpacity(double(qMax(MINIMUM_OPACITY,PsiOptions::instance()->getOption("options.ui.chat.opacity").toInt()))/100);
-+
-+ const QString css = PsiOptions::instance()->getOption("options.ui.chat.css").toString();
-+ if (!css.isEmpty()) {
-+ setStyleSheet(css);
-+ }
- }
-
- void TabDlg::tabSelected(QWidget* _selected)
---- a/src/widgets/fancypopup.cpp
-+++ b/src/widgets/fancypopup.cpp
-@@ -213,6 +213,11 @@ void FancyPopup::Private::initContents(QString title, const PsiIcon *icon, bool
- ui_.closeButton->setIcon( popup->style()->standardPixmap(QStyle::SP_TitleBarCloseButton) );
- ui_.closeButton->setFixedSize(BUTTON_WIDTH, BUTTON_HEIGHT);
- connect(ui_.closeButton, SIGNAL(clicked()), popup, SLOT(hide()));
-+
-+ const QString css = PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.css").toString();
-+ if (!css.isEmpty()) {
-+ popup->setStyleSheet(css);
-+ }
- }
-
- bool FancyPopup::Private::eventFilter(QObject *o, QEvent *e)
---- a/src/widgets/iconaction.cpp
-+++ b/src/widgets/iconaction.cpp
-@@ -30,6 +30,8 @@ class PsiIcon;
- class Iconset;
- #endif
-
-+#include "psioptions.h"
-+
- #include
- #include
- #include
-@@ -441,6 +443,11 @@ IconActionGroup::IconActionGroup(QObject *parent, const char *name, bool exclusi
- d->updatePopup();
-
- d->exclusive = exclusive;
-+
-+ const QString css = PsiOptions::instance()->getOption("options.ui.contactlist.css").toString();
-+ if (!css.isEmpty()) {
-+ d->popup->setStyleSheet(css);
-+ }
- }
-
- IconActionGroup::~IconActionGroup()
---- a/src/widgets/psitabwidget.cpp
-+++ b/src/widgets/psitabwidget.cpp
-@@ -74,6 +74,7 @@ PsiTabWidget::PsiTabWidget(QWidget *parent)
- stacked_ = new QStackedLayout(layout_);
-
- setTabPosition(QTabWidget::North);
-+ setLooks();
-
- if (!PsiOptions::instance()->getOption("options.ui.tabs.show-tab-close-buttons").toBool()){
- tabBar_->setTabsClosable(false);
-@@ -177,9 +178,18 @@ void PsiTabWidget::addTab(QWidget *widget, QString name, const QIcon &icon)
- tabBar_->addTab(icon, name);
- else
- tabBar_->addTab(name);
-+ setLooks();
- showPage(currentPage());
- }
-
-+void PsiTabWidget::setLooks()
-+{
-+ const QString css = PsiOptions::instance()->getOption("options.ui.chat.css").toString();
-+ if (!css.isEmpty()) {
-+ setStyleSheet(css);
-+ }
-+}
-+
- /**
- * Selects the page for the specified widget.
- */
---- a/src/widgets/psitabwidget.h
-+++ b/src/widgets/psitabwidget.h
-@@ -67,6 +67,7 @@ public:
- public slots:
- void setCurrentPage(int);
- void removeCurrentPage();
-+ void setLooks();
-
- signals:
- void mouseDoubleClickTab(QWidget *tab);
---- a/src/widgets/psitiplabel.cpp
-+++ b/src/widgets/psitiplabel.cpp
-@@ -55,6 +55,10 @@ void PsiTipLabel::init(const QString& text)
- enableColoring_ = false;
- }
- }
-+ const QString css = PsiOptions::instance()->getOption("options.ui.contactlist.tooltip.css").toString();
-+ if (!css.isEmpty()) {
-+ setStyleSheet(css);
-+ }
- }
-
- void PsiTipLabel::setText(const QString& text)
---- a/src/widgets/urlobject.cpp
-+++ b/src/widgets/urlobject.cpp
-@@ -19,6 +19,7 @@
- */
-
- #include "urlobject.h"
-+#include "psioptions.h"
-
- #include
- #include
-@@ -231,6 +232,7 @@ QMenu *URLObject::createPopupMenu(const QString &lnk)
- }
-
- m->addAction(d->act_copy);
-+ m->setStyleSheet(PsiOptions::instance()->getOption("options.ui.look.css").toString());
- return m;
- }
-