diff --git a/colorprefs.h b/colorprefs.h
index 5678f64..7db11fc 100644
--- a/colorprefs.h
+++ b/colorprefs.h
@@ -28,7 +28,8 @@ struct colorPrefsType{
     // Meters:
     QColor meterLevel;
     QColor meterAverage;
-    QColor meterPeak;
+    QColor meterPeakLevel;
+    QColor meterPeakScale;
     QColor meterLowerLine;
     QColor meterLowText;
 };
diff --git a/meter.cpp b/meter.cpp
index b3d10a2..9a24035 100644
--- a/meter.cpp
+++ b/meter.cpp
@@ -48,13 +48,21 @@ meter::meter(QWidget *parent) : QWidget(parent)
 
 }
 
-void meter::setColors(QColor current, QColor peak,
+void meter::setColors(QColor current, QColor peakScale, QColor peakLevel,
                       QColor average, QColor lowLine,
                       QColor lowText)
 {
     currentColor = current;
-    peakColor = peak;
+
+    peakColor = peakLevel; // color for the peak level indicator
+    highLineColor = peakScale; // color for the red side of the scale
+    highTextColor = peakScale; // color for the red side of the scale's text
+
     averageColor = average;
+
+    midScaleColor = QColor(Qt::yellow);
+    centerTuningColor = QColor(Qt::green);
+
     lowLineColor = lowLine;
     lowTextColor = lowText;
     this->update();
@@ -299,9 +307,8 @@ void meter::drawScaleRaw(QPainter *qp)
 
     // Line: X1, Y1 -->to--> X2, Y2
     qp->drawLine(mXstart,scaleLineYstart,peakRedLevel+mXstart,scaleLineYstart);
-    qp->setPen(Qt::red);
+    qp->setPen(highLineColor);
     qp->drawLine(peakRedLevel+mXstart,scaleLineYstart,255+mXstart,scaleLineYstart);
-
 }
 
 void meter::drawScaleVd(QPainter *qp)
@@ -338,7 +345,7 @@ void meter::drawScaleVd(QPainter *qp)
 
     // Line: X1, Y1 -->to--> X2, Y2
     qp->drawLine(mXstart,scaleLineYstart,peakRedLevel+mXstart,scaleLineYstart);
-    qp->setPen(Qt::red);
+    qp->setPen(highLineColor);
     qp->drawLine(peakRedLevel+mXstart,scaleLineYstart,255+mXstart,scaleLineYstart);
 
 }
@@ -349,7 +356,7 @@ void meter::drawScaleCenter(QPainter *qp)
     qp->setPen(lowLineColor);
     qp->drawText(60+mXstart,scaleTextYstart, QString("-"));
 
-    qp->setPen(Qt::green);
+    qp->setPen(centerTuningColor);
     // Attempt to draw the zero at the actual center
     qp->drawText(128-2+mXstart,scaleTextYstart, QString("0"));
 
@@ -360,7 +367,7 @@ void meter::drawScaleCenter(QPainter *qp)
     qp->setPen(lowLineColor);
     qp->drawLine(mXstart,scaleLineYstart,128-32+mXstart,scaleLineYstart);
 
-    qp->setPen(Qt::green);
+    qp->setPen(centerTuningColor);
     qp->drawLine(128-32+mXstart,scaleLineYstart,128+32+mXstart,scaleLineYstart);
 
     qp->setPen(lowLineColor);
@@ -394,7 +401,7 @@ void meter::drawScalePo(QPainter *qp)
     //qDebug() << "meter i: " << i;
     dnPerWatt = (213-143.0f) / 50.0f; // 1.4 dn per watt
     // P=5 here.
-    qp->setPen(Qt::yellow);
+    qp->setPen(midScaleColor);
     int k=0;
     for(i=mXstart+143; i<mXstart+213; i+=(5*dnPerWatt))
     {
@@ -404,7 +411,7 @@ void meter::drawScalePo(QPainter *qp)
     }
 
     // Now we're out past 100:
-    qp->setPen(Qt::red);
+    qp->setPen(highTextColor);
 
     for(i=mXstart+213; i<mXstart+255; i+=(10*dnPerWatt))
     {
@@ -418,7 +425,7 @@ void meter::drawScalePo(QPainter *qp)
 
     // Line: X1, Y1 -->to--> X2, Y2
     qp->drawLine(mXstart,scaleLineYstart,213+mXstart,scaleLineYstart);
-    qp->setPen(Qt::red);
+    qp->setPen(highLineColor);
     qp->drawLine(213+mXstart,scaleLineYstart,255+mXstart,scaleLineYstart);
 
     (void)qp;
@@ -444,7 +451,7 @@ void meter::drawScaleALC(QPainter *qp)
         alc +=20;
     }
 
-    qp->setPen(Qt::red);
+    qp->setPen(highTextColor);
 
     for(; i<mXstart+120; i+=(int)(10*i))
     {
@@ -455,7 +462,7 @@ void meter::drawScaleALC(QPainter *qp)
 
     qp->setPen(lowLineColor);
     qp->drawLine(mXstart,scaleLineYstart,100+mXstart,scaleLineYstart);
-    qp->setPen(Qt::red);
+    qp->setPen(highLineColor);
     qp->drawLine(100+mXstart,scaleLineYstart,255+mXstart,scaleLineYstart);
 
     (void)qp;
@@ -495,7 +502,7 @@ void meter::drawScaleComp(QPainter *qp)
 
     // Line: X1, Y1 -->to--> X2, Y2
     qp->drawLine(mXstart,scaleLineYstart,peakRedLevel+mXstart,scaleLineYstart);
-    qp->setPen(Qt::red);
+    qp->setPen(highLineColor);
     qp->drawLine(peakRedLevel+mXstart,scaleLineYstart,255+mXstart,scaleLineYstart);
 }
 
