diff --git a/colorprefs.h b/colorprefs.h
index aa2a4bf..fd9c005 100644
--- a/colorprefs.h
+++ b/colorprefs.h
@@ -9,6 +9,7 @@ struct colorPrefsType{
     QString presetName = QString("uninitialized");
 
     QColor gridColor;
+    QColor axisColor;
     QColor textColor;
     QColor spectrumLine;
     QColor spectrumFill;
@@ -26,6 +27,7 @@ struct colorPrefsType{
 
     QColor wfBackground;
     QColor wfGrid;
+    QColor wfAxis;
     QColor wfText;
 };
 
diff --git a/wfmain.cpp b/wfmain.cpp
index a70fa1e..ad34847 100644
--- a/wfmain.cpp
+++ b/wfmain.cpp
@@ -6320,15 +6320,15 @@ void wfmain::useColorPreset(colorPrefsType *cp)
     plot->legend->setBorderPen(cp->gridColor);
     plot->legend->setBrush(cp->gridColor);
 
-    plot->xAxis->setTickLabelColor(cp->gridColor);
-    plot->xAxis->setLabelColor(cp->textColor);
-    plot->yAxis->setTickLabelColor(cp->gridColor);
-    plot->yAxis->setLabelColor(cp->textColor);
+    plot->xAxis->setTickLabelColor(cp->textColor);
+    plot->xAxis->setLabelColor(cp->gridColor);
+    plot->yAxis->setTickLabelColor(cp->textColor);
+    plot->yAxis->setLabelColor(cp->gridColor);
 
-    plot->xAxis->setBasePen(cp->textColor);
-    plot->xAxis->setTickPen(cp->textColor);
-    plot->yAxis->setBasePen(cp->textColor);
-    plot->yAxis->setTickPen(cp->textColor);
+    plot->xAxis->setBasePen(cp->axisColor);
+    plot->xAxis->setTickPen(cp->axisColor);
+    plot->yAxis->setBasePen(cp->axisColor);
+    plot->yAxis->setTickPen(cp->axisColor);
 
     freqIndicatorLine->setPen(QPen(cp->tuningLine));
 
@@ -6338,6 +6338,21 @@ void wfmain::useColorPreset(colorPrefsType *cp)
     plot->graph(1)->setPen(QPen(cp->underlayLine));
     plot->graph(1)->setBrush(QBrush(cp->underlayFill));
 
+    wf->yAxis->setBasePen(cp->wfAxis);
+    wf->yAxis->setTickPen(cp->wfAxis);
+    wf->xAxis->setBasePen(cp->wfAxis);
+    wf->xAxis->setTickPen(cp->wfAxis);
+
+    wf->xAxis->setLabelColor(cp->wfGrid);
+    wf->yAxis->setLabelColor(cp->wfGrid);
+
+    wf->xAxis->setTickLabelColor(cp->wfText);
+    wf->yAxis->setTickLabelColor(cp->wfText);
+
+    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);
 }
 
 void wfmain::setColorButtonOperations(QColor *colorStore,
@@ -6408,6 +6423,7 @@ void wfmain::setDefaultColorPresets()
         // that format in the code when convenient.
 
         p->gridColor = QColor(0,0,0,255);
+        p->axisColor = QColor(Qt::white);
         p->textColor = QColor(Qt::white);
         p->spectrumLine = QColor(Qt::yellow);
         p->spectrumFill = QColor("transparent");
@@ -6423,6 +6439,7 @@ void wfmain::setDefaultColorPresets()
         p->meterLowText = QColor("#eff0f1");
 
         p->wfBackground = QColor(Qt::black);
+        p->wfAxis = QColor(Qt::white);
         p->wfGrid = QColor(Qt::white);
         p->wfText = QColor(Qt::white);
 
@@ -6459,8 +6476,8 @@ void wfmain::loadColorPresetToUIandPlots(int presetNumber)
 
     setEditAndLedFromColor(p.spectrumLine, ui->colorEditSpecLine, ui->colorSwatchSpecLine);
     setEditAndLedFromColor(p.spectrumFill, ui->colorEditSpecFill, ui->colorSwatchSpecFill);
-    setEditAndLedFromColor(p.underlayLine, ui->colorEditOverlayLine, ui->colorSwatchOverlayLine);
-    setEditAndLedFromColor(p.underlayFill, ui->colorEditOverlayFill, ui->colorSwatchOverlayFill);
+    setEditAndLedFromColor(p.underlayLine, ui->colorEditUnderlayLine, ui->colorSwatchUnderlayLine);
+    setEditAndLedFromColor(p.underlayFill, ui->colorEditUnderlayFill, ui->colorSwatchUnderlayFill);
     setEditAndLedFromColor(p.plotBackground, ui->colorEditPlotBackground, ui->colorSwatchPlotBackground);
     setEditAndLedFromColor(p.tuningLine, ui->colorEditTuningLine, ui->colorSwatchTuningLine);
 
@@ -6500,6 +6517,20 @@ void wfmain::on_colorEditGrid_editingFinished()
     setColorLineEditOperations(c, ui->colorEditGrid, ui->colorSwatchGrid);
 }
 
