diff --git a/controllersetup.cpp b/controllersetup.cpp
index 6b267f5..d33fbca 100644
--- a/controllersetup.cpp
+++ b/controllersetup.cpp
@@ -21,6 +21,7 @@ controllerSetup::~controllerSetup()
     delete noControllersText;
     delete updateDialog;
     delete ui;
+
 }
 
 void controllerSetup::hideEvent(QHideEvent *event)
@@ -106,7 +107,7 @@ void controllerSetup::init(usbDevMap* dev, QVector<BUTTON>* but, QVector<KNOB>*
                 offEvent->addItem(c.text, c.index);
             }
         }
-        else if (c.cmdType == commandKnob || c.cmdType == commandAny) {
+        if (c.cmdType == commandKnob || c.cmdType == commandAny) {
             if (c.command == cmdSeparator) {
                 knobEvent->insertSeparator(knobEvent->count());
             } else {
@@ -124,7 +125,7 @@ void controllerSetup::init(usbDevMap* dev, QVector<BUTTON>* but, QVector<KNOB>*
     connect(buttonLatch, SIGNAL(stateChanged(int)), this, SLOT(latchStateChanged(int)));
 
 }
-void controllerSetup::mousePressed(controllerScene* scene, QPoint p)
+void controllerSetup::showMenu(controllerScene* scene, QPoint p)
 {
     Q_UNUSED (scene) // We might want it in the future?
 
@@ -245,11 +246,13 @@ void controllerSetup::onEventIndexChanged(int index) {
     if (currentButton != Q_NULLPTR && onEvent->currentData().toInt() < commands->size()) {
         QMutexLocker locker(mutex);
         currentButton->onCommand = &commands->at(onEvent->currentData().toInt());
-        currentButton->onText->setPlainText(currentButton->onCommand->text);
-        currentButton->onText->setPos(currentButton->pos.center().x() - currentButton->onText->boundingRect().width() / 2,
-            (currentButton->pos.center().y() - currentButton->onText->boundingRect().height() / 2)-6);
+        currentButton->text->setPlainText(currentButton->onCommand->text);
+        currentButton->text->setPos(currentButton->pos.center().x() - currentButton->text->boundingRect().width() / 2,
+            (currentButton->pos.center().y() - currentButton->text->boundingRect().height() / 2));
         // Signal that any button programming on the device should be completed.
-        emit sendRequest(currentButton->parent,usbFeatureType::featureButton,currentButton->num,currentButton->onCommand->text,Q_NULLPTR,&currentButton->backgroundOn);
+        if (currentButton->icon == Q_NULLPTR) {
+            emit sendRequest(currentButton->parent,usbFeatureType::featureButton,currentButton->num,currentButton->onCommand->text,Q_NULLPTR,&currentButton->backgroundOn);
+        }
     }
 }
 
@@ -260,9 +263,6 @@ void controllerSetup::offEventIndexChanged(int index) {
     if (currentButton != Q_NULLPTR && offEvent->currentData().toInt() < commands->size()) {
         QMutexLocker locker(mutex);
         currentButton->offCommand = &commands->at(offEvent->currentData().toInt());
-        currentButton->offText->setPlainText(currentButton->offCommand->text);
-        currentButton->offText->setPos(currentButton->pos.center().x() - currentButton->offText->boundingRect().width() / 2,
-            (currentButton->pos.center().y() - currentButton->offText->boundingRect().height() / 2)+6);
     }
 }
 
@@ -273,8 +273,6 @@ void controllerSetup::knobEventIndexChanged(int index) {
     // If command is changed, delete current command and deep copy the new command
     if (currentKnob != Q_NULLPTR && knobEvent->currentData().toInt() < commands->size()) {
         QMutexLocker locker(mutex);
-        if (currentKnob->command)
-            delete currentKnob->command;
         currentKnob->command = &commands->at(knobEvent->currentData().toInt());
         currentKnob->text->setPlainText(currentKnob->command->text);
         currentKnob->text->setPos(currentKnob->pos.center().x() - currentKnob->text->boundingRect().width() / 2,
@@ -295,6 +293,10 @@ void controllerSetup::buttonOnColorClicked()
     {
         QMutexLocker locker(mutex);
         currentButton->backgroundOn = selColor;
+        if (currentButton->graphics && currentButton->bgRect != Q_NULLPTR)
+        {
+            currentButton->bgRect->setBrush(currentButton->backgroundOn);
+        }
         buttonOnColor->setStyleSheet(QString("background-color: %1").arg(currentButton->backgroundOn.name(QColor::HexArgb)));
         emit sendRequest(currentButton->parent,usbFeatureType::featureButton,currentButton->num,currentButton->onCommand->text,currentButton->icon,&currentButton->backgroundOn);
     }
@@ -327,8 +329,16 @@ void controllerSetup::buttonIconClicked()
         if (currentButton->icon != Q_NULLPTR)
             delete currentButton->icon;
         currentButton->icon = new QImage(image.scaled(currentButton->parent->type.iconSize,currentButton->parent->type.iconSize));
-        emit sendRequest(currentButton->parent,usbFeatureType::featureButton,currentButton->num,currentButton->onCommand->text,currentButton->icon, &currentButton->backgroundOn);
+    } else {
+        if (currentButton->icon != Q_NULLPTR)
+        {
+            currentButton->iconName = "";
+            delete currentButton->icon;
+            currentButton->icon = Q_NULLPTR;
+        }
     }
+    iconLabel->setText(currentButton->iconName);
+    emit sendRequest(currentButton->parent,usbFeatureType::featureButton,currentButton->num,currentButton->onCommand->text,currentButton->icon, &currentButton->backgroundOn);
 }
 
 void controllerSetup::latchStateChanged(int state)
@@ -339,38 +349,6 @@ void controllerSetup::latchStateChanged(int state)
     }
 }
 
-void controllerSetup::deleteMyWidget(QWidget* widget) {
-    QLayout *layout = widget->layout();
-    if (widget->layout())
-    {
-        QLayoutItem* child;
-        while (nullptr != (child = layout->takeAt(0)))
-        {
-            if (child->layout())
-            {
-                QLayoutItem* child2;
-
-                while (nullptr != (child2 = child->layout()->takeAt(0)))
-                {
-                    if (child2->widget())
-                    {
-                        deleteMyWidget(child2->widget());
-                    }
-                    delete child2;
-                    child2 = Q_NULLPTR;
-                }
-            }
-            else if (child->widget())
-            {
-                deleteMyWidget(child->widget());
-            }
-            delete child;
-            child = Q_NULLPTR;
-        }
-    }
-    delete widget;
-}
-
 void controllerSetup::removeDevice(USBDEVICE* dev)
 {
     QMutexLocker locker(mutex);
@@ -387,22 +365,23 @@ void controllerSetup::removeDevice(USBDEVICE* dev)
     {
         if (b->parent == dev && b->page == dev->currentPage)
         {
-            if (b->onText != Q_NULLPTR) {
-                tab.value()->scene->removeItem(b->onText);
-                delete b->onText;
-                b->onText = Q_NULLPTR;
-                b->onCommand = Q_NULLPTR;
-            }
-            if (b->offText != Q_NULLPTR) {
-                tab.value()->scene->removeItem(b->offText);
-                delete b->offText;
-                b->offText = Q_NULLPTR;
-                b->offCommand = Q_NULLPTR;
+            if (b->text != Q_NULLPTR) {
+                tab.value()->scene->removeItem(b->text);
+                delete b->text;
+                b->text = Q_NULLPTR;
             }
+            b->offCommand = Q_NULLPTR;
+            b->onCommand = Q_NULLPTR;
             if (b->icon != Q_NULLPTR) {
                 delete b->icon;
                 b->icon=Q_NULLPTR;
             }
+            if (b->bgRect != Q_NULLPTR) {
+                tab.value()->scene->removeItem(b->bgRect);
+                delete b->bgRect;
+                b->bgRect = Q_NULLPTR;
+            }
+
         }
     }
 
@@ -481,7 +460,6 @@ void controllerSetup::newDevice(USBDEVICE* dev)
     c->mainLayout.addWidget(&c->widget);
 
     c->widget.setLayout(&c->layout);
-    c->layout.addLayout(&c->sensLayout);
 
 
     c->topLayout.addWidget(&c->disabled);
@@ -503,14 +481,9 @@ void controllerSetup::newDevice(USBDEVICE* dev)
 
     c->layout.addWidget(&c->view);
 
-    c->page.setObjectName("Page SpinBox");
-    c->page.setValue(1);
-    c->page.setMinimum(1);
-    c->page.setMaximum(dev->pages);
-    c->page.setToolTip("Select current page to edit");
-    c->layout.addWidget(&c->page,0,Qt::AlignBottom | Qt::AlignRight);
-    dev->pageSpin = &c->page;
 
+    c->layout.addLayout(&c->sensLayout);
+    c->sensLabel.setText("Sensitivity:");
     c->sensLayout.addWidget(&c->sensLabel);
     c->sens.setMinimum(1);
     c->sens.setMaximum(21);
@@ -521,6 +494,17 @@ void controllerSetup::newDevice(USBDEVICE* dev)
     connect(&c->sens, &QSlider::valueChanged,
         [dev,this](int val) { this->sensitivityMoved(dev,val); });
 
+    c->pageLabel.setText("Page:");
+    c->sensLayout.addWidget(&c->pageLabel);
+    c->page.setObjectName("Page SpinBox");
+    c->page.setValue(1);
+    c->page.setMinimum(1);
+    c->page.setMaximum(dev->pages);
+    c->page.setToolTip("Select current page to edit");
+    c->sensLayout.addWidget(&c->page);
+
+    dev->pageSpin = &c->page;
+
     switch (dev->type.model) {
         case shuttleXpress:
             c->image.load(":/resources/shuttlexpress.png");
@@ -577,11 +561,12 @@ void controllerSetup::newDevice(USBDEVICE* dev)
 
     c->scene = new controllerScene();
     c->view.setScene(c->scene);
-    connect(c->scene, SIGNAL(mousePressed(controllerScene*,QPoint)), this, SLOT(mousePressed(controllerScene*,QPoint)));
+    connect(c->scene, SIGNAL(showMenu(controllerScene*,QPoint)), this, SLOT(showMenu(controllerScene*,QPoint)));
     c->scene->addItem(c->bgImage);
 
     c->layout.addLayout(&c->grid);
 
+    c->brightLabel.setText("Brightness");
     c->grid.addWidget(&c->brightLabel,0,0);
     c->brightness.addItem("Off");
     c->brightness.addItem("Low");
@@ -592,6 +577,7 @@ void controllerSetup::newDevice(USBDEVICE* dev)
     connect(&c->brightness, qOverload<int>(&QComboBox::currentIndexChanged),
         [dev,this](int index) { this->brightnessChanged(dev,index); });
 
+    c->speedLabel.setText("Speed");
     c->grid.addWidget(&c->speedLabel,0,1);
     c->speed.setObjectName("Speed");
     c->speed.addItem("Fastest");
@@ -604,6 +590,7 @@ void controllerSetup::newDevice(USBDEVICE* dev)
     connect(&c->speed, qOverload<int>(&QComboBox::currentIndexChanged),
         [dev,this](int index) { this->speedChanged(dev,index); });
 
+    c->orientLabel.setText("Orientation");
     c->grid.addWidget(&c->orientLabel,0,2);
     c->orientation.addItem("Rotate 0");
     c->orientation.addItem("Rotate 90");
@@ -628,7 +615,7 @@ void controllerSetup::newDevice(USBDEVICE* dev)
     connect(&c->timeout, qOverload<int>(&QSpinBox::valueChanged),
         [dev,this](int index) { this->timeoutChanged(dev,index); });
 
-    c->pagesLabel.setText("Pages");
+    c->pagesLabel.setText("Num Pages");
     c->grid.addWidget(&c->pagesLabel,0,5);
     c->pages.setValue(dev->pages);
     c->pages.setMinimum(1);
@@ -664,12 +651,11 @@ void controllerSetup::newDevice(USBDEVICE* dev)
     emit sendRequest(dev,usbFeatureType::featureOrientation,dev->orientation);
     emit sendRequest(dev,usbFeatureType::featureSpeed,dev->speed);
     emit sendRequest(dev,usbFeatureType::featureTimeout,dev->timeout);
-    emit sendRequest(dev,usbFeatureType::featureColor,0,dev->color.name(QColor::HexArgb));
+    emit sendRequest(dev,usbFeatureType::featureColor,0,"", Q_NULLPTR, &dev->color);
 
-    locker.unlock();
 
-    // pageChanged will update the buttons/knobs for the tab
-    pageChanged(dev,1);
+    // pageChanged will update the buttons/knobs for the tab (using qTimer ensures mutex is unlocked first)
+    QTimer::singleShot(0, this, [=]() { pageChanged(dev,1); });
 
 }
 
@@ -704,7 +690,7 @@ void controllerSetup::colorPicker(USBDEVICE* dev, QPushButton* btn, QColor curre
     if(selColor.isValid())
     {
         btn->setStyleSheet(QString("background-color: %1").arg(selColor.name(QColor::HexArgb)));
-        emit sendRequest(dev,usbFeatureType::featureColor,0,selColor.name(QColor::HexArgb));
+        emit sendRequest(dev,usbFeatureType::featureColor,0, "", Q_NULLPTR, &selColor);
     }
 }
 
@@ -723,6 +709,8 @@ void controllerSetup::pagesChanged(USBDEVICE* dev, int val)
 void controllerSetup::pageChanged(USBDEVICE* dev, int val)
 {
 
+    //QMutexLocker locker(mutex); // Not sure why I can't take the mutex here?
+
     auto tab = tabs.find(dev->path);
     if (tab == tabs.end())
     {
@@ -738,8 +726,6 @@ void controllerSetup::pageChanged(USBDEVICE* dev, int val)
 
     updateDialog->hide(); // Hide the dialog if the page changes.
 
-    QMutexLocker locker(mutex);
-
     int lastPage = dev->currentPage;
     dev->currentPage=val;
     dev->pageSpin->setValue(val);
@@ -751,31 +737,31 @@ void controllerSetup::pageChanged(USBDEVICE* dev, int val)
         {
             if (b->page == lastPage)
             {
-                if (b->onText != Q_NULLPTR) {
-                    tab.value()->scene->removeItem(b->onText);
-                    delete b->onText;
-                    b->onText = Q_NULLPTR;
+                if (b->text != Q_NULLPTR) {
+                    tab.value()->scene->removeItem(b->text);
+                    delete b->text;
+                    b->text = Q_NULLPTR;
                 }
-                if (b->offText != Q_NULLPTR) {
-                    tab.value()->scene->removeItem(b->offText);
-                    delete b->offText;
-                    b->offText = Q_NULLPTR;
+                if (b->bgRect != Q_NULLPTR) {
+                    tab.value()->scene->removeItem(b->bgRect);
+                    delete b->bgRect;
+                    b->bgRect = Q_NULLPTR;
                 }
             }
-            else if (b->page == dev->currentPage)
+            if (b->page == dev->currentPage)
             {
-                b->onText = new QGraphicsTextItem(b->onCommand->text);
-                b->onText->setDefaultTextColor(b->textColour);
-                tab.value()->scene->addItem(b->onText);
-                b->onText->setPos(b->pos.center().x() - b->onText->boundingRect().width() / 2,
-                    (b->pos.center().y() - b->onText->boundingRect().height() / 2) - 6);
+                if (b->graphics)
+                {
+                    b->bgRect = new QGraphicsRectItem(b->pos);
+                    b->bgRect->setBrush(b->backgroundOn);
+                    tab.value()->scene->addItem(b->bgRect);
+                }
+                b->text = new QGraphicsTextItem(b->onCommand->text);
+                b->text->setDefaultTextColor(b->textColour);
+                tab.value()->scene->addItem(b->text);
+                b->text->setPos(b->pos.center().x() - b->text->boundingRect().width() / 2,
+                    (b->pos.center().y() - b->text->boundingRect().height() / 2));
                 emit sendRequest(dev,usbFeatureType::featureButton,b->num,b->onCommand->text,b->icon,&b->backgroundOn);
-
-                b->offText = new QGraphicsTextItem(b->offCommand->text);
-                b->offText->setDefaultTextColor(b->textColour);
-                tab.value()->scene->addItem(b->offText);
-                b->offText->setPos(b->pos.center().x() - b->offText->boundingRect().width() / 2,
-                    (b->pos.center().y() - b->onText->boundingRect().height() / 2) + 6);
             }
         }
     }
@@ -792,7 +778,7 @@ void controllerSetup::pageChanged(USBDEVICE* dev, int val)
                     k->text = Q_NULLPTR;
                 }
             }
-            else if (k->page == dev->currentPage)
+            if (k->page == dev->currentPage)
             {
                 k->text = new QGraphicsTextItem(k->command->text);
                 k->text->setDefaultTextColor(k->textColour);
@@ -836,8 +822,15 @@ void controllerSetup::on_backupButton_clicked()
 {
     QString file = QFileDialog::getSaveFileName(this,"Select Backup Filename",".","Backup Files (*.ini)");
     if (!file.isEmpty()) {
-        QString path = ui->tabWidget->currentWidget()->objectName();
-        emit backup(file, path);
+        auto devIt = devices->find(ui->tabWidget->currentWidget()->objectName());
+        if (devIt==devices->end())
+        {
+            qWarning(logUsbControl) << "on_restoreButton_clicked() Cannot find existing controller, aborting!";
+        }
+        else
+        {
+            emit backup(&devIt.value(), file);
+        }
     }
 }
 
@@ -888,8 +881,7 @@ void controllerSetup::on_restoreButton_clicked()
                 return;
             }
         }
-
-        emit restore(file, path);
+        emit restore(dev, file);
     }
 }
 
diff --git a/controllersetup.h b/controllersetup.h
index d1bbb4a..5d0bdf5 100644
--- a/controllersetup.h
+++ b/controllersetup.h
@@ -6,6 +6,7 @@
 #include <QGraphicsScene>
 #include <QGraphicsTextItem>
 #include <QGraphicsPixmapItem>
+#include <QGraphicsRectItem>
 #include <QPoint>
 #include <QGraphicsSceneMouseEvent>
 #include <QVector>
@@ -39,19 +40,37 @@ class controllerScene : public QGraphicsScene
         QGraphicsLineItem* item = Q_NULLPTR;
 
 signals:
-    void mousePressed(controllerScene* scene, QPoint p);
+        void showMenu(controllerScene* scene, QPoint p);
+        void buttonAction(bool pressed, QPoint p);
 protected:
     void mousePressEvent(QGraphicsSceneMouseEvent* event) {
 
         if (event->button() == Qt::RightButton)
         {
-            emit mousePressed(this, event->scenePos().toPoint());
+            emit showMenu(this, event->scenePos().toPoint());
+        }
+        else if (event->button() == Qt::LeftButton)
+        {
+            // Simulate a button press
+            emit buttonAction(true,event->scenePos().toPoint());
         }
         else
         {
             QGraphicsScene::mousePressEvent(event);
         }
     }
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent* event) {
+
+        if (event->button() == Qt::LeftButton)
+        {
+            // Simulate a button release
+            emit buttonAction(false,event->scenePos().toPoint());
+        }
+        else
+        {
+            QGraphicsScene::mouseReleaseEvent(event);
+        }
+    }
 };
 
 
@@ -64,6 +83,7 @@ struct tabContent {
     QCheckBox disabled;
     QLabel message;
     QGraphicsView view;
+    QLabel pageLabel;
     QSpinBox page;
     QHBoxLayout sensLayout;
     QLabel sensLabel;
@@ -103,17 +123,17 @@ public:
 
 signals:
     void started();
-    void sendRequest(USBDEVICE* dev, usbFeatureType request, quint8 val=0, QString text="", QImage* img=Q_NULLPTR, QColor* color=Q_NULLPTR);
+    void sendRequest(USBDEVICE* dev, usbFeatureType request, int val=0, QString text="", QImage* img=Q_NULLPTR, QColor* color=Q_NULLPTR);
     void programDisable(USBDEVICE* dev, bool disable);
     void programPages(USBDEVICE* dev, int pages);
-    void backup(QString file, QString path);
-    void restore(QString file, QString path);
+    void backup(USBDEVICE* dev, QString path);
+    void restore(USBDEVICE *dev, QString path);
 
 public slots:
     void init(usbDevMap* dev, QVector<BUTTON>* but, QVector<KNOB>* kb, QVector<COMMAND>* cmd, QMutex* mut);
     void newDevice(USBDEVICE* dev);
     void removeDevice(USBDEVICE* dev);
-    void mousePressed(controllerScene *scene,QPoint p);
+    void showMenu(controllerScene *scene,QPoint p);
     void onEventIndexChanged(int index);
     void offEventIndexChanged(int index);
     void knobEventIndexChanged(int index);
@@ -139,7 +159,6 @@ public slots:
 
 private:
 
-    void deleteMyWidget(QWidget *);
     usbDeviceType type = usbNone;
     Ui::controllerSetup* ui;
     QGraphicsTextItem* textItem;
diff --git a/rigcommander.cpp b/rigcommander.cpp
index 8b2371d..06d90f7 100644
--- a/rigcommander.cpp
+++ b/rigcommander.cpp
@@ -2460,8 +2460,13 @@ void rigCommander::getRfGain()
 
 void rigCommander::getAfGain()
 {
-    QByteArray payload("\x14\x01");
-    prepDataAndSend(payload);
+    if (udp == Q_NULLPTR) {
+        QByteArray payload("\x14\x01");
+        prepDataAndSend(payload);
+    }
+    else {
+        emit haveAfGain(localVolume);
+    }
 }
 
 void rigCommander::getIFShift()
diff --git a/usbcontroller.cpp b/usbcontroller.cpp
index 071d6fe..b76c242 100644
--- a/usbcontroller.cpp
+++ b/usbcontroller.cpp
@@ -342,48 +342,49 @@ void usbController::run()
     {
         auto dev = &devIt.value();
 
-        if (dev->detected && !dev->disabled && !dev->connected && !dev->path.isEmpty()) {
+        // If device is not detected, ignore it.
+        if (dev->detected)
+        {
+            if (!dev->disabled && !dev->connected)
+            {
                         
-            qInfo(logUsbControl()) << QString("Attempting to connect to %0").arg(dev->product);
-            dev->handle = hid_open_path(dev->path.toLocal8Bit());
-            
-            if (dev->handle)
-            {
-                qInfo(logUsbControl()) << QString("Connected to device: %0 from %1 S/N %2").arg(dev->product).arg(dev->manufacturer).arg(dev->serial);
-                hid_set_nonblocking(dev->handle, 1);
-                devicesConnected++;
-                dev->connected=true;
+                qInfo(logUsbControl()) << QString("Attempting to connect to %0").arg(dev->product);
+                dev->handle = hid_open_path(dev->path.toLocal8Bit());
 
-                locker.unlock(); // Unlock the mutex so other devices can use it
-
-                if (dev->type.model == RC28)
+                if (dev->handle)
                 {
-                    ledControl(false, 0);
-                    ledControl(false, 1);
-                    ledControl(false, 2);
-                    ledControl(true, 3);
-                }
-                else if (dev->type.model == QuickKeys)
-                {
-                    sendRequest(dev,usbFeatureType::featureEventsA);
-                    sendRequest(dev,usbFeatureType::featureEventsB);
-                }
+                    qInfo(logUsbControl()) << QString("Connected to device: %0 from %1 S/N %2").arg(dev->product).arg(dev->manufacturer).arg(dev->serial);
+                    hid_set_nonblocking(dev->handle, 1);
+                    devicesConnected++;
+                    dev->connected=true;
 
-                sendRequest(dev,usbFeatureType::featureSerial);
-                sendRequest(dev,usbFeatureType::featureFirmware);
-                sendRequest(dev,usbFeatureType::featureResetKeys);
-                sendRequest(dev,usbFeatureType::featureOverlay,5,"Hello from wfview");
-                locker.relock(); // Take the mutex back.
+                    if (dev->type.model == RC28)
+                    {
+                        ledControl(false, 0);
+                        ledControl(false, 1);
+                        ledControl(false, 2);
+                        ledControl(true, 3);
+                    }
+                    else if (dev->type.model == QuickKeys)
+                    {
+                        QTimer::singleShot(0, this, [=]() { sendRequest(dev,usbFeatureType::featureEventsA); });
+                        QTimer::singleShot(0, this, [=]() { sendRequest(dev,usbFeatureType::featureEventsB); });
+                    }
+
+                    QTimer::singleShot(0, this, [=]() { sendRequest(dev,usbFeatureType::featureSerial); });
+                    QTimer::singleShot(0, this, [=]() { sendRequest(dev,usbFeatureType::featureFirmware); });
+                    QTimer::singleShot(0, this, [=]() { sendRequest(dev,usbFeatureType::featureOverlay,5,"Hello from wfview"); });
+                }
+                else
+                {
+                    // This should only get displayed once if we fail to connect to a device
+                    qInfo(logUsbControl()) << QString("Error connecting to  %0: %1")
+                                              .arg(dev->product)
+                                              .arg(QString::fromWCharArray(hid_error(dev->handle)));
+                }
             }
-            else if (!dev->uiCreated)
-            {
-                // This should only get displayed once if we fail to connect to a device
-                qInfo(logUsbControl()) << QString("Error connecting to  %0: %1")
-                                          .arg(dev->product)
-                                          .arg(QString::fromWCharArray(hid_error(dev->handle)));
-            }
-            
-            if (!dev->uiCreated)
+
+            if (!dev->uiCreated) // Create ui for all detected devices (even disabled)
             {
                 for (int i=0;i<dev->type.knobs;i++)
                 {
@@ -392,7 +393,7 @@ void usbController::run()
 
                 // Find our defaults/knobs/buttons for this controller:
                 // First see if we have any stored and add them to the list if not.
-                
+
                 if (dev->type.buttons > 0)
                 {
                     auto bti = std::find_if(buttonList->begin(), buttonList->end(), [dev](const BUTTON& b)
@@ -476,19 +477,16 @@ void usbController::run()
                 emit setConnected(dev);
             }
         }
-        else if (dev->uiCreated)
-        {
-            emit setConnected(dev);
-        }
     }
     
-    if (devicesConnected>0) {
-        // Run the periodic timer to get data if we have any devices
-        QTimer::singleShot(25, this, SLOT(runTimer()));
+    if (devicesConnected>0 && dataTimer == Q_NULLPTR) {
+        dataTimer = new QTimer(this);
+        connect(dataTimer, &QTimer::timeout, this, &usbController::runTimer);
+        dataTimer->start(25);
     }
     
 #ifndef Q_OS_WIN
-    // Run the periodic timer to check for new devices
+    // Run the periodic timer to check for new devices    
     QTimer::singleShot(2000, this, SLOT(run()));
 #endif
 }
@@ -529,6 +527,11 @@ void usbController::runTimer()
                 dev->remove = true;
                 dev->uiCreated = false;
                 devicesConnected--;
+                if (devicesConnected == 0) {
+                    dataTimer->stop();
+                    delete dataTimer;
+                    dataTimer = Q_NULLPTR;
+                }
                 emit removeDevice(dev);
                 QTimer::singleShot(250, this, SLOT(run())); // Cleanup
                 break;
@@ -717,14 +720,15 @@ void usbController::runTimer()
                                 dev->lcd = cmdLCDSpectrum;
                             else if (but->onCommand->command == cmdLCDWaterfall)
                                 dev->lcd = cmdLCDWaterfall;
-                            else {
+                            else if (but->onCommand->command == cmdLCDNothing) {
+                                dev->lcd = cmdLCDNothing;
+                                QTimer::singleShot(0, this, [=]() { sendRequest(dev,usbFeatureType::featureColor,i,"",Q_NULLPTR, &dev->color); });
+                            }else {
                                 emit button(but->onCommand);
                             }
                             // Change the button text to reflect the off Button
                             if (but->offCommand->index != 0) {
-                                locker.unlock();
-                                sendRequest(dev,usbFeatureType::featureButton,i,but->offCommand->text,but->icon,&but->backgroundOff);
-                                locker.relock();
+                                QTimer::singleShot(0, this, [=]() { sendRequest(dev,usbFeatureType::featureButton,i,but->offCommand->text, but->icon, &but->backgroundOff); });
                             }
                             but->isOn=true;
                         }
@@ -739,12 +743,13 @@ void usbController::runTimer()
                                 dev->lcd = cmdLCDSpectrum;
                             else if (but->offCommand->command == cmdLCDWaterfall)
                                 dev->lcd = cmdLCDWaterfall;
-                            else {
+                            else if (but->offCommand->command == cmdLCDNothing) {
+                                dev->lcd = cmdLCDNothing;
+                                QTimer::singleShot(0, this, [=]() { sendRequest(dev,usbFeatureType::featureColor,i,"",Q_NULLPTR, &dev->color); });
+                            } else {
                                 emit button(but->offCommand);
                             }
-                            locker.unlock();
-                            sendRequest(dev,usbFeatureType::featureButton,i,but->onCommand->text,but->icon,&but->backgroundOn);
-                            locker.relock();
+                            QTimer::singleShot(0, this, [=]() { sendRequest(dev,usbFeatureType::featureButton,i,but->onCommand->text, but->icon, &but->backgroundOn); });
                             but->isOn=false;
                         }
                         else if ((!but->toggle && but->isOn) && ((dev->buttons >> i & 1) && !(tempButtons >> i & 1)))
@@ -753,15 +758,16 @@ void usbController::runTimer()
                                 dev->lcd = cmdLCDSpectrum;
                             else if (but->offCommand->command == cmdLCDWaterfall)
                                 dev->lcd = cmdLCDWaterfall;
-                            else
+                            else if (but->offCommand->command == cmdLCDNothing) {
+                                QTimer::singleShot(0, this, [=]() { sendRequest(dev,usbFeatureType::featureColor,i,"",Q_NULLPTR, &dev->color); });
+                                dev->lcd = cmdLCDNothing;
+                            } else
                             {
                                 qDebug(logUsbControl()) << QString("Off Button event for button %0: %1").arg(but->num).arg(but->offCommand->text);
                                 emit button(but->offCommand);
                             }
                             // Change the button text to reflect the on Button
-                            locker.unlock();
-                            sendRequest(dev,usbFeatureType::featureButton,i,but->onCommand->text,but->icon,&but->backgroundOn);
-                            locker.relock();
+                            QTimer::singleShot(0, this, [=]() { sendRequest(dev,usbFeatureType::featureButton,i,but->onCommand->text, but->icon, &but->backgroundOn); });
                             but->isOn=false;
                         }
                     }
@@ -801,10 +807,8 @@ void usbController::runTimer()
                             tempVal = qMin(qMax(tempVal,0),255);
                             sendCommand.suffix = quint8(tempVal);
                             dev->knobValues[i].value=tempVal/dev->sensitivity; // This ensures that dial can't go outside 0-255
-                            locker.unlock();
                             dev->knobValues[i].name = kb->command->text;
-                            sendRequest(dev,usbFeatureType::featureGraph,i,"");
-                            locker.relock();
+                            QTimer::singleShot(0, this, [=]() { sendRequest(dev,usbFeatureType::featureGraph,i,"",Q_NULLPTR,&dev->color); });
                         }
                         else
                         {
@@ -825,11 +829,6 @@ void usbController::runTimer()
 
         }
     }
-    
-    if (devicesConnected>0) {
-        // Run the periodic timer to get data if we have any devices
-        QTimer::singleShot(25, this, SLOT(runTimer()));
-    }
 }
 
 void usbController::receivePTTStatus(bool on) {
@@ -839,12 +838,15 @@ void usbController::receivePTTStatus(bool on) {
     for (auto devIt = devices->begin(); devIt != devices->end(); devIt++)
     {
         auto dev = &devIt.value();
-        if (on && !ptt) {
-            lastColour = currentColour;
-            sendRequest(dev,usbFeatureType::featureColor,0,QColor(255,0,0).name(QColor::HexArgb));
-        }
-        else {
-            sendRequest(dev,usbFeatureType::featureColor,0,lastColour.name(QColor::HexArgb));
+        if (dev->lcd != cmdLCDSpectrum && dev->lcd != cmdLCDWaterfall) {
+            if (on && !ptt) {
+                lastColour = currentColour;
+                QColor newColor = QColor(255,0,0);
+                sendRequest(dev,usbFeatureType::featureColor,0, "", Q_NULLPTR, &newColor);
+            }
+            else {
+                sendRequest(dev,usbFeatureType::featureColor,0, "", Q_NULLPTR, &lastColour);
+            }
         }
     }
 
@@ -903,7 +905,7 @@ void usbController::ledControl(bool on, unsigned char num)
  * featureOrientation, featureSpeed, featureColor, featureOverlay, featureTimeout, featurePages, featureDisable
 */
 
-void usbController::sendRequest(USBDEVICE *dev, usbFeatureType feature, quint8 val, QString text, QImage* img, QColor* color)
+void usbController::sendRequest(USBDEVICE *dev, usbFeatureType feature, int val, QString text, QImage* img, QColor* color)
 {
     if (dev == Q_NULLPTR || !dev->connected || dev->disabled || !dev->handle)
         return;
@@ -971,16 +973,14 @@ void usbController::sendRequest(USBDEVICE *dev, usbFeatureType feature, quint8 v
             dev->speed = val;
             break;
         case usbFeatureType::featureColor: {
-            QColor col;
-            col.setNamedColor(text);
             data[1] = (qint8)0xb4;
             data[2] = (qint8)0x01;
             data[3] = (qint8)0x01;
-            data[6] = (qint8)col.red();
-            data[7] = (qint8)col.green();
-            data[8] = (qint8)col.blue();
+            data[6] = (qint8)color->red();
+            data[7] = (qint8)color->green();
+            data[8] = (qint8)color->blue();
             if (val) {
-               currentColour = col;
+               currentColour = *color;
                dev->color=currentColour;
             }
             break;
@@ -1089,15 +1089,23 @@ void usbController::sendRequest(USBDEVICE *dev, usbFeatureType feature, quint8 v
             if (dev->type.model == usbDeviceType::StreamDeckPlus && val < dev->type.knobs)
             {
                 QImage image(200,25, QImage::Format_RGB888);
-                image.fill(Qt::black);
-                QPainter paint(&image);
-                int x=qMin(190,(dev->knobValues[val].value * dev->sensitivity) * 190 / 255);
-                paint.fillRect(5,5,x,20, Qt::darkGreen);
-                paint.setFont(QFont("times",10));
-                paint.setPen(Qt::white);
-                int perc=qMin(100,(dev->knobValues[val].value * dev->sensitivity) * 100 / 255);
-                paint.drawText(5,5,190,20, Qt::AlignCenter | Qt::AlignVCenter, QString("%0 %1%").arg(dev->knobValues[val].name).arg(perc));
-
+                if (text != "**REMOVE**") { // && dev->knobValues[val].lastChanged + 1900 < QDateTime::currentMSecsSinceEpoch()) {
+                    image.fill(Qt::black);
+                    QPainter paint(&image);
+                    int x=qMin(190,(dev->knobValues[val].value * dev->sensitivity) * 190 / 255);
+                    paint.fillRect(5,5,x,20, Qt::darkGreen);
+                    paint.setFont(QFont("times",10));
+                    paint.setPen(Qt::white);
+                    int perc=qMin(100,(dev->knobValues[val].value * dev->sensitivity) * 100 / 255);
+                    paint.drawText(5,5,190,20, Qt::AlignCenter | Qt::AlignVCenter, QString("%0 %1%").arg(dev->knobValues[val].name).arg(perc));
+                }
+                else if (dev->knobValues[val].lastChanged + 1900 < QDateTime::currentMSecsSinceEpoch())
+                {
+                    image.fill(*color);
+                } else {
+                    // Value has changed.
+                    break;
+                }
                 data2.clear();
                 QBuffer buffer(&data2);
                 image.save(&buffer, "JPG");
@@ -1131,13 +1139,18 @@ void usbController::sendRequest(USBDEVICE *dev, usbFeatureType feature, quint8 v
                     data2.remove(0,length);
                     index++;
                 }
-                dev->knobValues[val].lastChanged = QDateTime::currentMSecsSinceEpoch();
+                if (text != "**REMOVE**") {
+                    dev->knobValues[val].lastChanged = QDateTime::currentMSecsSinceEpoch();
+                    if (dev->lcd != cmdLCDSpectrum && dev->lcd != cmdLCDWaterfall)
+                        QTimer::singleShot(2000, this, [=]() { sendRequest(dev,usbFeatureType::featureGraph,val,"**REMOVE**",Q_NULLPTR,&dev->color); });
+                }
+
             }
             break;
 
         }
         case usbFeatureType::featureColor:
-            dev->color.setNamedColor(text);
+            dev->color = *color;
             // Fall through
         case usbFeatureType::featureOverlay:
         {
@@ -1149,7 +1162,8 @@ void usbController::sendRequest(USBDEVICE *dev, usbFeatureType feature, quint8 v
                     paint.setFont(QFont("times",16));
                     paint.fillRect(image.rect(), dev->color);
                     paint.drawText(image.rect(),Qt::AlignCenter | Qt::AlignVCenter, text);
-                    QTimer::singleShot(val*1000, this, [=]() { sendRequest(dev,usbFeatureType::featureOverlay); });
+                    if (val)
+                       QTimer::singleShot(val*1000, this, [=]() { sendRequest(dev,usbFeatureType::featureOverlay); });
                 } else {
                     paint.fillRect(image.rect(), dev->color);
                 }
@@ -1168,7 +1182,7 @@ void usbController::sendRequest(USBDEVICE *dev, usbFeatureType feature, quint8 v
                     QPainter paint(&image);
 
                     for (int i=0;i<dev->type.knobs;i++) {
-                        if (QDateTime::currentMSecsSinceEpoch() < dev->knobValues[i].lastChanged + 1000)
+                        if (QDateTime::currentMSecsSinceEpoch() < dev->knobValues[i].lastChanged + 2000)
                         {
                             paint.fillRect(200*i,75,200,25, Qt::black);
                             int x=qMin(190,(dev->knobValues[i].value * dev->sensitivity) * 190 / 255);
@@ -1438,139 +1452,139 @@ void usbController::loadButtons()
     defaultButtons.append(BUTTON(QuickKeys, 9, QRect(139, 68, 65, 65), Qt::white, &commands[0], &commands[0]));
 
     // StreamDeckOriginal
-    defaultButtons.append(BUTTON(StreamDeckOriginal, 0, QRect(65, 91, 75, 75), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckOriginal, 1, QRect(165, 91, 75, 75), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckOriginal, 2, QRect(263, 91, 75, 75), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckOriginal, 3, QRect(364, 91, 75, 75), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckOriginal, 4, QRect(462, 91, 75, 75), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckOriginal, 5, QRect(65, 190, 75, 75), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckOriginal, 6, QRect(165, 190, 75, 75), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckOriginal, 7, QRect(263, 190, 75, 75), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckOriginal, 8, QRect(364, 190, 75, 75), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckOriginal, 9, QRect(462, 190, 75, 75), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckOriginal, 10, QRect(332, 291, 75, 75), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckOriginal, 11, QRect(462, 291, 75, 75), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckOriginal, 12, QRect(74, 291, 75, 75), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckOriginal, 13, QRect(204, 291, 75, 75), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckOriginal, 14, QRect(332, 291, 75, 75), Qt::white, &commands[0], &commands[0]));
+    defaultButtons.append(BUTTON(StreamDeckOriginal, 0, QRect(65, 91, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginal, 1, QRect(165, 91, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginal, 2, QRect(263, 91, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginal, 3, QRect(364, 91, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginal, 4, QRect(462, 91, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginal, 5, QRect(65, 190, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginal, 6, QRect(165, 190, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginal, 7, QRect(263, 190, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginal, 8, QRect(364, 190, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginal, 9, QRect(462, 190, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginal, 10, QRect(332, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginal, 11, QRect(462, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginal, 12, QRect(74, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginal, 13, QRect(204, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginal, 14, QRect(332, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
 
     // StreamDeckOriginalMK2
-    defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 0, QRect(65, 91, 75, 75), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 1, QRect(165, 91, 75, 75), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 2, QRect(263, 91, 75, 75), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 3, QRect(364, 91, 75, 75), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 4, QRect(462, 91, 75, 75), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 5, QRect(65, 190, 75, 75), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 6, QRect(165, 190, 75, 75), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 7, QRect(263, 190, 75, 75), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 8, QRect(364, 190, 75, 75), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 9, QRect(462, 190, 75, 75), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 10, QRect(332, 291, 75, 75), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 11, QRect(462, 291, 75, 75), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 12, QRect(74, 291, 75, 75), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 13, QRect(204, 291, 75, 75), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 14, QRect(332, 291, 75, 75), Qt::white, &commands[0], &commands[0]));
+    defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 0, QRect(65, 91, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 1, QRect(165, 91, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 2, QRect(263, 91, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 3, QRect(364, 91, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 4, QRect(462, 91, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 5, QRect(65, 190, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 6, QRect(165, 190, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 7, QRect(263, 190, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 8, QRect(364, 190, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 9, QRect(462, 190, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 10, QRect(332, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 11, QRect(462, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 12, QRect(74, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 13, QRect(204, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginalMK2, 14, QRect(332, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
 
     // StreamDeckOriginalV2
-    defaultButtons.append(BUTTON(StreamDeckOriginalV2, 0, QRect(65, 91, 75, 75), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckOriginalV2, 1, QRect(165, 91, 75, 75), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckOriginalV2, 2, QRect(263, 91, 75, 75), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckOriginalV2, 3, QRect(364, 91, 75, 75), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckOriginalV2, 4, QRect(462, 91, 75, 75), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckOriginalV2, 5, QRect(65, 190, 75, 75), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckOriginalV2, 6, QRect(165, 190, 75, 75), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckOriginalV2, 7, QRect(263, 190, 75, 75), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckOriginalV2, 8, QRect(364, 190, 75, 75), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckOriginalV2, 9, QRect(462, 190, 75, 75), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckOriginalV2, 10, QRect(332, 291, 75, 75), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckOriginalV2, 11, QRect(462, 291, 75, 75), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckOriginalV2, 12, QRect(74, 291, 75, 75), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckOriginalV2, 13, QRect(204, 291, 75, 75), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckOriginalV2, 14, QRect(332, 291, 75, 75), Qt::white, &commands[0], &commands[0]));
+    defaultButtons.append(BUTTON(StreamDeckOriginalV2, 0, QRect(65, 91, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginalV2, 1, QRect(165, 91, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginalV2, 2, QRect(263, 91, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginalV2, 3, QRect(364, 91, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginalV2, 4, QRect(462, 91, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginalV2, 5, QRect(65, 190, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginalV2, 6, QRect(165, 190, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginalV2, 7, QRect(263, 190, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginalV2, 8, QRect(364, 190, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginalV2, 9, QRect(462, 190, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginalV2, 10, QRect(332, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginalV2, 11, QRect(462, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginalV2, 12, QRect(74, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginalV2, 13, QRect(204, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckOriginalV2, 14, QRect(332, 291, 75, 75), Qt::white, &commands[0], &commands[0],true));
 
     // StreamDeckMini
-    defaultButtons.append(BUTTON(StreamDeckMini, 0, QRect(113, 86, 100, 80), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckMini, 1, QRect(252, 86, 100, 80), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckMini, 2, QRect(388, 86, 100, 80), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckMini, 3, QRect(113, 204, 100, 80), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckMini, 4, QRect(252, 204, 100, 80), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckMini, 5, QRect(388, 204, 100, 80), Qt::white, &commands[0], &commands[0]));
+    defaultButtons.append(BUTTON(StreamDeckMini, 0, QRect(113, 86, 100, 80), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckMini, 1, QRect(252, 86, 100, 80), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckMini, 2, QRect(388, 86, 100, 80), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckMini, 3, QRect(113, 204, 100, 80), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckMini, 4, QRect(252, 204, 100, 80), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckMini, 5, QRect(388, 204, 100, 80), Qt::white, &commands[0], &commands[0],true));
 
     // StreamDeckMiniV2
-    defaultButtons.append(BUTTON(StreamDeckMiniV2, 0, QRect(113, 86, 100, 80), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckMiniV2, 1, QRect(252, 86, 100, 80), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckMiniV2, 2, QRect(388, 86, 100, 80), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckMiniV2, 3, QRect(113, 204, 100, 80), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckMiniV2, 4, QRect(252, 204, 100, 80), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckMiniV2, 5, QRect(388, 204, 100, 80), Qt::white, &commands[0], &commands[0]));
+    defaultButtons.append(BUTTON(StreamDeckMiniV2, 0, QRect(113, 86, 100, 80), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckMiniV2, 1, QRect(252, 86, 100, 80), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckMiniV2, 2, QRect(388, 86, 100, 80), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckMiniV2, 3, QRect(113, 204, 100, 80), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckMiniV2, 4, QRect(252, 204, 100, 80), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckMiniV2, 5, QRect(388, 204, 100, 80), Qt::white, &commands[0], &commands[0],true));
 
     // StreamDeckXL
-    defaultButtons.append(BUTTON(StreamDeckXL, 0, QRect(80, 106, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXL, 1, QRect(168, 106, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXL, 2, QRect(258, 106, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXL, 3, QRect(349, 106, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXL, 4, QRect(438, 106, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXL, 5, QRect(529, 106, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXL, 6, QRect(618, 106, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXL, 7, QRect(711, 106, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXL, 8, QRect(80, 195, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXL, 9, QRect(168, 195, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXL, 10, QRect(258, 195, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXL, 11, QRect(349, 195, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXL, 12, QRect(438, 195, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXL, 13, QRect(529, 195, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXL, 14, QRect(618, 195, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXL, 15, QRect(711, 195, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXL, 16, QRect(80, 287, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXL, 17, QRect(168, 287, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXL, 18, QRect(258, 287, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXL, 19, QRect(349, 287, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXL, 20, QRect(438, 287, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXL, 21, QRect(529, 287, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXL, 22, QRect(618, 287, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXL, 23, QRect(711, 287, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXL, 24, QRect(80, 376, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXL, 25, QRect(168, 376, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXL, 26, QRect(258, 376, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXL, 27, QRect(349, 376, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXL, 28, QRect(438, 376, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXL, 29, QRect(529, 376, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXL, 30, QRect(618, 376, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXL, 31, QRect(711, 376, 61, 61), Qt::white, &commands[0], &commands[0]));
+    defaultButtons.append(BUTTON(StreamDeckXL, 0, QRect(80, 106, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXL, 1, QRect(168, 106, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXL, 2, QRect(258, 106, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXL, 3, QRect(349, 106, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXL, 4, QRect(438, 106, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXL, 5, QRect(529, 106, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXL, 6, QRect(618, 106, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXL, 7, QRect(711, 106, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXL, 8, QRect(80, 195, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXL, 9, QRect(168, 195, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXL, 10, QRect(258, 195, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXL, 11, QRect(349, 195, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXL, 12, QRect(438, 195, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXL, 13, QRect(529, 195, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXL, 14, QRect(618, 195, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXL, 15, QRect(711, 195, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXL, 16, QRect(80, 287, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXL, 17, QRect(168, 287, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXL, 18, QRect(258, 287, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXL, 19, QRect(349, 287, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXL, 20, QRect(438, 287, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXL, 21, QRect(529, 287, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXL, 22, QRect(618, 287, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXL, 23, QRect(711, 287, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXL, 24, QRect(80, 376, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXL, 25, QRect(168, 376, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXL, 26, QRect(258, 376, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXL, 27, QRect(349, 376, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXL, 28, QRect(438, 376, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXL, 29, QRect(529, 376, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXL, 30, QRect(618, 376, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXL, 31, QRect(711, 376, 61, 61), Qt::white, &commands[0], &commands[0],true));
 
     // StreamDeckXLV2
-    defaultButtons.append(BUTTON(StreamDeckXLV2, 0, QRect(80, 106, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXLV2, 1, QRect(168, 106, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXLV2, 2, QRect(258, 106, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXLV2, 3, QRect(349, 106, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXLV2, 4, QRect(438, 106, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXLV2, 5, QRect(529, 106, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXLV2, 6, QRect(618, 106, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXLV2, 7, QRect(711, 106, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXLV2, 8, QRect(80, 195, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXLV2, 9, QRect(168, 195, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXLV2, 10, QRect(258, 195, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXLV2, 11, QRect(349, 195, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXLV2, 12, QRect(438, 195, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXLV2, 13, QRect(529, 195, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXLV2, 14, QRect(618, 195, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXLV2, 15, QRect(711, 195, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXLV2, 16, QRect(80, 287, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXLV2, 17, QRect(168, 287, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXLV2, 18, QRect(258, 287, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXLV2, 19, QRect(349, 287, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXLV2, 20, QRect(438, 287, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXLV2, 21, QRect(529, 287, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXLV2, 22, QRect(618, 287, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXLV2, 23, QRect(711, 287, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXLV2, 24, QRect(80, 376, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXLV2, 25, QRect(168, 376, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXLV2, 26, QRect(258, 376, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXLV2, 27, QRect(349, 376, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXLV2, 28, QRect(438, 376, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXLV2, 29, QRect(529, 376, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXLV2, 30, QRect(618, 376, 61, 61), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckXLV2, 31, QRect(711, 376, 61, 61), Qt::white, &commands[0], &commands[0]));
+    defaultButtons.append(BUTTON(StreamDeckXLV2, 0, QRect(80, 106, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXLV2, 1, QRect(168, 106, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXLV2, 2, QRect(258, 106, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXLV2, 3, QRect(349, 106, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXLV2, 4, QRect(438, 106, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXLV2, 5, QRect(529, 106, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXLV2, 6, QRect(618, 106, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXLV2, 7, QRect(711, 106, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXLV2, 8, QRect(80, 195, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXLV2, 9, QRect(168, 195, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXLV2, 10, QRect(258, 195, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXLV2, 11, QRect(349, 195, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXLV2, 12, QRect(438, 195, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXLV2, 13, QRect(529, 195, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXLV2, 14, QRect(618, 195, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXLV2, 15, QRect(711, 195, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXLV2, 16, QRect(80, 287, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXLV2, 17, QRect(168, 287, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXLV2, 18, QRect(258, 287, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXLV2, 19, QRect(349, 287, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXLV2, 20, QRect(438, 287, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXLV2, 21, QRect(529, 287, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXLV2, 22, QRect(618, 287, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXLV2, 23, QRect(711, 287, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXLV2, 24, QRect(80, 376, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXLV2, 25, QRect(168, 376, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXLV2, 26, QRect(258, 376, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXLV2, 27, QRect(349, 376, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXLV2, 28, QRect(438, 376, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXLV2, 29, QRect(529, 376, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXLV2, 30, QRect(618, 376, 61, 61), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckXLV2, 31, QRect(711, 376, 61, 61), Qt::white, &commands[0], &commands[0],true));
 
     // StreamDeckPedal
     defaultButtons.append(BUTTON(StreamDeckPedal, 0, QRect(7, 47, 115, 347), Qt::white, &commands[0], &commands[0]));
@@ -1578,14 +1592,14 @@ void usbController::loadButtons()
     defaultButtons.append(BUTTON(StreamDeckPedal, 2, QRect(475, 47, 115, 347), Qt::white, &commands[0], &commands[0]));
 
     // StreamDeckPlus
-    defaultButtons.append(BUTTON(StreamDeckPlus, 0, QRect(69, 43, 78, 66), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckPlus, 1, QRect(198, 43, 78, 66), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckPlus, 2, QRect(323, 43, 78, 66), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckPlus, 3, QRect(452, 43, 78, 66), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckPlus, 4, QRect(69, 126, 78, 66), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckPlus, 5, QRect(198, 126, 78, 66), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckPlus, 6, QRect(323, 126, 78, 66), Qt::white, &commands[0], &commands[0]));
-    defaultButtons.append(BUTTON(StreamDeckPlus, 7, QRect(452, 126, 78, 66), Qt::white, &commands[0], &commands[0]));
+    defaultButtons.append(BUTTON(StreamDeckPlus, 0, QRect(75, 45, 63, 63), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckPlus, 1, QRect(202, 45, 63, 63), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckPlus, 2, QRect(330, 45, 63, 63), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckPlus, 3, QRect(458, 45, 63, 63), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckPlus, 4, QRect(75, 128, 63, 63), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckPlus, 5, QRect(202, 128, 63, 63), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckPlus, 6, QRect(330, 128, 63, 63), Qt::white, &commands[0], &commands[0],true));
+    defaultButtons.append(BUTTON(StreamDeckPlus, 7, QRect(458, 128, 63, 63), Qt::white, &commands[0], &commands[0],true));
     defaultButtons.append(BUTTON(StreamDeckPlus, 8, QRect(74, 358, 64, 52), Qt::white, &commands[0], &commands[0]));
     defaultButtons.append(BUTTON(StreamDeckPlus, 9, QRect(204, 358, 64, 52), Qt::white, &commands[0], &commands[0]));
     defaultButtons.append(BUTTON(StreamDeckPlus, 10, QRect(332, 358, 64, 52), Qt::white, &commands[0], &commands[0]));
@@ -1692,6 +1706,7 @@ void usbController::loadCommands()
     commands.append(COMMAND(num++, "Scope", commandButton, cmdNone, (quint8)0x0));
     commands.append(COMMAND(num++, "Spectrum", commandButton, cmdLCDSpectrum, (quint8)0x0));
     commands.append(COMMAND(num++, "Waterfall", commandButton, cmdLCDWaterfall, (quint8)0x0));
+    commands.append(COMMAND(num++, "No Display", commandButton, cmdLCDNothing, (quint8)0x0));
     commands.append(COMMAND(num++, "Pages", commandButton, cmdSeparator, (quint8)0x0));
     commands.append(COMMAND(num++, "Page Down", commandButton, cmdPageDown, (quint8)0x0));
     commands.append(COMMAND(num++, "Page Up", commandButton, cmdPageUp, (quint8)0x0));
@@ -1726,10 +1741,46 @@ void usbController::programPages(USBDEVICE* dev, int val)
         qInfo(logUsbControl()) << "Removing unused pages from " << dev->product;
         // Remove unneded pages
 
-        buttonList->erase(std::remove_if(buttonList->begin(), buttonList->end(), [val](auto bt) {
-            return (bt.page>val); }),buttonList->end());
-        knobList->erase(std::remove_if(knobList->begin(), knobList->end(), [val](auto kb) {
-            return (kb.page>val); }),knobList->end());
+        // Remove old buttons
+        for (auto b = buttonList->begin();b != buttonList->end();)
+        {
+            if (b->parent == dev && b->page > val)
+            {
+                if (b->text != Q_NULLPTR) {
+                    delete b->text;
+                    b->text = Q_NULLPTR;
+                }
+                if (b->bgRect != Q_NULLPTR) {
+                    delete b->bgRect;
+                    b->bgRect = Q_NULLPTR;
+                }
+                b->onCommand = Q_NULLPTR;
+                b->offCommand = Q_NULLPTR;
+                if (b->icon != Q_NULLPTR) {
+                    delete b->icon;
+                    b->icon=Q_NULLPTR;
+                }
+                b = buttonList->erase(b);
+            } else {
+                ++b;
+            }
+        }
+
+        // Remove old knobs
+        for (auto k = knobList->begin();k != knobList->end();)
+        {
+            if (k->parent == dev && k->page > val)
+            {
+                if (k->text != Q_NULLPTR) {
+                    delete k->text;
+                    k->text = Q_NULLPTR;
+                    k->command = Q_NULLPTR;
+                }
+                k = knobList->erase(k);
+            } else {
+                ++k;
+            }
+        }
     }
     else if (dev->pages < val)
     {
@@ -1737,36 +1788,28 @@ void usbController::programPages(USBDEVICE* dev, int val)
         {
             qInfo(logUsbControl()) << QString("Adding new page %0 to %1").arg(page).arg(dev->product);
             // Add new pages
-            
-            QVector<BUTTON> tempButs;
-            auto bt = buttonList->begin();
-            while (bt != buttonList->end())
+
+            for (auto bt = defaultButtons.begin();bt != defaultButtons.end(); bt++)
             {
-                if (bt->path == dev->path && bt->page == 1) {
-                    BUTTON but = BUTTON(bt->dev, bt->num, bt->pos, bt->textColour, new COMMAND(commands[0]), new COMMAND(commands[0]));
+                if (bt->dev == dev->type.model) {
+                    BUTTON but = BUTTON(bt->dev, bt->num, bt->pos, bt->textColour, &commands[0], &commands[0],bt->graphics);
                     but.path = dev->path;
                     but.parent = dev;
                     but.page = page;
-                    tempButs.append(but);
+                    buttonList->append(but);
                 }
-                ++bt;
             }
-            buttonList->append(tempButs);
-            
-            QVector<KNOB> tempKnobs;
-            auto kb = knobList->begin();
-            while (kb != knobList->end())
+
+            for (auto kb = defaultKnobs.begin();kb != defaultKnobs.end(); kb++)
             {
-                if (kb->path == dev->path && kb->page == 1) {
-                    KNOB knob = KNOB(kb->dev, kb->num, kb->pos, kb->textColour, new COMMAND(commands[0]));
+                if (kb->dev == dev->type.model) {
+                    KNOB knob = KNOB(kb->dev, kb->num, kb->pos, kb->textColour, &commands[0]);
                     knob.path = dev->path;
                     knob.parent = dev;
                     knob.page = page;
-                    tempKnobs.append(knob);
+                    knobList->append(knob);
                 }
-                ++kb;
             }
-            knobList->append(tempKnobs);
         }
     }
     dev->pages = val;
@@ -1834,215 +1877,237 @@ void usbController::receiveLevel(cmds cmd, unsigned char level)
         auto kb = std::find_if(knobList->begin(), knobList->end(), [dev, cmd](const KNOB& k)
         { return (k.command && dev->connected && k.path == dev->path && k.page == dev->currentPage && k.command->getCommand == cmd);});
         if (kb != knobList->end() && kb->num < dev->knobValues.size()) {
-            qDebug(logUsbControl()) << "Received value:" << level << "for knob" << kb->num;
+            qInfo(logUsbControl()) << "Received value:" << level << "for knob" << kb->num;
             // Set both current and previous knobvalue to the received value
             dev->knobValues[kb->num].value = level/dev->sensitivity;
             dev->knobValues[kb->num].previous = level/dev->sensitivity;
         }
-        ++devIt;
     }
 }
 
-void usbController::backupController(QString file, QString path)
+void usbController::backupController(USBDEVICE* dev, QString file)
 {
-    QSettings settings = QSettings(file, QSettings::Format::IniFormat);
-
-    qInfo(logUsbControl()) << "Backup of" << path << "to" << file;
-
-    settings.setValue("Version", QString(WFVIEW_VERSION));
-    settings.beginGroup("Controller");
     QMutexLocker locker(mutex);
 
-    auto devIt = devices->find(file);
-    if (devIt==devices->end())
+    QSettings* settings = new QSettings(file, QSettings::Format::IniFormat);
+
+    qInfo(logUsbControl()) << "Backup of" << dev->path << "to" << file;
+
+    settings->setValue("Version", QString(WFVIEW_VERSION));
+    settings->beginGroup("Controller");
+
+    settings->setValue("Model",dev->product);
+    settings->setValue("Disabled", dev->disabled);
+    settings->setValue("Sensitivity", dev->sensitivity);
+    settings->setValue("Brightness", dev->brightness);
+    settings->setValue("Orientation", dev->orientation);
+    settings->setValue("Speed", dev->speed);
+    settings->setValue("Timeout", dev->timeout);
+    settings->setValue("Pages", dev->pages);
+    settings->setValue("Color", dev->color.name(QColor::HexArgb));
+    settings->setValue("LCD", dev->lcd);
+
+    int n=0;
+    settings->beginWriteArray("Buttons");
+    for (auto b = buttonList->begin(); b != buttonList->end(); b++)
     {
-        qWarning(logUsbControl) << "Cannot find existing device in backupController(), aborting!";
-        return;
+        if (b->path == dev->path)
+        {
+            settings->setArrayIndex(n);
+            settings->setValue("Page", b->page);
+            settings->setValue("Dev", b->dev);
+            settings->setValue("Num", b->num);
+            settings->setValue("Name", b->name);
+            settings->setValue("Left", b->pos.left());
+            settings->setValue("Top", b->pos.top());
+            settings->setValue("Width", b->pos.width());
+            settings->setValue("Height", b->pos.height());
+            settings->setValue("Colour", b->textColour.name(QColor::HexArgb));
+            settings->setValue("BackgroundOn", b->backgroundOn.name(QColor::HexArgb));
+            settings->setValue("BackgroundOff", b->backgroundOff.name(QColor::HexArgb));
+            if (b->icon != Q_NULLPTR) {
+                settings->setValue("Icon", *b->icon);
+                settings->setValue("IconName", b->iconName);
+            }
+            settings->setValue("Toggle", b->toggle);
+
+            if (b->onCommand != Q_NULLPTR)
+                settings->setValue("OnCommand", b->onCommand->text);
+            if (b->offCommand != Q_NULLPTR)
+                settings->setValue("OffCommand", b->offCommand->text);
+            settings->setValue("Graphics",b->graphics);
+            ++n;
+        }
     }
-    else
+    settings->endArray();
+
+    n = 0;
+    settings->beginWriteArray("Knobs");
+    for (auto k = knobList->begin(); k != knobList->end(); k++)
     {
-        auto dev = &devIt.value();
-        settings.setValue("Model",dev->product);
-        settings.setValue("Disabled", dev->disabled);
-        settings.setValue("Sensitivity", dev->sensitivity);
-        settings.setValue("Brightness", dev->brightness);
-        settings.setValue("Orientation", dev->orientation);
-        settings.setValue("Speed", dev->speed);
-        settings.setValue("Timeout", dev->timeout);
-        settings.setValue("Pages", dev->pages);
-        settings.setValue("Color", dev->color.name(QColor::HexArgb));
-        settings.setValue("LCD", dev->lcd);
-
-        int n=0;
-        settings.beginWriteArray("Buttons");
-        for (auto b = buttonList->begin(); b != buttonList->end(); b++)
+        if (k->path == dev->path)
         {
-            if (b->path == path)
-            {
-                settings.setArrayIndex(n);
-                settings.setValue("Page", b->page);
-                settings.setValue("Dev", b->dev);
-                settings.setValue("Num", b->num);
-                settings.setValue("Name", b->name);
-                settings.setValue("Left", b->pos.left());
-                settings.setValue("Top", b->pos.top());
-                settings.setValue("Width", b->pos.width());
-                settings.setValue("Height", b->pos.height());
-                settings.setValue("Colour", b->textColour.name(QColor::HexArgb));
-                settings.setValue("BackgroundOn", b->backgroundOn.name(QColor::HexArgb));
-                settings.setValue("BackgroundOff", b->backgroundOff.name(QColor::HexArgb));
-                if (b->icon != Q_NULLPTR) {
-                    settings.setValue("Icon", *b->icon);
-                    settings.setValue("IconName", b->iconName);
-                }
-                settings.setValue("Toggle", b->toggle);
-
-                if (b->onCommand != Q_NULLPTR)
-                    settings.setValue("OnCommand", b->onCommand->text);
-                if (b->offCommand != Q_NULLPTR)
-                    settings.setValue("OffCommand", b->offCommand->text);
-                ++n;
-            }
+            settings->setArrayIndex(n);
+            settings->setValue("Page", k->page);
+            settings->setValue("Dev", k->dev);
+            settings->setValue("Num", k->num);
+            settings->setValue("Left", k->pos.left());
+            settings->setValue("Top", k->pos.top());
+            settings->setValue("Width", k->pos.width());
+            settings->setValue("Height", k->pos.height());
+            settings->setValue("Colour", k->textColour.name());
+            if (k->command != Q_NULLPTR)
+                settings->setValue("Command", k->command->text);
+            ++n;
         }
-        settings.endArray();
-
-        n = 0;
-        settings.beginWriteArray("Knobs");
-        for (auto k = knobList->begin(); k != knobList->end(); k++)
-        {
-            if (k->path == path)
-            {
-                settings.setArrayIndex(n);
-                settings.setValue("Page", k->page);
-                settings.setValue("Dev", k->dev);
-                settings.setValue("Num", k->num);
-                settings.setValue("Left", k->pos.left());
-                settings.setValue("Top", k->pos.top());
-                settings.setValue("Width", k->pos.width());
-                settings.setValue("Height", k->pos.height());
-                settings.setValue("Colour", k->textColour.name());
-                if (k->command != Q_NULLPTR)
-                    settings.setValue("Command", k->command->text);
-                ++n;
-            }
-        }
-
-        settings.endArray();
-        settings.endGroup();
-        settings.sync();
     }
+
+    settings->endArray();
+    settings->endGroup();
+    settings->sync();
+    delete settings;
 }
 
-void usbController::restoreController(QString file, QString path)
+void usbController::restoreController(USBDEVICE* dev, QString file)
 {
 
-    auto devIt = devices->find(path);
-    if (devIt==devices->end())
-    {
-        qWarning(logUsbControl) << "Cannot find existing device in restoreController(), aborting!";
-        return;
-    }
-
-    // If we are here, we have a valid device
-    auto dev = &devIt.value();
-
-    QSettings settings = QSettings(file, QSettings::Format::IniFormat);
-
-    qInfo(logUsbControl()) << "Restore of" << path << "from" << file;
-    settings.beginGroup("Controller");
-
     // Signal UI to remove existing device.
     emit removeDevice(dev);
 
     QMutexLocker locker(mutex);
 
-    dev->disabled = settings.value("Disabled", false).toBool();
-    dev->sensitivity = settings.value("Sensitivity", 1).toInt();
-    dev->pages = settings.value("Pages", 1).toInt();
-    dev->brightness = (quint8)settings.value("Brightness", 2).toInt();
-    dev->orientation = (quint8)settings.value("Orientation", 2).toInt();
-    dev->speed = (quint8)settings.value("Speed", 2).toInt();
-    dev->timeout = (quint8)settings.value("Timeout", 30).toInt();
-    dev->color.setNamedColor(settings.value("Color", QColor(Qt::white).name(QColor::HexArgb)).toString());
-    dev->lcd = (cmds)settings.value("LCD",0).toInt();
+    QSettings* settings = new QSettings(file, QSettings::Format::IniFormat);
+
+    settings->beginGroup("Controller");
+
+    dev->disabled = settings->value("Disabled", false).toBool();
+    dev->sensitivity = settings->value("Sensitivity", 1).toInt();
+    dev->pages = settings->value("Pages", 1).toInt();
+    dev->brightness = (quint8)settings->value("Brightness", 2).toInt();
+    dev->orientation = (quint8)settings->value("Orientation", 2).toInt();
+    dev->speed = (quint8)settings->value("Speed", 2).toInt();
+    dev->timeout = (quint8)settings->value("Timeout", 30).toInt();
+    dev->color.setNamedColor(settings->value("Color", QColor(Qt::white).name(QColor::HexArgb)).toString());
+    dev->lcd = (cmds)settings->value("LCD",0).toInt();
+
+    qInfo(logUsbControl()) << "Restore of" << dev->product << "path" << dev->path << "from" << file;
 
     // Remove old buttons
-    buttonList->erase(std::remove_if(buttonList->begin(), buttonList->end(), [path](const BUTTON& b)
-        { return (b.path == path); }),buttonList->end());
 
-    int numButtons = settings.beginReadArray("Buttons");
+    for (auto b = buttonList->begin();b != buttonList->end();)
+    {
+        if (b->parent == dev)
+        {
+            if (b->text != Q_NULLPTR) {
+                delete b->text;
+                b->text = Q_NULLPTR;
+            }
+            if (b->bgRect != Q_NULLPTR) {
+                delete b->bgRect;
+                b->bgRect = Q_NULLPTR;
+            }
+            b->onCommand = Q_NULLPTR;
+            b->offCommand = Q_NULLPTR;
+            if (b->icon != Q_NULLPTR) {
+                delete b->icon;
+                b->icon=Q_NULLPTR;
+            }
+            b = buttonList->erase(b);
+        } else {
+            ++b;
+        }
+    }
+
+    int numButtons = settings->beginReadArray("Buttons");
     if (numButtons == 0) {
-        settings.endArray();
+        qInfo(logUsbControl()) << "No Buttons Found!";
+        settings->endArray();
     }
     else {
         for (int b = 0; b < numButtons; b++)
         {
-            settings.setArrayIndex(b);
+            settings->setArrayIndex(b);
             BUTTON but;
-            but.page = settings.value("Page", 1).toInt();
-            but.dev = (usbDeviceType)settings.value("Dev", 0).toInt();
-            but.num = settings.value("Num", 0).toInt();
-            but.name = settings.value("Name", "").toString();
-            but.pos = QRect(settings.value("Left", 0).toInt(),
-                settings.value("Top", 0).toInt(),
-                settings.value("Width", 0).toInt(),
-                settings.value("Height", 0).toInt());
-            but.textColour.setNamedColor(settings.value("Colour", QColor(Qt::white).name(QColor::HexArgb)).toString());
-            but.backgroundOn.setNamedColor(settings.value("BackgroundOn", QColor(Qt::lightGray).name(QColor::HexArgb)).toString());
-            but.backgroundOff.setNamedColor(settings.value("BackgroundOff", QColor(Qt::blue).name(QColor::HexArgb)).toString());
-            but.toggle = settings.value("Toggle", false).toBool();
-            if (settings.value("Icon",NULL) != NULL) {
-                but.icon = new QImage(settings.value("Icon",NULL).value<QImage>());
-                but.iconName = settings.value("IconName", "").toString();
+            but.page = settings->value("Page", 1).toInt();
+            but.dev = (usbDeviceType)settings->value("Dev", 0).toInt();
+            but.num = settings->value("Num", 0).toInt();
+            but.name = settings->value("Name", "").toString();
+            but.pos = QRect(settings->value("Left", 0).toInt(),
+                settings->value("Top", 0).toInt(),
+                settings->value("Width", 0).toInt(),
+                settings->value("Height", 0).toInt());
+            but.textColour.setNamedColor(settings->value("Colour", QColor(Qt::white).name(QColor::HexArgb)).toString());
+            but.backgroundOn.setNamedColor(settings->value("BackgroundOn", QColor(Qt::lightGray).name(QColor::HexArgb)).toString());
+            but.backgroundOff.setNamedColor(settings->value("BackgroundOff", QColor(Qt::blue).name(QColor::HexArgb)).toString());
+            but.toggle = settings->value("Toggle", false).toBool();
+            if (settings->value("Icon",NULL) != NULL) {
+                but.icon = new QImage(settings->value("Icon",NULL).value<QImage>());
+                but.iconName = settings->value("IconName", "").toString();
             }
-            but.on = settings.value("OnCommand", "None").toString();
-            but.off = settings.value("OffCommand", "None").toString();
-
-            but.path = path;
-            buttonList->append(but);
+            but.on = settings->value("OnCommand", "None").toString();
+            but.off = settings->value("OffCommand", "None").toString();
+            but.graphics = settings->value("Graphics",false).toBool();
+            but.path = dev->path;
+            qInfo(logUsbControl()) << "Restoring button" << but.num << "On" << but.on << "Off" << but.off;
+            buttonList->append(BUTTON(but));
         }
-        settings.endArray();
+        settings->endArray();
     }
 
 
     // Remove old knobs
-    knobList->erase(std::remove_if(knobList->begin(), knobList->end(), [path](const KNOB& k)
-        { return (k.path == path); }),knobList->end());
 
-    int numKnobs = settings.beginReadArray("Knobs");
+    for (auto k = knobList->begin();k != knobList->end();)
+    {
+        if (k->parent == dev)
+        {
+            if (k->text != Q_NULLPTR) {
+                delete k->text;
+                k->text = Q_NULLPTR;
+                k->command = Q_NULLPTR;
+            }
+            k = knobList->erase(k);
+        } else {
+            ++k;
+        }
+    }
+
+    int numKnobs = settings->beginReadArray("Knobs");
     if (numKnobs == 0) {
-        settings.endArray();
+        qInfo(logUsbControl()) << "No Knobs Found!";
+        settings->endArray();
     }
     else {
         for (int k = 0; k < numKnobs; k++)
         {
-            settings.setArrayIndex(k);
+            settings->setArrayIndex(k);
             KNOB kb;
-            kb.page = settings.value("Page", 1).toInt();
-            kb.dev = (usbDeviceType)settings.value("Dev", 0).toInt();
-            kb.num = settings.value("Num", 0).toInt();
-            kb.name = settings.value("Name", "").toString();
-            kb.pos = QRect(settings.value("Left", 0).toInt(),
-                settings.value("Top", 0).toInt(),
-                settings.value("Width", 0).toInt(),
-                settings.value("Height", 0).toInt());
-            kb.textColour = QColor((settings.value("Colour", "Green").toString()));
+            kb.page = settings->value("Page", 1).toInt();
+            kb.dev = (usbDeviceType)settings->value("Dev", 0).toInt();
+            kb.num = settings->value("Num", 0).toInt();
+            kb.name = settings->value("Name", "").toString();
+            kb.pos = QRect(settings->value("Left", 0).toInt(),
+                settings->value("Top", 0).toInt(),
+                settings->value("Width", 0).toInt(),
+                settings->value("Height", 0).toInt());
+            kb.textColour = QColor((settings->value("Colour", "Green").toString()));
 
-            kb.cmd = settings.value("Command", "None").toString();
-            kb.path = path;
-            knobList->append(kb);
+            kb.cmd = settings->value("Command", "None").toString();
+            kb.path = dev->path;
+            qInfo(logUsbControl()) << "Restoring knob" << kb.num << "Cmd" << kb.cmd;
+            knobList->append(KNOB(kb));
         }
-        settings.endArray();
+        settings->endArray();
     }
 
-    settings.endGroup();
-    settings.sync();
+    settings->endGroup();
+    settings->sync();
+    delete settings;
 
     qInfo(logUsbControl()) << "Disconnecting device" << dev->product;
     hid_close(dev->handle);
     dev->handle = NULL;
     dev->connected = false;
-    dev->remove = true;
     dev->uiCreated = false;
     devicesConnected--;
     QTimer::singleShot(250, this, SLOT(run())); // Call run to cleanup connectons after 250ms
diff --git a/usbcontroller.h b/usbcontroller.h
index 03df507..ba722c5 100644
--- a/usbcontroller.h
+++ b/usbcontroller.h
@@ -163,9 +163,9 @@ struct COMMAND {
 struct BUTTON {
     BUTTON() {}
 
-    BUTTON(usbDeviceType dev, int num, QRect pos, const QColor textColour, COMMAND* on, COMMAND* off) :
-        dev(dev), num(num), name(""), pos(pos), textColour(textColour), onCommand(on), offCommand(off), on(onCommand->text), off(offCommand->text) {}
-    BUTTON(usbDeviceType dev,  QString name, QRect pos, const QColor textColour, COMMAND* on, COMMAND* off) :
+    BUTTON(usbDeviceType dev, int num, QRect pos, const QColor textColour, COMMAND* on, COMMAND* off, bool graphics=false) :
+        dev(dev), num(num), name(""), pos(pos), textColour(textColour), onCommand(on), offCommand(off), on(onCommand->text), off(offCommand->text), graphics(graphics) {}
+    BUTTON(usbDeviceType dev, QString name, QRect pos, const QColor textColour, COMMAND* on, COMMAND* off) :
         dev(dev), num(-1), name(name), pos(pos), textColour(textColour), onCommand(on), offCommand(off), on(onCommand->text), off(offCommand->text) {}
 
     usbDeviceType dev;
@@ -177,8 +177,8 @@ struct BUTTON {
     QColor textColour;
     const COMMAND* onCommand = Q_NULLPTR;
     const COMMAND* offCommand = Q_NULLPTR;
-    QGraphicsTextItem* onText = Q_NULLPTR;
-    QGraphicsTextItem* offText = Q_NULLPTR;
+    QGraphicsRectItem* bgRect = Q_NULLPTR;
+    QGraphicsTextItem* text = Q_NULLPTR;
     QString on;
     QString off;
     QString path;
@@ -188,6 +188,7 @@ struct BUTTON {
     QImage* icon = Q_NULLPTR;
     bool toggle = false;
     bool isOn = false;
+    bool graphics = false;
 };
 
 
@@ -234,10 +235,10 @@ public slots:
     void programPages(USBDEVICE* dev, int pages);
     void programDisable(USBDEVICE* dev, bool disabled);
 
-    void sendRequest(USBDEVICE *dev, usbFeatureType feature, quint8 val=0, QString text="", QImage* img=Q_NULLPTR, QColor* color=Q_NULLPTR);
+    void sendRequest(USBDEVICE *dev, usbFeatureType feature, int val=0, QString text="", QImage* img=Q_NULLPTR, QColor* color=Q_NULLPTR);
     void sendToLCD(QImage *img);
-    void backupController(QString file, QString path);
-    void restoreController(QString file, QString path);
+    void backupController(USBDEVICE* dev, QString file);
+    void restoreController(USBDEVICE* dev, QString file);
 
 signals:
     void jogPlus();
@@ -268,7 +269,7 @@ private:
     QVector<KNOB> defaultKnobs;
     QVector<USBTYPE> knownDevices;
     QVector<COMMAND> commands;
-    usbDevMap* devices;
+    usbDevMap* devices;    
 
 #if (QT_VERSION < QT_VERSION_CHECK(6,0,0))
     QGamepad* gamepad=Q_NULLPTR;
@@ -280,6 +281,7 @@ private:
     QMutex* mutex=Q_NULLPTR;
     COMMAND sendCommand;
 
+    QTimer* dataTimer = Q_NULLPTR;
 protected:
 };
 
diff --git a/wfmain.cpp b/wfmain.cpp
index 4836f75..3b4efd4 100644
--- a/wfmain.cpp
+++ b/wfmain.cpp
@@ -1715,16 +1715,16 @@ void wfmain::setupUsbControllerDevice()
     connect(usbControllerDev, SIGNAL(newDevice(USBDEVICE*)), usbWindow, SLOT(newDevice(USBDEVICE *)));
     usbControllerThread->start(QThread::LowestPriority);
     
-    connect(usbWindow, SIGNAL(sendRequest(USBDEVICE*, usbFeatureType, quint8, QString, QImage*, QColor *)), usbControllerDev, SLOT(sendRequest(USBDEVICE*, usbFeatureType, quint8, QString, QImage*, QColor *)));
-    connect(this, SIGNAL(sendControllerRequest(USBDEVICE*, usbFeatureType, quint8, QString, QImage*, QColor *)), usbControllerDev, SLOT(sendRequest(USBDEVICE*, usbFeatureType, quint8, QString, QImage*, QColor *)));
+    connect(usbWindow, SIGNAL(sendRequest(USBDEVICE*, usbFeatureType, int, QString, QImage*, QColor *)), usbControllerDev, SLOT(sendRequest(USBDEVICE*, usbFeatureType, int, QString, QImage*, QColor *)));
+    connect(this, SIGNAL(sendControllerRequest(USBDEVICE*, usbFeatureType, int, QString, QImage*, QColor *)), usbControllerDev, SLOT(sendRequest(USBDEVICE*, usbFeatureType, int, QString, QImage*, QColor *)));
     connect(usbWindow, SIGNAL(programPages(USBDEVICE*, int)), usbControllerDev, SLOT(programPages(USBDEVICE*, int)));
     connect(usbWindow, SIGNAL(programDisable(USBDEVICE*, bool)), usbControllerDev, SLOT(programDisable(USBDEVICE*, bool)));
     connect(this, SIGNAL(setPTT(bool)), usbControllerDev, SLOT(receivePTTStatus(bool)));
     connect(this, SIGNAL(sendLevel(cmds, unsigned char)), usbControllerDev, SLOT(receiveLevel(cmds, unsigned char)));
     connect(this, SIGNAL(initUsbController(QMutex*,usbDevMap*,QVector<BUTTON>*,QVector<KNOB>*)), usbControllerDev, SLOT(init(QMutex*,usbDevMap*,QVector<BUTTON>*,QVector<KNOB>*)));
     connect(this, SIGNAL(usbHotplug()), usbControllerDev, SLOT(run()));
-    connect(usbWindow, SIGNAL(backup(QString, QString)), usbControllerDev, SLOT(backupController(QString, QString)));
-    connect(usbWindow, SIGNAL(restore(QString, QString)), usbControllerDev, SLOT(restoreController(QString, QString)));
+    connect(usbWindow, SIGNAL(backup(USBDEVICE*, QString)), usbControllerDev, SLOT(backupController(USBDEVICE*, QString)));
+    connect(usbWindow, SIGNAL(restore(USBDEVICE*, QString)), usbControllerDev, SLOT(restoreController(USBDEVICE*, QString)));
 
 #endif
 }
@@ -2579,6 +2579,7 @@ void wfmain::loadSettings()
             }
             butt.on = settings->value("OnCommand", "None").toString();
             butt.off = settings->value("OffCommand", "None").toString();
+            butt.graphics = settings->value("Graphics", false).toBool();
             if (!butt.path.isEmpty())
                 usbButtons.append(butt);
         }
@@ -3091,6 +3092,7 @@ void wfmain::saveSettings()
             settings->setValue("OnCommand", usbButtons[nb].onCommand->text);
         if (usbButtons[nb].offCommand != Q_NULLPTR)
             settings->setValue("OffCommand", usbButtons[nb].offCommand->text);
+        settings->setValue("Graphics",usbButtons[nb].graphics);
     }
 
     settings->endArray();
diff --git a/wfmain.h b/wfmain.h
index 6e32e85..dcf5225 100644
--- a/wfmain.h
+++ b/wfmain.h
@@ -277,7 +277,7 @@ signals:
     void setClusterTimeout(int timeout);
     void setClusterSkimmerSpots(bool enable);
     void setFrequencyRange(double low, double high);
-    void sendControllerRequest(USBDEVICE* dev, usbFeatureType request, quint8 val=0, QString text="", QImage* img=Q_NULLPTR, QColor* color=Q_NULLPTR);
+    void sendControllerRequest(USBDEVICE* dev, usbFeatureType request, int val=0, QString text="", QImage* img=Q_NULLPTR, QColor* color=Q_NULLPTR);
 
 private slots:
     void setAudioDevicesUI();
diff --git a/wfviewtypes.h b/wfviewtypes.h
index eb03db2..1791056 100644
--- a/wfviewtypes.h
+++ b/wfviewtypes.h
@@ -174,7 +174,7 @@ enum cmds {
     // Below Only used for USB Controller at the moment.
     cmdSetBandUp, cmdSetBandDown, cmdSetModeUp, cmdSetModeDown, cmdSetStepUp, cmdSetStepDown,
     cmdSetSpanUp, cmdSetSpanDown, cmdIFFilterUp, cmdIFFilterDown, cmdPageDown, cmdPageUp,
-    cmdLCDWaterfall, cmdLCDSpectrum, cmdSeparator
+    cmdLCDWaterfall, cmdLCDSpectrum, cmdLCDNothing, cmdSeparator
 };
 
 struct commandtype {