@@ -507,27 +514,29 @@ void meter::drawScaleSWR(QPainter *qp)
     // 0080=SWR2.0,
     // 0120=SWR3.0
 
+    qp->setPen(lowTextColor);
     qp->drawText(mXstart,scaleTextYstart, QString("1.0"));
     qp->drawText(24+mXstart,scaleTextYstart, QString("1.3"));
     qp->drawText(48+mXstart,scaleTextYstart, QString("1.5"));    
     qp->drawText(80+mXstart,scaleTextYstart, QString("2.0"));
     qp->drawText(100+mXstart,scaleTextYstart, QString("2.5"));
+    qp->setPen(highTextColor);
     qp->drawText(120+mXstart,scaleTextYstart, QString("3.0"));
 
+    qp->setPen(lowLineColor);
     qp->drawLine(  0+mXstart,scaleTextYstart,  0+mXstart, scaleTextYstart+5);
     qp->drawLine( 24+mXstart,scaleTextYstart, 24+mXstart, scaleTextYstart+5);
     qp->drawLine( 48+mXstart,scaleTextYstart, 48+mXstart, scaleTextYstart+5);
     qp->drawLine( 80+mXstart,scaleTextYstart, 80+mXstart, scaleTextYstart+5);
     qp->drawLine(100+mXstart,scaleTextYstart,100+mXstart, scaleTextYstart+5); // does not draw?
+    qp->setPen(highLineColor);
     qp->drawLine(120+mXstart,scaleTextYstart,120+mXstart, scaleTextYstart+5);
 
 
     qp->setPen(lowLineColor);
     qp->drawLine(mXstart,scaleLineYstart,100+mXstart,scaleLineYstart);
-    qp->setPen(Qt::red);
+    qp->setPen(highLineColor);
     qp->drawLine(100+mXstart,scaleLineYstart,255+mXstart,scaleLineYstart);
-
-
 }
 
 void meter::drawScaleId(QPainter *qp)
@@ -565,7 +574,7 @@ void meter::drawScaleId(QPainter *qp)
 
     // Line: X1, Y1 -->to--> X2, Y2
     qp->drawLine(mXstart,scaleLineYstart,peakRedLevel+mXstart,scaleLineYstart);
-    qp->setPen(Qt::red);
+    qp->setPen(highLineColor);
     qp->drawLine(peakRedLevel+mXstart,scaleLineYstart,255+mXstart,scaleLineYstart);
 }
 
@@ -594,7 +603,7 @@ void meter::drawScaleS(QPainter *qp)
     s = 20;
     i+=20;
 
-    qp->setPen(Qt::red);
+    qp->setPen(highTextColor);
 
     for(; i<mXstart+255; i+=40)
     {
@@ -604,9 +613,7 @@ void meter::drawScaleS(QPainter *qp)
     }
 
     qp->setPen(lowLineColor);
-
     qp->drawLine(mXstart,scaleLineYstart,peakRedLevel+mXstart,scaleLineYstart);
-    qp->setPen(Qt::red);
+    qp->setPen(highLineColor);
     qp->drawLine(peakRedLevel+mXstart,scaleLineYstart,255+mXstart,scaleLineYstart);
-
 }
diff --git a/meter.h b/meter.h
index fc29168..b57e362 100644
--- a/meter.h
+++ b/meter.h
@@ -30,7 +30,7 @@ public slots:
     void setMeterShortString(QString);
     QString getMeterShortString();
     meterKind getMeterType();
-    void setColors(QColor current, QColor peak,
+    void setColors(QColor current, QColor peakScale, QColor peakLevel,
                    QColor average, QColor lowLine,
                    QColor lowText);
 
@@ -87,6 +87,9 @@ private:
     QColor highTextColor;
     QColor highLineColor;
 
+    QColor midScaleColor;
+    QColor centerTuningColor;
+
 };
 
 #endif // METER_H
diff --git a/wfmain.cpp b/wfmain.cpp
index 128d8b2..9b1f2bc 100644
--- a/wfmain.cpp
+++ b/wfmain.cpp
@@ -1401,7 +1401,8 @@ void wfmain::loadSettings()
             p->wfText.setNamedColor(settings->value("wfText", p->wfText.name(QColor::HexArgb)).toString());
             p->meterLevel.setNamedColor(settings->value("meterLevel", p->meterLevel.name(QColor::HexArgb)).toString());
             p->meterAverage.setNamedColor(settings->value("meterAverage", p->meterAverage.name(QColor::HexArgb)).toString());