+// Axis:
+void wfmain::on_colorSetBtnAxis_clicked()
+{
+    int pos = ui->colorPresetCombo->currentIndex();
+    QColor *c = &(colorPreset[pos].axisColor);
+    setColorButtonOperations(c, ui->colorEditAxis, ui->colorSwatchAxis);
+}
+void wfmain::on_colorEditAxis_editingFinished()
+{
+    int pos = ui->colorPresetCombo->currentIndex();
+    QColor *c = &(colorPreset[pos].axisColor);
+    setColorLineEditOperations(c, ui->colorEditAxis, ui->colorSwatchAxis);
+}
+
 // Text:
 void wfmain::on_colorSetBtnText_clicked()
 {
@@ -6556,5 +6587,171 @@ void wfmain::on_colorSetBtnPlotBackground_clicked()
     setColorButtonOperations(c, ui->colorEditPlotBackground, ui->colorSwatchPlotBackground);
 }
 
+// Underlay Line:
+void wfmain::on_colorSetBtnUnderlayLine_clicked()
+{
+    int pos = ui->colorPresetCombo->currentIndex();
+    QColor *c = &(colorPreset[pos].underlayLine);
+    setColorButtonOperations(c, ui->colorEditUnderlayLine, ui->colorSwatchUnderlayLine);
+}
 
+void wfmain::on_colorEditUnderlayLine_editingFinished()
+{
+    int pos = ui->colorPresetCombo->currentIndex();
+    QColor *c = &(colorPreset[pos].underlayLine);
+    setColorLineEditOperations(c, ui->colorEditUnderlayLine, ui->colorSwatchUnderlayLine);
+}
 
