diff --git a/libs/widgets/KisVisualColorSelector.cpp b/libs/widgets/KisVisualColorSelector.cpp
index 4b653d6c81..043f6f6dcd 100644
--- a/libs/widgets/KisVisualColorSelector.cpp
+++ b/libs/widgets/KisVisualColorSelector.cpp
@@ -1,425 +1,413 @@
 /*
  * Copyright (C) Wolthera van Hovell tot Westerflier <griffinvalley@gmail.com>, (C) 2016
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 #include "KisVisualColorSelector.h"
 
 #include <QColor>
 #include <QPixmap>
 #include <QPainter>
 #include <QPainterPath>
 #include <QRect>
 #include <QVector>
 #include <QVBoxLayout>
 #include <QList>
 #include <QPolygon>
 #include <QtMath>
 
 #include <KSharedConfig>
 #include <KConfigGroup>
 
 #include "KoColorConversions.h"
 #include "KoColorDisplayRendererInterface.h"
 #include "KoChannelInfo.h"
 #include <KoColorModelStandardIds.h>
 #include <QPointer>
 #include "kis_signal_compressor.h"
 #include "kis_debug.h"
 
 #include "KisVisualColorSelectorShape.h"
 #include "KisVisualRectangleSelectorShape.h"
 #include "KisVisualTriangleSelectorShape.h"
 #include "KisVisualEllipticalSelectorShape.h"
 
 struct KisVisualColorSelector::Private
 {
     KoColor currentcolor;
     const KoColorSpace *currentCS {0};
     QList<KisVisualColorSelectorShape*> widgetlist;
     bool updateSelf {false};
-    bool updateLonesome {false}; // for modal dialogs.
+    bool updateLonesome {false}; // currently redundant; remove?
     bool circular {false};
     const KoColorDisplayRendererInterface *displayRenderer {0};
     KisColorSelectorConfiguration acs_config;
     KisSignalCompressor *updateTimer {0};
 };
 
 KisVisualColorSelector::KisVisualColorSelector(QWidget *parent)
     : KisColorSelectorInterface(parent)
     , m_d(new Private)
 {
     this->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding);
 
     KConfigGroup cfg =  KSharedConfig::openConfig()->group("advancedColorSelector");
     m_d->acs_config = KisColorSelectorConfiguration::fromString(cfg.readEntry("colorSelectorConfiguration", KisColorSelectorConfiguration().toString()));
     m_d->updateTimer = new KisSignalCompressor(100 /* ms */, KisSignalCompressor::POSTPONE);
     connect(m_d->updateTimer, SIGNAL(timeout()), SLOT(slotRebuildSelectors()), Qt::UniqueConnection);
 }
 
 KisVisualColorSelector::~KisVisualColorSelector()
 {
     delete m_d->updateTimer;
 }
 
 void KisVisualColorSelector::slotSetColor(const KoColor &c)
 {
-    if (m_d->updateSelf == false) {
-        m_d->currentcolor = c;
-        if (m_d->currentCS != c.colorSpace()) {
-            slotsetColorSpace(c.colorSpace());
-        }
+    m_d->currentcolor = c;
+    if (m_d->currentCS != c.colorSpace()) {
+        slotsetColorSpace(c.colorSpace());
     }
     updateSelectorElements(QObject::sender());
 }
 
 void KisVisualColorSelector::slotsetColorSpace(const KoColorSpace *cs)
 {
     if (m_d->currentCS != cs) {
         m_d->currentCS = cs;
         slotRebuildSelectors();
     }
 }
 
 void KisVisualColorSelector::setConfig(bool forceCircular, bool forceSelfUpdate)
 {
     m_d->circular = forceCircular;
     m_d->updateLonesome = forceSelfUpdate;
 }
 
 KoColor KisVisualColorSelector::getCurrentColor() const
 {
     return m_d->currentcolor;
 }
 
 void KisVisualColorSelector::configurationChanged()
 {
     if (m_d->updateTimer) {
         m_d->updateTimer->start();
     }
 }
 
 void KisVisualColorSelector::slotRebuildSelectors()
 {
     KConfigGroup cfg =  KSharedConfig::openConfig()->group("advancedColorSelector");
     m_d->acs_config = KisColorSelectorConfiguration::fromString(cfg.readEntry("colorSelectorConfiguration", KisColorSelectorConfiguration().toString()));
 
     qDeleteAll(children());
     m_d->widgetlist.clear();
     // TODO: Layout only used for monochrome selector currently, but always present
     QLayout *layout = new QHBoxLayout;
     //recreate all the widgets.
 
     if (m_d->currentCS->colorChannelCount() == 1) {
 
         KisVisualColorSelectorShape *bar;
 
         if (m_d->circular==false) {
             bar = new KisVisualRectangleSelectorShape(this, KisVisualColorSelectorShape::onedimensional,KisVisualColorSelectorShape::Channel, m_d->currentCS, 0, 0,m_d->displayRenderer, 20);
             bar->setMaximumWidth(width()*0.1);
             bar->setMaximumHeight(height());
         }
         else {
             bar = new KisVisualEllipticalSelectorShape(this, KisVisualColorSelectorShape::onedimensional,KisVisualColorSelectorShape::Channel, m_d->currentCS, 0, 0,m_d->displayRenderer, 20, KisVisualEllipticalSelectorShape::borderMirrored);
             layout->setMargin(0);
         }
 
         connect (bar, SIGNAL(sigNewColor(KoColor)), this, SLOT(updateFromWidgets(KoColor)));
         layout->addWidget(bar);
         m_d->widgetlist.append(bar);
     }
     else if (m_d->currentCS->colorChannelCount() == 3) {
         KisVisualColorSelectorShape::ColorModel modelS = KisVisualColorSelectorShape::HSV;
         int channel1 = 0;
         int channel2 = 1;
         int channel3 = 2;
 
         switch(m_d->acs_config.subTypeParameter)
         {
         case KisColorSelectorConfiguration::H:
             channel1 = 0;
             break;
         case KisColorSelectorConfiguration::hsyS:
         case KisColorSelectorConfiguration::hsiS:
         case KisColorSelectorConfiguration::hslS:
         case KisColorSelectorConfiguration::hsvS:
             channel1 = 1;
             break;
         case KisColorSelectorConfiguration::V:
         case KisColorSelectorConfiguration::L:
         case KisColorSelectorConfiguration::I:
         case KisColorSelectorConfiguration::Y:
             channel1 = 2;
             break;
         default:
             Q_ASSERT_X(false, "", "Invalid acs_config.subTypeParameter");
         }
 
         switch(m_d->acs_config.mainTypeParameter)
         {
         case KisColorSelectorConfiguration::hsySH:
             modelS = KisVisualColorSelectorShape::HSY;
             channel2 = 0;
             channel3 = 1;
             break;
         case KisColorSelectorConfiguration::hsiSH:
             modelS = KisVisualColorSelectorShape::HSI;
             channel2 = 0;
             channel3 = 1;
             break;
         case KisColorSelectorConfiguration::hslSH:
             modelS = KisVisualColorSelectorShape::HSL;
             channel2 = 0;
             channel3 = 1;
             break;
         case KisColorSelectorConfiguration::hsvSH:
             modelS = KisVisualColorSelectorShape::HSV;
             channel2 = 0;
             channel3 = 1;
             break;
         case KisColorSelectorConfiguration::YH:
             modelS = KisVisualColorSelectorShape::HSY;
             channel2 = 0;
             channel3 = 2;
             break;
         case KisColorSelectorConfiguration::LH:
             modelS = KisVisualColorSelectorShape::HSL;
             channel2 = 0;
             channel3 = 2;
             break;
         case KisColorSelectorConfiguration::IH:
             modelS = KisVisualColorSelectorShape::HSL;
             channel2 = 0;
             channel3 = 2;
             break;
         case KisColorSelectorConfiguration::VH:
             modelS = KisVisualColorSelectorShape::HSV;
             channel2 = 0;
             channel3 = 2;
             break;
         case KisColorSelectorConfiguration::SY:
             modelS = KisVisualColorSelectorShape::HSY;
             channel2 = 1;
             channel3 = 2;
             break;
         case KisColorSelectorConfiguration::SI:
             modelS = KisVisualColorSelectorShape::HSI;
             channel2 = 1;
             channel3 = 2;
             break;
         case KisColorSelectorConfiguration::SL:
             modelS = KisVisualColorSelectorShape::HSL;
             channel2 = 1;
             channel3 = 2;
             break;
         case KisColorSelectorConfiguration::SV:
         case KisColorSelectorConfiguration::SV2:
             modelS = KisVisualColorSelectorShape::HSV;
             channel2 = 1;
             channel3 = 2;
             break;
         default:
             Q_ASSERT_X(false, "", "Invalid acs_config.mainTypeParameter");
         }
         if (m_d->acs_config.mainType == KisColorSelectorConfiguration::Triangle) {
             modelS = KisVisualColorSelectorShape::HSV;
             //Triangle only really works in HSV mode.
         }
         KisVisualColorSelectorShape *bar;
         if (m_d->acs_config.subType == KisColorSelectorConfiguration::Ring) {
             bar = new KisVisualEllipticalSelectorShape(this,
                                                        KisVisualColorSelectorShape::onedimensional,
                                                        modelS,
                                                        m_d->currentCS, channel1, channel1,
                                                        m_d->displayRenderer, 20,KisVisualEllipticalSelectorShape::border);
         }
         else if (m_d->acs_config.subType == KisColorSelectorConfiguration::Slider && m_d->circular == false) {
             bar = new KisVisualRectangleSelectorShape(this,
                                                       KisVisualColorSelectorShape::onedimensional,
                                                       modelS,
                                                       m_d->currentCS, channel1, channel1,
                                                       m_d->displayRenderer, 20);
         }
         else if (m_d->acs_config.subType == KisColorSelectorConfiguration::Slider && m_d->circular == true) {
             bar = new KisVisualEllipticalSelectorShape(this,
                                                        KisVisualColorSelectorShape::onedimensional,
                                                        modelS,
                                                        m_d->currentCS, channel1, channel1,
                                                        m_d->displayRenderer, 20, KisVisualEllipticalSelectorShape::borderMirrored);
         } else {
             // Accessing bar below would crash since it's not initialized.
             // Hopefully this can never happen.
             warnUI << "Invalid subType, cannot initialize KisVisualColorSelectorShape";
             Q_ASSERT_X(false, "", "Invalid subType, cannot initialize KisVisualColorSelectorShape");
             return;
         }
 
         bar->setColor(m_d->currentcolor);
         m_d->widgetlist.append(bar);
 
         KisVisualColorSelectorShape *block;
         if (m_d->acs_config.mainType == KisColorSelectorConfiguration::Triangle) {
             block = new KisVisualTriangleSelectorShape(this, KisVisualColorSelectorShape::twodimensional,
                                                        modelS,
                                                        m_d->currentCS, channel2, channel3,
                                                        m_d->displayRenderer);
         }
         else if (m_d->acs_config.mainType == KisColorSelectorConfiguration::Square) {
             block = new KisVisualRectangleSelectorShape(this, KisVisualColorSelectorShape::twodimensional,
                                                         modelS,
                                                         m_d->currentCS, channel2, channel3,
                                                         m_d->displayRenderer);
         }
         else {
             block = new KisVisualEllipticalSelectorShape(this, KisVisualColorSelectorShape::twodimensional,
                                                          modelS,
                                                          m_d->currentCS, channel2, channel3,
                                                          m_d->displayRenderer);
         }
 
         block->setColor(m_d->currentcolor);
-        connect (bar, SIGNAL(sigNewColor(KoColor)), block, SLOT(setColorFromSibling(KoColor)));
+        connect (bar, SIGNAL(sigNewColor(KoColor)), SLOT(updateFromWidgets(KoColor)));
         connect (block, SIGNAL(sigNewColor(KoColor)), SLOT(updateFromWidgets(KoColor)));
         connect (bar, SIGNAL(sigHSXchange()), SLOT(HSXwrangler()));
         connect (block, SIGNAL(sigHSXchange()), SLOT(HSXwrangler()));
         m_d->widgetlist.append(block);
     }
     else if (m_d->currentCS->colorChannelCount() == 4) {
         KisVisualRectangleSelectorShape *block =  new KisVisualRectangleSelectorShape(this, KisVisualRectangleSelectorShape::twodimensional,KisVisualColorSelectorShape::Channel, m_d->currentCS, 0, 1);
         KisVisualRectangleSelectorShape *block2 =  new KisVisualRectangleSelectorShape(this, KisVisualRectangleSelectorShape::twodimensional,KisVisualColorSelectorShape::Channel, m_d->currentCS, 2, 3);
-        connect (block, SIGNAL(sigNewColor(KoColor)), block2, SLOT(setColorFromSibling(KoColor)));
+        connect (block, SIGNAL(sigNewColor(KoColor)), SLOT(updateFromWidgets(KoColor)));
         connect (block2, SIGNAL(sigNewColor(KoColor)), SLOT(updateFromWidgets(KoColor)));
         m_d->widgetlist.append(block);
         m_d->widgetlist.append(block2);
     }
 
     this->setLayout(layout);
     // make sure we call "our" resize function
     KisVisualColorSelector::resizeEvent(0);
 }
 
 void KisVisualColorSelector::setDisplayRenderer (const KoColorDisplayRendererInterface *displayRenderer) {
     m_d->displayRenderer = displayRenderer;
     if (m_d->widgetlist.size()>0) {
         Q_FOREACH (KisVisualColorSelectorShape *shape, m_d->widgetlist) {
             shape->setDisplayRenderer(displayRenderer);
         }
     }
 }
 
 void KisVisualColorSelector::updateSelectorElements(QObject *source)
 {
-    //first lock all elements from sending updates, then update all elements.
-    Q_FOREACH (KisVisualColorSelectorShape *shape, m_d->widgetlist) {
-        shape->blockSignals(true);
-    }
-
     Q_FOREACH (KisVisualColorSelectorShape *shape, m_d->widgetlist) {
         if (shape!=source) {
             if (m_d->updateSelf) {
                 shape->setColorFromSibling(m_d->currentcolor);
             } else {
                 shape->setColor(m_d->currentcolor);
             }
         }
+        else if(!m_d->updateSelf)
+        {
+            shape->setColor(m_d->currentcolor);
+        }
     }
-    Q_FOREACH (KisVisualColorSelectorShape *shape, m_d->widgetlist) {
-        shape->blockSignals(false);
-    }
-
 }
 
 void KisVisualColorSelector::updateFromWidgets(KoColor c)
 {
     m_d->currentcolor = c;
     m_d->updateSelf = true;
-    if (m_d->updateLonesome) {
-        slotSetColor(c);
-        Q_EMIT sigNewColor(c);
-
-    } else {
-        Q_EMIT sigNewColor(c);
-    }
+    updateSelectorElements(QObject::sender());
+    Q_EMIT sigNewColor(c);
 }
 
 void KisVisualColorSelector::leaveEvent(QEvent *)
 {
     m_d->updateSelf = false;
 }
 
 void KisVisualColorSelector::resizeEvent(QResizeEvent *) {
     int sizeValue = qMin(width(), height());
     int borderWidth = qMax(sizeValue*0.1, 20.0);
     QRect newrect(0,0, this->geometry().width(), this->geometry().height());
     if (!m_d->currentCS) {
         slotsetColorSpace(m_d->currentcolor.colorSpace());
     }
     if (m_d->currentCS->colorChannelCount()==3) {
 
         if (m_d->acs_config.subType == KisColorSelectorConfiguration::Ring) {
             m_d->widgetlist.at(0)->resize(sizeValue,sizeValue);
         }
         else if (m_d->acs_config.subType == KisColorSelectorConfiguration::Slider && m_d->circular==false) {
             m_d->widgetlist.at(0)->setMaximumWidth(borderWidth);
             m_d->widgetlist.at(0)->setMinimumWidth(borderWidth);
             m_d->widgetlist.at(0)->setMinimumHeight(sizeValue);
             m_d->widgetlist.at(0)->setMaximumHeight(sizeValue);
         }
         else if (m_d->acs_config.subType == KisColorSelectorConfiguration::Slider && m_d->circular==true) {
             m_d->widgetlist.at(0)->resize(sizeValue,sizeValue);
         }
         m_d->widgetlist.at(0)->setBorderWidth(borderWidth);
 
         if (m_d->acs_config.mainType == KisColorSelectorConfiguration::Triangle) {
             m_d->widgetlist.at(1)->setGeometry(m_d->widgetlist.at(0)->getSpaceForTriangle(newrect));
         }
         else if (m_d->acs_config.mainType == KisColorSelectorConfiguration::Square) {
             m_d->widgetlist.at(1)->setGeometry(m_d->widgetlist.at(0)->getSpaceForSquare(newrect));
         }
         else if (m_d->acs_config.mainType == KisColorSelectorConfiguration::Wheel) {
             m_d->widgetlist.at(1)->setGeometry(m_d->widgetlist.at(0)->getSpaceForCircle(newrect));
         }
     }
     else if (m_d->currentCS->colorChannelCount() == 4) {
         int sizeBlock = qMin(width()/2 - 8, height());
         m_d->widgetlist.at(0)->setGeometry(0, 0, sizeBlock, sizeBlock);
         m_d->widgetlist.at(1)->setGeometry(sizeBlock + 8, 0, sizeBlock, sizeBlock);
     }
     Q_FOREACH (KisVisualColorSelectorShape *shape, m_d->widgetlist) {
         shape->update();
     }
 }
 
 void KisVisualColorSelector::HSXwrangler()
 {
     //qDebug() << this << "HSXWrangler";
 
     QVector<qreal> currentCoordinates = QVector<qreal>(3);
 
     QVector <qreal> w1 = m_d->widgetlist.at(0)->getHSX(currentCoordinates, true);
     QVector <qreal> w2 = m_d->widgetlist.at(1)->getHSX(currentCoordinates, true);
     QVector <int> ch(3);
 
     ch[0] = m_d->widgetlist.at(0)->getChannels().at(0);
     ch[1] = m_d->widgetlist.at(1)->getChannels().at(0);
     ch[2] = m_d->widgetlist.at(1)->getChannels().at(1);
 
     currentCoordinates[ch[0]] = w1[ch[0]];
     currentCoordinates[ch[1]] = w2[ch[1]];
     currentCoordinates[ch[2]] = w2[ch[2]];
 
     m_d->widgetlist.at(0)->setHSX(currentCoordinates, true);
     m_d->widgetlist.at(1)->setHSX(currentCoordinates, true);
 }
diff --git a/libs/widgets/KisVisualColorSelectorShape.cpp b/libs/widgets/KisVisualColorSelectorShape.cpp
index 0dbf241f86..2cd9e8343a 100644
--- a/libs/widgets/KisVisualColorSelectorShape.cpp
+++ b/libs/widgets/KisVisualColorSelectorShape.cpp
@@ -1,619 +1,619 @@
 /*
  * Copyright (C) Wolthera van Hovell tot Westerflier <griffinvalley@gmail.com>, (C) 2016
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 #include "KisVisualColorSelectorShape.h"
 
 #include <QColor>
 #include <QPixmap>
 #include <QPainter>
 #include <QPainterPath>
 #include <QRect>
 #include <QVector>
 #include <QVBoxLayout>
 #include <QList>
 #include <QPolygon>
 #include <QtMath>
 
 #include <KSharedConfig>
 #include <KConfigGroup>
 
 #include "KoColorConversions.h"
 #include "KoColorDisplayRendererInterface.h"
 #include "KoChannelInfo.h"
 #include <KoColorModelStandardIds.h>
 #include <QPointer>
 
 #include "kis_signal_compressor.h"
 #include "kis_debug.h"
 
 struct KisVisualColorSelectorShape::Private
 {
     QImage gradient;
     QImage fullSelector;
     bool imagesNeedUpdate {true};
     QPointF currentCoordinates;
     Dimensions dimension;
     ColorModel model;
     const KoColorSpace *colorSpace;
     KoColor currentColor;
     int channel1;
     int channel2;
     KisSignalCompressor *updateTimer {0};
     bool mousePressActive = false;
     const KoColorDisplayRendererInterface *displayRenderer = 0;
     qreal hue = 0.0;
     qreal sat = 0.0;
     qreal tone = 0.0;
     bool usesOCIO = false;
     bool isRGBA = false;
     bool is8Bit = false;
 
 };
 
 KisVisualColorSelectorShape::KisVisualColorSelectorShape(QWidget *parent,
                                                          KisVisualColorSelectorShape::Dimensions dimension,
                                                          KisVisualColorSelectorShape::ColorModel model,
                                                          const KoColorSpace *cs,
                                                          int channel1,
                                                          int channel2,
                                                          const KoColorDisplayRendererInterface *displayRenderer): QWidget(parent), m_d(new Private)
 {
     m_d->dimension = dimension;
     m_d->model = model;
     m_d->colorSpace = cs;
 
     // TODO: The following is done because the IDs are actually strings. Ideally, in the future, we
     // refactor everything so that the IDs are actually proper enums or something faster.
     if (m_d->displayRenderer
             && (m_d->colorSpace->colorDepthId() == Float16BitsColorDepthID
                 || m_d->colorSpace->colorDepthId() == Float32BitsColorDepthID
                 || m_d->colorSpace->colorDepthId() == Float64BitsColorDepthID)
             && m_d->colorSpace->colorModelId() != LABAColorModelID
             && m_d->colorSpace->colorModelId() != CMYKAColorModelID) {
         m_d->usesOCIO = true;
     } else {
         m_d->usesOCIO = false;
     }
     if (m_d->colorSpace->colorModelId() == RGBAColorModelID) {
         m_d->isRGBA = true;
     } else {
         m_d->isRGBA = false;
     }
     if (m_d->colorSpace->colorDepthId() == Integer8BitsColorDepthID) {
         m_d->is8Bit = true;
     } else {
         m_d->is8Bit = false;
     }
     m_d->currentColor = KoColor();
     m_d->currentColor.setOpacity(1.0);
     m_d->currentColor.convertTo(cs);
     int maxchannel = m_d->colorSpace->colorChannelCount()-1;
     m_d->channel1 = qBound(0, channel1, maxchannel);
     m_d->channel2 = qBound(0, channel2, maxchannel);
     this->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     // HACK: the updateTimer isn't connected to anything, we only check whether it's still active
     //       and running in order to determine whether we will emit a certain signal.
     m_d->updateTimer = new KisSignalCompressor(100 /* ms */, KisSignalCompressor::POSTPONE, this);
     setDisplayRenderer(displayRenderer);
     show();
 
 }
 
 KisVisualColorSelectorShape::~KisVisualColorSelectorShape()
 {
 }
 
 void KisVisualColorSelectorShape::updateCursor()
 {
     QPointF point1 = convertKoColorToShapeCoordinate(m_d->currentColor);
     if (point1 != m_d->currentCoordinates) {
         m_d->currentCoordinates = point1;
     }
 }
 
 QPointF KisVisualColorSelectorShape::getCursorPosition() {
     return m_d->currentCoordinates;
 }
 
 void KisVisualColorSelectorShape::setColor(KoColor c)
 {
     //qDebug() << this  << "KisVisualColorSelectorShape::setColor";
     if (c.colorSpace() != m_d->colorSpace) {
         c.convertTo(m_d->colorSpace);
     }
     m_d->currentColor = c;
     updateCursor();
 
     m_d->imagesNeedUpdate = true;
     update();
 }
 
 void KisVisualColorSelectorShape::setColorFromSibling(KoColor c)
 {
     //qDebug() << this  << "setColorFromSibling";
     if (c.colorSpace() != m_d->colorSpace) {
         c.convertTo(m_d->colorSpace);
     }
     m_d->currentColor = c;
-    Q_EMIT sigNewColor(c);
+
     m_d->imagesNeedUpdate = true;
     update();
 }
 
 void KisVisualColorSelectorShape::setDisplayRenderer (const KoColorDisplayRendererInterface *displayRenderer)
 {
     if (displayRenderer) {
         if (m_d->displayRenderer) {
             m_d->displayRenderer->disconnect(this);
         }
         m_d->displayRenderer = displayRenderer;
     } else {
         m_d->displayRenderer = KoDumbColorDisplayRenderer::instance();
     }
     connect(m_d->displayRenderer, SIGNAL(displayConfigurationChanged()),
             SLOT(updateFromChangedDisplayRenderer()), Qt::UniqueConnection);
 
 }
 
 void KisVisualColorSelectorShape::updateFromChangedDisplayRenderer()
 {
     //qDebug() << this  << "updateFromChangedDisplayRenderer();";
     m_d->imagesNeedUpdate = true;
     updateCursor();
     //m_d->currentColor = convertShapeCoordinateToKoColor(getCursorPosition());
     update();
 }
 
 void KisVisualColorSelectorShape::forceImageUpdate()
 {
     //qDebug() << this  << "forceImageUpdate";
     m_d->imagesNeedUpdate = true;
 }
 
 QColor KisVisualColorSelectorShape::getColorFromConverter(KoColor c){
     QColor col;
     KoColor color = c;
     if (m_d->displayRenderer) {
         color.convertTo(m_d->displayRenderer->getPaintingColorSpace());
         col = m_d->displayRenderer->toQColor(c);
     } else {
         col = c.toQColor();
     }
     return col;
 }
 
 void KisVisualColorSelectorShape::slotSetActiveChannels(int channel1, int channel2)
 {
     //qDebug() << this  << "slotSetActiveChannels";
     int maxchannel = m_d->colorSpace->colorChannelCount()-1;
     m_d->channel1 = qBound(0, channel1, maxchannel);
     m_d->channel2 = qBound(0, channel2, maxchannel);
     m_d->imagesNeedUpdate = true;
     update();
 }
 
 bool KisVisualColorSelectorShape::imagesNeedUpdate() const {
     return m_d->imagesNeedUpdate;
 }
 
 QImage KisVisualColorSelectorShape::getImageMap()
 {
     //qDebug() << this  << ">>>>>>>>> getImageMap()" << m_d->imagesNeedUpdate;
 
     if (m_d->imagesNeedUpdate == true) {
         m_d->gradient = QImage(width(), height(), QImage::Format_ARGB32);
         m_d->gradient.fill(Qt::transparent);
 //        KoColor c = m_d->currentColor;
 
         // Fill a buffer with the right kocolors
         quint8 *data = new quint8[width() * height() * height()];
         quint8 *dataPtr = data;
         for (int y = 0; y < m_d->gradient.height(); y++) {
             for (int x=0; x < m_d->gradient.width(); x++) {
                 QPointF newcoordinate = convertWidgetCoordinateToShapeCoordinate(QPoint(x, y));
                 KoColor c = convertShapeCoordinateToKoColor(newcoordinate);
                 memcpy(dataPtr, c.data(), m_d->currentColor.colorSpace()->pixelSize());
                 dataPtr += m_d->currentColor.colorSpace()->pixelSize();
             }
         }
         // Convert the buffer to a qimage
         if (m_d->displayRenderer) {
             m_d->gradient = m_d->displayRenderer->convertToQImage(m_d->currentColor.colorSpace(), data, width(), height());
         }
         else {
             m_d->gradient = m_d->currentColor.colorSpace()->convertToQImage(data, width(), height(), 0, KoColorConversionTransformation::internalRenderingIntent(), KoColorConversionTransformation::internalConversionFlags());
         }
         delete[] data;
 
         m_d->imagesNeedUpdate = false;
     }
     return m_d->gradient;
 }
 
 KoColor KisVisualColorSelectorShape::convertShapeCoordinateToKoColor(QPointF coordinates, bool cursor)
 {
     //qDebug() << this  << ">>>>>>>>> convertShapeCoordinateToKoColor()" << coordinates;
 
     KoColor c = m_d->currentColor;
     QVector <float> channelValues (c.colorSpace()->channelCount());
     channelValues.fill(1.0);
     c.colorSpace()->normalisedChannelsValue(c.data(), channelValues);
     QVector <float> channelValuesDisplay = channelValues;
     QVector <qreal> maxvalue(c.colorSpace()->channelCount());
     maxvalue.fill(1.0);
 
     if (m_d->usesOCIO == true) {
 
         for (int ch = 0; ch < maxvalue.size(); ch++) {
             KoChannelInfo *channel = m_d->colorSpace->channels()[ch];
             maxvalue[ch] = m_d->displayRenderer->maxVisibleFloatValue(channel);
             channelValues[ch] = channelValues[ch]/(maxvalue[ch]);
             channelValuesDisplay[KoChannelInfo::displayPositionToChannelIndex(ch, m_d->colorSpace->channels())] = channelValues[ch];
         }
     }
     else {
         for (int i =0; i < channelValues.size();i++) {
             channelValuesDisplay[KoChannelInfo::displayPositionToChannelIndex(i, m_d->colorSpace->channels())] = qBound((float)0.0,channelValues[i], (float)1.0);
         }
     }
 
     qreal huedivider = 1.0;
     qreal huedivider2 = 1.0;
 
     if (m_d->channel1 == 0) {
         huedivider = 360.0;
     }
 
     if (m_d->channel2 == 0) {
         huedivider2 = 360.0;
     }
 
     if (m_d->model != ColorModel::Channel && m_d->isRGBA == true) {
 
         if (m_d->model == ColorModel::HSV) {
             /*
              * RGBToHSV has a undefined hue possibility. This means that hue will be -1.
              * This can be annoying for dealing with a selector, but I understand it is being
              * used for the KoColorSelector... For now implement a qMax here.
              */
             QVector <float> inbetween(3);
             RGBToHSV(channelValuesDisplay[0],channelValuesDisplay[1], channelValuesDisplay[2], &inbetween[0], &inbetween[1], &inbetween[2]);
             inbetween = convertvectorqrealTofloat(getHSX(convertvectorfloatToqreal(inbetween)));
             inbetween[m_d->channel1] = coordinates.x()*huedivider;
             if (m_d->dimension == Dimensions::twodimensional) {
                 inbetween[m_d->channel2] = coordinates.y()*huedivider2;
             }
             if (cursor) {
                 setHSX(convertvectorfloatToqreal(inbetween));
                 Q_EMIT sigHSXchange();
             }
             HSVToRGB(qMax(inbetween[0],(float)0.0), inbetween[1], inbetween[2], &channelValuesDisplay[0], &channelValuesDisplay[1], &channelValuesDisplay[2]);
         }
         else if (m_d->model == ColorModel::HSL) {
             /*
              * HSLToRGB can give negative values on the grey. I fixed the fromNormalisedChannel function to clamp,
              * but you might want to manually clamp for floating point values.
              */
             QVector <float> inbetween(3);
             RGBToHSL(channelValuesDisplay[0],channelValuesDisplay[1], channelValuesDisplay[2], &inbetween[0], &inbetween[1], &inbetween[2]);
             inbetween = convertvectorqrealTofloat(getHSX(convertvectorfloatToqreal(inbetween)));
             inbetween[m_d->channel1] = fmod(coordinates.x()*huedivider, 360.0);
             if (m_d->dimension == Dimensions::twodimensional) {
                 inbetween[m_d->channel2] = coordinates.y()*huedivider2;
             }
             if (cursor) {
                 setHSX(convertvectorfloatToqreal(inbetween));
                 Q_EMIT sigHSXchange();
             }
             HSLToRGB(qMax(inbetween[0], (float)0.0), inbetween[1], inbetween[2], &channelValuesDisplay[0], &channelValuesDisplay[1], &channelValuesDisplay[2]);
         }
         else if (m_d->model == ColorModel::HSI) {
             /*
              * HSI is a modified HSY function.
              */
             QVector <qreal> chan2 = convertvectorfloatToqreal(channelValuesDisplay);
             QVector <qreal> inbetween(3);
             RGBToHSI(chan2[0],chan2[1], chan2[2], &inbetween[0], &inbetween[1], &inbetween[2]);
             inbetween = getHSX(inbetween);
             inbetween[m_d->channel1] = coordinates.x();
             if (m_d->dimension == Dimensions::twodimensional) {
                 inbetween[m_d->channel2] = coordinates.y();
             }
             if (cursor) {
                 setHSX(inbetween);
                 Q_EMIT sigHSXchange();
             }
             HSIToRGB(inbetween[0], inbetween[1], inbetween[2],&chan2[0],&chan2[1], &chan2[2]);
             channelValuesDisplay = convertvectorqrealTofloat(chan2);
         }
         else /*if (m_d->model == ColorModel::HSY)*/ {
             /*
              * HSY is pretty slow to render due being a pretty over-the-top function.
              * Might be worth investigating whether HCY can be used instead, but I have had
              * some weird results with that.
              */
             QVector <qreal> luma= m_d->colorSpace->lumaCoefficients();
             QVector <qreal> chan2 = convertvectorfloatToqreal(channelValuesDisplay);
             QVector <qreal> inbetween(3);
             RGBToHSY(chan2[0],chan2[1], chan2[2], &inbetween[0], &inbetween[1], &inbetween[2],
                     luma[0], luma[1], luma[2]);
             inbetween = getHSX(inbetween);
             inbetween[m_d->channel1] = coordinates.x();
             if (m_d->dimension == Dimensions::twodimensional) {
                 inbetween[m_d->channel2] = coordinates.y();
             }
             if (cursor) {
                 setHSX(inbetween);
                 Q_EMIT sigHSXchange();
             }
             HSYToRGB(inbetween[0], inbetween[1], inbetween[2],&chan2[0],&chan2[1], &chan2[2],
                     luma[0], luma[1], luma[2]);
             channelValuesDisplay = convertvectorqrealTofloat(chan2);
         }
 
     }
     else {
         channelValuesDisplay[m_d->channel1] = coordinates.x();
         if (m_d->dimension == Dimensions::twodimensional) {
             channelValuesDisplay[m_d->channel2] = coordinates.y();
         }
     }
 
     for (int i=0; i<channelValues.size();i++) {
         channelValues[i] = channelValuesDisplay[KoChannelInfo::displayPositionToChannelIndex(i, m_d->colorSpace->channels())]*(maxvalue[i]);
     }
 
     c.colorSpace()->fromNormalisedChannelsValue(c.data(), channelValues);
 
     return c;
 }
 
 QPointF KisVisualColorSelectorShape::convertKoColorToShapeCoordinate(KoColor c)
 {
     ////qDebug() << this  << ">>>>>>>>> convertKoColorToShapeCoordinate()";
 
     if (c.colorSpace() != m_d->colorSpace) {
         c.convertTo(m_d->colorSpace);
     }
     QVector <float> channelValues (m_d->currentColor.colorSpace()->channelCount());
     channelValues.fill(1.0);
     m_d->colorSpace->normalisedChannelsValue(c.data(), channelValues);
     QVector <float> channelValuesDisplay = channelValues;
     QVector <qreal> maxvalue(c.colorSpace()->channelCount());
     maxvalue.fill(1.0);
     if (m_d->usesOCIO == true) {
         for (int ch = 0; ch<maxvalue.size(); ch++) {
             KoChannelInfo *channel = m_d->colorSpace->channels()[ch];
             maxvalue[ch] = m_d->displayRenderer->maxVisibleFloatValue(channel);
             channelValues[ch] = channelValues[ch]/(maxvalue[ch]);
             channelValuesDisplay[KoChannelInfo::displayPositionToChannelIndex(ch, m_d->colorSpace->channels())] = channelValues[ch];
         }
     } else {
         for (int i =0; i<channelValues.size();i++) {
             channelValuesDisplay[KoChannelInfo::displayPositionToChannelIndex(i, m_d->colorSpace->channels())] = qBound((float)0.0,channelValues[i], (float)1.0);
         }
     }
     QPointF coordinates(0.0,0.0);
     qreal huedivider = 1.0;
     qreal huedivider2 = 1.0;
     if (m_d->channel1==0) {
         huedivider = 360.0;
     }
     if (m_d->channel2==0) {
         huedivider2 = 360.0;
     }
     if (m_d->model != ColorModel::Channel && m_d->isRGBA == true) {
         if (m_d->isRGBA == true) {
             if (m_d->model == ColorModel::HSV){
                 QVector <float> inbetween(3);
                 RGBToHSV(channelValuesDisplay[0],channelValuesDisplay[1], channelValuesDisplay[2], &inbetween[0], &inbetween[1], &inbetween[2]);
                 inbetween = convertvectorqrealTofloat(getHSX(convertvectorfloatToqreal(inbetween)));
                 coordinates.setX(inbetween[m_d->channel1]/huedivider);
                 if (m_d->dimension == Dimensions::twodimensional) {
                     coordinates.setY(inbetween[m_d->channel2]/huedivider2);
                 }
             } else if (m_d->model == ColorModel::HSL) {
                 QVector <float> inbetween(3);
                 RGBToHSL(channelValuesDisplay[0],channelValuesDisplay[1], channelValuesDisplay[2], &inbetween[0], &inbetween[1], &inbetween[2]);
                 inbetween = convertvectorqrealTofloat(getHSX(convertvectorfloatToqreal(inbetween)));
                 coordinates.setX(inbetween[m_d->channel1]/huedivider);
                 if (m_d->dimension == Dimensions::twodimensional) {
                     coordinates.setY(inbetween[m_d->channel2]/huedivider2);
                 }
             } else if (m_d->model == ColorModel::HSI) {
                 QVector <qreal> chan2 = convertvectorfloatToqreal(channelValuesDisplay);
                 QVector <qreal> inbetween(3);
                 RGBToHSI(channelValuesDisplay[0],channelValuesDisplay[1], channelValuesDisplay[2], &inbetween[0], &inbetween[1], &inbetween[2]);
                 inbetween = getHSX(inbetween);
                 coordinates.setX(inbetween[m_d->channel1]);
                 if (m_d->dimension == Dimensions::twodimensional) {
                     coordinates.setY(inbetween[m_d->channel2]);
                 }
             } else if (m_d->model == ColorModel::HSY) {
                 QVector <qreal> luma = m_d->colorSpace->lumaCoefficients();
                 QVector <qreal> chan2 = convertvectorfloatToqreal(channelValuesDisplay);
                 QVector <qreal> inbetween(3);
                 RGBToHSY(channelValuesDisplay[0],channelValuesDisplay[1], channelValuesDisplay[2], &inbetween[0], &inbetween[1], &inbetween[2], luma[0], luma[1], luma[2]);
                 inbetween = getHSX(inbetween);
                 coordinates.setX(inbetween[m_d->channel1]);
                 if (m_d->dimension == Dimensions::twodimensional) {
                     coordinates.setY(inbetween[m_d->channel2]);
                 }
             }
         }
     } else {
         coordinates.setX(qBound((float)0.0, channelValuesDisplay[m_d->channel1], (float)1.0));
         if (m_d->dimension == Dimensions::twodimensional) {
             coordinates.setY(qBound((float)0.0, channelValuesDisplay[m_d->channel2], (float)1.0));
         }
     }
     return coordinates;
 }
 
 QVector<float> KisVisualColorSelectorShape::convertvectorqrealTofloat(QVector<qreal> real)
 {
     QVector <float> vloat(real.size());
     for (int i=0; i<real.size(); i++) {
         vloat[i] = real[i];
     }
     return vloat;
 }
 
 QVector<qreal> KisVisualColorSelectorShape::convertvectorfloatToqreal(QVector <float> vloat)
 {
     QVector <qreal> real(vloat.size());
     for (int i=0; i<vloat.size(); i++) {
         real[i] = vloat[i];
     }
     return real;
 }
 
 void KisVisualColorSelectorShape::mousePressEvent(QMouseEvent *e)
 {
     if (e->button()==Qt::LeftButton) {
         m_d->mousePressActive = true;
         QPointF coordinates = convertWidgetCoordinateToShapeCoordinate(e->pos());
         KoColor col = convertShapeCoordinateToKoColor(coordinates, true);
         setColor(col);
         Q_EMIT sigNewColor(col);
         m_d->updateTimer->start();
     }
 }
 
 void KisVisualColorSelectorShape::mouseMoveEvent(QMouseEvent *e)
 {
     if (m_d->mousePressActive==true && this->mask().contains(e->pos())) {
         QPointF coordinates = convertWidgetCoordinateToShapeCoordinate(e->pos());
         quint8* oldData = m_d->currentColor.data();
         KoColor col = convertShapeCoordinateToKoColor(coordinates, true);
         QRect offsetrect(this->geometry().topLeft() + QPoint(7.0, 7.0), this->geometry().bottomRight() - QPoint(7.0, 7.0));
         if (offsetrect.contains(e->pos()) || (m_d->colorSpace->difference(col.data(), oldData) > 5)) {
             setColor(col);
             if (!m_d->updateTimer->isActive()) {
                 Q_EMIT sigNewColor(col);
                 m_d->updateTimer->start();
             }
         }
 
     } else {
         e->ignore();
     }
 }
 
 void KisVisualColorSelectorShape::mouseReleaseEvent(QMouseEvent *)
 {
     m_d->mousePressActive = false;
 }
 void KisVisualColorSelectorShape::paintEvent(QPaintEvent*)
 {
     QPainter painter(this);
 
     //check if old and new colors differ.
 
     if (m_d->imagesNeedUpdate) {
         setMask(getMaskMap());
     }
     drawCursor();
     painter.drawImage(0,0,m_d->fullSelector);
 }
 
 KisVisualColorSelectorShape::Dimensions KisVisualColorSelectorShape::getDimensions()
 {
     return m_d->dimension;
 }
 
 KisVisualColorSelectorShape::ColorModel KisVisualColorSelectorShape::getColorModel()
 {
     return m_d->model;
 }
 
 void KisVisualColorSelectorShape::setFullImage(QImage full)
 {
     m_d->fullSelector = full;
 }
 KoColor KisVisualColorSelectorShape::getCurrentColor()
 {
     return m_d->currentColor;
 }
 
 QVector <qreal> KisVisualColorSelectorShape::getHSX(QVector<qreal> hsx, bool wrangler)
 {
     QVector <qreal> ihsx = hsx;
     if (!wrangler){
         //Ok, so this docker will not update luminosity if there's not at the least 3% more variation.
         //This is necessary for 8bit.
         if (m_d->is8Bit == true){
             if (hsx[2]>m_d->tone-0.03 && hsx[2]<m_d->tone+0.03) {
                 ihsx[2] = m_d->tone;
             }
         } else {
             if (hsx[2]>m_d->tone-0.005 && hsx[2]<m_d->tone+0.005) {
                 ihsx[2] = m_d->tone;
             }
         }
         if (m_d->model==HSV){
             if (hsx[2]<=0.0) {
                 ihsx[1] = m_d->sat;
             }
         } else {
             if ((hsx[2]<=0.0 || hsx[2]>=1.0)) {
                 ihsx[1] = m_d->sat;
             }
         }
         if ((hsx[1]<=0.0 || hsx[0]<0.0)){
             ihsx[0]=m_d->hue;
         }
     } else {
         ihsx[0]=m_d->hue;
         ihsx[1]=m_d->sat;
         ihsx[2]=m_d->tone;
     }
     return ihsx;
 }
 
 void KisVisualColorSelectorShape::setHSX(QVector<qreal> hsx, bool wrangler)
 {
     if (wrangler){
         m_d->tone = hsx[2];
         m_d->sat = hsx[1];
         m_d->hue = hsx[0];
     } else {
         if (m_d->channel1==2 || m_d->channel2==2){
             m_d->tone=hsx[2];
         }
         if (m_d->model==HSV){
             if (hsx[2]>0.0) {
                 m_d->sat = hsx[1];
             }
         } else {
             if ((hsx[2]>0.0 || hsx[2]<1.0)) {
                 m_d->sat = hsx[1];
             }
         }
         if ((hsx[1]>0.0 && hsx[0]>=0.0)){
             m_d->hue = hsx[0];
         }
     }
 }
 
 QVector <int> KisVisualColorSelectorShape::getChannels()
 {
     QVector <int> channels(2);
     channels[0] = m_d->channel1;
     channels[1] = m_d->channel2;
     return channels;
 }