-            p->meterPeak.setNamedColor(settings->value("meterPeak", p->meterPeak.name(QColor::HexArgb)).toString());
+            p->meterPeakLevel.setNamedColor(settings->value("meterPeakLevel", p->meterPeakLevel.name(QColor::HexArgb)).toString());
+            p->meterPeakScale.setNamedColor(settings->value("meterPeakScale", p->meterPeakScale.name(QColor::HexArgb)).toString());
             p->meterLowerLine.setNamedColor(settings->value("meterLowerLine", p->meterLowerLine.name(QColor::HexArgb)).toString());
             p->meterLowText.setNamedColor(settings->value("meterLowText", p->meterLowText.name(QColor::HexArgb)).toString());
         }
@@ -1974,7 +1975,8 @@ void wfmain::saveSettings()
         settings->setValue("wfText", p->wfText.name(QColor::HexArgb));
         settings->setValue("meterLevel", p->meterLevel.name(QColor::HexArgb));
         settings->setValue("meterAverage", p->meterAverage.name(QColor::HexArgb));
-        settings->setValue("meterPeak", p->meterPeak.name(QColor::HexArgb));
+        settings->setValue("meterPeakScale", p->meterPeakScale.name(QColor::HexArgb));
+        settings->setValue("meterPeakLevel", p->meterPeakLevel.name(QColor::HexArgb));
         settings->setValue("meterLowerLine", p->meterLowerLine.name(QColor::HexArgb));
         settings->setValue("meterLowText", p->meterLowText.name(QColor::HexArgb));
     }
@@ -2621,7 +2623,8 @@ void wfmain::setDefaultColors()
 
     pDark->meterLevel = QColor("#148CD2").darker();
     pDark->meterAverage = QColor("#3FB7CD");
-    pDark->meterPeak = QColor("#3CA0DB").lighter();
+    pDark->meterPeakScale = QColor(Qt::red);
+    pDark->meterPeakLevel = QColor("#3CA0DB").lighter();
     pDark->meterLowerLine = QColor("#eff0f1");
     pDark->meterLowText = QColor("#eff0f1");
 
@@ -2643,7 +2646,8 @@ void wfmain::setDefaultColors()
     pLight->tuningLine = QColor(Qt::darkBlue);
 
     pLight->meterAverage = QColor("#3FB7CD");
-    pLight->meterPeak = QColor("#3CA0DB");
+    pLight->meterPeakLevel = QColor("#3CA0DB");
+    pLight->meterPeakScale = QColor(Qt::darkRed);
     pLight->meterLowerLine = QColor(Qt::black);
     pLight->meterLowText = QColor(Qt::black);
 
@@ -6338,8 +6342,8 @@ void wfmain::useColorPreset(colorPrefsType *cp)
 
     wf->setBackground(cp->wfBackground);
 
-    ui->meterSPoWidget->setColors(cp->meterLevel, cp->meterPeak, cp->meterAverage, cp->meterLowerLine, cp->meterLowText);
-    ui->meter2Widget->setColors(cp->meterLevel, cp->meterPeak, cp->meterAverage, cp->meterLowerLine, cp->meterLowText);
+    ui->meterSPoWidget->setColors(cp->meterLevel, cp->meterPeakScale, cp->meterPeakLevel, cp->meterAverage, cp->meterLowerLine, cp->meterLowText);
+    ui->meter2Widget->setColors(cp->meterLevel, cp->meterPeakScale, cp->meterPeakLevel, cp->meterAverage, cp->meterLowerLine, cp->meterLowText);
 }
 
 void wfmain::setColorButtonOperations(QColor *colorStore,
@@ -6434,7 +6438,8 @@ void wfmain::setDefaultColorPresets()
 
         p->meterLevel = QColor("#148CD2").darker();
         p->meterAverage = QColor("#3FB7CD");
-        p->meterPeak = QColor("#3CA0DB").lighter();
+        p->meterPeakLevel = QColor("#3CA0DB").lighter();
+        p->meterPeakScale = QColor(Qt::red);
         p->meterLowerLine = QColor("#eff0f1");
         p->meterLowText = QColor("#eff0f1");
 
@@ -6485,7 +6490,8 @@ void wfmain::loadColorPresetToUIandPlots(int presetNumber)
 
     setEditAndLedFromColor(p.meterLevel, ui->colorEditMeterLevel, ui->colorSwatchMeterLevel);
     setEditAndLedFromColor(p.meterAverage, ui->colorEditMeterAvg, ui->colorSwatchMeterAverage);
-    setEditAndLedFromColor(p.meterPeak, ui->colorEditMeterPeak, ui->colorSwatchMeterPeak);
+    setEditAndLedFromColor(p.meterPeakLevel, ui->colorEditMeterPeakLevel, ui->colorSwatchMeterPeakLevel);
+    setEditAndLedFromColor(p.meterPeakScale, ui->colorEditMeterPeakScale, ui->colorSwatchMeterPeakScale);
     setEditAndLedFromColor(p.meterLowerLine, ui->colorEditMeterScale, ui->colorSwatchMeterScale);
     setEditAndLedFromColor(p.meterLowText, ui->colorEditMeterText, ui->colorSwatchMeterText);
 
@@ -6747,18 +6753,32 @@ void wfmain::on_colorEditMeterAvg_editingFinished()
     setColorLineEditOperations(c, ui->colorEditMeterAvg, ui->colorSwatchMeterAverage);
 }
 