+// Underlay Fill:
+void wfmain::on_colorSetBtnUnderlayFill_clicked()
+{
+    int pos = ui->colorPresetCombo->currentIndex();
+    QColor *c = &(colorPreset[pos].underlayFill);
+    setColorButtonOperations(c, ui->colorEditUnderlayFill, ui->colorSwatchUnderlayFill);
+}
+void wfmain::on_colorEditUnderlayFill_editingFinished()
+{
+    int pos = ui->colorPresetCombo->currentIndex();
+    QColor *c = &(colorPreset[pos].underlayFill);
+    setColorLineEditOperations(c, ui->colorEditUnderlayFill, ui->colorSwatchUnderlayFill);
+}
+
+// WF Background:
+void wfmain::on_colorSetBtnwfBackground_clicked()
+{
+    int pos = ui->colorPresetCombo->currentIndex();
+    QColor *c = &(colorPreset[pos].wfBackground);
+    setColorButtonOperations(c, ui->colorEditWfBackground, ui->colorSwatchWfBackground);
+}
+void wfmain::on_colorEditWfBackground_editingFinished()
+{
+    int pos = ui->colorPresetCombo->currentIndex();
+    QColor *c = &(colorPreset[pos].wfBackground);
+    setColorLineEditOperations(c, ui->colorEditWfBackground, ui->colorSwatchWfBackground);
+}
+
+// WF Grid:
+void wfmain::on_colorSetBtnWfGrid_clicked()
+{
+    int pos = ui->colorPresetCombo->currentIndex();
+    QColor *c = &(colorPreset[pos].wfGrid);
+    setColorButtonOperations(c, ui->colorEditWfGrid, ui->colorSwatchWfGrid);
+}
+void wfmain::on_colorEditWfGrid_editingFinished()
+{
+    int pos = ui->colorPresetCombo->currentIndex();
+    QColor *c = &(colorPreset[pos].wfGrid);
+    setColorLineEditOperations(c, ui->colorEditWfGrid, ui->colorSwatchWfGrid);
+}
+
+// WF Axis:
+void wfmain::on_colorSetBtnWfAxis_clicked()
+{
+    int pos = ui->colorPresetCombo->currentIndex();
+    QColor *c = &(colorPreset[pos].wfAxis);
+    setColorButtonOperations(c, ui->colorEditWfAxis, ui->colorSwatchWfAxis);
+}
+void wfmain::on_colorEditWfAxis_editingFinished()
+{
+    int pos = ui->colorPresetCombo->currentIndex();
+    QColor *c = &(colorPreset[pos].wfAxis);
+    setColorLineEditOperations(c, ui->colorEditWfAxis, ui->colorSwatchWfAxis);
+}
+
+// WF Text:
+void wfmain::on_colorSetBtnWfText_clicked()
+{
+    int pos = ui->colorPresetCombo->currentIndex();
+    QColor *c = &(colorPreset[pos].wfText);
+    setColorButtonOperations(c, ui->colorEditWfText, ui->colorSwatchWfText);
+}
+void wfmain::on_colorEditWfText_editingFinished()
+{
+    int pos = ui->colorPresetCombo->currentIndex();
+    QColor *c = &(colorPreset[pos].wfText);
+    setColorLineEditOperations(c, ui->colorEditWfText, ui->colorSwatchWfText);
+}
+
+// Tuning Line:
+void wfmain::on_colorSetBtnTuningLine_clicked()
+{
+    int pos = ui->colorPresetCombo->currentIndex();
+    QColor *c = &(colorPreset[pos].tuningLine);
+    setColorButtonOperations(c, ui->colorEditTuningLine, ui->colorSwatchTuningLine);
+}
+void wfmain::on_colorEditTuningLine_editingFinished()
+{
+    int pos = ui->colorPresetCombo->currentIndex();
+    QColor *c = &(colorPreset[pos].tuningLine);
+    setColorLineEditOperations(c, ui->colorEditTuningLine, ui->colorSwatchTuningLine);
+}
+
+// Meter Level:
+void wfmain::on_colorSetBtnMeterLevel_clicked()
+{
+    int pos = ui->colorPresetCombo->currentIndex();
+    QColor *c = &(colorPreset[pos].meterLevel);
+    setColorButtonOperations(c, ui->colorEditMeterLevel, ui->colorSwatchMeterLevel);
+}
+void wfmain::on_colorEditMeterLevel_editingFinished()
+{
+    int pos = ui->colorPresetCombo->currentIndex();
+    QColor *c = &(colorPreset[pos].meterLevel);
+    setColorLineEditOperations(c, ui->colorEditMeterLevel, ui->colorSwatchMeterLevel);
+}
+
+// Meter Average:
+void wfmain::on_colorSetBtnMeterAvg_clicked()
+{
+    int pos = ui->colorPresetCombo->currentIndex();
+    QColor *c = &(colorPreset[pos].meterAverage);
+    setColorButtonOperations(c, ui->colorEditMeterAvg, ui->colorSwatchMeterAverage);
+}
+void wfmain::on_colorEditMeterAvg_editingFinished()
+{
+    int pos = ui->colorPresetCombo->currentIndex();
+    QColor *c = &(colorPreset[pos].meterAverage);
+    setColorLineEditOperations(c, ui->colorEditMeterAvg, ui->colorSwatchMeterAverage);
+}
+
+// Meter Peak:
+void wfmain::on_colorSetBtnMeterPeak_clicked()
+{
+    int pos = ui->colorPresetCombo->currentIndex();
+    QColor *c = &(colorPreset[pos].meterPeak);
+    setColorButtonOperations(c, ui->colorEditMeterPeak, ui->colorSwatchMeterPeak);
+}
+void wfmain::on_colorEditMeterPeak_editingFinished()
+{
+    int pos = ui->colorPresetCombo->currentIndex();
+    QColor *c = &(colorPreset[pos].meterPeak);
+    setColorLineEditOperations(c, ui->colorEditMeterPeak, ui->colorSwatchMeterPeak);
+}
+
+// Meter Scale (line):
+void wfmain::on_colorSetBtnMeterScale_clicked()
+{
+    int pos = ui->colorPresetCombo->currentIndex();
+    QColor *c = &(colorPreset[pos].meterLowerLine);
+    setColorButtonOperations(c, ui->colorEditMeterScale, ui->colorSwatchMeterScale);
+}
+void wfmain::on_colorEditMeterScale_editingFinished()
+{
+    int pos = ui->colorPresetCombo->currentIndex();
+    QColor *c = &(colorPreset[pos].meterLowerLine);
+    setColorLineEditOperations(c, ui->colorEditMeterScale, ui->colorSwatchMeterScale);
+}
+
+// Meter Text:
+void wfmain::on_colorSetBtnMeterText_clicked()
+{
+    int pos = ui->colorPresetCombo->currentIndex();
+    QColor *c = &(colorPreset[pos].meterLowText);
+    setColorButtonOperations(c, ui->colorEditMeterText, ui->colorSwatchMeterText);
+}
+void wfmain::on_colorEditMeterText_editingFinished()
+{
+    int pos = ui->colorPresetCombo->currentIndex();
+    QColor *c = &(colorPreset[pos].meterLowText);
+    setColorLineEditOperations(c, ui->colorEditMeterText, ui->colorSwatchMeterText);
+}
diff --git a/wfmain.h b/wfmain.h
index ea109be..35a147d 100644
--- a/wfmain.h
+++ b/wfmain.h
@@ -583,6 +583,58 @@ private slots:
 
     void on_colorEditSpecFill_editingFinished();
 
