diff --git a/src/applesoftfile/applesoftfile.cpp b/src/applesoftfile/applesoftfile.cpp
index 065e015..af12565 100644
--- a/src/applesoftfile/applesoftfile.cpp
+++ b/src/applesoftfile/applesoftfile.cpp
@@ -1,4 +1,3 @@
-
 /*****************************************************************************
 *    AppleSAWS - The Apple Software Analysis WorkShop                        *
 *    Copyright (C) 2015-2021  Mark D. Long                                   *
@@ -17,9 +16,9 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
 #include "applesoftfile.h"
 #include "util.h"
+
 #include <QDebug>
 #include <QRegularExpression>
 #include <QRegularExpressionMatch>
diff --git a/src/applesoftfile/applesoftfile.h b/src/applesoftfile/applesoftfile.h
index 93482e0..1c3469e 100644
--- a/src/applesoftfile/applesoftfile.h
+++ b/src/applesoftfile/applesoftfile.h
@@ -29,7 +29,7 @@
 #include "applesoftline.h"
 #include "genericfile.h"
 #include "applesofttoken.h"
-#include "ApplesoftRetokenizer.h"
+#include "applesoftretokenizer.h"
 
 
 class ApplesoftFile : public GenericFile
diff --git a/src/applesoftfile/applesoftformatter.cpp b/src/applesoftfile/applesoftformatter.cpp
index bcbdcec..2008a74 100644
--- a/src/applesoftfile/applesoftformatter.cpp
+++ b/src/applesoftfile/applesoftformatter.cpp
@@ -1,4 +1,3 @@
-
 /*****************************************************************************
 *    AppleSAWS - The Apple Software Analysis WorkShop                        *
 *    Copyright (C) 2015-2021  Mark D. Long                                   *
@@ -17,9 +16,9 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
 #include "applesoftformatter.h"
 #include "util.h"
+
 #include <QTextCursor>
 #include <QTextCharFormat>
 #include <QChar>
diff --git a/src/applesoftfile/applesofttoken.cpp b/src/applesoftfile/applesofttoken.cpp
index a12185a..4dfda5e 100644
--- a/src/applesoftfile/applesofttoken.cpp
+++ b/src/applesoftfile/applesofttoken.cpp
@@ -17,7 +17,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
 #include "applesofttoken.h"
 
 QMap<quint16, QString> ApplesoftToken::m_tokens = QMap<quint16, QString>();
diff --git a/src/binaryfile/assemblersymbolmodel.cpp b/src/binaryfile/assemblersymbolmodel.cpp
index a8866d8..bb99ef3 100644
--- a/src/binaryfile/assemblersymbolmodel.cpp
+++ b/src/binaryfile/assemblersymbolmodel.cpp
@@ -18,7 +18,7 @@
 *****************************************************************************/
 
 
-#include "AssemblerSymbolModel.h"
+#include "assemblersymbolmodel.h"
 #include "util.h"
 
 #include <QDebug>
diff --git a/src/binaryfile/assemblersymbolmodel.h b/src/binaryfile/assemblersymbolmodel.h
index 43243de..be1623f 100644
--- a/src/binaryfile/assemblersymbolmodel.h
+++ b/src/binaryfile/assemblersymbolmodel.h
@@ -19,7 +19,7 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-#include "AssemblerSymbols.h"
+#include "assemblersymbols.h"
 
 #include <QDataStream>
 #include <QAbstractTableModel>
diff --git a/src/binaryfile/assemblersymbols.cpp b/src/binaryfile/assemblersymbols.cpp
index dde9236..c8e7f88 100644
--- a/src/binaryfile/assemblersymbols.cpp
+++ b/src/binaryfile/assemblersymbols.cpp
@@ -17,7 +17,7 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-#include "AssemblerSymbols.h"
+#include "assemblersymbols.h"
 
 
 AssemblerSymbols::AssemblerSymbols(QObject *parent) : QObject(parent)
diff --git a/src/binaryfile/binaryfile.cpp b/src/binaryfile/binaryfile.cpp
index b0b186a..f0ec3f9 100644
--- a/src/binaryfile/binaryfile.cpp
+++ b/src/binaryfile/binaryfile.cpp
@@ -16,10 +16,11 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-#include <QDebug>
 #include "binaryfile.h"
 #include "util.h"
 