-// Meter Peak:
-void wfmain::on_colorSetBtnMeterPeak_clicked()
+// Meter Peak Level:
+void wfmain::on_colorSetBtnMeterPeakLevel_clicked()
 {
     int pos = ui->colorPresetCombo->currentIndex();
-    QColor *c = &(colorPreset[pos].meterPeak);
-    setColorButtonOperations(c, ui->colorEditMeterPeak, ui->colorSwatchMeterPeak);
+    QColor *c = &(colorPreset[pos].meterPeakLevel);
+    setColorButtonOperations(c, ui->colorEditMeterPeakLevel, ui->colorSwatchMeterPeakLevel);
 }
-void wfmain::on_colorEditMeterPeak_editingFinished()
+void wfmain::on_colorEditMeterPeakLevel_editingFinished()
 {
     int pos = ui->colorPresetCombo->currentIndex();
-    QColor *c = &(colorPreset[pos].meterPeak);
-    setColorLineEditOperations(c, ui->colorEditMeterPeak, ui->colorSwatchMeterPeak);
+    QColor *c = &(colorPreset[pos].meterPeakLevel);
+    setColorLineEditOperations(c, ui->colorEditMeterPeakLevel, ui->colorSwatchMeterPeakLevel);
+}
+
+// Meter Peak Scale:
+void wfmain::on_colorSetBtnMeterPeakScale_clicked()
+{
+    int pos = ui->colorPresetCombo->currentIndex();
+    QColor *c = &(colorPreset[pos].meterPeakScale);
+    setColorButtonOperations(c, ui->colorEditMeterPeakScale, ui->colorSwatchMeterPeakScale);
+}
+void wfmain::on_colorEditMeterPeakScale_editingFinished()
+{
+    int pos = ui->colorPresetCombo->currentIndex();
+    QColor *c = &(colorPreset[pos].meterPeakScale);
+    setColorLineEditOperations(c, ui->colorEditMeterPeakScale, ui->colorSwatchMeterPeakScale);
 }
 
 // Meter Scale (line):
@@ -6799,3 +6819,6 @@ void wfmain::on_colorRevertPresetBtn_clicked()
     //int pn = ui->colorPresetCombo->currentIndex();
     //setDefaultColors();
 }
+
+
+
diff --git a/wfmain.h b/wfmain.h
index f0d7e8e..d35c811 100644
--- a/wfmain.h
+++ b/wfmain.h
@@ -613,10 +613,6 @@ private slots:
 
     void on_colorEditMeterAvg_editingFinished();
 
-    void on_colorSetBtnMeterPeak_clicked();
-
-    void on_colorEditMeterPeak_editingFinished();
-
     void on_colorSetBtnMeterScale_clicked();
 
     void on_colorEditMeterScale_editingFinished();
@@ -629,6 +625,14 @@ private slots:
 
     void on_colorRevertPresetBtn_clicked();
 
+    void on_colorSetBtnMeterPeakLevel_clicked();
+
+    void on_colorEditMeterPeakLevel_editingFinished();
+
+    void on_colorSetBtnMeterPeakScale_clicked();
+
+    void on_colorEditMeterPeakScale_editingFinished();
+
 private:
     Ui::wfmain *ui;
     void closeEvent(QCloseEvent *event);
diff --git a/wfmain.ui b/wfmain.ui
index 0a68604..1dea96e 100644
--- a/wfmain.ui
+++ b/wfmain.ui
@@ -3095,139 +3095,13 @@
                     <property name="geometry">
                      <rect>
                       <x>0</x>
-                      <y>0</y>
+                      <y>-369</y>
                       <width>767</width>
-                      <height>582</height>
+                      <height>612</height>
                      </rect>
                     </property>
                     <layout class="QGridLayout" name="gridLayout_2">