+    void on_colorSetBtnAxis_clicked();
+
+    void on_colorEditAxis_editingFinished();
+
+    void on_colorSetBtnUnderlayLine_clicked();
+
+    void on_colorEditUnderlayLine_editingFinished();
+
+    void on_colorSetBtnUnderlayFill_clicked();
+
+    void on_colorEditUnderlayFill_editingFinished();
+
+    void on_colorSetBtnwfBackground_clicked();
+
+    void on_colorEditWfBackground_editingFinished();
+
+    void on_colorSetBtnWfGrid_clicked();
+
+    void on_colorEditWfGrid_editingFinished();
+
+    void on_colorSetBtnWfAxis_clicked();
+
+    void on_colorEditWfAxis_editingFinished();
+
+    void on_colorSetBtnWfText_clicked();
+
+    void on_colorEditWfText_editingFinished();
+
+    void on_colorSetBtnTuningLine_clicked();
+
+    void on_colorEditTuningLine_editingFinished();
+
+    void on_colorSetBtnMeterLevel_clicked();
+
+    void on_colorEditMeterLevel_editingFinished();
+
+    void on_colorSetBtnMeterAvg_clicked();
+
+    void on_colorEditMeterAvg_editingFinished();
+
+    void on_colorSetBtnMeterPeak_clicked();
+
+    void on_colorEditMeterPeak_editingFinished();
+
+    void on_colorSetBtnMeterScale_clicked();
+
+    void on_colorEditMeterScale_editingFinished();
+
+    void on_colorSetBtnMeterText_clicked();
+
+    void on_colorEditMeterText_editingFinished();
+
 private:
     Ui::wfmain *ui;
     void closeEvent(QCloseEvent *event);
