diff --git a/ChangeLog b/ChangeLog
index d6c75d7f..df588546 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22407,3 +22407,6 @@
 2021-09-11 Fred Gleason <fredg@paravelsystems.com>
 	* Fixed a bug in rdlibrary(1) that could cause appearance of duplicate
 	cut entries in the cart list.
+2021-09-12 Fred Gleason <fredg@paravelsystems.com>
+	* Fixed regressions where vestigal accelerator indicators ('&')
+	remained in in-line strings.
diff --git a/lib/rdadd_cart.cpp b/lib/rdadd_cart.cpp
index 6bee7392..3c03d348 100644
--- a/lib/rdadd_cart.cpp
+++ b/lib/rdadd_cart.cpp
@@ -18,12 +18,12 @@
 //   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include <qpushbutton.h>
-#include <qmessagebox.h>
+#include <QMessageBox>
+#include <QPushButton>
 
-#include <rddb.h>
-#include <rdescape_string.h>
-#include <rdgroup.h>
+#include "rddb.h"
+#include "rdescape_string.h"
+#include "rdgroup.h"
 
 #include "rdadd_cart.h"
 
@@ -52,7 +52,7 @@ RDAddCart::RDAddCart(QString *group,RDCart::Type *type,QString *title,
   //
   cart_group_box=new QComboBox(this);
   cart_group_box->setGeometry(145,11,160,19);
-  QLabel *cart_group_label=new QLabel(tr("&Group:"),this);
+  QLabel *cart_group_label=new QLabel(tr("Group:"),this);
   cart_group_label->setGeometry(10,11,130,19);
   cart_group_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
   cart_group_label->setFont(labelFont());
@@ -78,7 +78,7 @@ RDAddCart::RDAddCart(QString *group,RDCart::Type *type,QString *title,
   QIntValidator *validator=new QIntValidator(this);
   validator->setRange(1,999999);
   cart_number_edit->setValidator(validator);
-  QLabel *cart_number_label=new QLabel(tr("&New Cart Number:"),this);
+  QLabel *cart_number_label=new QLabel(tr("New Cart Number:"),this);
   cart_number_label->setGeometry(10,32,130,19);
   cart_number_label->setFont(labelFont());
   cart_number_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
@@ -88,7 +88,7 @@ RDAddCart::RDAddCart(QString *group,RDCart::Type *type,QString *title,
   //
   cart_type_box=new QComboBox(this);
   cart_type_box->setGeometry(145,53,100,19);
-  QLabel *cart_type_label=new QLabel(tr("&New Cart Type:"),this);
+  QLabel *cart_type_label=new QLabel(tr("New Cart Type:"),this);
   cart_type_label->setGeometry(10,53,130,19);
   cart_type_label->setFont(labelFont());
   cart_type_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
@@ -116,7 +116,7 @@ RDAddCart::RDAddCart(QString *group,RDCart::Type *type,QString *title,
   cart_title_edit->setMaxLength(255);
   //  cart_title_edit->setValidator(text_validator);
   cart_title_edit->setText(tr("[new cart]"));
-  QLabel *cart_title_label=new QLabel(tr("&New Cart Title:"),this);
+  QLabel *cart_title_label=new QLabel(tr("New Cart Title:"),this);
   cart_title_label->setGeometry(10,73,130,19);
   cart_title_label->setFont(labelFont());
   cart_title_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
@@ -128,7 +128,7 @@ RDAddCart::RDAddCart(QString *group,RDCart::Type *type,QString *title,
   ok_button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50);
   ok_button->setDefault(true);
   ok_button->setFont(buttonFont());
-  ok_button->setText(tr("&OK"));
+  ok_button->setText(tr("OK"));
   connect(ok_button,SIGNAL(clicked()),this,SLOT(okData()));
 
   //
@@ -138,7 +138,7 @@ RDAddCart::RDAddCart(QString *group,RDCart::Type *type,QString *title,
   cancel_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,
 			     80,50);
   cancel_button->setFont(buttonFont());
-  cancel_button->setText(tr("&Cancel"));
+  cancel_button->setText(tr("Cancel"));
   connect(cancel_button,SIGNAL(clicked()),this,SLOT(cancelData()));
 
   groupActivatedData(cart_group_box->currentText());
diff --git a/lib/rdadd_log.cpp b/lib/rdadd_log.cpp
index 4df321ed..fc33ade2 100644
--- a/lib/rdadd_log.cpp
+++ b/lib/rdadd_log.cpp
@@ -83,7 +83,7 @@ RDAddLog::RDAddLog(QString *logname,QString *svcname,
     setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50);
   add_ok_button->setDefault(true);
   add_ok_button->setFont(buttonFont());
-  add_ok_button->setText(tr("&OK"));
+  add_ok_button->setText(tr("OK"));
   add_ok_button->setDisabled(true);
   connect(add_ok_button,SIGNAL(clicked()),this,SLOT(okData()));
 
@@ -94,7 +94,7 @@ RDAddLog::RDAddLog(QString *logname,QString *svcname,
   add_cancel_button->
     setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50);
   add_cancel_button->setFont(buttonFont());
-  add_cancel_button->setText(tr("&Cancel"));
+  add_cancel_button->setText(tr("Cancel"));
   connect(add_cancel_button,SIGNAL(clicked()),this,SLOT(cancelData()));
 
   //
diff --git a/lib/rdbutton_dialog.cpp b/lib/rdbutton_dialog.cpp
index d257b43c..cf3de998 100644
--- a/lib/rdbutton_dialog.cpp
+++ b/lib/rdbutton_dialog.cpp
@@ -102,7 +102,7 @@ RDButtonDialog::RDButtonDialog(QString station_name,const QString &caption,
   button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50);
   button->setDefault(true);
   button->setFont(buttonFont());
-  button->setText(tr("&OK"));
+  button->setText(tr("OK"));
   connect(button,SIGNAL(clicked()),this,SLOT(okData()));
 
   //
@@ -111,7 +111,7 @@ RDButtonDialog::RDButtonDialog(QString station_name,const QString &caption,
   button=new QPushButton(this);
   button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50);
   button->setFont(buttonFont());
-  button->setText(tr("&Cancel"));
+  button->setText(tr("Cancel"));
   connect(button,SIGNAL(clicked()),this,SLOT(cancelData()));
 }
 
diff --git a/lib/rdcart_dialog.cpp b/lib/rdcart_dialog.cpp
index f934dc64..eec489dd 100644
--- a/lib/rdcart_dialog.cpp
+++ b/lib/rdcart_dialog.cpp
@@ -118,7 +118,7 @@ RDCartDialog::RDCartDialog(QString *filter,QString *group,QString *schedcode,
   //
   // Send to Editor Button
   //
-  cart_editor_button=new QPushButton(tr("Send to\n&Editor"),this);
+  cart_editor_button=new QPushButton(tr("Send to\nEditor"),this);
   cart_editor_button->setFont(buttonFont());
   connect(cart_editor_button,SIGNAL(clicked()),this,SLOT(editorData()));
   if(rda->station()->editorPath().isEmpty()) {
@@ -128,7 +128,7 @@ RDCartDialog::RDCartDialog(QString *filter,QString *group,QString *schedcode,
   //
   // Load From File Button
   //
-  cart_file_button=new QPushButton(tr("Load From\n&File"),this);
+  cart_file_button=new QPushButton(tr("Load From\nFile"),this);
   cart_file_button->setFont(buttonFont());
   connect(cart_file_button,SIGNAL(clicked()),this,SLOT(loadFileData()));
   if(rda->station()->editorPath().isEmpty()) {
@@ -138,14 +138,14 @@ RDCartDialog::RDCartDialog(QString *filter,QString *group,QString *schedcode,
   //
   // OK Button
   //
-  cart_ok_button=new QPushButton(tr("&OK"),this);
+  cart_ok_button=new QPushButton(tr("OK"),this);
   cart_ok_button->setFont(buttonFont());
   connect(cart_ok_button,SIGNAL(clicked()),this,SLOT(okData()));
 
   //
   // Cancel Button
   //
-  cart_cancel_button=new QPushButton(tr("&Cancel"),this);
+  cart_cancel_button=new QPushButton(tr("Cancel"),this);
   cart_cancel_button->setFont(buttonFont());
   connect(cart_cancel_button,SIGNAL(clicked()),this,SLOT(cancelData()));
 
diff --git a/lib/rdcartfilter.cpp b/lib/rdcartfilter.cpp
index 46deb705..fbf3eb31 100644
--- a/lib/rdcartfilter.cpp
+++ b/lib/rdcartfilter.cpp
@@ -53,7 +53,7 @@ RDCartFilter::RDCartFilter(bool show_drag_box,bool user_is_admin,
   //
   // Filter Search Button
   //
-  d_search_button=new QPushButton(tr("&Search"),this);
+  d_search_button=new QPushButton(tr("Search"),this);
   d_search_button->setFont(buttonFont());
   connect(d_search_button,SIGNAL(clicked()),this,SLOT(searchClickedData()));
   switch(rda->station()->filterMode()) {
@@ -68,7 +68,7 @@ RDCartFilter::RDCartFilter(bool show_drag_box,bool user_is_admin,
   //
   // Filter Clear Button
   //
-  d_clear_button=new QPushButton(tr("&Clear"),this);
+  d_clear_button=new QPushButton(tr("Clear"),this);
   d_clear_button->setFont(buttonFont());
   d_clear_button->setDisabled(true);
   connect(d_clear_button,SIGNAL(clicked()),this,SLOT(clearClickedData()));
diff --git a/lib/rdcueedit.cpp b/lib/rdcueedit.cpp
index 19b699b2..f835aae3 100644
--- a/lib/rdcueedit.cpp
+++ b/lib/rdcueedit.cpp
@@ -168,7 +168,7 @@ RDCueEdit::RDCueEdit(QWidget *parent)
     setPalette(QPalette(QColor(RD_CUEEDITOR_START_MARKER),
 			palette().color(QPalette::Background)));
   edit_recue_button->setFont(buttonFont());
-  edit_recue_button->setText(tr("&Recue"));
+  edit_recue_button->setText(tr("Recue"));
   connect(edit_recue_button,SIGNAL(clicked()),this,SLOT(recue()));
 
   //
diff --git a/lib/rdcueeditdialog.cpp b/lib/rdcueeditdialog.cpp
index a8c292f5..cf54fa63 100644
--- a/lib/rdcueeditdialog.cpp
+++ b/lib/rdcueeditdialog.cpp
@@ -40,7 +40,7 @@ RDCueEditDialog::RDCueEditDialog(RDCae *cae,int play_card,int play_port,
   QPushButton *button=new QPushButton(this);
   button->setGeometry(sizeHint().width()-170,sizeHint().height()-60,80,50);
   button->setFont(buttonFont());
-  button->setText(tr("&OK"));
+  button->setText(tr("OK"));
   connect(button,SIGNAL(clicked()),this,SLOT(okData()));
 
   //
@@ -49,7 +49,7 @@ RDCueEditDialog::RDCueEditDialog(RDCae *cae,int play_card,int play_port,
   button=new QPushButton(this);
   button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50);
   button->setFont(buttonFont());
-  button->setText(tr("&Cancel"));
+  button->setText(tr("Cancel"));
   connect(button,SIGNAL(clicked()),this,SLOT(cancelData()));
 }
 
diff --git a/lib/rdcut_dialog.cpp b/lib/rdcut_dialog.cpp
index 22ec5649..535d2f3d 100644
--- a/lib/rdcut_dialog.cpp
+++ b/lib/rdcut_dialog.cpp
@@ -111,7 +111,7 @@ RDCutDialog::RDCutDialog(QString *filter,QString *group,QString *schedcode,
   //
   // Add Button
   //
-  cart_add_button=new QPushButton(tr("&Add New\nCart"),this);
+  cart_add_button=new QPushButton(tr("Add New\nCart"),this);
   cart_add_button->setGeometry(10,sizeHint().height()-60,80,50);
   cart_add_button->setFont(buttonFont());
   connect(cart_add_button,SIGNAL(clicked()),this,SLOT(addButtonData()));
@@ -122,7 +122,7 @@ RDCutDialog::RDCutDialog(QString *filter,QString *group,QString *schedcode,
   //
   // Clear Button
   //
-  cart_clear_button=new QPushButton(tr("&Clear"),this);
+  cart_clear_button=new QPushButton(tr("Clear"),this);
   cart_clear_button->setFont(buttonFont());
   connect(cart_clear_button,SIGNAL(clicked()),
 	  cart_cart_view,SLOT(clearSelection()));
@@ -133,7 +133,7 @@ RDCutDialog::RDCutDialog(QString *filter,QString *group,QString *schedcode,
   //
   // OK Button
   //
-  cart_ok_button=new QPushButton(tr("&OK"),this);
+  cart_ok_button=new QPushButton(tr("OK"),this);
   cart_ok_button->setFont(buttonFont());
   connect(cart_ok_button,SIGNAL(clicked()),this,SLOT(okData()));
   cart_ok_button->setDisabled(true);
@@ -141,7 +141,7 @@ RDCutDialog::RDCutDialog(QString *filter,QString *group,QString *schedcode,
   //
   // Cancel Button
   //
-  cart_cancel_button=new QPushButton(tr("&Cancel"),this);
+  cart_cancel_button=new QPushButton(tr("Cancel"),this);
   cart_cancel_button->setFont(buttonFont());
   connect(cart_cancel_button,SIGNAL(clicked()),this,SLOT(cancelData()));
 
diff --git a/lib/rddatedialog.cpp b/lib/rddatedialog.cpp
index f57e6fc5..ac26b706 100644
--- a/lib/rddatedialog.cpp
+++ b/lib/rddatedialog.cpp
@@ -45,7 +45,7 @@ RDDateDialog::RDDateDialog(int low_year,int high_year,QWidget *parent)
   QPushButton *button=new QPushButton(this);
   button->setGeometry(sizeHint().width()-130,sizeHint().height()-40,50,30);
   button->setFont(buttonFont());
-  button->setText(tr("&OK"));
+  button->setText(tr("OK"));
   connect(button,SIGNAL(clicked()),this,SLOT(okData()));
 
   //
@@ -54,7 +54,7 @@ RDDateDialog::RDDateDialog(int low_year,int high_year,QWidget *parent)
   button=new QPushButton(this);
   button->setGeometry(sizeHint().width()-65,sizeHint().height()-40,55,30);
   button->setFont(buttonFont());
-  button->setText(tr("&Cancel"));
+  button->setText(tr("Cancel"));
   connect(button,SIGNAL(clicked()),this,SLOT(cancelData()));
 }
 
diff --git a/lib/rdedit_panel_name.cpp b/lib/rdedit_panel_name.cpp
index 42e3332d..0bcb6e08 100644
--- a/lib/rdedit_panel_name.cpp
+++ b/lib/rdedit_panel_name.cpp
@@ -43,7 +43,7 @@ RDEditPanelName::RDEditPanelName(QString *panelname,QWidget *parent)
   panel_name_edit->setMaxLength(64);
   panel_name_edit->setText(*panel_name);
   panel_name_edit->selectAll();
-  QLabel *panel_name_label=new QLabel(tr("Panel &Name:"),this);
+  QLabel *panel_name_label=new QLabel(tr("Panel Name:"),this);
   panel_name_label->setGeometry(10,13,80,19);
   panel_name_label->setFont(labelFont());
   panel_name_label->setAlignment(Qt::AlignRight);
@@ -55,7 +55,7 @@ RDEditPanelName::RDEditPanelName(QString *panelname,QWidget *parent)
   ok_button->setGeometry(sizeHint().width()-180,45,80,50);
   ok_button->setDefault(true);
   ok_button->setFont(buttonFont());
-  ok_button->setText(tr("&OK"));
+  ok_button->setText(tr("OK"));
   connect(ok_button,SIGNAL(clicked()),this,SLOT(okData()));
 
   //
@@ -64,7 +64,7 @@ RDEditPanelName::RDEditPanelName(QString *panelname,QWidget *parent)
   QPushButton *cancel_button=new QPushButton(this);
   cancel_button->setGeometry(sizeHint().width()-90,45,80,50);
   cancel_button->setFont(buttonFont());
-  cancel_button->setText(tr("&Cancel"));
+  cancel_button->setText(tr("Cancel"));
   connect(cancel_button,SIGNAL(clicked()),this,SLOT(cancelData()));
 }
 
diff --git a/lib/rdexport_settings_dialog.cpp b/lib/rdexport_settings_dialog.cpp
index 68a59f0b..016e9979 100644
--- a/lib/rdexport_settings_dialog.cpp
+++ b/lib/rdexport_settings_dialog.cpp
@@ -139,7 +139,7 @@ RDExportSettingsDialog::RDExportSettingsDialog(const QString &caption,
   lib_ok_button=new QPushButton(this);
   lib_ok_button->setDefault(true);
   lib_ok_button->setFont(buttonFont());
-  lib_ok_button->setText(tr("&OK"));
+  lib_ok_button->setText(tr("OK"));
   connect(lib_ok_button,SIGNAL(clicked()),this,SLOT(okData()));
 
   //
@@ -147,7 +147,7 @@ RDExportSettingsDialog::RDExportSettingsDialog(const QString &caption,
   //
   lib_cancel_button=new QPushButton(this);
   lib_cancel_button->setFont(buttonFont());
-  lib_cancel_button->setText(tr("&Cancel"));
+  lib_cancel_button->setText(tr("Cancel"));
   connect(lib_cancel_button,SIGNAL(clicked()),this,SLOT(cancelData()));
 }
 
diff --git a/lib/rdget_ath.cpp b/lib/rdget_ath.cpp
index 0b96784f..c040c8ff 100644
--- a/lib/rdget_ath.cpp
+++ b/lib/rdget_ath.cpp
@@ -2,7 +2,7 @@
 //
 // Get an Aggreggate Tuning Hours (ATH) Figure.
 //
-//   (C) Copyright 2006-2019 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2006-2021 Fred Gleason <fredg@paravelsystems.com>
 //
 //   This program is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License version 2 as
@@ -18,10 +18,10 @@
 //   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include <qpushbutton.h>
-#include <qlabel.h>
-#include <qmessagebox.h>
-#include <qvalidator.h>
+#include <QLabel>
+#include <QMessageBox>
+#include <QPushButton>
+#include <QValidator>
 
 #include "rdget_ath.h"
 
@@ -68,7 +68,7 @@ RDGetAth::RDGetAth(double *ath,QWidget *parent)
   ok_button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50);
   ok_button->setDefault(true);
   ok_button->setFont(buttonFont());
-  ok_button->setText(tr("&OK"));
+  ok_button->setText(tr("OK"));
   connect(ok_button,SIGNAL(clicked()),this,SLOT(okData()));
 
   //
@@ -78,7 +78,7 @@ RDGetAth::RDGetAth(double *ath,QWidget *parent)
   cancel_button->
     setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50);
   cancel_button->setFont(buttonFont());
-  cancel_button->setText(tr("&Cancel"));
+  cancel_button->setText(tr("Cancel"));
   connect(cancel_button,SIGNAL(clicked()),this,SLOT(cancelData()));
 }
 
diff --git a/lib/rdgetpasswd.cpp b/lib/rdgetpasswd.cpp
index b7a41ca7..084b3e03 100644
--- a/lib/rdgetpasswd.cpp
+++ b/lib/rdgetpasswd.cpp
@@ -2,7 +2,7 @@
 //
 // Prompt for a password.
 //
-//   (C) Copyright 2006-2019 Fred Gleason <fredg@salemradiolabs.com>
+//   (C) Copyright 2006-2021 Fred Gleason <fredg@salemradiolabs.com>
 //
 //   This program is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License version 2 as
@@ -18,12 +18,9 @@
 //   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include <qpushbutton.h>
-#include <qlabel.h>
-#include <qmessagebox.h>
-#include <qvalidator.h>
+#include <QPushButton>
 
-#include <rdgetpasswd.h>
+#include "rdgetpasswd.h"
 
 RDGetPasswd::RDGetPasswd(QString *passwd,QWidget *parent)
   : RDDialog(parent)
@@ -33,10 +30,8 @@ RDGetPasswd::RDGetPasswd(QString *passwd,QWidget *parent)
   //
   // Fix the Window Size
   //
-  setMinimumWidth(sizeHint().width());
-  setMaximumWidth(sizeHint().width());
-  setMinimumHeight(sizeHint().height());
-  setMaximumHeight(sizeHint().height());
+  setMinimumSize(sizeHint());
+  setMaximumSize(sizeHint());
 
   setWindowTitle(tr("Enter Password"));
 
@@ -61,7 +56,7 @@ RDGetPasswd::RDGetPasswd(QString *passwd,QWidget *parent)
   ok_button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50);
   ok_button->setDefault(true);
   ok_button->setFont(buttonFont());
-  ok_button->setText(tr("&OK"));
+  ok_button->setText(tr("OK"));
   connect(ok_button,SIGNAL(clicked()),this,SLOT(okData()));
 
   //
@@ -71,7 +66,7 @@ RDGetPasswd::RDGetPasswd(QString *passwd,QWidget *parent)
   cancel_button->
     setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50);
   cancel_button->setFont(buttonFont());
-  cancel_button->setText(tr("&Cancel"));
+  cancel_button->setText(tr("Cancel"));
   connect(cancel_button,SIGNAL(clicked()),this,SLOT(cancelData()));
 }
 
diff --git a/lib/rdimport_audio.cpp b/lib/rdimport_audio.cpp
index 31be7044..dc05ad1d 100644
--- a/lib/rdimport_audio.cpp
+++ b/lib/rdimport_audio.cpp
@@ -2,7 +2,7 @@
 //
 // Audio File Importation Dialog for Rivendell.
 //
-//   (C) Copyright 2002-2020 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2002-2021 Fred Gleason <fredg@paravelsystems.com>
 //
 //   This program is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License version 2 as
@@ -26,11 +26,10 @@
 #include <unistd.h>
 #include <math.h>
 
-#include <qpushbutton.h>
-#include <qfiledialog.h>
-#include <qmessagebox.h>
-#include <qcheckbox.h>
-#include <qpainter.h>
+#include <QFileDialog>
+#include <QMessageBox>
+#include <QPainter>
+#include <QPushButton>
 
 #include "rd.h"
 #include "rdapplication.h"
@@ -99,7 +98,7 @@ RDImportAudio::RDImportAudio(QString cutname,QString *path,
   //
   // Input File Selector Button
   //
-  import_in_selector_button=new QPushButton(tr("&Select"),this);
+  import_in_selector_button=new QPushButton(tr("Select"),this);
   import_in_selector_button->setGeometry(sizeHint().width()-85,27,70,26);
   connect(import_in_selector_button,SIGNAL(clicked()),
 	  this,SLOT(selectInputFileData()));
@@ -171,7 +170,7 @@ RDImportAudio::RDImportAudio(QString cutname,QString *path,
   //
   // Output File Selector Button
   //
-  import_out_selector_button=new QPushButton(tr("&Select"),this);
+  import_out_selector_button=new QPushButton(tr("Select"),this);
   import_out_selector_button->setGeometry(sizeHint().width()-85,137,70,26);
   connect(import_out_selector_button,SIGNAL(clicked()),
 	  this,SLOT(selectOutputFileData()));
@@ -199,7 +198,7 @@ RDImportAudio::RDImportAudio(QString cutname,QString *path,
   //
   // Output Format Selector Button
   //
-  import_out_format_button=new QPushButton(tr("S&et"),this);
+  import_out_format_button=new QPushButton(tr("Set"),this);
   import_out_format_button->setGeometry(sizeHint().width()-85,178,70,26);
   connect(import_out_format_button,SIGNAL(clicked()),
 	  this,SLOT(selectOutputFormatData()));
@@ -238,7 +237,7 @@ RDImportAudio::RDImportAudio(QString cutname,QString *path,
   //
   // Import Button
   //
-  import_import_button=new QPushButton(tr("&Import"),this);
+  import_import_button=new QPushButton(tr("Import"),this);
   import_import_button->
     setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50);
   import_import_button->setFont(buttonFont());
@@ -247,7 +246,7 @@ RDImportAudio::RDImportAudio(QString cutname,QString *path,
   //
   // Cancel Button
   //
-  import_cancel_button=new QPushButton(tr("&Cancel"),this);
+  import_cancel_button=new QPushButton(tr("Cancel"),this);
   import_cancel_button->
     setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50);
   import_cancel_button->setFont(buttonFont());
diff --git a/lib/rdlist_groups.cpp b/lib/rdlist_groups.cpp
index 1a9eddf2..22053b70 100644
--- a/lib/rdlist_groups.cpp
+++ b/lib/rdlist_groups.cpp
@@ -58,7 +58,7 @@ RDListGroups::RDListGroups(QString *groupname,const QString &caption,
   //
   // OK Button
   //
-  QPushButton *button=new QPushButton(tr("&OK"),this);
+  QPushButton *button=new QPushButton(tr("OK"),this);
   button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50);
   button->setFont(buttonFont());
   button->setDefault(true);
@@ -67,7 +67,7 @@ RDListGroups::RDListGroups(QString *groupname,const QString &caption,
   //
   // Cancel Button
   //
-  button=new QPushButton(tr("&Cancel"),this);
+  button=new QPushButton(tr("Cancel"),this);
   button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50);
   button->setFont(buttonFont());
   connect(button,SIGNAL(clicked()),this,SLOT(cancelData()));
diff --git a/lib/rdlistsvcs.cpp b/lib/rdlistsvcs.cpp
index 3e12d9a7..0556f80c 100644
--- a/lib/rdlistsvcs.cpp
+++ b/lib/rdlistsvcs.cpp
@@ -54,7 +54,7 @@ RDListSvcs::RDListSvcs(const QString &caption,QWidget *parent)
   edit_ok_button=new QPushButton(this);
   edit_ok_button->setDefault(true);
   edit_ok_button->setFont(buttonFont());
-  edit_ok_button->setText(tr("&OK"));
+  edit_ok_button->setText(tr("OK"));
   connect(edit_ok_button,SIGNAL(clicked()),this,SLOT(okData()));
 
   //
@@ -62,7 +62,7 @@ RDListSvcs::RDListSvcs(const QString &caption,QWidget *parent)
   //
   edit_cancel_button=new QPushButton(this);
   edit_cancel_button->setFont(buttonFont());
-  edit_cancel_button->setText(tr("&Cancel"));
+  edit_cancel_button->setText(tr("Cancel"));
   connect(edit_cancel_button,SIGNAL(clicked()),this,SLOT(cancelData()));
 }
 
diff --git a/lib/rdschedcodes_dialog.cpp b/lib/rdschedcodes_dialog.cpp
index 569eaca3..b2eb0f46 100644
--- a/lib/rdschedcodes_dialog.cpp
+++ b/lib/rdschedcodes_dialog.cpp
@@ -20,8 +20,7 @@
 //   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include <qpainter.h>
-#include <qmessagebox.h>
+#include <QPainter>
 
 #include "rddb.h"
 #include "rdschedcodes_dialog.h"
@@ -44,7 +43,7 @@ RDSchedCodesDialog::RDSchedCodesDialog(QWidget *parent)
   //
   //  Ok Button
   //
-  edit_ok_button=new QPushButton(tr("&OK"),this);
+  edit_ok_button=new QPushButton(tr("OK"),this);
   edit_ok_button->setDefault(true);
   edit_ok_button->setFont(buttonFont());
   connect(edit_ok_button,SIGNAL(clicked()),this,SLOT(okData()));
@@ -52,7 +51,7 @@ RDSchedCodesDialog::RDSchedCodesDialog(QWidget *parent)
   //
   //  Cancel Button
   //
-  edit_cancel_button=new QPushButton(tr("&Cancel"),this);
+  edit_cancel_button=new QPushButton(tr("Cancel"),this);
   edit_cancel_button->setFont(buttonFont());
   connect(edit_cancel_button,SIGNAL(clicked()),this,SLOT(cancelData()));
 }
diff --git a/lib/rdslotdialog.cpp b/lib/rdslotdialog.cpp
index 0d41b388..8e222aca 100644
--- a/lib/rdslotdialog.cpp
+++ b/lib/rdslotdialog.cpp
@@ -2,7 +2,7 @@
 //
 // Slot Editor for RDCartSlots.
 //
-//   (C) Copyright 2012-2019 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2012-2021 Fred Gleason <fredg@paravelsystems.com>
 //
 //   This program is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License version 2 as
@@ -18,17 +18,13 @@
 //   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include <qcolordialog.h>
-//Added by qt3to4:
-#include <QResizeEvent>
 #include <QLabel>
 
-#include <rddb.h>
-#include <rdcart.h>
-#include <rdcart_dialog.h>
-#include <rd.h>
-#include <rdconf.h>
-
+#include "rddb.h"
+#include "rdcart.h"
+#include "rdcart_dialog.h"
+#include "rd.h"
+#include "rdconf.h"
 #include "rdslotdialog.h"
 
 RDSlotDialog::RDSlotDialog(const QString &caption,QWidget *parent)
@@ -88,7 +84,7 @@ RDSlotDialog::RDSlotDialog(const QString &caption,QWidget *parent)
   edit_ok_button=new QPushButton(this);
   edit_ok_button->setDefault(true);
   edit_ok_button->setFont(buttonFont());
-  edit_ok_button->setText(tr("&OK"));
+  edit_ok_button->setText(tr("OK"));
   connect(edit_ok_button,SIGNAL(clicked()),this,SLOT(okData()));
 
   //
@@ -96,7 +92,7 @@ RDSlotDialog::RDSlotDialog(const QString &caption,QWidget *parent)
   //
   edit_cancel_button=new QPushButton(this);
   edit_cancel_button->setFont(buttonFont());
-  edit_cancel_button->setText(tr("&Cancel"));
+  edit_cancel_button->setText(tr("Cancel"));
   connect(edit_cancel_button,SIGNAL(clicked()),this,SLOT(cancelData()));
 }
 
diff --git a/rdlogmanager/pick_report_dates.cpp b/rdlogmanager/pick_report_dates.cpp
index af949ccc..271d740b 100644
--- a/rdlogmanager/pick_report_dates.cpp
+++ b/rdlogmanager/pick_report_dates.cpp
@@ -82,7 +82,7 @@ PickReportDates::PickReportDates(const QString &svcname,QWidget *parent)
   QPushButton *button=new QPushButton(this);
   button->setGeometry(260,33,50,27);
   button->setFont(subButtonFont());
-  button->setText(tr("&Select"));
+  button->setText(tr("Select"));
   connect(button,SIGNAL(clicked()),this,SLOT(selectStartDateData()));
 
   //
@@ -98,7 +98,7 @@ PickReportDates::PickReportDates(const QString &svcname,QWidget *parent)
   button=new QPushButton(this);
   button->setGeometry(260,63,50,27);
   button->setFont(subButtonFont());
-  button->setText(tr("&Select"));
+  button->setText(tr("Select"));
   connect(button,SIGNAL(clicked()),this,SLOT(selectEndDateData()));
 
   //