-                     <item row="3" column="1">
-                      <widget class="QLineEdit" name="colorEditAxis">
-                       <property name="maximumSize">
-                        <size>
-                         <width>90</width>
-                         <height>16777215</height>
-                        </size>
-                       </property>
-                       <property name="text">
-                        <string>#AARRGGBB</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="4" column="2">
-                      <widget class="QLedLabel" name="colorSwatchText" native="true"/>
-                     </item>
-                     <item row="10" column="0">
-                      <widget class="QPushButton" name="colorSetBtnwfBackground">
-                       <property name="text">
-                        <string>Waterfall Back</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="18" column="0">
-                      <widget class="QPushButton" name="colorSetBtnMeterScale">
-                       <property name="text">
-                        <string>Meter Scale</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="17" column="0">
-                      <widget class="QPushButton" name="colorSetBtnMeterPeak">
-                       <property name="text">
-                        <string>Meter Peak</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="11" column="1">
-                      <widget class="QLineEdit" name="colorEditWfGrid">
-                       <property name="maximumSize">
-                        <size>
-                         <width>90</width>
-                         <height>16777215</height>
-                        </size>
-                       </property>
-                       <property name="text">
-                        <string>#AARRGGBB</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="15" column="1">
-                      <widget class="QLineEdit" name="colorEditMeterLevel">
-                       <property name="maximumSize">
-                        <size>
-                         <width>90</width>
-                         <height>16777215</height>
-                        </size>
-                       </property>
-                       <property name="text">
-                        <string>#AARRGGBB</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="6" column="2">
-                      <widget class="QLedLabel" name="colorSwatchSpecLine" native="true"/>
-                     </item>
-                     <item row="11" column="2">
-                      <widget class="QLedLabel" name="colorSwatchWfGrid" native="true"/>
-                     </item>
-                     <item row="4" column="0">
-                      <widget class="QPushButton" name="colorSetBtnText">
-                       <property name="text">
-                        <string>Text</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="7" column="2">
-                      <widget class="QLedLabel" name="colorSwatchSpecFill" native="true"/>
-                     </item>
-                     <item row="2" column="0">
-                      <widget class="QPushButton" name="colorSetBtnGrid">
-                       <property name="text">
-                        <string>Grid</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="18" column="2">
-                      <widget class="QLedLabel" name="colorSwatchMeterScale" native="true"/>
-                     </item>
-                     <item row="5" column="2">
-                      <widget class="QLedLabel" name="colorSwatchPlotBackground" native="true"/>
-                     </item>
-                     <item row="19" column="0">
-                      <widget class="QPushButton" name="colorSetBtnMeterText">
-                       <property name="text">
-                        <string>Meter Text</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="7" column="0">
-                      <widget class="QPushButton" name="colorSetBtnSpecFill">
-                       <property name="text">
-                        <string>Spectrum Fill</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="14" column="2">
-                      <widget class="QLedLabel" name="colorSwatchTuningLine" native="true"/>
-                     </item>
-                     <item row="15" column="0">
-                      <widget class="QPushButton" name="colorSetBtnMeterLevel">
-                       <property name="text">
-                        <string>Meter Level</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="12" column="2">
-                      <widget class="QLedLabel" name="colorSwatchWfAxis" native="true"/>
-                     </item>
-                     <item row="1" column="6">
-                      <widget class="QPushButton" name="colorRenamePresetBtn">
-                       <property name="text">
-                        <string>Rename Preset</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="19" column="1">
+                     <item row="20" column="1">
                       <widget class="QLineEdit" name="colorEditMeterText">
                        <property name="maximumSize">
                         <size>
@@ -3240,101 +3114,10 @@
                        </property>
                       </widget>
                      </item>
-                     <item row="13" column="0">
-                      <widget class="QPushButton" name="colorSetBtnWfText">
+                     <item row="4" column="0">
+                      <widget class="QPushButton" name="colorSetBtnText">
                        <property name="text">
-                        <string>Waterfall Text</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="11" column="0">
-                      <widget class="QPushButton" name="colorSetBtnWfGrid">
-                       <property name="text">
-                        <string>Waterfall Grid</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="16" column="2">
-                      <widget class="QLedLabel" name="colorSwatchMeterAverage" native="true"/>
-                     </item>
-                     <item row="13" column="2">
-                      <widget class="QLedLabel" name="colorSwatchWfText" native="true"/>
-                     </item>
-                     <item row="7" column="1">
-                      <widget class="QLineEdit" name="colorEditSpecFill">
-                       <property name="maximumSize">
-                        <size>
-                         <width>90</width>
-                         <height>16777215</height>
-                        </size>
-                       </property>
-                       <property name="text">
-                        <string>#AARRGGBB</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="10" column="2">
-                      <widget class="QLedLabel" name="colorSwatchWfBackground" native="true"/>
-                     </item>
-                     <item row="9" column="1">
-                      <widget class="QLineEdit" name="colorEditUnderlayFill">
-                       <property name="maximumSize">
-                        <size>
-                         <width>90</width>
-                         <height>16777215</height>
-                        </size>
-                       </property>
-                       <property name="text">
-                        <string>#AARRGGBB</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="12" column="1">
-                      <widget class="QLineEdit" name="colorEditWfAxis">
-                       <property name="maximumSize">
-                        <size>
-                         <width>90</width>
-                         <height>16777215</height>
-                        </size>
-                       </property>
-                       <property name="text">
-                        <string>#AARRGGBB</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="17" column="1">
-                      <widget class="QLineEdit" name="colorEditMeterPeak">
-                       <property name="maximumSize">
-                        <size>
-                         <width>90</width>
-                         <height>16777215</height>
-                        </size>
-                       </property>
-                       <property name="text">
-                        <string>#AARRGGBB</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="17" column="2">
-                      <widget class="QLedLabel" name="colorSwatchMeterPeak" native="true"/>
-                     </item>
-                     <item row="8" column="1">
-                      <widget class="QLineEdit" name="colorEditUnderlayLine">
-                       <property name="maximumSize">
-                        <size>
-                         <width>90</width>
-                         <height>16777215</height>
-                        </size>
-                       </property>
-                       <property name="text">
-                        <string>#AARRGGBB</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="3" column="0">
-                      <widget class="QPushButton" name="colorSetBtnAxis">
-                       <property name="text">
-                        <string>Axis</string>
+                        <string>Text</string>
                        </property>
                       </widget>
                      </item>
@@ -3373,28 +3156,22 @@
                        </item>
                       </widget>
                      </item>
-                     <item row="6" column="0">
-                      <widget class="QPushButton" name="colorSetBtnSpecLine">
+                     <item row="1" column="6">
+                      <widget class="QPushButton" name="colorRenamePresetBtn">
                        <property name="text">
-                        <string>Spectrum Line</string>
+                        <string>Rename Preset</string>
                        </property>
                       </widget>
                      </item>
