diff --git a/src/prefs/SpectrogramSettings.cpp b/src/prefs/SpectrogramSettings.cpp
index 617c45394..3abb96856 100644
--- a/src/prefs/SpectrogramSettings.cpp
+++ b/src/prefs/SpectrogramSettings.cpp
@@ -175,7 +175,7 @@ const wxArrayString &SpectrogramSettings::GetScaleNames()
       /* i18n-hint: The name of a frequency scale in psychoacoustics, named for Heinrich Barkhausen */
       theArray.Add(_("Bark"));
       /* i18n-hint: The name of a frequency scale in psychoacoustics, abbreviates Equivalent Rectangular Bandwidth */
-      theArray.Add(_("ERB"));
+      theArray.Add(_("ERBS"));
       /* i18n-hint: A mathematical formula where f stands for frequency */
       theArray.Add(_("1 / f"));
    }
@@ -190,8 +190,8 @@ const wxArrayString &SpectrogramSettings::GetAlgorithmNames()
 
    if (theArray.IsEmpty()) {
       // Keep in correspondence with enum SpectrogramSettings::Algorithm:
-      theArray.Add(_("STFT"));
-      theArray.Add(_("Pitch (enhanced autocorrelation)"));
+      theArray.Add(_("Frequencies"));
+      theArray.Add(_("Pitch (EAC)"));
    }
 
    return theArray;
diff --git a/src/prefs/SpectrumPrefs.cpp b/src/prefs/SpectrumPrefs.cpp
index ee76cdacf..b662a6f12 100644
--- a/src/prefs/SpectrumPrefs.cpp
+++ b/src/prefs/SpectrumPrefs.cpp
@@ -154,92 +154,103 @@ void SpectrumPrefs::PopulateOrExchange(ShuttleGui & S)
    S.SetBorder(2);
 
    // S.StartStatic(_("Track Settings"));