diff --git a/wfmain.ui b/wfmain.ui
index 4b441f7..86e1e77 100644
--- a/wfmain.ui
+++ b/wfmain.ui
@@ -3102,21 +3102,197 @@
                     <property name="geometry">
                      <rect>
                       <x>0</x>
-                      <y>0</y>
+                      <y>-100</y>
                       <width>767</width>
-                      <height>522</height>
+                      <height>582</height>
                      </rect>
                     </property>
                     <layout class="QGridLayout" name="gridLayout_2">
-                     <item row="16" column="0">
-                      <widget class="QPushButton" name="colorSetBtnMeterScale">
+                     <item row="1" column="3">
+                      <widget class="QPushButton" name="colorMakeCurrentBtn">
                        <property name="text">
-                        <string>Meter Scale</string>
+                        <string>Make Current</string>
                        </property>
                       </widget>
                      </item>
-                     <item row="12" column="2">
-                      <widget class="QLedLabel" name="colorSwatchTuningLine" native="true"/>
+                     <item row="15" column="2">
+                      <widget class="QLedLabel" name="colorSwatchMeterLevel" native="true"/>
+                     </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="18" column="1">
+                      <widget class="QLineEdit" name="colorEditMeterScale">
+                       <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="1">
+                      <widget class="QLineEdit" name="colorEditWfBackground">
+                       <property name="maximumSize">
+                        <size>
+                         <width>90</width>
+                         <height>16777215</height>
+                        </size>
+                       </property>
+                       <property name="text">
+                        <string>#AARRGGBB</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="19" column="1">
+                      <widget class="QLineEdit" name="colorEditMeterText">
+                       <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="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="5" column="0">
+                      <widget class="QPushButton" name="colorSetBtnPlotBackground">
+                       <property name="text">
+                        <string>Plot Background</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="7" column="2">
+                      <widget class="QLedLabel" name="colorSwatchSpecFill" native="true"/>
+                     </item>
+                     <item row="19" column="2">
+                      <widget class="QLedLabel" name="colorSwatchMeterText" 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="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="13" column="2">
+                      <widget class="QLedLabel" name="colorSwatchWfText" native="true"/>
+                     </item>
+                     <item row="6" column="1">
+                      <widget class="QLineEdit" name="colorEditSpecLine">
+                       <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="3" column="0">
+                      <widget class="QPushButton" name="colorSetBtnAxis">
+                       <property name="text">
+                        <string>Axis</string>
+                       </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>
+                     <item row="4" column="0">
+                      <widget class="QPushButton" name="colorSetBtnText">
+                       <property name="text">
+                        <string>Text</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="3" column="2">
+                      <widget class="QLedLabel" name="colorSwatchAxis" native="true"/>
                      </item>
                      <item row="1" column="7">
                       <spacer name="colorHorizSpacerTopLine">
@@ -3131,11 +3307,8 @@
                        </property>
                       </spacer>
                      </item>
-                     <item row="6" column="2">
-                      <widget class="QLedLabel" name="colorSwatchSpecFill" native="true"/>
-                     </item>
-                     <item row="14" column="1">
-                      <widget class="QLineEdit" name="colorEditMeterAvg">
+                     <item row="8" column="1">
+                      <widget class="QLineEdit" name="colorEditUnderlayLine">
                        <property name="maximumSize">
                         <size>
                          <width>90</width>
@@ -3147,168 +3320,23 @@
                        </property>
                       </widget>
                      </item>