-                     <item row="1" column="2">
-                      <widget class="QWidget" name="colorDummyLed" native="true"/>
-                     </item>
-                     <item row="14" column="0">
-                      <widget class="QPushButton" name="colorSetBtnTuningLine">
+                     <item row="15" column="0">
+                      <widget class="QPushButton" name="colorSetBtnMeterLevel">
                        <property name="text">
-                        <string>Tuning Line</string>
+                        <string>Meter Level</string>
                        </property>
                       </widget>
                      </item>
-                     <item row="2" column="2">
-                      <widget class="QLedLabel" name="colorSwatchGrid" native="true"/>
-                     </item>
-                     <item row="18" column="1">
-                      <widget class="QLineEdit" name="colorEditMeterScale">
+                     <item row="8" column="1">
+                      <widget class="QLineEdit" name="colorEditUnderlayLine">
                        <property name="maximumSize">
                         <size>
                          <width>90</width>
@@ -3406,42 +3183,6 @@
                        </property>
                       </widget>
                      </item>
-                     <item row="8" column="2">
-                      <widget class="QLedLabel" name="colorSwatchUnderlayLine" native="true"/>
-                     </item>
-                     <item row="1" column="7">
-                      <widget class="QPushButton" name="colorPopOutBtn">
-                       <property name="text">
-                        <string>Pop-Out</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="19" column="2">
-                      <widget class="QLedLabel" name="colorSwatchMeterText" native="true"/>
-                     </item>
-                     <item row="1" column="8">
-                      <spacer name="colorHorizSpacerTopLine">
-                       <property name="orientation">
-                        <enum>Qt::Horizontal</enum>
-                       </property>
-                       <property name="sizeHint" stdset="0">
-                        <size>
-                         <width>40</width>
-                         <height>20</height>
-                        </size>
-                       </property>
-                      </spacer>
-                     </item>
-                     <item row="9" column="2">
-                      <widget class="QLedLabel" name="colorSwatchUnderlayFill" native="true"/>
-                     </item>
-                     <item row="12" column="0">
-                      <widget class="QPushButton" name="colorSetBtnWfAxis">
-                       <property name="text">
-                        <string>Waterfall Axis</string>
-                       </property>
-                      </widget>
-                     </item>
                      <item row="10" column="1">
                       <widget class="QLineEdit" name="colorEditWfBackground">
                        <property name="maximumSize">
@@ -3455,8 +3196,38 @@
                        </property>
                       </widget>
                      </item>
-                     <item row="14" column="1">
-                      <widget class="QLineEdit" name="colorEditTuningLine">
+                     <item row="13" column="2">
+                      <widget class="QLedLabel" name="colorSwatchWfText" native="true"/>
+                     </item>
+                     <item row="8" column="0">
+                      <widget class="QPushButton" name="colorSetBtnUnderlayLine">
+                       <property name="text">
+                        <string>Underlay Line</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="1" column="5">
+                      <widget class="QPushButton" name="colorRevertPresetBtn">
+                       <property name="text">
+                        <string>Revert</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="5" column="2">
+                      <widget class="QLedLabel" name="colorSwatchPlotBackground" native="true"/>
+                     </item>
+                     <item row="3" column="2">
+                      <widget class="QLedLabel" name="colorSwatchAxis" native="true"/>
+                     </item>
+                     <item row="17" column="0">
+                      <widget class="QPushButton" name="colorSetBtnMeterPeakLevel">
+                       <property name="text">
+                        <string>Meter Peak Level</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="12" column="1">
+                      <widget class="QLineEdit" name="colorEditWfAxis">
                        <property name="maximumSize">
                         <size>
                          <width>90</width>
@@ -3468,16 +3239,25 @@
                        </property>
                       </widget>
                      </item>
-                     <item row="9" column="0">
-                      <widget class="QPushButton" name="colorSetBtnUnderlayFill">
+                     <item row="4" column="2">
+                      <widget class="QLedLabel" name="colorSwatchText" native="true"/>
+                     </item>
+                     <item row="8" column="2">
+                      <widget class="QLedLabel" name="colorSwatchUnderlayLine" native="true"/>
+                     </item>
+                     <item row="3" column="1">
+                      <widget class="QLineEdit" name="colorEditAxis">
+                       <property name="maximumSize">
+                        <size>
+                         <width>90</width>
+                         <height>16777215</height>
+                        </size>
+                       </property>
                        <property name="text">
-                        <string>Underlay Fill</string>
+                        <string>#AARRGGBB</string>
                        </property>
                       </widget>
                      </item>
-                     <item row="15" column="2">
-                      <widget class="QLedLabel" name="colorSwatchMeterLevel" native="true"/>
-                     </item>
                      <item row="2" column="1">
                       <widget class="QLineEdit" name="colorEditGrid">
                        <property name="maximumSize">
@@ -3491,26 +3271,6 @@
                        </property>
                       </widget>
                      </item>
-                     <item row="5" column="0">
-                      <widget class="QPushButton" name="colorSetBtnPlotBackground">
-                       <property name="text">
-                        <string>Plot Background</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="5" column="1">
-                      <widget class="QLineEdit" name="colorEditPlotBackground">
-                       <property name="maximumSize">
-                        <size>
-                         <width>90</width>
-                         <height>16777215</height>
-                        </size>
-                       </property>
-                       <property name="text">
-                        <string>#AARRGGBB</string>
-                       </property>
-                      </widget>
-                     </item>
                      <item row="16" column="0">
                       <widget class="QPushButton" name="colorSetBtnMeterAvg">
                        <property name="text">