+#include <QDebug>
+
 BinaryFile::BinaryFile(Dos33DiskImage *image, FileDescriptiveEntry &fde)
     : GenericFile(image,fde)
 {
diff --git a/src/binaryfile/binaryfilemetadata.cpp b/src/binaryfile/binaryfilemetadata.cpp
index b26db66..6dbf18d 100644
--- a/src/binaryfile/binaryfilemetadata.cpp
+++ b/src/binaryfile/binaryfilemetadata.cpp
@@ -18,9 +18,11 @@
 
 #include "binaryfilemetadata.h"
 #include "genericfile.h"
+
 #include <QFile>
 #include <QDataStream>
 #include <QDebug>
+
 BinaryFileMetadata::BinaryFileMetadata(GenericFile *file, quint16 defaultAddress, QObject *parent)
     : QObject(parent)
 {
diff --git a/src/binaryfile/binaryfilemetadata.h b/src/binaryfile/binaryfilemetadata.h
index 75a5d0f..f54691f 100644
--- a/src/binaryfile/binaryfilemetadata.h
+++ b/src/binaryfile/binaryfilemetadata.h
@@ -21,8 +21,8 @@
 
 
 
-#include "EntryPoints.h"
-#include "AssemblerSymbols.h"
+#include "entrypoints.h"
+#include "assemblersymbols.h"
 #include "genericfile.h"
 #include "binaryfile.h"
 
diff --git a/src/binaryfile/disassembler.cpp b/src/binaryfile/disassembler.cpp
index fe19411..a8ae321 100644
--- a/src/binaryfile/disassembler.cpp
+++ b/src/binaryfile/disassembler.cpp
@@ -21,9 +21,11 @@
 #include "role_asm_opcode.h"
 #include "role_asm_operand.h"
 #include "util.h"
+
 #include <QByteArray>
 #include <QDebug>
 #include <QList>
+
 #include <math.h>
 
 
diff --git a/src/binaryfile/disassembler.h b/src/binaryfile/disassembler.h
index cccb4f8..f03d244 100644
--- a/src/binaryfile/disassembler.h
+++ b/src/binaryfile/disassembler.h
@@ -19,9 +19,9 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-#include "MemoryUsageMap.h"
+#include "memoryusagemap.h"
 #include "util.h"
-#include "JumpLineManager.h"
+#include "jumplinemanager.h"
 #include "opcodes.h"
 #include "attributedmemory.h"
 
diff --git a/src/binaryfile/entrypointmodel.cpp b/src/binaryfile/entrypointmodel.cpp
index d1f7453..53d1666 100644
--- a/src/binaryfile/entrypointmodel.cpp
+++ b/src/binaryfile/entrypointmodel.cpp
@@ -16,7 +16,7 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-#include "EntryPointModel.h"
+#include "entrypointmodel.h"
 #include "util.h"
 
 #include <QDebug>
diff --git a/src/binaryfile/entrypointmodel.h b/src/binaryfile/entrypointmodel.h
index e4b94b8..019a48d 100644
--- a/src/binaryfile/entrypointmodel.h
+++ b/src/binaryfile/entrypointmodel.h
@@ -21,7 +21,7 @@
 
 
 
-#include "EntryPoints.h"
+#include "entrypoints.h"
 
 #include <QDataStream>
 #include <QAbstractTableModel>
diff --git a/src/binaryfile/entrypoints.cpp b/src/binaryfile/entrypoints.cpp
index be953e9..3f3e117 100644
--- a/src/binaryfile/entrypoints.cpp
+++ b/src/binaryfile/entrypoints.cpp
@@ -16,7 +16,7 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-#include "EntryPoints.h"
+#include "entrypoints.h"
 #include <QDebug>
 
 EntryPoints::EntryPoints(QObject *parent) : QObject(parent)
diff --git a/src/diskfiles/cpressdiskfs.h b/src/diskfiles/cpressdiskfs.h
index 88855fb..6be91e1 100644
--- a/src/diskfiles/cpressdiskfs.h
+++ b/src/diskfiles/cpressdiskfs.h
@@ -22,7 +22,6 @@
 #include <QObject>
 #include "DiskImg.h"
 
-
 class CPressDiskFS : public QObject
 {
     Q_OBJECT
diff --git a/src/diskfiles/diskstore/asdiskimporter.cpp b/src/diskfiles/diskstore/asdiskimporter.cpp
index 5ea6c6e..e9cc7ae 100644
--- a/src/diskfiles/diskstore/asdiskimporter.cpp
+++ b/src/diskfiles/diskstore/asdiskimporter.cpp
@@ -17,6 +17,7 @@
 *****************************************************************************/
 
 #include "asdiskimporter.h"
+
 #include "DiskImg.h"
 
 #include <QDir>
diff --git a/src/diskfiles/diskstore/asdiskimporter.h b/src/diskfiles/diskstore/asdiskimporter.h
index d0cc7a5..d9f07aa 100644
--- a/src/diskfiles/diskstore/asdiskimporter.h
+++ b/src/diskfiles/diskstore/asdiskimporter.h
@@ -19,10 +19,10 @@
 #ifndef ASDISKIMPORTER_H
 #define ASDISKIMPORTER_H
 
-#include <QObject>
-
 #include "asdiskdata.h"
 
+#include <QObject>
+
 class ASDiskImporter : public QObject
 {
     Q_OBJECT
diff --git a/src/diskfiles/dos33/dos33diskimage.cpp b/src/diskfiles/dos33/dos33diskimage.cpp
index 2407692..7fe8218 100644
--- a/src/diskfiles/dos33/dos33diskimage.cpp
+++ b/src/diskfiles/dos33/dos33diskimage.cpp
@@ -18,21 +18,21 @@
 
 #include "dos33diskimage.h"
 
+#include "tracksectorlist.h"
+#include "genericfile.h"
+#include "applesoftfile.h"
+#include "binaryfile.h"
+#include "intbasicfile.h"
+#include "relocatablefile.h"
+#include "textfile.h"
+#include "sector.h"
+
 #include <QFile>
 #include <QDataStream>
 #include <QFileInfo>
 #include <QDebug>
 #include <QDir>
 
-#include "tracksectorlist.h"
-#include "genericfile.h"
-#include "applesoftfile.h"
-#include "binaryfile.h"
-#include "IntBasicFile.h"
-#include "relocatablefile.h"
-#include "textfile.h"
-#include "sector.h"
-
 Dos33DiskImage::Dos33DiskImage(QString filename)
 {
    m_disk_image = new ASDiskData();
diff --git a/src/diskfiles/dos33/dos33imagemodel.cpp b/src/diskfiles/dos33/dos33imagemodel.cpp
index f4aa096..2ede1f6 100644
--- a/src/diskfiles/dos33/dos33imagemodel.cpp
+++ b/src/diskfiles/dos33/dos33imagemodel.cpp
@@ -17,11 +17,10 @@
 *****************************************************************************/
 
 #include "dos33imagemodel.h"
+#include "tspair.h"
 
 #include <QIcon>
 
-#include "tspair.h"
-
 Dos33ImageModel::Dos33ImageModel(QObject *parent) : QStandardItemModel(parent)
 {
     setHorizontalHeaderLabels({"Disk Images"});
diff --git a/src/diskfiles/dos33/filedescriptiveentry.h b/src/diskfiles/dos33/filedescriptiveentry.h
index b18e1f4..ade1a82 100644
--- a/src/diskfiles/dos33/filedescriptiveentry.h
+++ b/src/diskfiles/dos33/filedescriptiveentry.h
@@ -19,12 +19,11 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include "tspair.h"
-#include <QDebug>
 #include "applestring.h"
 
+#include <QDebug>
+
 class GenericFile;
 
 
diff --git a/src/diskfiles/dos33/genericfile.cpp b/src/diskfiles/dos33/genericfile.cpp
index 1cf515e..6d2dfab 100644
--- a/src/diskfiles/dos33/genericfile.cpp
+++ b/src/diskfiles/dos33/genericfile.cpp
@@ -18,7 +18,6 @@
 
 #include "genericfile.h"
 
-
 quint8 GenericFile::rawDataAt(int offset)
 {
     return rawData().at(offset);
diff --git a/src/diskfiles/dos33/genericfile.h b/src/diskfiles/dos33/genericfile.h
index 1b825b8..a5bc9ff 100644
--- a/src/diskfiles/dos33/genericfile.h
+++ b/src/diskfiles/dos33/genericfile.h
@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include "dos33diskimage.h"
 #include "filedescriptiveentry.h"
 
diff --git a/src/diskfiles/dos33/sector.h b/src/diskfiles/dos33/sector.h
index 2b2536b..ad48d9f 100644
--- a/src/diskfiles/dos33/sector.h
+++ b/src/diskfiles/dos33/sector.h
@@ -21,7 +21,6 @@
 
 #include <QByteArray>
 #include <QSharedPointer>
-//#include "rawdiskimage.h"
 
 #include "vtoc.h"
 #include "catalogsector.h"
diff --git a/src/diskfiles/dos33/tracksectorlist.h b/src/diskfiles/dos33/tracksectorlist.h
index 6f8c88d..e549b1b 100644
--- a/src/diskfiles/dos33/tracksectorlist.h
+++ b/src/diskfiles/dos33/tracksectorlist.h
@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include "tspair.h"
 
 #include <QSharedPointer>
diff --git a/src/diskfiles/dos33/vtoc.cpp b/src/diskfiles/dos33/vtoc.cpp
index 346b2a6..6d9b67e 100644
--- a/src/diskfiles/dos33/vtoc.cpp
+++ b/src/diskfiles/dos33/vtoc.cpp
@@ -17,13 +17,12 @@
 *****************************************************************************/
 
 #include "vtoc.h"
+#include "sector.h"
+#include "util.h"
 
 #include <QDebug>
 #include <QString>
 
-#include "sector.h"
-#include "util.h"
-
 VTOC::VTOC(QSharedPointer<const Sector> data)
 {
     m_data = data;
diff --git a/src/diskfiles/dos33/vtoc.h b/src/diskfiles/dos33/vtoc.h
index 1c17b68..d2d48d8 100644
--- a/src/diskfiles/dos33/vtoc.h
+++ b/src/diskfiles/dos33/vtoc.h
@@ -19,16 +19,11 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include <Qt>
 #include "util.h"
 #include "tspair.h"
 
 class Sector;
-
-
-
 class QString;
 
 class VTOC
diff --git a/src/intbasic/intbasicfile.cpp b/src/intbasic/intbasicfile.cpp
index 97ffab2..037badd 100644
--- a/src/intbasic/intbasicfile.cpp
+++ b/src/intbasic/intbasicfile.cpp
@@ -16,7 +16,7 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-#include "IntBasicFile.h"
+#include "intbasicfile.h"
 #include <QDebug>
 
 #include "util.h"
diff --git a/src/intbasic/intbasicfile.h b/src/intbasic/intbasicfile.h
index dbbfb14..e13ed34 100644
--- a/src/intbasic/intbasicfile.h
+++ b/src/intbasic/intbasicfile.h
@@ -1,7 +1,5 @@
-#ifndef INTBASICFILE_H
-#define INTBASICFILE_H
-
 /*****************************************************************************
+
 *    AppleSAWS - The Apple Software Analysis WorkShop                        *
 *    Copyright (C) 2015-2021  Mark D. Long                                   *
 *                                                                            *
@@ -19,7 +17,8 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
+#ifndef INTBASICFILE_H
+#define INTBASICFILE_H
 
 #include "genericfile.h"
 
diff --git a/src/internals/jumplinemanager.cpp b/src/internals/jumplinemanager.cpp
index 3d83397..3972be8 100644
--- a/src/internals/jumplinemanager.cpp
+++ b/src/internals/jumplinemanager.cpp
@@ -16,7 +16,7 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-#include "JumpLineManager.h"
+#include "jumplinemanager.h"
 
 JumpLineManager::JumpLineManager(quint16 from, quint16 to)
     : m_start(from),
diff --git a/src/internals/jumplinemanager.h b/src/internals/jumplinemanager.h
index 6968cd5..ab3f84d 100644
--- a/src/internals/jumplinemanager.h
+++ b/src/internals/jumplinemanager.h
@@ -1,7 +1,5 @@
-#ifndef JUMPLINEMANAGER_H
-#define JUMPLINEMANAGER_H
-
 /*****************************************************************************
+
 *    AppleSAWS - The Apple Software Analysis WorkShop                        *
 *    Copyright (C) 2015-2021  Mark D. Long                                   *
 *                                                                            *
@@ -18,8 +16,8 @@
 *    You should have received a copy of the GNU General Public License       *
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
-
-
+#ifndef JUMPLINEMANAGER_H
+#define JUMPLINEMANAGER_H
 
 #include <QPair>
 #include <QMap>
diff --git a/src/main.cpp b/src/main.cpp
index 96688b4..dcb3691 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -29,22 +29,9 @@
 #include "applesoftfile.h"
 #include "startupdialog.h"
 
-//#include <QByteArray>
-//#include "sector.h"
 
 int main(int argc, char** argv)
 {
-//    QByteArray ba(256,0xff);
-//    Sector s(ba,1,2);
-//    s.dump();
-//    Sector t(s);
-//    t.dump();
-
-//qDebug () << "S at 1: " << s.at(1);
-//qDebug () << "T at 1: " << s.at(1);
-//qDebug () << "S at 2: " << s.at(2);
-//qDebug () << "T at 2: " << s.at(2);
-//    return 0;
 
 
     QCoreApplication::setOrganizationName("LydianScaleSoftware");
diff --git a/src/memory/attributedmemory.h b/src/memory/attributedmemory.h
index c266593..12e2e7b 100644
--- a/src/memory/attributedmemory.h
+++ b/src/memory/attributedmemory.h
@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include "memorycell.h"
 
 
diff --git a/src/memory/memorycell.h b/src/memory/memorycell.h
index a3ed075..4ac70e1 100644
--- a/src/memory/memorycell.h
+++ b/src/memory/memorycell.h
@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include "memrole.h"
 
 #include <Qt>
diff --git a/src/memory/memrole.h b/src/memory/memrole.h
index f661b8c..6e1f5ce 100644
--- a/src/memory/memrole.h
+++ b/src/memory/memrole.h
@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include <QString>
 
 // IDs:
diff --git a/src/memory/roles/role_asm_opcode.h b/src/memory/roles/role_asm_opcode.h
index a05bdee..ddd069c 100644
--- a/src/memory/roles/role_asm_opcode.h
+++ b/src/memory/roles/role_asm_opcode.h
@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include "memrole.h"
 #include "opcodes.h"
 
diff --git a/src/memory/roles/role_asm_operand.h b/src/memory/roles/role_asm_operand.h
index 65df35e..9e9060c 100644
--- a/src/memory/roles/role_asm_operand.h
+++ b/src/memory/roles/role_asm_operand.h
@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include <QString>
 #include "memrole.h"
 
diff --git a/src/relocatablefile/relocatablefile.cpp b/src/relocatablefile/relocatablefile.cpp
index b22a620..b9a0bde 100644
--- a/src/relocatablefile/relocatablefile.cpp
+++ b/src/relocatablefile/relocatablefile.cpp
@@ -16,10 +16,11 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-#include <QDebug>
 #include "relocatablefile.h"
 #include "util.h"
 
+#include <QDebug>
+
 RelocatableFile::RelocatableFile(Dos33DiskImage *image, FileDescriptiveEntry &fde)
                                  : GenericFile(image,fde)
 {
diff --git a/src/relocatablefile/relocatablefile.h b/src/relocatablefile/relocatablefile.h
index 43ee98f..ddf41d2 100644
--- a/src/relocatablefile/relocatablefile.h
+++ b/src/relocatablefile/relocatablefile.h
@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include <QPair>
 #include <QByteArray>
 
diff --git a/src/sequence/sequenceevent.h b/src/sequence/sequenceevent.h
index 8bac852..2194534 100644
--- a/src/sequence/sequenceevent.h
+++ b/src/sequence/sequenceevent.h
@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include <QString>
 
 class SequenceEvent
diff --git a/src/sequence/sequenceeventlist.h b/src/sequence/sequenceeventlist.h
index a1ac258..be49878 100644
--- a/src/sequence/sequenceeventlist.h
+++ b/src/sequence/sequenceeventlist.h
@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include "sequenceevent.h"
 
 #include <QAbstractListModel>
diff --git a/src/sequence/sequenceeventlistwidget.h b/src/sequence/sequenceeventlistwidget.h
index ece77a6..b9b88b4 100644
--- a/src/sequence/sequenceeventlistwidget.h
+++ b/src/sequence/sequenceeventlistwidget.h
@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include <QListView>
 
 class SequenceEventListWidget : public QListView
diff --git a/src/sequence/sequenceoutputview.cpp b/src/sequence/sequenceoutputview.cpp
index f89a801..2b7b97d 100644
--- a/src/sequence/sequenceoutputview.cpp
+++ b/src/sequence/sequenceoutputview.cpp
@@ -34,7 +34,7 @@ SequenceOutputView::SequenceOutputView(QWidget *parent) : QPlainTextEdit(parent)
     updateLineNumberAreaWidth(0);
     highlightCurrentLine();
 
-    auto hl = new TestHighlighter(document());
+    /*auto hl = */new TestHighlighter(document());
 }
 
 void SequenceOutputView::lineNumberAreaPaintEvent(QPaintEvent *event)
diff --git a/src/sequence/sequenceoutputview.h b/src/sequence/sequenceoutputview.h
index 823f4c4..138e7dc 100644
--- a/src/sequence/sequenceoutputview.h
+++ b/src/sequence/sequenceoutputview.h
@@ -26,8 +26,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 class SOVNumberPanel;
 
 
diff --git a/src/sequence/sequencetool.cpp b/src/sequence/sequencetool.cpp
index 1f5078a..7a8dd18 100644
--- a/src/sequence/sequencetool.cpp
+++ b/src/sequence/sequencetool.cpp
@@ -35,7 +35,7 @@ void SequenceTool::setSequenceEvent(SequenceEvent *event)
 
 }
 
-void SequenceTool::mousePressEvent(QMouseEvent *event)
+void SequenceTool::mousePressEvent(QMouseEvent * /*event*/)
 {
 
 }
diff --git a/src/sequence/sequencetool.h b/src/sequence/sequencetool.h
index e667dc4..8154fed 100644
--- a/src/sequence/sequencetool.h
+++ b/src/sequence/sequencetool.h
@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include "sequenceevent.h"
 
 #include <QWidget>
diff --git a/src/sequence/sequencetoolbox.h b/src/sequence/sequencetoolbox.h
index 396b25f..345ec51 100644
--- a/src/sequence/sequencetoolbox.h
+++ b/src/sequence/sequencetoolbox.h
@@ -28,8 +28,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 class SequenceToolBoxHeader : public QCheckBox
 {
     Q_OBJECT
diff --git a/src/sequence/sequenceviewer.h b/src/sequence/sequenceviewer.h
index 85c4c79..ce1720a 100644
--- a/src/sequence/sequenceviewer.h
+++ b/src/sequence/sequenceviewer.h
@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include <QWidget>
 
 namespace Ui {
diff --git a/src/sequence/textblockuserdata.h b/src/sequence/textblockuserdata.h
index d137c20..07f6912 100644
--- a/src/sequence/textblockuserdata.h
+++ b/src/sequence/textblockuserdata.h
@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include <QTextBlockUserData>
 #include <QSyntaxHighlighter>
 
diff --git a/src/textfile/textfile.cpp b/src/textfile/textfile.cpp
index caacaf8..3e8a70f 100644
--- a/src/textfile/textfile.cpp
+++ b/src/textfile/textfile.cpp
@@ -16,9 +16,10 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-#include <QDebug>
 #include "textfile.h"
 
+#include <QDebug>
+
 TextFile::TextFile(Dos33DiskImage *image, FileDescriptiveEntry &fde)
     : GenericFile(image,fde)
 {
diff --git a/src/textfile/textfile.h b/src/textfile/textfile.h
index afc5879..72c3477 100644
--- a/src/textfile/textfile.h
+++ b/src/textfile/textfile.h
@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include "genericfile.h"
 
 class TextFile : public GenericFile
diff --git a/src/ui/catalogwidget.cpp b/src/ui/catalogwidget.cpp
index 34ba1b6..0da9f13 100644
--- a/src/ui/catalogwidget.cpp
+++ b/src/ui/catalogwidget.cpp
@@ -22,7 +22,8 @@
 #include "binaryfile.h"
 #include "applesoftfile.h"
 #include "genericfile.h"
-#include "IntBasicFile.h"
+#include "intbasicfile.h"
+
 #include <QUrl>
 #include <QDebug>
 #include <QMenu>
diff --git a/src/ui/catalogwidget.h b/src/ui/catalogwidget.h
index ab5b522..8946d1e 100644
--- a/src/ui/catalogwidget.h
+++ b/src/ui/catalogwidget.h
@@ -22,8 +22,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include "dos33diskimage.h"
 
 namespace Ui {
diff --git a/src/ui/central/centralappwindow.cpp b/src/ui/central/centralappwindow.cpp
index 9e041af..42e0c06 100644
--- a/src/ui/central/centralappwindow.cpp
+++ b/src/ui/central/centralappwindow.cpp
@@ -23,7 +23,7 @@
 #include "dos33imagemodel.h"
 #include "dos33disktreeview.h"
 #include "sequencetoolbox.h"
-#include "DiskExplorerMapWidget.h"
+#include "diskexplorermapwidget.h"
 
 #include <QTreeView>
 #include <QAction>
@@ -108,7 +108,7 @@ void CentralAppWindow::initMenuBar()
     filemenu->addAction(m_quitAction);
 
 
-    auto toolsmenu = menuBar()->addMenu(tr("&Tools"));
+    /*auto toolsmenu =*/ menuBar()->addMenu(tr("&Tools"));
 }
 
 void CentralAppWindow::initStatusBar()
diff --git a/src/ui/central/centralappwindow.h b/src/ui/central/centralappwindow.h
index 33a3f6a..42455ca 100644
--- a/src/ui/central/centralappwindow.h
+++ b/src/ui/central/centralappwindow.h
@@ -20,10 +20,8 @@
 *****************************************************************************/
 
 
-
-#include <QMainWindow>
-
 #include "mainapptoolbar.h"
+
 class QTreeView;
 class QAction;
 class QStatusBar;
@@ -34,6 +32,7 @@ class QStackedWidget;
 #include "DockWidget.h"
 #include "DockManager.h"
 #include <QActionGroup>
+#include <QMainWindow>
 
 
 class CentralAppWindow : public QMainWindow
diff --git a/src/ui/central/mainapptoolbar.h b/src/ui/central/mainapptoolbar.h
index ef3e229..e742580 100644
--- a/src/ui/central/mainapptoolbar.h
+++ b/src/ui/central/mainapptoolbar.h
@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include <QToolBar>
 
 class MainAppToolbar : public QToolBar
diff --git a/src/ui/diskexplorer/diskexplorer.cpp b/src/ui/diskexplorer/diskexplorer.cpp
index 37cd1e6..41c7eb9 100644
--- a/src/ui/diskexplorer/diskexplorer.cpp
+++ b/src/ui/diskexplorer/diskexplorer.cpp
@@ -16,7 +16,7 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-#include "DiskExplorer.h"
+#include "diskexplorer.h"
 
 #include <QGridLayout>
 #include <QMenuBar>
diff --git a/src/ui/diskexplorer/diskexplorer.h b/src/ui/diskexplorer/diskexplorer.h
index b0529d1..4cd42c4 100644
--- a/src/ui/diskexplorer/diskexplorer.h
+++ b/src/ui/diskexplorer/diskexplorer.h
@@ -24,13 +24,14 @@
 #include <QMainWindow>
 
 #include "catalogwidget.h"
-#include "DiskExplorerMapWidget.h"
+#include "diskexplorermapwidget.h"
 #include "dos33diskimage.h"
 #include "hrcgcontrolsinfo.h"
 #include "hexconverter.h"
-//#include "hexdumpviewer.h"
 #include "viewerbase.h"
 #include "asciiinfodialog.h"
+
+//#include "hexdumpviewer.h"
 //#include "notesdialog.h"
 
 #include "viewwidgetstack.h"
diff --git a/src/ui/diskexplorer/diskexplorermapwidget.cpp b/src/ui/diskexplorer/diskexplorermapwidget.cpp
index a80e703..582d4ea 100644
--- a/src/ui/diskexplorer/diskexplorermapwidget.cpp
+++ b/src/ui/diskexplorer/diskexplorermapwidget.cpp
@@ -16,10 +16,7 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-#include "DiskExplorerMapWidget.h"
-
-//#include "vtoc.h"
-//#include "catalogsector.h"
+#include "diskexplorermapwidget.h"
 #include "util.h"
 
 #include <QPushButton>
diff --git a/src/ui/diskexplorer/tslistview.h b/src/ui/diskexplorer/tslistview.h
index 3c5db9b..4a3ce94 100644
--- a/src/ui/diskexplorer/tslistview.h
+++ b/src/ui/diskexplorer/tslistview.h
@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include <QTextBrowser>
 
 class Sector;
diff --git a/src/ui/diskexplorer/viewwidgetstack.cpp b/src/ui/diskexplorer/viewwidgetstack.cpp
index 8080b34..cf2eaa4 100644
--- a/src/ui/diskexplorer/viewwidgetstack.cpp
+++ b/src/ui/diskexplorer/viewwidgetstack.cpp
@@ -21,7 +21,7 @@
 #include "vtocview.h"
 #include "catalogsectorview.h"
 #include "tslistview.h"
-#include "DiskExplorerMapWidget.h"
+#include "diskexplorermapwidget.h"
 
 ViewWidgetStack::ViewWidgetStack(QWidget *parent) : QTabWidget(parent)
 {
diff --git a/src/ui/diskexplorer/viewwidgetstack.h b/src/ui/diskexplorer/viewwidgetstack.h
index 2fe42f8..c27224f 100644
--- a/src/ui/diskexplorer/viewwidgetstack.h
+++ b/src/ui/diskexplorer/viewwidgetstack.h
@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include <QTabWidget>
 
 class Sector;
diff --git a/src/ui/diskexplorer/vtocview.h b/src/ui/diskexplorer/vtocview.h
index eb72a8e..ecd6d46 100644
--- a/src/ui/diskexplorer/vtocview.h
+++ b/src/ui/diskexplorer/vtocview.h
@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include <QWidget>
 
 class Sector;
diff --git a/src/ui/startupdialog.cpp b/src/ui/startupdialog.cpp
index 16bf650..0bc2df7 100644
--- a/src/ui/startupdialog.cpp
+++ b/src/ui/startupdialog.cpp
@@ -19,7 +19,7 @@
 #include "startupdialog.h"
 #include "ui_startupdialog.h"
 
-#include "diskexplorer/DiskExplorer.h"
+#include "diskexplorer.h"
 
 #include <QFileDialog>
 #include "centralappwindow.h"
diff --git a/src/ui/startupdialog.h b/src/ui/startupdialog.h
index 04f6c40..5e325bb 100644
--- a/src/ui/startupdialog.h
+++ b/src/ui/startupdialog.h
@@ -19,15 +19,14 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include "notesdialog.h"
 #include "hrcgcontrolsinfo.h"
 #include "hexconverter.h"
 #include "hexdumpviewer.h"
-#include <QDialog>
 #include "asciiinfodialog.h"
 
+#include <QDialog>
+
 namespace Ui {
 class StartupDialog;
 }
diff --git a/src/ui/viewers/applesoftfiledetailviewer.h b/src/ui/viewers/applesoftfiledetailviewer.h
index 310e667..de41c6a 100644
--- a/src/ui/viewers/applesoftfiledetailviewer.h
+++ b/src/ui/viewers/applesoftfiledetailviewer.h
@@ -19,13 +19,12 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
-#include <QWidget>
 #include "applesoftline.h"
 #include "applesofttoken.h"
 #include "applesoftfile.h"
+
 #include <QDebug>
+#include <QWidget>
 
 namespace Ui {
 class ApplesoftFileDetailViewer;
diff --git a/src/ui/viewers/applesoftfileviewer.cpp b/src/ui/viewers/applesoftfileviewer.cpp
index 1951e6b..ff778cf 100644
--- a/src/ui/viewers/applesoftfileviewer.cpp
+++ b/src/ui/viewers/applesoftfileviewer.cpp
@@ -20,6 +20,7 @@
 #include "ui_applesoftfileviewer.h"
 #include "applesoftformatter.h"
 #include "util.h"
+
 #include <QDebug>
 #include <QSettings>
 #include <QPrinter>
diff --git a/src/ui/viewers/applesoftfileviewer.h b/src/ui/viewers/applesoftfileviewer.h
index f5472de..b9a1542 100644
--- a/src/ui/viewers/applesoftfileviewer.h
+++ b/src/ui/viewers/applesoftfileviewer.h
@@ -19,17 +19,15 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
-#include <QWidget>
-#include <QMenu>
-#include <QAction>
-
 #include "applesoftfile.h"
 #include "applesoftformatter.h"
 #include "viewerbase.h"
 #include "applesoftfiledetailviewer.h"
 
+#include <QWidget>
+#include <QMenu>
+#include <QAction>
+
 
 namespace Ui {
 class ApplesoftFileViewer;
diff --git a/src/ui/viewers/charsetviewer.cpp b/src/ui/viewers/charsetviewer.cpp
index a387fc3..599d050 100644
--- a/src/ui/viewers/charsetviewer.cpp
+++ b/src/ui/viewers/charsetviewer.cpp
@@ -17,6 +17,7 @@
 *****************************************************************************/
 
 #include "charsetviewer.h"
+
 #include <QGridLayout>
 #include <QSettings>
 #include <QAction>
diff --git a/src/ui/viewers/charsetviewer.h b/src/ui/viewers/charsetviewer.h
index b9ecf1a..04d4c2d 100644
--- a/src/ui/viewers/charsetviewer.h
+++ b/src/ui/viewers/charsetviewer.h
@@ -19,12 +19,10 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include "binaryfile.h"
 #include "characterwidget.h"
 #include "fileviewerinterface.h"
-#include "CharacterSetExplorer.h"
+#include "charactersetexplorer.h"
 
 #include <QWidget>
 
diff --git a/src/ui/viewers/disassemblerviewer.cpp b/src/ui/viewers/disassemblerviewer.cpp
index 4f38eba..97364ac 100644
--- a/src/ui/viewers/disassemblerviewer.cpp
+++ b/src/ui/viewers/disassemblerviewer.cpp
@@ -24,7 +24,6 @@
 #include "relocatablefile.h"
 #include "opcodes.h"
 
-
 #include <QSettings>
 #include <QMenu>
 #include <QAction>
diff --git a/src/ui/viewers/disassemblerviewer.h b/src/ui/viewers/disassemblerviewer.h
index 45308a8..eb5dec0 100644
--- a/src/ui/viewers/disassemblerviewer.h
+++ b/src/ui/viewers/disassemblerviewer.h
@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include <QWidget>
 #include <QByteArray>
 
@@ -28,8 +26,8 @@
 #include "binaryfile.h"
 #include "relocatablefile.h"
 #include "fileviewerinterface.h"
-#include "DisassemblerMetadataDialog.h"
-#include "JumpLineManager.h"
+#include "disassemblermetadatadialog.h"
+#include "jumplinemanager.h"
 
 namespace Ui {
 class DisassemblerViewer;
diff --git a/src/ui/viewers/fileviewerinterface.h b/src/ui/viewers/fileviewerinterface.h
index 269a708..1b88b16 100644
--- a/src/ui/viewers/fileviewerinterface.h
+++ b/src/ui/viewers/fileviewerinterface.h
@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include <QWidget>
 #include <QString>
 #include <QPrinter>
diff --git a/src/ui/viewers/hiresviewwidget.h b/src/ui/viewers/hiresviewwidget.h
index 3ed04bb..5dea134 100644
--- a/src/ui/viewers/hiresviewwidget.h
+++ b/src/ui/viewers/hiresviewwidget.h
@@ -19,11 +19,9 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include "binaryfile.h"
 #include "fileviewerinterface.h"
-#include "HiresScreenWidget.h"
+#include "hiresscreenwidget.h"
 
 #include <QWidget>
 #include <QPixmap>
diff --git a/src/ui/viewers/intbasicfileviewer.h b/src/ui/viewers/intbasicfileviewer.h
index 47d1211..94a1c17 100644
--- a/src/ui/viewers/intbasicfileviewer.h
+++ b/src/ui/viewers/intbasicfileviewer.h
@@ -19,10 +19,8 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include "fileviewerinterface.h"
-#include "IntBasicFile.h"
+#include "intbasicfile.h"
 
 namespace Ui {
 class IntBasicFileViewer;
diff --git a/src/ui/viewers/mazeviewer.cpp b/src/ui/viewers/mazeviewer.cpp
index 86d7440..55e1ea2 100644
--- a/src/ui/viewers/mazeviewer.cpp
+++ b/src/ui/viewers/mazeviewer.cpp
@@ -17,12 +17,12 @@
 *****************************************************************************/
 
 #include "mazeviewer.h"
+#include "memory.h"
+
 #include <QPainter>
 #include <QResizeEvent>
 #include <QDebug>
 
-#include "memory.h"
-
 MazeViewer::MazeViewer(QWidget *parent) : FileViewerInterface(parent)
 {
     //setMinimumSize(480,600);
diff --git a/src/ui/viewers/viewerbase.cpp b/src/ui/viewers/viewerbase.cpp
index a933b53..0b81c6c 100644
--- a/src/ui/viewers/viewerbase.cpp
+++ b/src/ui/viewers/viewerbase.cpp
@@ -19,6 +19,17 @@
 #include "viewerbase.h"
 #include "ui_viewerbase.h"
 
+#include "applesoftfileviewer.h"
+#include "hexdumpviewer.h"
+#include "texthexdumpviewer.h"
+#include "charsetviewer.h"
+#include "intbasicfile.h"
+#include "intbasicfileviewer.h"
+#include "hiresviewwidget.h"
+#include "disassemblerviewer.h"
+#include "textfile.h"
+#include "mazeviewer.h"
+
 #include <QCloseEvent>
 #include <QToolBar>
 #include <QComboBox>
@@ -26,17 +37,6 @@
 #include <QDebug>
 #include <QScrollArea>
 
-#include "applesoftfileviewer.h"
-#include "hexdumpviewer.h"
-#include "texthexdumpviewer.h"
-#include "charsetviewer.h"
-#include "IntBasicFile.h"
-#include "intbasicfileviewer.h"
-#include "hiresviewwidget.h"
-#include "disassemblerviewer.h"
-#include "textfile.h"
-#include "mazeviewer.h"
-
 ViewerBase::ViewerBase(QWidget *parent) :
     QMainWindow(parent),
     ui(new Ui::ViewerBase)
diff --git a/src/ui/viewers/viewerbase.h b/src/ui/viewers/viewerbase.h
index b3340ae..42b7f38 100644
--- a/src/ui/viewers/viewerbase.h
+++ b/src/ui/viewers/viewerbase.h
@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include <QMainWindow>
 #include <QStackedWidget>
 #include <QToolBar>
diff --git a/src/ui/widgets/asciiinfodialog.h b/src/ui/widgets/asciiinfodialog.h
index 60bc44c..86306c6 100644
--- a/src/ui/widgets/asciiinfodialog.h
+++ b/src/ui/widgets/asciiinfodialog.h
@@ -19,10 +19,9 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
+#include "ui_asciiinfodialog.h"
 
 #include <QDialog>
-#include "ui_asciiinfodialog.h"
 
 namespace Ui {
 class AsciiInfoDialog;
diff --git a/src/ui/widgets/charactersetexplorer.cpp b/src/ui/widgets/charactersetexplorer.cpp
index a1df312..f415cf4 100644
--- a/src/ui/widgets/charactersetexplorer.cpp
+++ b/src/ui/widgets/charactersetexplorer.cpp
@@ -16,8 +16,8 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-#include "CharacterSetExplorer.h"
-#include "ui_CharacterSetExplorer.h"
+#include "charactersetexplorer.h"
+#include "ui_charactersetexplorer.h"
 
 CharacterSetExplorer::CharacterSetExplorer(QWidget *parent) :
     QDialog(parent),
diff --git a/src/ui/widgets/charactersetexplorer.h b/src/ui/widgets/charactersetexplorer.h
index d257009..b020ad4 100644
--- a/src/ui/widgets/charactersetexplorer.h
+++ b/src/ui/widgets/charactersetexplorer.h
@@ -19,12 +19,10 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
+#include "charset.h"
 
 #include <QDialog>
 
-#include "charset.h"
-
 namespace Ui {
 class CharacterSetExplorer;
 }
diff --git a/src/ui/widgets/characterwidget.h b/src/ui/widgets/characterwidget.h
index 7cd7f60..84f8985 100644
--- a/src/ui/widgets/characterwidget.h
+++ b/src/ui/widgets/characterwidget.h
@@ -18,8 +18,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include <QWidget>
 #include <QColor>
 #include <QPixmap>
diff --git a/src/ui/widgets/disassemblermetadatadialog.cpp b/src/ui/widgets/disassemblermetadatadialog.cpp
index 398387a..ce4565a 100644
--- a/src/ui/widgets/disassemblermetadatadialog.cpp
+++ b/src/ui/widgets/disassemblermetadatadialog.cpp
@@ -16,9 +16,10 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-#include "DisassemblerMetadataDialog.h"
-#include "ui_DisassemblerMetadataDialog.h"
+#include "disassemblermetadatadialog.h"
+#include "ui_disassemblermetadatadialog.h"
 #include "util.h"
+
 #include <QDebug>
 
 
diff --git a/src/ui/widgets/disassemblermetadatadialog.h b/src/ui/widgets/disassemblermetadatadialog.h
index 29a39ef..fcc3516 100644
--- a/src/ui/widgets/disassemblermetadatadialog.h
+++ b/src/ui/widgets/disassemblermetadatadialog.h
@@ -19,14 +19,12 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include "binaryfilemetadata.h"
-#include "EntryPoints.h"
-#include "EntryPointModel.h"
-#include "AssemblerSymbolModel.h"
-#include "AssemblerSymbols.h"
-#include "LocationInfoDialog.h"
+#include "entrypoints.h"
+#include "entrypointmodel.h"
+#include "assemblersymbolmodel.h"
+#include "assemblersymbols.h"
+#include "locationinfodialog.h"
 
 #include <QDialog>
 #include <QItemSelection>
diff --git a/src/ui/widgets/flowlinetextbrowser.cpp b/src/ui/widgets/flowlinetextbrowser.cpp
index 3f30ad5..ed7ccda 100644
--- a/src/ui/widgets/flowlinetextbrowser.cpp
+++ b/src/ui/widgets/flowlinetextbrowser.cpp
@@ -16,7 +16,7 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-#include "FlowLineTextBrowser.h"
+#include "flowlinetextbrowser.h"
 
 #include <QPainter>
 #include <QTextBlock>
diff --git a/src/ui/widgets/flowlinetextbrowser.h b/src/ui/widgets/flowlinetextbrowser.h
index 35c2483..84fde9b 100644
--- a/src/ui/widgets/flowlinetextbrowser.h
+++ b/src/ui/widgets/flowlinetextbrowser.h
@@ -19,9 +19,7 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
-#include "JumpLineManager.h"
+#include "jumplinemanager.h"
 
 #include <QTextBrowser>
 #include <QObject>
diff --git a/src/ui/widgets/hexconverter.cpp b/src/ui/widgets/hexconverter.cpp
index 713057c..2c9762f 100644
--- a/src/ui/widgets/hexconverter.cpp
+++ b/src/ui/widgets/hexconverter.cpp
@@ -18,6 +18,7 @@
 
 #include "hexconverter.h"
 #include "ui_hexconverter.h"
+
 #include <QString>
 #include <QIntValidator>
 
diff --git a/src/ui/widgets/hexconverter.h b/src/ui/widgets/hexconverter.h
index 52765e4..6de5bd3 100644
--- a/src/ui/widgets/hexconverter.h
+++ b/src/ui/widgets/hexconverter.h
@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include <QDialog>
 
 namespace Ui {
diff --git a/src/ui/widgets/hiresscreenwidget.cpp b/src/ui/widgets/hiresscreenwidget.cpp
index 4779654..09d0e7c 100644
--- a/src/ui/widgets/hiresscreenwidget.cpp
+++ b/src/ui/widgets/hiresscreenwidget.cpp
@@ -16,7 +16,7 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-#include "HiresScreenWidget.h"
+#include "hiresscreenwidget.h"
 
 #include "binaryfile.h"
 
diff --git a/src/ui/widgets/hiresscreenwidget.h b/src/ui/widgets/hiresscreenwidget.h
index 2f40150..52b3e9b 100644
--- a/src/ui/widgets/hiresscreenwidget.h
+++ b/src/ui/widgets/hiresscreenwidget.h
@@ -19,10 +19,8 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include "binaryfile.h"
-#include "AppleColors.h"
+#include "applecolors.h"
 
 #include <QWidget>
 #include <QPixmap>
diff --git a/src/ui/widgets/hrcgcontrolsinfo.h b/src/ui/widgets/hrcgcontrolsinfo.h
index 06980cd..fb3584e 100644
--- a/src/ui/widgets/hrcgcontrolsinfo.h
+++ b/src/ui/widgets/hrcgcontrolsinfo.h
@@ -19,11 +19,9 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
-#include <QDialog>
 #include "ui_hrcgcontrolsinfo.h"
 
+#include <QDialog>
 
 namespace Ui {
 class HRCGControlsInfo;
diff --git a/src/ui/widgets/locationinfodialog.cpp b/src/ui/widgets/locationinfodialog.cpp
index b26e8ff..d6b07b1 100644
--- a/src/ui/widgets/locationinfodialog.cpp
+++ b/src/ui/widgets/locationinfodialog.cpp
@@ -16,8 +16,8 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-#include "LocationInfoDialog.h"
-#include "ui_LocationInfoDialog.h"
+#include "locationinfodialog.h"
+#include "ui_locationinfodialog.h"
 
 LocationInfoDialog::LocationInfoDialog(QWidget *parent) :
     QDialog(parent,  Qt::CustomizeWindowHint | Qt::WindowTitleHint ),
diff --git a/src/ui/widgets/locationinfodialog.h b/src/ui/widgets/locationinfodialog.h
index 1b810fc..3802f93 100644
--- a/src/ui/widgets/locationinfodialog.h
+++ b/src/ui/widgets/locationinfodialog.h
@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include <QDialog>
 #include <QLabel>
 
diff --git a/src/ui/widgets/notesdialog.cpp b/src/ui/widgets/notesdialog.cpp
index c7c08fb..1b356d9 100644
--- a/src/ui/widgets/notesdialog.cpp
+++ b/src/ui/widgets/notesdialog.cpp
@@ -18,6 +18,7 @@
 
 #include "notesdialog.h"
 #include "ui_notesdialog.h"
+
 #include <QFile>
 
 NotesDialog::NotesDialog(QWidget *parent) :
diff --git a/src/ui/widgets/notesdialog.h b/src/ui/widgets/notesdialog.h
index 8d8b045..4a4f80b 100644
--- a/src/ui/widgets/notesdialog.h
+++ b/src/ui/widgets/notesdialog.h
@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include <QDialog>
 
 namespace Ui {