-                     <item row="9" column="2">
-                      <widget class="QLedLabel" name="colorSwatchWfBackground" native="true"/>
-                     </item>
-                     <item row="5" column="1">
-                      <widget class="QLineEdit" name="colorEditSpecLine">
-                       <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="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="colorSwatchMeterAverage" native="true"/>
+                      <widget class="QLedLabel" name="colorSwatchTuningLine" native="true"/>
                      </item>
-                     <item row="5" column="2">
-                      <widget class="QLedLabel" name="colorSwatchSpecLine" native="true"/>
-                     </item>
-                     <item row="9" column="0">
-                      <widget class="QPushButton" name="colorSetBtnwfBackground">
+                     <item row="8" column="0">
+                      <widget class="QPushButton" name="colorSetBtnUnderlayLine">
                        <property name="text">
-                        <string>Waterfall Back</string>
+                        <string>Underlay Line</string>
                        </property>
                       </widget>
                      </item>
-                     <item row="17" column="0">
-                      <widget class="QPushButton" name="colorSetBtnMeterText">
+                     <item row="11" column="0">
+                      <widget class="QPushButton" name="colorSetBtnWfGrid">
                        <property name="text">
-                        <string>Meter Text</string>
+                        <string>Waterfall Grid</string>
                        </property>
                       </widget>
                      </item>
-                     <item row="3" column="2">
-                      <widget class="QLedLabel" name="colorSwatchText" native="true"/>
-                     </item>
-                     <item row="7" column="1">
-                      <widget class="QLineEdit" name="colorEditOverlayLine">
-                       <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">
-                        <string>Save Preset</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="1" column="5">
-                      <widget class="QPushButton" name="colorRenamePreset">
-                       <property name="text">
-                        <string>Rename Preset</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="3" column="0">
-                      <widget class="QPushButton" name="colorSetBtnText">
-                       <property name="text">
-                        <string>Text</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="13" column="2">
-                      <widget class="QLedLabel" name="colorSwatchMeterLevel" native="true"/>
-                     </item>
-                     <item row="10" 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="1" column="6">
-                      <widget class="QPushButton" name="colorPopOutBtn">
-                       <property name="text">
-                        <string>Pop-Out</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="1" column="2">
-                      <widget class="QWidget" name="colorDummyLed" native="true"/>
-                     </item>
-                     <item row="15" 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="1" column="3">
-                      <widget class="QPushButton" name="colorMakeCurrentBtn">
-                       <property name="text">
-                        <string>Make Current</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="15" column="0">
-                      <widget class="QPushButton" name="colorSetBtnMeterPeak">
-                       <property name="text">
-                        <string>Meter Peak</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="8" column="2">
-                      <widget class="QLedLabel" name="colorSwatchOverlayFill" native="true"/>
-                     </item>
-                     <item row="13" column="0">
-                      <widget class="QPushButton" name="colorSetBtnMeterLevel">
-                       <property name="text">
-                        <string>Meter Level</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="15" column="2">
-                      <widget class="QLedLabel" name="colorSwatchMeterPeak" native="true"/>
-                     </item>
-                     <item row="3" column="1">
-                      <widget class="QLineEdit" name="colorEditText">
-                       <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="colorSwatchWfGrid" native="true"/>
-                     </item>
                      <item row="1" column="1">
                       <widget class="QComboBox" name="colorPresetCombo">
                        <property name="maximumSize">
@@ -3344,6 +3372,69 @@
                        </item>
                       </widget>
                      </item>