@@ -3518,8 +3278,8 @@
                        </property>
                       </widget>
                      </item>
-                     <item row="6" column="1">
-                      <widget class="QLineEdit" name="colorEditSpecLine">
+                     <item row="19" column="1">
+                      <widget class="QLineEdit" name="colorEditMeterScale">
                        <property name="maximumSize">
                         <size>
                          <width>90</width>
@@ -3531,6 +3291,145 @@
                        </property>
                       </widget>
                      </item>
+                     <item row="12" column="0">
+                      <widget class="QPushButton" name="colorSetBtnWfAxis">
+                       <property name="text">
+                        <string>Waterfall Axis</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="3" column="0">
+                      <widget class="QPushButton" name="colorSetBtnAxis">
+                       <property name="text">
+                        <string>Axis</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="9" column="0">
+                      <widget class="QPushButton" name="colorSetBtnUnderlayFill">
+                       <property name="text">
+                        <string>Underlay Fill</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="19" column="0">
+                      <widget class="QPushButton" name="colorSetBtnMeterScale">
+                       <property name="text">
+                        <string>Meter Scale</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="14" column="1">
+                      <widget class="QLineEdit" name="colorEditTuningLine">
+                       <property name="maximumSize">
+                        <size>
+                         <width>90</width>
+                         <height>16777215</height>
+                        </size>
+                       </property>
+                       <property name="text">
+                        <string>#AARRGGBB</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="1" column="2">
+                      <widget class="QWidget" name="colorDummyLed" native="true"/>
+                     </item>
+                     <item row="20" column="0">
+                      <widget class="QPushButton" name="colorSetBtnMeterText">
+                       <property name="text">
+                        <string>Meter Text</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="6" column="2">
+                      <widget class="QLedLabel" name="colorSwatchSpecLine" native="true"/>
+                     </item>
+                     <item row="6" column="0">
+                      <widget class="QPushButton" name="colorSetBtnSpecLine">
+                       <property name="text">
+                        <string>Spectrum Line</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="9" column="1">
+                      <widget class="QLineEdit" name="colorEditUnderlayFill">
+                       <property name="maximumSize">
+                        <size>
+                         <width>90</width>
+                         <height>16777215</height>
+                        </size>
+                       </property>
+                       <property name="text">
+                        <string>#AARRGGBB</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="15" column="2">
+                      <widget class="QLedLabel" name="colorSwatchMeterLevel" native="true"/>
+                     </item>
+                     <item row="16" column="1">
+                      <widget class="QLineEdit" name="colorEditMeterAvg">
+                       <property name="maximumSize">
+                        <size>
+                         <width>90</width>
+                         <height>16777215</height>
+                        </size>
+                       </property>
+                       <property name="text">
+                        <string>#AARRGGBB</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="1" column="8">
+                      <spacer name="colorHorizSpacerTopLine">
+                       <property name="orientation">
+                        <enum>Qt::Horizontal</enum>
+                       </property>
+                       <property name="sizeHint" stdset="0">
+                        <size>
+                         <width>40</width>
+                         <height>20</height>
+                        </size>
+                       </property>
+                      </spacer>
+                     </item>
+                     <item row="15" column="1">
+                      <widget class="QLineEdit" name="colorEditMeterLevel">
+                       <property name="maximumSize">
+                        <size>
+                         <width>90</width>
+                         <height>16777215</height>
+                        </size>
+                       </property>
+                       <property name="text">
+                        <string>#AARRGGBB</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="11" column="0">
+                      <widget class="QPushButton" name="colorSetBtnWfGrid">
+                       <property name="text">
+                        <string>Waterfall Grid</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="17" column="2">
+                      <widget class="QLedLabel" name="colorSwatchMeterPeakLevel" native="true"/>
+                     </item>
+                     <item row="10" column="0">
+                      <widget class="QPushButton" name="colorSetBtnwfBackground">
+                       <property name="text">
+                        <string>Waterfall Back</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="7" column="2">
+                      <widget class="QLedLabel" name="colorSwatchSpecFill" native="true"/>
+                     </item>
+                     <item row="14" column="2">
+                      <widget class="QLedLabel" name="colorSwatchTuningLine" native="true"/>
+                     </item>
                      <item row="4" column="1">
                       <widget class="QLineEdit" name="colorEditText">
                        <property name="maximumSize">
@@ -3544,6 +3443,42 @@
                        </property>
                       </widget>
                      </item>
+                     <item row="11" column="1">
+                      <widget class="QLineEdit" name="colorEditWfGrid">
+                       <property name="maximumSize">
+                        <size>
+                         <width>90</width>
+                         <height>16777215</height>
+                        </size>
+                       </property>
+                       <property name="text">
+                        <string>#AARRGGBB</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="10" column="2">
+                      <widget class="QLedLabel" name="colorSwatchWfBackground" native="true"/>
+                     </item>
+                     <item row="13" column="0">
+                      <widget class="QPushButton" name="colorSetBtnWfText">
+                       <property name="text">
+                        <string>Waterfall Text</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="13" column="1">
+                      <widget class="QLineEdit" name="colorEditWfText">
+                       <property name="maximumSize">
+                        <size>
+                         <width>90</width>
+                         <height>16777215</height>
+                        </size>
+                       </property>
+                       <property name="text">
+                        <string>#AARRGGBB</string>
+                       </property>
+                      </widget>
+                     </item>
                      <item row="1" column="4">
                       <widget class="QPushButton" name="colorSavePresetBtn">
                        <property name="text">