-   {
-      mDefaultsCheckbox = 0;
-      if (mWt) {
-         /* i18n-hint: use is a verb */
-         mDefaultsCheckbox = S.Id(ID_DEFAULTS).TieCheckBox(_("Use Preferences"), mDefaulted);
-      }
-      S.StartStatic(_("FFT Window"));
-      {
-         S.StartMultiColumn(2);
-         {
-            S.Id(ID_WINDOW_SIZE).TieChoice(_("Window &size:"),
-               mTempSettings.windowSize,
-               &mSizeChoices);
-            S.SetSizeHints(mSizeChoices);
+   // {
 
-            S.Id(ID_WINDOW_TYPE).TieChoice(_("Window &type:"),
-               mTempSettings.windowType,
-               &mTypeChoices);
-            S.SetSizeHints(mTypeChoices);
+   mDefaultsCheckbox = 0;
+   if (mWt) {
+      /* i18n-hint: use is a verb */
+      mDefaultsCheckbox = S.Id(ID_DEFAULTS).TieCheckBox(_("Use Preferences"), mDefaulted);
+   }
+
+   S.StartStatic(_("Scale"));
+   {
+      S.StartTwoColumn();
+      {
+         S.Id(ID_SCALE).TieChoice(_("S&cale") + wxString(wxT(":")),
+            *(int*)&mTempSettings.scaleType,
+            &mScaleChoices);
+
+         mMinFreq =
+            S.Id(ID_MINIMUM).TieNumericTextBox(_("Mi&nimum Frequency (Hz):"),
+            mTempSettings.minFreq,
+            12);
+
+         mMaxFreq =
+            S.Id(ID_MAXIMUM).TieNumericTextBox(_("Ma&ximum Frequency (Hz):"),
+            mTempSettings.maxFreq,
+            12);
+      }
+      S.EndTwoColumn();
+   }
+   S.EndStatic();
+
+   S.StartStatic(_("Colors"));
+   {
+      S.StartTwoColumn();
+      {
+         mGain =
+            S.Id(ID_GAIN).TieNumericTextBox(_("&Gain (dB):"),
+            mTempSettings.gain,
+            8);
+
+         mRange =
+            S.Id(ID_RANGE).TieNumericTextBox(_("&Range (dB):"),
+            mTempSettings.range,
+            8);
+
+         mFrequencyGain =
+            S.Id(ID_FREQUENCY_GAIN).TieNumericTextBox(_("Frequency g&ain (dB/dec):"),
+            mTempSettings.frequencyGain,
+            4);
+      }
+
+      S.Id(ID_GRAYSCALE).TieCheckBox(_("S&how the spectrum using grayscale colors"),
+         mTempSettings.isGrayscale);
+
+      S.EndTwoColumn();
+   }
+   S.EndStatic();
+
+   S.StartStatic(_("Algorithm"));
+   {
+      S.StartMultiColumn(2);
+      {
+         mAlgorithmChoice =
+            S.Id(ID_ALGORITHM).TieChoice(_("A&lgorithm") + wxString(wxT(":")),
+            *(int*)&mTempSettings.algorithm,
+            &mAlgorithmChoices);
+
+         S.Id(ID_WINDOW_SIZE).TieChoice(_("Window &size:"),
+            mTempSettings.windowSize,
+            &mSizeChoices);
+         S.SetSizeHints(mSizeChoices);
+
+         S.Id(ID_WINDOW_TYPE).TieChoice(_("Window &type:"),
+            mTempSettings.windowType,
+            &mTypeChoices);
+         S.SetSizeHints(mTypeChoices);
 
 #ifdef EXPERIMENTAL_ZERO_PADDED_SPECTROGRAMS
-            mZeroPaddingChoiceCtrl =
+         mZeroPaddingChoiceCtrl =
             S.Id(ID_PADDING_SIZE).TieChoice(_("&Zero padding factor") + wxString(wxT(":")),
-               mTempSettings.zeroPaddingFactor,
-               &mZeroPaddingChoices);
-            S.SetSizeHints(mZeroPaddingChoices);
+            mTempSettings.zeroPaddingFactor,
+            &mZeroPaddingChoices);
+         S.SetSizeHints(mZeroPaddingChoices);
 #endif
-         }
-         S.EndMultiColumn();
       }
-      S.EndStatic();
-
-      S.StartStatic(_("Display"));
-      {
-         S.StartTwoColumn();
-         {
-            S.Id(ID_SCALE).TieChoice(_("S&cale") + wxString(wxT(":")),
-               *(int*)&mTempSettings.scaleType,
-               &mScaleChoices);
-
-            mAlgorithmChoice =
-            S.Id(ID_ALGORITHM).TieChoice(_("Algorithm") + wxString(wxT(":")),
-               *(int*)&mTempSettings.algorithm,
-               &mAlgorithmChoices);
-
-            mMinFreq =
-               S.Id(ID_MINIMUM).TieNumericTextBox(_("Mi&nimum Frequency (Hz):"),
-               mTempSettings.minFreq,
-               12);
-
-            mMaxFreq =
-               S.Id(ID_MAXIMUM).TieNumericTextBox(_("Ma&ximum Frequency (Hz):"),
-               mTempSettings.maxFreq,
-               12);
-
-            mGain =
-               S.Id(ID_GAIN).TieNumericTextBox(_("&Gain (dB):"),
-               mTempSettings.gain,
-               8);
-
-            mRange =
-               S.Id(ID_RANGE).TieNumericTextBox(_("&Range (dB):"),
-               mTempSettings.range,
-               8);
-
-            mFrequencyGain =
-               S.Id(ID_FREQUENCY_GAIN).TieNumericTextBox(_("Frequency g&ain (dB/dec):"),
-               mTempSettings.frequencyGain,
-               4);
-         }
-         S.EndTwoColumn();
-
-         S.Id(ID_GRAYSCALE).TieCheckBox(_("S&how the spectrum using grayscale colors"),
-            mTempSettings.isGrayscale);
+      S.EndMultiColumn();
+   }
+   S.EndStatic();
 
 #ifndef SPECTRAL_SELECTION_GLOBAL_SWITCH
-         S.Id(ID_SPECTRAL_SELECTION).TieCheckBox(_("Ena&ble Spectral Selection"),
-            mTempSettings.spectralSelection);
+   S.Id(ID_SPECTRAL_SELECTION).TieCheckBox(_("Ena&ble Spectral Selection"),
+      mTempSettings.spectralSelection);
 #endif
 
 #ifdef EXPERIMENTAL_FFT_Y_GRID
          S.TieCheckBox(_("Show a grid along the &Y-axis"),
             mTempSettings.fftYGrid);
 #endif //EXPERIMENTAL_FFT_Y_GRID
-      }
-      S.EndStatic();
 
 #ifdef EXPERIMENTAL_FIND_NOTES
       /* i18n-hint: FFT stands for Fast Fourier Transform and probably shouldn't be translated*/
@@ -267,7 +278,6 @@ void SpectrumPrefs::PopulateOrExchange(ShuttleGui & S)
       }
       S.EndStatic();
 #endif //EXPERIMENTAL_FIND_NOTES
-   }
    // S.EndStatic();
 
 #ifdef SPECTRAL_SELECTION_GLOBAL_SWITCH