diff --git a/repeatersetup.cpp b/repeatersetup.cpp
index 2fd9eb7..618d659 100644
--- a/repeatersetup.cpp
+++ b/repeatersetup.cpp
@@ -12,6 +12,15 @@ repeaterSetup::repeaterSetup(QWidget *parent) :
 
     // populate the DCS combo box:
     populateDTCS();
+
+#ifdef QT_DEBUG
+    ui->debugBtn->setVisible(true);
+    ui->rptReadRigBtn->setVisible(true);
+#else
+    ui->debugBtn->setVisible(false);
+    ui->rptReadRigBtn->setVisible(false);
+#endif
+
 }
 
 repeaterSetup::~repeaterSetup()
@@ -19,6 +28,35 @@ repeaterSetup::~repeaterSetup()
     delete ui;
 }
 
+void repeaterSetup::setRig(rigCapabilities rig)
+{
+    this->rig = rig;
+    haveRig = true;
+    if(rig.hasCTCSS)
+    {
+        ui->rptToneCombo->setDisabled(false);
+        ui->toneTone->setDisabled(false);
+        ui->toneTSQL->setDisabled(false);
+    } else {
+        ui->rptToneCombo->setDisabled(true);
+        ui->toneTone->setDisabled(true);
+        ui->toneTSQL->setDisabled(true);
+    }
+
+    if(rig.hasDTCS)
+    {
+        ui->rptDTCSCombo->setDisabled(false);
+        ui->toneDTCS->setDisabled(false);
+        ui->rptDTCSInvertRx->setDisabled(false);
+        ui->rptDTCSInvertTx->setDisabled(false);
+    } else {
+        ui->rptDTCSCombo->setDisabled(true);
+        ui->toneDTCS->setDisabled(true);
+        ui->rptDTCSInvertRx->setDisabled(true);
+        ui->rptDTCSInvertTx->setDisabled(true);
+    }
+}
+
 void repeaterSetup::populateTones()
 {
     ui->rptToneCombo->addItem("67.0", quint16(670));
diff --git a/repeatersetup.h b/repeatersetup.h
index 33df159..49e0808 100644
--- a/repeatersetup.h
+++ b/repeatersetup.h
@@ -4,6 +4,7 @@
 #include <QMainWindow>
 
 #include "repeaterattributes.h"
+#include "rigidentities.h"
 
 namespace Ui {
 class repeaterSetup;
@@ -16,6 +17,7 @@ class repeaterSetup : public QMainWindow
 public:
     explicit repeaterSetup(QWidget *parent = 0);
     ~repeaterSetup();
+    void setRig(rigCapabilities rig);
 
 signals:
     void getDuplexMode();
@@ -55,7 +57,8 @@ private:
 
     void populateTones();
     void populateDTCS();
-
+    rigCapabilities rig;
+    bool haveRig = false;
     duplexMode currentdm;
 };
 
diff --git a/wfmain.cpp b/wfmain.cpp
index 017bc0e..904b4ce 100644
--- a/wfmain.cpp
+++ b/wfmain.cpp
@@ -1984,6 +1984,7 @@ void wfmain::receiveRigID(rigCapabilities rigCaps)
         haveRigCaps = true;
         // Added so that server receives rig capabilities.
         emit sendRigCaps(rigCaps);
+        rpt->setRig(rigCaps);
         if(rigCaps.model==model7850)
         {
             ui->modeSelectCombo->addItem("PSK", 0x12);