@@ -3551,18 +3486,14 @@
                        </property>
                       </widget>
                      </item>
-                     <item row="16" column="1">
-                      <widget class="QLineEdit" name="colorEditMeterAvg">
-                       <property name="maximumSize">
-                        <size>
-                         <width>90</width>
-                         <height>16777215</height>
-                        </size>
-                       </property>
-                       <property name="text">
-                        <string>#AARRGGBB</string>
-                       </property>
-                      </widget>
+                     <item row="11" column="2">
+                      <widget class="QLedLabel" name="colorSwatchWfGrid" native="true"/>
+                     </item>
+                     <item row="16" column="2">
+                      <widget class="QLedLabel" name="colorSwatchMeterAverage" native="true"/>
+                     </item>
+                     <item row="19" column="2">
+                      <widget class="QLedLabel" name="colorSwatchMeterScale" native="true"/>
                      </item>
                      <item row="1" column="0">
                       <widget class="QLabel" name="colorPresetLabel">
@@ -3574,18 +3505,8 @@
                        </property>
                       </widget>
                      </item>
-                     <item row="8" column="0">
-                      <widget class="QPushButton" name="colorSetBtnUnderlayLine">
-                       <property name="text">
-                        <string>Underlay Line</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="3" column="2">
-                      <widget class="QLedLabel" name="colorSwatchAxis" native="true"/>
-                     </item>
-                     <item row="13" column="1">
-                      <widget class="QLineEdit" name="colorEditWfText">
+                     <item row="6" column="1">
+                      <widget class="QLineEdit" name="colorEditSpecLine">
                        <property name="maximumSize">
                         <size>
                          <width>90</width>
@@ -3597,13 +3518,115 @@
                        </property>
                       </widget>
                      </item>
-                     <item row="1" column="5">
-                      <widget class="QPushButton" name="colorRevertPresetBtn">
+                     <item row="2" column="0">
+                      <widget class="QPushButton" name="colorSetBtnGrid">
                        <property name="text">
-                        <string>Revert</string>
+                        <string>Grid</string>
                        </property>
                       </widget>
                      </item>
+                     <item row="9" column="2">
+                      <widget class="QLedLabel" name="colorSwatchUnderlayFill" native="true"/>
+                     </item>
+                     <item row="5" column="0">
+                      <widget class="QPushButton" name="colorSetBtnPlotBackground">
+                       <property name="text">
+                        <string>Plot Background</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="2" column="2">
+                      <widget class="QLedLabel" name="colorSwatchGrid" native="true"/>
+                     </item>
+                     <item row="17" column="1">
+                      <widget class="QLineEdit" name="colorEditMeterPeakLevel">
+                       <property name="maximumSize">
+                        <size>
+                         <width>90</width>
+                         <height>16777215</height>
+                        </size>
+                       </property>
+                       <property name="text">
+                        <string>#AARRGGBB</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="5" column="1">
+                      <widget class="QLineEdit" name="colorEditPlotBackground">
+                       <property name="maximumSize">
+                        <size>
+                         <width>90</width>
+                         <height>16777215</height>
+                        </size>
+                       </property>
+                       <property name="text">
+                        <string>#AARRGGBB</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="20" column="2">
+                      <widget class="QLedLabel" name="colorSwatchMeterText" native="true"/>
+                     </item>
+                     <item row="12" column="2">
+                      <widget class="QLedLabel" name="colorSwatchWfAxis" native="true"/>
+                     </item>
+                     <item row="14" column="0">
+                      <widget class="QPushButton" name="colorSetBtnTuningLine">
+                       <property name="text">
+                        <string>Tuning Line</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="7" column="0">
+                      <widget class="QPushButton" name="colorSetBtnSpecFill">
+                       <property name="text">
+                        <string>Spectrum Fill</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="7" column="1">
+                      <widget class="QLineEdit" name="colorEditSpecFill">
+                       <property name="maximumSize">
+                        <size>
+                         <width>90</width>
+                         <height>16777215</height>
+                        </size>
+                       </property>
+                       <property name="text">
+                        <string>#AARRGGBB</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="1" column="7">
+                      <widget class="QPushButton" name="colorPopOutBtn">
+                       <property name="text">
+                        <string>Pop-Out</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="18" column="0">
+                      <widget class="QPushButton" name="colorSetBtnMeterPeakScale">
+                       <property name="text">
+                        <string>Meter Peak Scale</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="18" column="1">
+                      <widget class="QLineEdit" name="colorEditMeterPeakScale">
+                       <property name="maximumSize">
+                        <size>
+                         <width>90</width>
+                         <height>16777215</height>
+                        </size>
+                       </property>
+                       <property name="text">
+                        <string>#AARRGGBB</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="18" column="2">
+                      <widget class="QLedLabel" name="colorSwatchMeterPeakScale" native="true"/>
+                     </item>
                     </layout>
                    </widget>
                   </widget>