+                     <item row="14" column="0">
+                      <widget class="QPushButton" name="colorSetBtnTuningLine">
+                       <property name="text">
+                        <string>Tuning Line</string>
+                       </property>
+                      </widget>
+                     </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>#AARRGGBB</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="1" column="2">
+                      <widget class="QWidget" name="colorDummyLed" native="true"/>
+                     </item>
+                     <item row="9" column="0">
+                      <widget class="QPushButton" name="colorSetBtnUnderlayFill">
+                       <property name="text">
+                        <string>Underlay Fill</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="1" column="6">
+                      <widget class="QPushButton" name="colorPopOutBtn">
+                       <property name="text">
+                        <string>Pop-Out</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="1" column="4">
+                      <widget class="QPushButton" name="colorSavePresetBtn">
+                       <property name="text">
+                        <string>Save Preset</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="18" column="2">
+                      <widget class="QLedLabel" name="colorSwatchMeterScale" native="true"/>
+                     </item>
+                     <item row="4" column="1">
+                      <widget class="QLineEdit" name="colorEditText">
+                       <property name="maximumSize">
+                        <size>
+                         <width>90</width>
+                         <height>16777215</height>
+                        </size>
+                       </property>
+                       <property name="text">
+                        <string>#AARRGGBB</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="8" column="2">
+                      <widget class="QLedLabel" name="colorSwatchUnderlayLine" native="true"/>
+                     </item>
                      <item row="2" column="2">
                       <widget class="QLedLabel" name="colorSwatchGrid" native="true">
                        <property name="minimumSize">
@@ -3360,91 +3451,11 @@
                        </property>
                       </widget>
                      </item>
-                     <item row="5" column="0">
-                      <widget class="QPushButton" name="colorSetBtnSpecLine">
-                       <property name="text">
-                        <string>Spectrum Line</string>
-                       </property>
-                      </widget>
+                     <item row="16" column="2">
+                      <widget class="QLedLabel" name="colorSwatchMeterAverage" native="true"/>
                      </item>
-                     <item row="12" 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="16" column="1">
-                      <widget class="QLineEdit" name="colorEditMeterScale">
-                       <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="colorSwatchPlotBackground" native="true"/>
-                     </item>
-                     <item row="14" column="0">
-                      <widget class="QPushButton" name="colorSetBtnMeterAvg">
-                       <property name="text">
-                        <string>Meter Average</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="8" column="0">
-                      <widget class="QPushButton" name="colorSetBtnOverlayFill">
-                       <property name="text">
-                        <string>Underlay Fill</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="13" 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="7" column="2">
-                      <widget class="QLedLabel" name="colorSwatchOverlayLine" native="true"/>
-                     </item>
-                     <item row="8" column="1">
-                      <widget class="QLineEdit" name="colorEditOverlayFill">
-                       <property name="maximumSize">
-                        <size>
-                         <width>90</width>
-                         <height>16777215</height>
-                        </size>
-                       </property>
-                       <property name="text">
-                        <string>#AARRGGBB</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="7" column="0">
-                      <widget class="QPushButton" name="colorSetBtnOverlayLine">
-                       <property name="text">
-                        <string>Underlay Line</string>
-                       </property>
-                      </widget>
+                     <item row="11" column="2">
+                      <widget class="QLedLabel" name="colorSwatchWfGrid" native="true"/>
                      </item>
                      <item row="2" column="0">
                       <widget class="QPushButton" name="colorSetBtnGrid">
@@ -3453,76 +3464,6 @@
                        </property>
                       </widget>
                      </item>
-                     <item row="4" 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="6" 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="0">
-                      <widget class="QLabel" name="colorPresetLabel">
-                       <property name="text">
-                        <string>Preset:</string>
-                       </property>
-                       <property name="alignment">
-                        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="4" column="0">
-                      <widget class="QPushButton" name="colorSetBtnPlotBackground">
-                       <property name="text">
-                        <string>Plot Background</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="9" column="1">
-                      <widget class="QLineEdit" name="colorEditWfBackground">
-                       <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="0">
-                      <widget class="QPushButton" name="colorSetBtnTuningLine">
-                       <property name="text">
-                        <string>Tuning Line</string>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="10" column="0">
-                      <widget class="QPushButton" name="colorSetBtnWfGrid">
-                       <property name="text">
-                        <string>Waterfall Grid</string>
-                       </property>
-                      </widget>
-                     </item>
                      <item row="2" column="1">
                       <widget class="QLineEdit" name="colorEditGrid">
                        <property name="maximumSize">
@@ -3536,11 +3477,8 @@
                        </property>
                       </widget>
                      </item>
-                     <item row="16" column="2">
-                      <widget class="QLedLabel" name="colorSwatchMeterScale" native="true"/>
-                     </item>
-                     <item row="17" column="1">
-                      <widget class="QLineEdit" name="colorEditMeterText">
+                     <item row="7" column="1">
+                      <widget class="QLineEdit" name="colorEditSpecFill">
                        <property name="maximumSize">
                         <size>
                          <width>90</width>
@@ -3552,17 +3490,14 @@
                        </property>
                       </widget>
                      </item>
-                     <item row="17" column="2">
-                      <widget class="QLedLabel" name="colorSwatchMeterText" native="true"/>
-                     </item>
-                     <item row="11" column="0">
-                      <widget class="QPushButton" name="colorSetBtnWfText">
+                     <item row="17" column="0">
+                      <widget class="QPushButton" name="colorSetBtnMeterPeak">
                        <property name="text">
-                        <string>Waterfall Text</string>
+                        <string>Meter Peak</string>
                        </property>
                       </widget>
                      </item>
-                     <item row="11" column="1">
+                     <item row="13" column="1">
                       <widget class="QLineEdit" name="colorEditWfText">
                        <property name="maximumSize">
                         <size>
@@ -3575,8 +3510,119 @@
                        </property>
                       </widget>
                      </item>
-                     <item row="11" column="2">
-                      <widget class="QLedLabel" name="colorSwatchWfText" native="true"/>
+                     <item row="6" column="2">
+                      <widget class="QLedLabel" name="colorSwatchSpecLine" native="true"/>
+                     </item>
+                     <item row="18" column="0">
+                      <widget class="QPushButton" name="colorSetBtnMeterScale">
+                       <property name="text">
+                        <string>Meter Scale</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="5" column="2">
+                      <widget class="QLedLabel" name="colorSwatchPlotBackground" native="true"/>
+                     </item>
+                     <item row="1" column="5">
+                      <widget class="QPushButton" name="colorRenamePreset">
+                       <property name="text">
+                        <string>Rename Preset</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="10" column="0">
+                      <widget class="QPushButton" name="colorSetBtnwfBackground">
+                       <property name="text">
+                        <string>Waterfall Back</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="9" column="2">
+                      <widget class="QLedLabel" name="colorSwatchUnderlayFill" native="true"/>
+                     </item>
+                     <item row="4" column="2">
+                      <widget class="QLedLabel" name="colorSwatchText" native="true"/>
+                     </item>
+                     <item row="1" column="0">
+                      <widget class="QLabel" name="colorPresetLabel">
+                       <property name="text">
+                        <string>Preset:</string>
+                       </property>
+                       <property name="alignment">
+                        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="6" column="0">
+                      <widget class="QPushButton" name="colorSetBtnSpecLine">
+                       <property name="text">
+                        <string>Spectrum Line</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="16" column="0">
+                      <widget class="QPushButton" name="colorSetBtnMeterAvg">
+                       <property name="text">
+                        <string>Meter Average</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="10" column="2">
+                      <widget class="QLedLabel" name="colorSwatchWfBackground" 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="19" column="0">
+                      <widget class="QPushButton" name="colorSetBtnMeterText">
+                       <property name="text">
+                        <string>Meter Text</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="17" column="2">
+                      <widget class="QLedLabel" name="colorSwatchMeterPeak" 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="12" column="0">
+                      <widget class="QPushButton" name="colorSetBtnWfAxis">
+                       <property name="text">
+                        <string>Waterfall Axis</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="12" column="2">
+                      <widget class="QLedLabel" name="colorSwatchWfAxis" native="true"/>
                      </item>
                     </layout>
                    </widget>