diff --git a/.clang-format b/.clang-format
index d68fa440..238060c5 100644
--- a/.clang-format
+++ b/.clang-format
@@ -50,11 +50,20 @@ BreakTemplateDeclarations: Yes
 # clang-format does not handle that.
 AllowShortFunctionsOnASingleLine: Inline
 
-# The coding style specifies some include order categories, but also tells to
-# separate categories with an empty line. It does not specify the order within
-# the categories. Since the SortInclude feature of clang-format does not
-# re-order includes separated by empty lines, the feature is not used.
-SortIncludes: false
+# Sort includes and regroup them into consistent blocks:
+#   0. self include (the .h matching the .cpp, automatic)
+#   1. project includes  ""
+#   2. Qt includes       <Q...>
+#   3. system includes   <...>
+SortIncludes: CaseSensitive
+IncludeBlocks: Regroup
+IncludeCategories:
+    - Regex: "^\""
+      Priority: 1
+    - Regex: "^<Q"
+      Priority: 2
+    - Regex: "^<"
+      Priority: 3
 
 # macros for which the opening brace stays attached.
 ForEachMacros:   [ foreach, BOOST_FOREACH, forever, Q_FOREVER, QBENCHMARK, QBENCHMARK_ONCE ]
diff --git a/YACReader/bookmarks_dialog.cpp b/YACReader/bookmarks_dialog.cpp
index ea806afe..1d315394 100644
--- a/YACReader/bookmarks_dialog.cpp
+++ b/YACReader/bookmarks_dialog.cpp
@@ -1,14 +1,14 @@
 #include "bookmarks_dialog.h"
 
-#include <QGridLayout>
-#include <QLabel>
+#include "bookmarks.h"
+
 #include <QApplication>
 #include <QFrame>
+#include <QGridLayout>
 #include <QImage>
+#include <QLabel>
 #include <QScreen>
 
-#include "bookmarks.h"
-
 BookmarksDialog::BookmarksDialog(QWidget *parent)
     : QDialog(parent)
 {
diff --git a/YACReader/bookmarks_dialog.h b/YACReader/bookmarks_dialog.h
index a440b895..375223fc 100644
--- a/YACReader/bookmarks_dialog.h
+++ b/YACReader/bookmarks_dialog.h
@@ -1,15 +1,15 @@
 #ifndef __BOOKMARKS_DIALOG_H
 #define __BOOKMARKS_DIALOG_H
 
-#include <QWidget>
+#include "bookmarks.h"
+
 #include <QDialog>
-#include <QLabel>
-#include <QPushButton>
 #include <QEvent>
 #include <QKeyEvent>
+#include <QLabel>
 #include <QPropertyAnimation>
-
-#include "bookmarks.h"
+#include <QPushButton>
+#include <QWidget>
 
 class BookmarksDialog : public QDialog
 {
diff --git a/YACReader/configuration.cpp b/YACReader/configuration.cpp
index 93a93d32..9e2b0d4a 100644
--- a/YACReader/configuration.cpp
+++ b/YACReader/configuration.cpp
@@ -1,11 +1,10 @@
 #include "configuration.h"
 
-#include <QFile>
-#include <QFile>
-#include <QTextStream>
 #include <QCoreApplication>
-#include <QStringList>
+#include <QFile>
 #include <QMessageBox>
+#include <QStringList>
+#include <QTextStream>
 
 Configuration::Configuration()
 {
diff --git a/YACReader/configuration.h b/YACReader/configuration.h
index 10d49938..2556b6fb 100644
--- a/YACReader/configuration.h
+++ b/YACReader/configuration.h
@@ -1,16 +1,16 @@
 #ifndef __CONFIGURATION_H
 #define __CONFIGURATION_H
 
-#include <QByteArray>
-#include <QString>
-#include <QSize>
-#include <QObject>
-#include <QColor>
-#include <QSettings>
-#include <QDate>
-
-#include "yacreader_global_gui.h"
 #include "resize_image.h"
+#include "yacreader_global_gui.h"
+
+#include <QByteArray>
+#include <QColor>
+#include <QDate>
+#include <QObject>
+#include <QSettings>
+#include <QSize>
+#include <QString>
 
 #define CONF_FILE_PATH "."
 #define SLIDE_ASPECT_RATIO 1.585
diff --git a/YACReader/continuous_page_widget.cpp b/YACReader/continuous_page_widget.cpp
index 514156c6..e3c9cc72 100644
--- a/YACReader/continuous_page_widget.cpp
+++ b/YACReader/continuous_page_widget.cpp
@@ -1,11 +1,12 @@
 #include "continuous_page_widget.h"
+
+#include "configuration.h"
 #include "continuous_view_model.h"
 #include "render.h"
 #include "resize_image.h"
-#include "configuration.h"
 
-#include <QPainter>
 #include <QPaintEvent>
+#include <QPainter>
 
 ContinuousPageWidget::ContinuousPageWidget(QWidget *parent)
     : QWidget(parent)
diff --git a/YACReader/continuous_page_widget.h b/YACReader/continuous_page_widget.h
index aff9b809..aae13923 100644
--- a/YACReader/continuous_page_widget.h
+++ b/YACReader/continuous_page_widget.h
@@ -1,13 +1,13 @@
 #ifndef CONTINUOUS_PAGE_WIDGET_H
 #define CONTINUOUS_PAGE_WIDGET_H
 
-#include <QWidget>
-#include <QSize>
-#include <QVector>
+#include "themable.h"
+
 #include <QHash>
 #include <QList>
-
-#include "themable.h"
+#include <QSize>
+#include <QVector>
+#include <QWidget>
 
 class Render;
 class ContinuousViewModel;
diff --git a/YACReader/continuous_view_model.cpp b/YACReader/continuous_view_model.cpp
index 8d88443d..7e2f55aa 100644
--- a/YACReader/continuous_view_model.cpp
+++ b/YACReader/continuous_view_model.cpp
@@ -1,7 +1,7 @@
 #include "continuous_view_model.h"
 
-#include <QtMath>
 #include <QWidget>
+#include <QtMath>
 
 #include <algorithm>
 #include <limits>
diff --git a/YACReader/goto_dialog.cpp b/YACReader/goto_dialog.cpp
index 537ab910..f442b93b 100644
--- a/YACReader/goto_dialog.cpp
+++ b/YACReader/goto_dialog.cpp
@@ -1,8 +1,8 @@
 #include "goto_dialog.h"
 
 #include <QHBoxLayout>
-#include <QVBoxLayout>
 #include <QIntValidator>
+#include <QVBoxLayout>
 
 GoToDialog::GoToDialog(QWidget *parent)
     : QDialog(parent)
diff --git a/YACReader/goto_dialog.h b/YACReader/goto_dialog.h
index 3e16a974..e62f8d2d 100644
--- a/YACReader/goto_dialog.h
+++ b/YACReader/goto_dialog.h
@@ -2,10 +2,10 @@
 #define __GOTODIALOG_H
 
 #include <QDialog>
+#include <QIntValidator>
 #include <QLabel>
 #include <QLineEdit>
 #include <QPushButton>
-#include <QIntValidator>
 
 class GoToDialog : public QDialog
 {
diff --git a/YACReader/goto_flow_toolbar.cpp b/YACReader/goto_flow_toolbar.cpp
index f3428eca..5905d76b 100644
--- a/YACReader/goto_flow_toolbar.cpp
+++ b/YACReader/goto_flow_toolbar.cpp
@@ -1,16 +1,16 @@
 #include "goto_flow_toolbar.h"
 
+#include "configuration.h"
+
 #include <QAbstractButton>
-#include <QPainter>
 #include <QHBoxLayout>
 #include <QIntValidator>
 #include <QLabel>
 #include <QLineEdit>
+#include <QPainter>
 #include <QPushButton>
 #include <QSlider>
 
-#include "configuration.h"
-
 GoToFlowToolBar::GoToFlowToolBar(QWidget *parent)
     : QStackedWidget(parent)
 {
diff --git a/YACReader/goto_flow_toolbar.h b/YACReader/goto_flow_toolbar.h
index 615a3511..1f87526f 100644
--- a/YACReader/goto_flow_toolbar.h
+++ b/YACReader/goto_flow_toolbar.h
@@ -1,11 +1,11 @@
 #ifndef GOTO_FLOW_TOOLBAR_H
 #define GOTO_FLOW_TOOLBAR_H
 
-#include <QWidget>
-#include <QStackedWidget>
-
 #include "themable.h"
 
+#include <QStackedWidget>
+#include <QWidget>
+
 class QLineEdit;
 class QIntValidator;
 class QPushButton;
diff --git a/YACReader/goto_flow_widget.cpp b/YACReader/goto_flow_widget.cpp
index 782b9b87..8071c6e1 100644
--- a/YACReader/goto_flow_widget.cpp
+++ b/YACReader/goto_flow_widget.cpp
@@ -1,14 +1,14 @@
 #include "goto_flow_widget.h"
 
+#include "configuration.h"
+#include "goto_flow_toolbar.h"
+
+#include <QApplication>
+#include <QCoreApplication>
 #include <QHBoxLayout>
 #include <QKeyEvent>
-#include <QCoreApplication>
-#include <QApplication>
 #include <QSettings>
 
-#include "goto_flow_toolbar.h"
-#include "configuration.h"
-
 GoToFlowWidget::GoToFlowWidget(QWidget *parent, FlowType flowType)
     : QWidget(parent)
 {
diff --git a/YACReader/goto_flow_widget.h b/YACReader/goto_flow_widget.h
index 7d5c73a2..809673a2 100644
--- a/YACReader/goto_flow_widget.h
+++ b/YACReader/goto_flow_widget.h
@@ -1,12 +1,12 @@
 #ifndef __GOTO_FLOW_WIDGET_H
 #define __GOTO_FLOW_WIDGET_H
 
-#include <QWidget>
-#include <QSettings>
-#include "yacreader_global_gui.h"
-
-#include "yacreader_page_flow_rhi.h"
 #include "themable.h"
+#include "yacreader_global_gui.h"
+#include "yacreader_page_flow_rhi.h"
+
+#include <QSettings>
+#include <QWidget>
 
 using namespace YACReader;
 
diff --git a/YACReader/magnifying_glass.cpp b/YACReader/magnifying_glass.cpp
index 5bc1f78d..306c48a8 100644
--- a/YACReader/magnifying_glass.cpp
+++ b/YACReader/magnifying_glass.cpp
@@ -1,4 +1,5 @@
 #include "magnifying_glass.h"
+
 #include "viewer.h"
 
 MagnifyingGlass::MagnifyingGlass(int w, int h, float zoomLevel, QWidget *parent)
diff --git a/YACReader/main.cpp b/YACReader/main.cpp
index 27d0d08c..4a554d85 100644
--- a/YACReader/main.cpp
+++ b/YACReader/main.cpp
@@ -1,18 +1,17 @@
-#include <QApplication>
-#include <QDir>
-#include <QCommandLineParser>
-#include <QImageReader>
-
-#include "main_window_viewer.h"
-#include "exit_check.h"
-#include "appearance_configuration.h"
-#include "theme_manager.h"
-#include "theme_repository.h"
-#include "app_language_utils.h"
-#include "yacreader_global.h"
-
 #include "QsLog.h"
 #include "QsLogDest.h"
+#include "app_language_utils.h"
+#include "appearance_configuration.h"
+#include "exit_check.h"
+#include "main_window_viewer.h"
+#include "theme_manager.h"
+#include "theme_repository.h"
+#include "yacreader_global.h"
+
+#include <QApplication>
+#include <QCommandLineParser>
+#include <QDir>
+#include <QImageReader>
 
 using namespace QsLogging;
 using namespace YACReader;
diff --git a/YACReader/main_window_viewer.cpp b/YACReader/main_window_viewer.cpp
index bb210bc6..28b7747c 100644
--- a/YACReader/main_window_viewer.cpp
+++ b/YACReader/main_window_viewer.cpp
@@ -1,41 +1,39 @@
 #include "main_window_viewer.h"
+
 #include "bookmarks_dialog.h"
-#include "configuration.h"
-#include "viewer.h"
-#include "options_dialog.h"
 #include "check_new_version.h"
 #include "comic.h"
-#include "width_slider.h"
-#include "qnaturalsorting.h"
-#include "help_about_dialog.h"
-#include "yacreader_tool_bar_stretch.h"
-
 #include "comic_db.h"
-#include "yacreader_local_client.h"
-
-#include "yacreader_global.h"
+#include "configuration.h"
 #include "edit_shortcuts_dialog.h"
+#include "help_about_dialog.h"
+#include "options_dialog.h"
+#include "qnaturalsorting.h"
 #include "shortcuts_manager.h"
 #include "theme_manager.h"
-
+#include "viewer.h"
 #include "whats_new_controller.h"
-
-#include <algorithm>
-#include <utility>
+#include "width_slider.h"
+#include "yacreader_global.h"
+#include "yacreader_local_client.h"
+#include "yacreader_tool_bar_stretch.h"
 
 #include <QActionGroup>
 #include <QApplication>
 #include <QCoreApplication>
-#include <QDesktopServices>
-#include <QWindow>
-#include <QToolButton>
-#include <QMenu>
-#include <QFileDialog>
-#include <QMessageBox>
-#include <QImage>
 #include <QDate>
+#include <QDesktopServices>
+#include <QFileDialog>
+#include <QImage>
+#include <QMenu>
 #include <QMenuBar>
+#include <QMessageBox>
 #include <QStandardPaths>
+#include <QToolButton>
+#include <QWindow>
+
+#include <algorithm>
+#include <utility>
 
 #ifdef use_unarr
 #include "unarr.h"
diff --git a/YACReader/main_window_viewer.h b/YACReader/main_window_viewer.h
index 561c54c8..24b6a4f7 100644
--- a/YACReader/main_window_viewer.h
+++ b/YACReader/main_window_viewer.h
@@ -1,16 +1,16 @@
 #ifndef __MAIN_WINDOW_VIEWER_H
 #define __MAIN_WINDOW_VIEWER_H
+#include "themable.h"
+#include "yacreader_global.h"
+
+#include <QAction>
+#include <QCloseEvent>
 #include <QMainWindow>
+#include <QMouseEvent>
 #include <QScrollArea>
+#include <QSettings>
 #include <QToolBar>
 #include <QToolButton>
-#include <QAction>
-#include <QMouseEvent>
-#include <QCloseEvent>
-#include <QSettings>
-
-#include "yacreader_global.h"
-#include "themable.h"
 
 #ifdef Y_MAC_UI
 #include "yacreader_macosx_toolbar.h"
diff --git a/YACReader/mouse_handler.cpp b/YACReader/mouse_handler.cpp
index 4ac97da7..dcdfec9f 100644
--- a/YACReader/mouse_handler.cpp
+++ b/YACReader/mouse_handler.cpp
@@ -1,13 +1,13 @@
 #include "mouse_handler.h"
 
-#include <QScrollBar>
-
 #include "configuration.h"
 #include "goto_flow_widget.h"
 #include "magnifying_glass.h"
 #include "render.h"
 #include "viewer.h"
 
+#include <QScrollBar>
+
 using namespace YACReader;
 
 YACReader::MouseHandler::MouseHandler(Viewer *viewer)
diff --git a/YACReader/options_dialog.cpp b/YACReader/options_dialog.cpp
index 38b7e6d3..0c4a96dc 100644
--- a/YACReader/options_dialog.cpp
+++ b/YACReader/options_dialog.cpp
@@ -1,26 +1,27 @@
 #include "options_dialog.h"
+
+#include "app_language_utils.h"
+#include "appearance_tab_widget.h"
 #include "configuration.h"
-#include <QVBoxLayout>
-#include <QHBoxLayout>
+#include "theme_factory.h"
+#include "theme_manager.h"
+#include "yacreader_3d_flow_config_widget.h"
+#include "yacreader_spin_slider_widget.h"
+
+#include <QCheckBox>
+#include <QColorDialog>
+#include <QComboBox>
 #include <QFileDialog>
 #include <QGroupBox>
-#include <QRadioButton>
-#include <QTabWidget>
-#include <QSlider>
-#include <QLineEdit>
-#include <QPushButton>
+#include <QHBoxLayout>
 #include <QLabel>
-#include <QColorDialog>
-#include <QCheckBox>
-#include <QComboBox>
+#include <QLineEdit>
 #include <QMessageBox>
-#include "theme_manager.h"
-#include "theme_factory.h"
-#include "appearance_tab_widget.h"
-#include "app_language_utils.h"
-
-#include "yacreader_spin_slider_widget.h"
-#include "yacreader_3d_flow_config_widget.h"
+#include <QPushButton>
+#include <QRadioButton>
+#include <QSlider>
+#include <QTabWidget>
+#include <QVBoxLayout>
 
 OptionsDialog::OptionsDialog(QWidget *parent)
     : YACReaderOptionsDialog(parent)
diff --git a/YACReader/options_dialog.h b/YACReader/options_dialog.h
index 874e1c9f..e89f0d0b 100644
--- a/YACReader/options_dialog.h
+++ b/YACReader/options_dialog.h
@@ -1,8 +1,8 @@
 #ifndef __OPTIONS_DIALOG_H
 #define __OPTIONS_DIALOG_H
 
-#include "yacreader_options_dialog.h"
 #include "themable.h"
+#include "yacreader_options_dialog.h"
 
 #include <QPointer>
 
diff --git a/YACReader/page_label_widget.h b/YACReader/page_label_widget.h
index 1bec7c4e..898c5b1d 100644
--- a/YACReader/page_label_widget.h
+++ b/YACReader/page_label_widget.h
@@ -1,10 +1,10 @@
 #ifndef PAGE_LABEL_WIDGET_H
 #define PAGE_LABEL_WIDGET_H
 
-#include <QWidget>
-
 #include "themable.h"
 
+#include <QWidget>
+
 class QLabel;
 class QPropertyAnimation;
 
diff --git a/YACReader/render.cpp b/YACReader/render.cpp
index 9ad49ec4..bfba392b 100644
--- a/YACReader/render.cpp
+++ b/YACReader/render.cpp
@@ -1,15 +1,17 @@
 #include "render.h"
-#include <cmath>
-#include <QList>
-#include <algorithm>
-#include <QByteArray>
-#include <QPixmap>
-#include <QApplication>
-#include <QImage>
 
 #include "comic_db.h"
-#include "yacreader_global_gui.h"
 #include "configuration.h"
+#include "yacreader_global_gui.h"
+
+#include <QApplication>
+#include <QByteArray>
+#include <QImage>
+#include <QList>
+#include <QPixmap>
+
+#include <algorithm>
+#include <cmath>
 
 template<class T>
 inline const T &kClamp(const T &x, const T &low, const T &high)
diff --git a/YACReader/render.h b/YACReader/render.h
index 25ad7166..da7a57ce 100644
--- a/YACReader/render.h
+++ b/YACReader/render.h
@@ -1,13 +1,14 @@
 #ifndef RENDER_H
 #define RENDER_H
 
-#include <QImage>
-#include <QPixmap>
-#include <QPainter>
-#include <QThread>
-#include <QByteArray>
-#include <QVector>
 #include "comic.h"
+
+#include <QByteArray>
+#include <QImage>
+#include <QPainter>
+#include <QPixmap>
+#include <QThread>
+#include <QVector>
 //-----------------------------------------------------------------------------
 // FILTERS
 //-----------------------------------------------------------------------------
diff --git a/YACReader/themes/theme.h b/YACReader/themes/theme.h
index 658fe8a6..f5c07351 100644
--- a/YACReader/themes/theme.h
+++ b/YACReader/themes/theme.h
@@ -1,13 +1,13 @@
 #ifndef THEME_H
 #define THEME_H
 
+#include "help_about_dialog_theme.h"
+#include "theme_meta.h"
+#include "whats_new_dialog_theme.h"
+
 #include <QIcon>
 #include <QJsonObject>
 
-#include "help_about_dialog_theme.h"
-#include "whats_new_dialog_theme.h"
-#include "theme_meta.h"
-
 struct ToolbarThemeTemplates {
     QString toolbarQSS = "QToolBar { border: none; background: %1; }\n"
                          "QToolBar::separator { background: %2; width: 1px; margin: 5px 4px; }\n"
diff --git a/YACReader/themes/theme_factory.cpp b/YACReader/themes/theme_factory.cpp
index 6f5cfa8e..deb85517 100644
--- a/YACReader/themes/theme_factory.cpp
+++ b/YACReader/themes/theme_factory.cpp
@@ -1,10 +1,10 @@
 #include "theme_factory.h"
 
-#include <QApplication>
-
 #include "icon_utils.h"
 #include "theme_meta.h"
 
+#include <QApplication>
+
 struct ToolbarParams {
     ToolbarThemeTemplates t;
 
diff --git a/YACReader/translator.cpp b/YACReader/translator.cpp
index d1a447e0..ad593d1f 100644
--- a/YACReader/translator.cpp
+++ b/YACReader/translator.cpp
@@ -1,30 +1,28 @@
-#include <QTextToSpeech>
-#include <QJsonDocument>
-#include <QJsonObject>
-
-#include <QPushButton>
-#include <QPalette>
-#include <QMouseEvent>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
 #include "translator.h"
-#include "viewer.h"
 
+#include "viewer.h"
 #include "yacreader_busy_widget.h"
 
-#include <QFile>
-#include <QPoint>
-#include <QWidget>
-#include <QLabel>
-#include <QTextEdit>
 #include <QComboBox>
-#include <QThread>
 #include <QEventLoop>
-#include <QTimer>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-
+#include <QFile>
+#include <QHBoxLayout>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QLabel>
 #include <QMessageBox>
+#include <QMouseEvent>
+#include <QNetworkReply>
+#include <QNetworkRequest>
+#include <QPalette>
+#include <QPoint>
+#include <QPushButton>
+#include <QTextEdit>
+#include <QTextToSpeech>
+#include <QThread>
+#include <QTimer>
+#include <QVBoxLayout>
+#include <QWidget>
 
 YACReaderTranslator::YACReaderTranslator(Viewer *parent)
     : QWidget(parent), drag(false)
diff --git a/YACReader/translator.h b/YACReader/translator.h
index 3cfb7fa5..ba2cec30 100644
--- a/YACReader/translator.h
+++ b/YACReader/translator.h
@@ -10,11 +10,12 @@ class QPushButton;
 class YACReaderBusyWidget;
 class QTextToSpeech;
 
-#include <QWidget>
+#include "themable.h"
+#include "viewer.h"
+
 #include <QThread>
 #include <QUrl>
-#include "viewer.h"
-#include "themable.h"
+#include <QWidget>
 
 class YACReaderTranslator : public QWidget, protected Themable
 {
diff --git a/YACReader/viewer.cpp b/YACReader/viewer.cpp
index ba08498d..5a0334cf 100644
--- a/YACReader/viewer.cpp
+++ b/YACReader/viewer.cpp
@@ -1,17 +1,18 @@
 #include "viewer.h"
+
+#include "bookmarks_dialog.h"
+#include "comic_db.h"
+#include "configuration.h"
 #include "continuous_page_widget.h"
 #include "continuous_view_model.h"
-#include "resize_image.h"
-#include "configuration.h"
-#include "magnifying_glass.h"
-#include "goto_flow_widget.h"
-#include "bookmarks_dialog.h"
-#include "render.h"
 #include "goto_dialog.h"
-#include "translator.h"
-#include "page_label_widget.h"
+#include "goto_flow_widget.h"
+#include "magnifying_glass.h"
 #include "notifications_label_widget.h"
-#include "comic_db.h"
+#include "page_label_widget.h"
+#include "render.h"
+#include "resize_image.h"
+#include "translator.h"
 
 #include <QFile>
 #include <QKeyEvent>
diff --git a/YACReader/viewer.h b/YACReader/viewer.h
index 0189c7f4..62071d11 100644
--- a/YACReader/viewer.h
+++ b/YACReader/viewer.h
@@ -1,25 +1,24 @@
 #ifndef __VIEWER_H
 #define __VIEWER_H
 
-#include <QMainWindow>
-
-#include <QScrollArea>
-#include <QAction>
-#include <QTimer>
-#include <QLabel>
-#include <QPixmap>
-#include <QResizeEvent>
-#include <QWheelEvent>
-#include <QMouseEvent>
-#include <QCloseEvent>
-#include <QPropertyAnimation>
-#include <QParallelAnimationGroup>
-#include <QSettings>
-
-#include "scroll_management.h"
 #include "mouse_handler.h"
+#include "scroll_management.h"
 #include "themable.h"
 
+#include <QAction>
+#include <QCloseEvent>
+#include <QLabel>
+#include <QMainWindow>
+#include <QMouseEvent>
+#include <QParallelAnimationGroup>
+#include <QPixmap>
+#include <QPropertyAnimation>
+#include <QResizeEvent>
+#include <QScrollArea>
+#include <QSettings>
+#include <QTimer>
+#include <QWheelEvent>
+
 class ComicDB;
 class Comic;
 class MagnifyingGlass;
diff --git a/YACReader/width_slider.h b/YACReader/width_slider.h
index df5522ff..d1bafa59 100644
--- a/YACReader/width_slider.h
+++ b/YACReader/width_slider.h
@@ -1,8 +1,8 @@
 #ifndef WIDTH_SLIDER_H
 #define WIDTH_SLIDER_H
 
-#include <QWidgetAction>
 #include <QWidget>
+#include <QWidgetAction>
 
 class QLabel;
 class QSlider;
diff --git a/YACReader/yacreader_local_client.cpp b/YACReader/yacreader_local_client.cpp
index d845d67e..6cb6cb92 100644
--- a/YACReader/yacreader_local_client.cpp
+++ b/YACReader/yacreader_local_client.cpp
@@ -1,11 +1,11 @@
 #include "yacreader_local_client.h"
+
+#include "QsLog.h"
 #include "comic_db.h"
 #include "yacreader_global.h"
 
 #include <QLocalSocket>
 
-#include "QsLog.h"
-
 using namespace YACReader;
 
 YACReaderLocalClient::YACReaderLocalClient(QObject *parent)
diff --git a/YACReader/yacreader_local_client.h b/YACReader/yacreader_local_client.h
index b683d694..d4472b0b 100644
--- a/YACReader/yacreader_local_client.h
+++ b/YACReader/yacreader_local_client.h
@@ -1,8 +1,8 @@
 #ifndef YACREADER_LOCAL_CLIENT_H
 #define YACREADER_LOCAL_CLIENT_H
 
-#include "yacreader_global.h"
 #include "comic_db.h"
+#include "yacreader_global.h"
 
 #include <QObject>
 
diff --git a/YACReaderLibrary/add_label_dialog.h b/YACReaderLibrary/add_label_dialog.h
index fd943119..54a64fe9 100644
--- a/YACReaderLibrary/add_label_dialog.h
+++ b/YACReaderLibrary/add_label_dialog.h
@@ -1,14 +1,14 @@
 #ifndef ADD_LABEL_DIALOG_H
 #define ADD_LABEL_DIALOG_H
 
+#include "themable.h"
+#include "yacreader_global.h"
+
 #include <QDialog>
 #include <QLineEdit>
 #include <QListWidget>
 #include <QPushButton>
 
-#include "yacreader_global.h"
-#include "themable.h"
-
 class AddLabelDialog : public QDialog, protected Themable
 {
     Q_OBJECT
diff --git a/YACReaderLibrary/add_library_dialog.cpp b/YACReaderLibrary/add_library_dialog.cpp
index d5ebc09b..557cf528 100644
--- a/YACReaderLibrary/add_library_dialog.cpp
+++ b/YACReaderLibrary/add_library_dialog.cpp
@@ -1,9 +1,9 @@
 #include "add_library_dialog.h"
 
-#include <QHBoxLayout>
-#include <QVBoxLayout>
 #include <QFileDialog>
 #include <QGridLayout>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
 
 AddLibraryDialog::AddLibraryDialog(QWidget *parent)
     : QDialog(parent)
diff --git a/YACReaderLibrary/classic_comics_view.cpp b/YACReaderLibrary/classic_comics_view.cpp
index 6c5d883f..ba7c6a08 100644
--- a/YACReaderLibrary/classic_comics_view.cpp
+++ b/YACReaderLibrary/classic_comics_view.cpp
@@ -1,6 +1,9 @@
 #include "classic_comics_view.h"
 
+#include "comic_flow_widget.h"
+#include "shortcuts_manager.h"
 #include "yacreader_global.h"
+#include "yacreader_table_view.h"
 
 #include <QHBoxLayout>
 #include <QHeaderView>
@@ -12,10 +15,6 @@
 #include <QToolBar>
 #include <QVBoxLayout>
 
-#include "comic_flow_widget.h"
-#include "shortcuts_manager.h"
-#include "yacreader_table_view.h"
-
 ClassicComicsView::ClassicComicsView(QWidget *parent)
     : ComicsView(parent), searching(false)
 {
diff --git a/YACReaderLibrary/comic_files_manager.cpp b/YACReaderLibrary/comic_files_manager.cpp
index 091e36fa..517c4f12 100644
--- a/YACReaderLibrary/comic_files_manager.cpp
+++ b/YACReaderLibrary/comic_files_manager.cpp
@@ -1,12 +1,12 @@
 #include "comic_files_manager.h"
-#include <QFile>
-#include <QFileInfo>
-#include <QDir>
-
-#include <QsLog.h>
 
 #include "comic.h"
 
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
+#include <QsLog.h>
+
 ComicFilesManager::ComicFilesManager(QObject *parent)
     : QObject(parent), canceled(false)
 {
diff --git a/YACReaderLibrary/comic_files_manager.h b/YACReaderLibrary/comic_files_manager.h
index ae39c23d..870f85a8 100644
--- a/YACReaderLibrary/comic_files_manager.h
+++ b/YACReaderLibrary/comic_files_manager.h
@@ -1,10 +1,10 @@
 #ifndef COMIC_FILES_MANAGER_H
 #define COMIC_FILES_MANAGER_H
 
-#include <QObject>
 #include <QList>
-#include <QPair>
 #include <QModelIndex>
+#include <QObject>
+#include <QPair>
 
 // this class is intended to work in background, just use moveToThread and process to start working
 class ComicFilesManager : public QObject
diff --git a/YACReaderLibrary/comic_flow_widget.cpp b/YACReaderLibrary/comic_flow_widget.cpp
index 7e54ae6a..b75fdb52 100644
--- a/YACReaderLibrary/comic_flow_widget.cpp
+++ b/YACReaderLibrary/comic_flow_widget.cpp
@@ -1,4 +1,5 @@
 #include "comic_flow_widget.h"
+
 #include <QVBoxLayout>
 
 ComicFlowWidget::ComicFlowWidget(QWidget *parent)
diff --git a/YACReaderLibrary/comic_flow_widget.h b/YACReaderLibrary/comic_flow_widget.h
index 8492bfa2..17556496 100644
--- a/YACReaderLibrary/comic_flow_widget.h
+++ b/YACReaderLibrary/comic_flow_widget.h
@@ -1,13 +1,12 @@
 #ifndef __COMIC_FLOW_WIDGET_H
 #define __COMIC_FLOW_WIDGET_H
 
-#include <QWidget>
-
-#include "yacreader_global.h"
-
-#include "yacreader_comic_flow_rhi.h"
-#include "yacreader_global_gui.h"
 #include "themable.h"
+#include "yacreader_comic_flow_rhi.h"
+#include "yacreader_global.h"
+#include "yacreader_global_gui.h"
+
+#include <QWidget>
 
 class ComicFlowWidget : public QWidget, protected Themable
 {
diff --git a/YACReaderLibrary/comic_vine/api_key_dialog.cpp b/YACReaderLibrary/comic_vine/api_key_dialog.cpp
index ae063da4..9aa581e7 100644
--- a/YACReaderLibrary/comic_vine/api_key_dialog.cpp
+++ b/YACReaderLibrary/comic_vine/api_key_dialog.cpp
@@ -1,13 +1,13 @@
 #include "api_key_dialog.h"
 
-#include <QVBoxLayout>
+#include "yacreader_global_gui.h"
+
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QLineEdit>
 #include <QPushButton>
 #include <QSettings>
-
-#include "yacreader_global_gui.h"
+#include <QVBoxLayout>
 
 ApiKeyDialog::ApiKeyDialog(QWidget *parent)
     : QDialog(parent)
diff --git a/YACReaderLibrary/comic_vine/comic_vine_client.cpp b/YACReaderLibrary/comic_vine/comic_vine_client.cpp
index 67ee031a..888bfa48 100644
--- a/YACReaderLibrary/comic_vine/comic_vine_client.cpp
+++ b/YACReaderLibrary/comic_vine/comic_vine_client.cpp
@@ -1,7 +1,7 @@
 #include "comic_vine_client.h"
-#include "yacreader_global_gui.h"
 
 #include "comic_vine_all_volume_comics_retriever.h"
+#include "yacreader_global_gui.h"
 
 // this is the API key used by YACReader to access Comic Vine
 // please, do not use it in your own software, get one for free at Comic Vine
diff --git a/YACReaderLibrary/comic_vine/comic_vine_dialog.cpp b/YACReaderLibrary/comic_vine/comic_vine_dialog.cpp
index acdc37ac..15effb3a 100644
--- a/YACReaderLibrary/comic_vine/comic_vine_dialog.cpp
+++ b/YACReaderLibrary/comic_vine/comic_vine_dialog.cpp
@@ -1,34 +1,34 @@
 #include "comic_vine_dialog.h"
-#include <QApplication>
-#include <QHBoxLayout>
-#include <QScreen>
-#include <QLabel>
-#include <QMessageBox>
-#include <QPushButton>
-#include <QRadioButton>
-#include <QStackedWidget>
-#include <QTableView>
-#include <QVBoxLayout>
-#include <QtConcurrent/QtConcurrentRun>
-#include "data_base_management.h"
-#include <QSqlDatabase>
 
-#include "yacreader_busy_widget.h"
+#include "QsLog.h"
 #include "comic_vine_client.h"
 #include "comic_vine_json_parser.h"
+#include "data_base_management.h"
+#include "db_helper.h"
+#include "response_parser.h"
 #include "scraper_lineedit.h"
-#include "title_header.h"
-#include "series_question.h"
 #include "search_single_comic.h"
 #include "search_volume.h"
 #include "select_comic.h"
 #include "select_volume.h"
 #include "selected_volume_info.h"
+#include "series_question.h"
 #include "sort_volume_comics.h"
-#include "db_helper.h"
-#include "response_parser.h"
+#include "title_header.h"
+#include "yacreader_busy_widget.h"
 
-#include "QsLog.h"
+#include <QApplication>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QMessageBox>
+#include <QPushButton>
+#include <QRadioButton>
+#include <QScreen>
+#include <QSqlDatabase>
+#include <QStackedWidget>
+#include <QTableView>
+#include <QVBoxLayout>
+#include <QtConcurrent/QtConcurrentRun>
 
 ComicVineDialog::ComicVineDialog(QWidget *parent)
     : QDialog(parent)
diff --git a/YACReaderLibrary/comic_vine/comic_vine_dialog.h b/YACReaderLibrary/comic_vine/comic_vine_dialog.h
index 36468023..ecd4485b 100644
--- a/YACReaderLibrary/comic_vine/comic_vine_dialog.h
+++ b/YACReaderLibrary/comic_vine/comic_vine_dialog.h
@@ -1,11 +1,11 @@
 #ifndef COMIC_VINE_DIALOG_H
 #define COMIC_VINE_DIALOG_H
 
-#include <QDialog>
-
 #include "comic_db.h"
-#include "volume_search_query.h"
 #include "themable.h"
+#include "volume_search_query.h"
+
+#include <QDialog>
 
 class QPushButton;
 class QStackedWidget;
diff --git a/YACReaderLibrary/comic_vine/model/local_comic_list_model.h b/YACReaderLibrary/comic_vine/model/local_comic_list_model.h
index 14baff98..dd2cde96 100644
--- a/YACReaderLibrary/comic_vine/model/local_comic_list_model.h
+++ b/YACReaderLibrary/comic_vine/model/local_comic_list_model.h
@@ -1,10 +1,10 @@
 #ifndef LOCAL_COMIC_LIST_MODEL_H
 #define LOCAL_COMIC_LIST_MODEL_H
 
-#include <QAbstractItemModel>
-
 #include "comic_db.h"
 
+#include <QAbstractItemModel>
+
 class LocalComicListModel : public QAbstractItemModel
 {
     Q_OBJECT
diff --git a/YACReaderLibrary/comic_vine/model/response_parser.cpp b/YACReaderLibrary/comic_vine/model/response_parser.cpp
index dd258212..5c46f3c1 100644
--- a/YACReaderLibrary/comic_vine/model/response_parser.cpp
+++ b/YACReaderLibrary/comic_vine/model/response_parser.cpp
@@ -1,4 +1,5 @@
 #include "response_parser.h"
+
 #include <QDebug>
 #include <QJsonDocument>
 #include <QJsonParseError>
diff --git a/YACReaderLibrary/comic_vine/model/volume_comics_model.cpp b/YACReaderLibrary/comic_vine/model/volume_comics_model.cpp
index 908d7614..d88700a9 100644
--- a/YACReaderLibrary/comic_vine/model/volume_comics_model.cpp
+++ b/YACReaderLibrary/comic_vine/model/volume_comics_model.cpp
@@ -1,4 +1,5 @@
 #include "volume_comics_model.h"
+
 #include "qnaturalsorting.h"
 
 #include <QJsonDocument>
diff --git a/YACReaderLibrary/comic_vine/scraper_checkbox.h b/YACReaderLibrary/comic_vine/scraper_checkbox.h
index d2362650..6c4081f0 100644
--- a/YACReaderLibrary/comic_vine/scraper_checkbox.h
+++ b/YACReaderLibrary/comic_vine/scraper_checkbox.h
@@ -1,10 +1,10 @@
 #ifndef SCRAPER_CHECKBOX_H
 #define SCRAPER_CHECKBOX_H
 
-#include <QCheckBox>
-
 #include "themable.h"
 
+#include <QCheckBox>
+
 class ScraperCheckBox : public QCheckBox, protected Themable
 {
 public:
diff --git a/YACReaderLibrary/comic_vine/scraper_lineedit.h b/YACReaderLibrary/comic_vine/scraper_lineedit.h
index 977e4d0f..93d13823 100644
--- a/YACReaderLibrary/comic_vine/scraper_lineedit.h
+++ b/YACReaderLibrary/comic_vine/scraper_lineedit.h
@@ -1,10 +1,10 @@
 #ifndef SCRAPPER_LINEEDIT_H
 #define SCRAPPER_LINEEDIT_H
 
-#include <QLineEdit>
-
 #include "themable.h"
 
+#include <QLineEdit>
+
 class QLabel;
 
 class ScraperLineEdit : public QLineEdit, protected Themable
diff --git a/YACReaderLibrary/comic_vine/scraper_results_paginator.cpp b/YACReaderLibrary/comic_vine/scraper_results_paginator.cpp
index 8594656f..cfffdecb 100644
--- a/YACReaderLibrary/comic_vine/scraper_results_paginator.cpp
+++ b/YACReaderLibrary/comic_vine/scraper_results_paginator.cpp
@@ -1,4 +1,5 @@
 #include "scraper_results_paginator.h"
+
 #include "response_parser.h"
 
 #include <QHBoxLayout>
diff --git a/YACReaderLibrary/comic_vine/scraper_scroll_label.cpp b/YACReaderLibrary/comic_vine/scraper_scroll_label.cpp
index f9422890..75141354 100644
--- a/YACReaderLibrary/comic_vine/scraper_scroll_label.cpp
+++ b/YACReaderLibrary/comic_vine/scraper_scroll_label.cpp
@@ -1,7 +1,7 @@
 #include "scraper_scroll_label.h"
 
-#include <QLabel>
 #include <QDesktopServices>
+#include <QLabel>
 #include <QUrl>
 
 ScraperScrollLabel::ScraperScrollLabel(QWidget *parent)
diff --git a/YACReaderLibrary/comic_vine/scraper_scroll_label.h b/YACReaderLibrary/comic_vine/scraper_scroll_label.h
index f78da91a..0fe79baf 100644
--- a/YACReaderLibrary/comic_vine/scraper_scroll_label.h
+++ b/YACReaderLibrary/comic_vine/scraper_scroll_label.h
@@ -1,10 +1,10 @@
 #ifndef SCRAPER_SCROLL_LABEL_H
 #define SCRAPER_SCROLL_LABEL_H
 
-#include <QScrollArea>
-
 #include "themable.h"
 
+#include <QScrollArea>
+
 class QLabel;
 
 class ScraperScrollLabel : public QScrollArea, protected Themable
diff --git a/YACReaderLibrary/comic_vine/scraper_tableview.h b/YACReaderLibrary/comic_vine/scraper_tableview.h
index 98159dce..9f8eaf74 100644
--- a/YACReaderLibrary/comic_vine/scraper_tableview.h
+++ b/YACReaderLibrary/comic_vine/scraper_tableview.h
@@ -1,10 +1,10 @@
 #ifndef SCRAPPER_TABLEVIEW_H
 #define SCRAPPER_TABLEVIEW_H
 
-#include <QTableView>
-
 #include "themable.h"
 
+#include <QTableView>
+
 class ScraperTableView : public QTableView, protected Themable
 {
     Q_OBJECT
diff --git a/YACReaderLibrary/comic_vine/search_single_comic.cpp b/YACReaderLibrary/comic_vine/search_single_comic.cpp
index 9dd7c7db..9af75d07 100644
--- a/YACReaderLibrary/comic_vine/search_single_comic.cpp
+++ b/YACReaderLibrary/comic_vine/search_single_comic.cpp
@@ -2,9 +2,9 @@
 
 #include "scraper_lineedit.h"
 
+#include <QHBoxLayout>
 #include <QLabel>
 #include <QVBoxLayout>
-#include <QHBoxLayout>
 
 SearchSingleComic::SearchSingleComic(QWidget *parent)
     : QWidget(parent)
diff --git a/YACReaderLibrary/comic_vine/search_volume.cpp b/YACReaderLibrary/comic_vine/search_volume.cpp
index 7a0a4cfa..ed42dd0a 100644
--- a/YACReaderLibrary/comic_vine/search_volume.cpp
+++ b/YACReaderLibrary/comic_vine/search_volume.cpp
@@ -1,7 +1,7 @@
 #include "search_volume.h"
 
-#include "scraper_lineedit.h"
 #include "scraper_checkbox.h"
+#include "scraper_lineedit.h"
 
 #include <QLabel>
 #include <QVBoxLayout>
diff --git a/YACReaderLibrary/comic_vine/search_volume.h b/YACReaderLibrary/comic_vine/search_volume.h
index 2fa38608..c38fa703 100644
--- a/YACReaderLibrary/comic_vine/search_volume.h
+++ b/YACReaderLibrary/comic_vine/search_volume.h
@@ -1,12 +1,12 @@
 #ifndef SEARCH_VOLUME_H
 #define SEARCH_VOLUME_H
 
-#include <QLabel>
-#include <QWidget>
-
 #include "scraper_checkbox.h"
 #include "themable.h"
 
+#include <QLabel>
+#include <QWidget>
+
 class ScraperLineEdit;
 class ScraperCheckBox;
 
diff --git a/YACReaderLibrary/comic_vine/select_volume.cpp b/YACReaderLibrary/comic_vine/select_volume.cpp
index 924c6358..2e778f32 100644
--- a/YACReaderLibrary/comic_vine/select_volume.cpp
+++ b/YACReaderLibrary/comic_vine/select_volume.cpp
@@ -1,5 +1,14 @@
 #include "select_volume.h"
 
+#include "comic_vine_client.h"
+#include "scraper_lineedit.h"
+#include "scraper_results_paginator.h"
+#include "scraper_scroll_label.h"
+#include "scraper_tableview.h"
+#include "selected_volume_info.h"
+#include "volumes_model.h"
+
+#include <QAction>
 #include <QDesktopServices>
 #include <QHBoxLayout>
 #include <QHeaderView>
@@ -12,18 +21,6 @@
 #include <QSortFilterProxyModel>
 #include <QToolButton>
 #include <QVBoxLayout>
-#include <QAction>
-
-#include "scraper_tableview.h"
-#include "scraper_lineedit.h"
-
-#include "volumes_model.h"
-#include "comic_vine_client.h"
-#include "scraper_scroll_label.h"
-
-#include "scraper_results_paginator.h"
-
-#include "selected_volume_info.h"
 
 SelectVolume::SelectVolume(QWidget *parent)
     : QWidget(parent), model(0)
diff --git a/YACReaderLibrary/comic_vine/select_volume.h b/YACReaderLibrary/comic_vine/select_volume.h
index 07793787..79852d5a 100644
--- a/YACReaderLibrary/comic_vine/select_volume.h
+++ b/YACReaderLibrary/comic_vine/select_volume.h
@@ -3,8 +3,8 @@
 
 #include "scraper_results_paginator.h"
 #include "selected_volume_info.h"
-#include "volume_search_query.h"
 #include "themable.h"
+#include "volume_search_query.h"
 
 class QLabel;
 class VolumesModel;
diff --git a/YACReaderLibrary/comic_vine/series_question.cpp b/YACReaderLibrary/comic_vine/series_question.cpp
index 34c53c7e..31e0ede2 100644
--- a/YACReaderLibrary/comic_vine/series_question.cpp
+++ b/YACReaderLibrary/comic_vine/series_question.cpp
@@ -1,8 +1,8 @@
 #include "series_question.h"
 
+#include <QLabel>
 #include <QRadioButton>
 #include <QVBoxLayout>
-#include <QLabel>
 
 SeriesQuestion::SeriesQuestion(QWidget *parent)
     : QWidget(parent)
diff --git a/YACReaderLibrary/comic_vine/series_question.h b/YACReaderLibrary/comic_vine/series_question.h
index 26b850c0..26a140da 100644
--- a/YACReaderLibrary/comic_vine/series_question.h
+++ b/YACReaderLibrary/comic_vine/series_question.h
@@ -1,10 +1,10 @@
 #ifndef SERIES_QUESTION_H
 #define SERIES_QUESTION_H
 
-#include <QWidget>
-
 #include "themable.h"
 
+#include <QWidget>
+
 class QRadioButton;
 class QLabel;
 
diff --git a/YACReaderLibrary/comic_vine/sort_volume_comics.cpp b/YACReaderLibrary/comic_vine/sort_volume_comics.cpp
index 5bb2d6c5..16cf75c6 100644
--- a/YACReaderLibrary/comic_vine/sort_volume_comics.cpp
+++ b/YACReaderLibrary/comic_vine/sort_volume_comics.cpp
@@ -1,15 +1,15 @@
 #include "sort_volume_comics.h"
 
-#include <QLabel>
+#include "local_comic_list_model.h"
+#include "scraper_tableview.h"
+#include "theme_manager.h"
+#include "volume_comics_model.h"
+
+#include <QAction>
 #include <QBoxLayout>
+#include <QLabel>
 #include <QPushButton>
 #include <QScrollBar>
-#include <QAction>
-
-#include "scraper_tableview.h"
-#include "local_comic_list_model.h"
-#include "volume_comics_model.h"
-#include "theme_manager.h"
 
 ScrapperToolButton::ScrapperToolButton(ScrapperToolButton::Appearance appearance, QWidget *parent)
     : QPushButton(parent), appearance(appearance)
diff --git a/YACReaderLibrary/comic_vine/sort_volume_comics.h b/YACReaderLibrary/comic_vine/sort_volume_comics.h
index b516f7c5..c5724868 100644
--- a/YACReaderLibrary/comic_vine/sort_volume_comics.h
+++ b/YACReaderLibrary/comic_vine/sort_volume_comics.h
@@ -1,14 +1,14 @@
 #ifndef SORT_VOLUME_COMICS_H
 #define SORT_VOLUME_COMICS_H
 
-#include <QModelIndex>
-#include <QPushButton>
-#include <QPainter>
-
 #include "comic_db.h"
 #include "scraper_results_paginator.h"
 #include "themable.h"
 
+#include <QModelIndex>
+#include <QPainter>
+#include <QPushButton>
+
 class ScraperTableView;
 class LocalComicListModel;
 class VolumeComicsModel;
diff --git a/YACReaderLibrary/comic_vine/title_header.cpp b/YACReaderLibrary/comic_vine/title_header.cpp
index 8f54c5b3..3a13905e 100644
--- a/YACReaderLibrary/comic_vine/title_header.cpp
+++ b/YACReaderLibrary/comic_vine/title_header.cpp
@@ -1,7 +1,7 @@
 #include "title_header.h"
 
-#include <QLabel>
 #include <QHBoxLayout>
+#include <QLabel>
 #include <QVBoxLayout>
 
 TitleHeader::TitleHeader(QWidget *parent)
diff --git a/YACReaderLibrary/comic_vine/title_header.h b/YACReaderLibrary/comic_vine/title_header.h
index 1ad00c8e..93df1e38 100644
--- a/YACReaderLibrary/comic_vine/title_header.h
+++ b/YACReaderLibrary/comic_vine/title_header.h
@@ -1,10 +1,10 @@
 #ifndef TITLE_HEADER_H
 #define TITLE_HEADER_H
 
-#include <QWidget>
-
 #include "themable.h"
 
+#include <QWidget>
+
 class QLabel;
 
 class TitleHeader : public QWidget, protected Themable
diff --git a/YACReaderLibrary/comics_remover.cpp b/YACReaderLibrary/comics_remover.cpp
index 7d11e928..fcc197f9 100644
--- a/YACReaderLibrary/comics_remover.cpp
+++ b/YACReaderLibrary/comics_remover.cpp
@@ -1,10 +1,10 @@
 #include "comics_remover.h"
 
-#include <QFile>
-#include <QDir>
-
 #include "QsLog.h"
 
+#include <QDir>
+#include <QFile>
+
 ComicsRemover::ComicsRemover(QModelIndexList &il, QList<QString> &ps, qulonglong parentId, QObject *parent)
     : QObject(parent), indexList(il), paths(ps), parentId(parentId)
 {
diff --git a/YACReaderLibrary/comics_remover.h b/YACReaderLibrary/comics_remover.h
index f153af6e..9fed4256 100644
--- a/YACReaderLibrary/comics_remover.h
+++ b/YACReaderLibrary/comics_remover.h
@@ -1,9 +1,8 @@
 #ifndef COMICS_REMOVER_H
 #define COMICS_REMOVER_H
 
-#include <QThread>
-
 #include <QModelIndex>
+#include <QThread>
 
 class ComicsRemover : public QObject
 {
diff --git a/YACReaderLibrary/comics_view.cpp b/YACReaderLibrary/comics_view.cpp
index 5e537837..c00d0aa4 100644
--- a/YACReaderLibrary/comics_view.cpp
+++ b/YACReaderLibrary/comics_view.cpp
@@ -1,9 +1,9 @@
 #include "comics_view.h"
-#include "comic.h"
-#include "comic_files_manager.h"
-#include "comic_db.h"
 
 #include "QsLog.h"
+#include "comic.h"
+#include "comic_db.h"
+#include "comic_files_manager.h"
 
 #include <QQmlContext>
 #include <QQuickWidget>
diff --git a/YACReaderLibrary/comics_view.h b/YACReaderLibrary/comics_view.h
index f516d2d4..22ab71e3 100644
--- a/YACReaderLibrary/comics_view.h
+++ b/YACReaderLibrary/comics_view.h
@@ -1,12 +1,12 @@
 #ifndef COMICS_VIEW_H
 #define COMICS_VIEW_H
 
+#include "comic_model.h"
+
 #include <QAbstractItemView>
 #include <QSettings>
 #include <QWidget>
 
-#include "comic_model.h"
-
 class YACReaderTableView;
 class QSplitter;
 class ComicFlowWidget;
diff --git a/YACReaderLibrary/comics_view_transition.h b/YACReaderLibrary/comics_view_transition.h
index d428e674..26438dc9 100644
--- a/YACReaderLibrary/comics_view_transition.h
+++ b/YACReaderLibrary/comics_view_transition.h
@@ -1,10 +1,10 @@
 #ifndef COMICS_VIEW_TRANSITION_H
 #define COMICS_VIEW_TRANSITION_H
 
-#include <QWidget>
-
 #include "themable.h"
 
+#include <QWidget>
+
 class ComicsViewTransition : public QWidget, protected Themable
 {
     Q_OBJECT
diff --git a/YACReaderLibrary/create_library_dialog.cpp b/YACReaderLibrary/create_library_dialog.cpp
index 4fe22327..5c3a1278 100644
--- a/YACReaderLibrary/create_library_dialog.cpp
+++ b/YACReaderLibrary/create_library_dialog.cpp
@@ -1,11 +1,12 @@
 #include "create_library_dialog.h"
+
 #include "yacreader_global.h"
 
-#include <QHBoxLayout>
-#include <QVBoxLayout>
 #include <QFileDialog>
-#include <QSizePolicy>
+#include <QHBoxLayout>
 #include <QMessageBox>
+#include <QSizePolicy>
+#include <QVBoxLayout>
 
 using namespace YACReader;
 
diff --git a/YACReaderLibrary/create_library_dialog.h b/YACReaderLibrary/create_library_dialog.h
index 6adfb661..82412a0f 100644
--- a/YACReaderLibrary/create_library_dialog.h
+++ b/YACReaderLibrary/create_library_dialog.h
@@ -1,15 +1,15 @@
 #ifndef __CREATE_LIBRARY_DIALOG_H
 #define __CREATE_LIBRARY_DIALOG_H
 
-#include "yacreader_libraries.h"
 #include "themable.h"
+#include "yacreader_libraries.h"
 
 #include <QDialog>
 #include <QLabel>
 #include <QLineEdit>
+#include <QProgressBar>
 #include <QPushButton>
 #include <QThread>
-#include <QProgressBar>
 
 class CreateLibraryDialog : public QDialog, protected Themable
 {
diff --git a/YACReaderLibrary/db/comic_item.cpp b/YACReaderLibrary/db/comic_item.cpp
index 96cc0d80..d7abfd6e 100644
--- a/YACReaderLibrary/db/comic_item.cpp
+++ b/YACReaderLibrary/db/comic_item.cpp
@@ -1,8 +1,8 @@
 
-#include <QStringList>
-
 #include "comic_item.h"
 
+#include <QStringList>
+
 //! [0]
 ComicItem::ComicItem(const QList<QVariant> &data)
 
diff --git a/YACReaderLibrary/db/comic_model.cpp b/YACReaderLibrary/db/comic_model.cpp
index 8701aca5..01cf7039 100644
--- a/YACReaderLibrary/db/comic_model.cpp
+++ b/YACReaderLibrary/db/comic_model.cpp
@@ -1,18 +1,19 @@
 
-#include <QtGui>
-#include <QtDebug>
-#include <QStringBuilder>
-#include <QSqlRecord>
-
-#include "comic_item.h"
 #include "comic_model.h"
-#include "data_base_management.h"
-#include "qnaturalsorting.h"
+
 #include "comic_db.h"
+#include "comic_item.h"
+#include "data_base_management.h"
 #include "db_helper.h"
+#include "qnaturalsorting.h"
 #include "reading_list_model.h"
 #include "yacreader_global_gui.h"
 
+#include <QSqlRecord>
+#include <QStringBuilder>
+#include <QtDebug>
+#include <QtGui>
+
 #ifdef use_unarr
 #include <unarr.h>
 #endif
diff --git a/YACReaderLibrary/db/comic_model.h b/YACReaderLibrary/db/comic_model.h
index 484a69f6..9426ed57 100644
--- a/YACReaderLibrary/db/comic_model.h
+++ b/YACReaderLibrary/db/comic_model.h
@@ -1,14 +1,14 @@
 #ifndef TABLEMODEL_H
 #define TABLEMODEL_H
 
+#include "yacreader_global.h"
+
 #include <QAbstractItemModel>
 #include <QModelIndex>
-#include <QVariant>
-#include <QSqlQuery>
 #include <QSqlDatabase>
+#include <QSqlQuery>
 #include <QUrl>
-
-#include "yacreader_global.h"
+#include <QVariant>
 
 class ComicDB;
 
diff --git a/YACReaderLibrary/db/comic_query_result_processor.cpp b/YACReaderLibrary/db/comic_query_result_processor.cpp
index da0c9c5d..edfe35d5 100644
--- a/YACReaderLibrary/db/comic_query_result_processor.cpp
+++ b/YACReaderLibrary/db/comic_query_result_processor.cpp
@@ -1,13 +1,13 @@
 #include "comic_query_result_processor.h"
 
-#include <QSqlRecord>
-
 #include "comic_item.h"
 #include "comic_model.h"
 #include "data_base_management.h"
 #include "qnaturalsorting.h"
 #include "search_query.h"
 
+#include <QSqlRecord>
+
 YACReader::ComicQueryResultProcessor::ComicQueryResultProcessor()
     : querySearchQueue(1)
 {
diff --git a/YACReaderLibrary/db/comic_query_result_processor.h b/YACReaderLibrary/db/comic_query_result_processor.h
index a99623ad..103b522e 100644
--- a/YACReaderLibrary/db/comic_query_result_processor.h
+++ b/YACReaderLibrary/db/comic_query_result_processor.h
@@ -1,11 +1,11 @@
 #ifndef COMIC_QUERY_RESULT_PROCESSOR_H
 #define COMIC_QUERY_RESULT_PROCESSOR_H
 
-#include <QtCore>
-#include <QSqlQuery>
-
 #include "concurrent_queue.h"
 
+#include <QSqlQuery>
+#include <QtCore>
+
 class ComicItem;
 
 namespace YACReader {
diff --git a/YACReaderLibrary/db/data_base_management.cpp b/YACReaderLibrary/db/data_base_management.cpp
index 0a1bc656..05d1cceb 100644
--- a/YACReaderLibrary/db/data_base_management.cpp
+++ b/YACReaderLibrary/db/data_base_management.cpp
@@ -1,14 +1,14 @@
 #include "data_base_management.h"
 
-#include <QtCore>
+#include "QsLog.h"
+#include "db_helper.h"
+#include "initial_comic_info_extractor.h"
+
 #include <QImageReader>
 #include <QSqlError>
 #include <QSqlQuery>
 #include <QSqlRecord>
-#include "initial_comic_info_extractor.h"
-#include "db_helper.h"
-
-#include "QsLog.h"
+#include <QtCore>
 
 using namespace YACReader;
 
diff --git a/YACReaderLibrary/db/data_base_management.h b/YACReaderLibrary/db/data_base_management.h
index c1d4aa7d..1e170afd 100644
--- a/YACReaderLibrary/db/data_base_management.h
+++ b/YACReaderLibrary/db/data_base_management.h
@@ -1,8 +1,8 @@
 #ifndef __DATA_BASE_MANAGEMENT_H
 #define __DATA_BASE_MANAGEMENT_H
 
-#include <QtCore>
 #include <QSqlDatabase>
+#include <QtCore>
 
 class ComicsInfoExporter : public QThread
 {
diff --git a/YACReaderLibrary/db/folder_item.cpp b/YACReaderLibrary/db/folder_item.cpp
index 3b54f13b..8b539b4a 100644
--- a/YACReaderLibrary/db/folder_item.cpp
+++ b/YACReaderLibrary/db/folder_item.cpp
@@ -1,8 +1,9 @@
-#include <QStringList>
-
 #include "folder_item.h"
+
 #include "qnaturalsorting.h"
 
+#include <QStringList>
+
 FolderItem::FolderItem(const QList<QVariant> &data, FolderItem *parent)
 {
     parentItem = parent;
diff --git a/YACReaderLibrary/db/folder_item.h b/YACReaderLibrary/db/folder_item.h
index ef77c4d9..071e0a9b 100644
--- a/YACReaderLibrary/db/folder_item.h
+++ b/YACReaderLibrary/db/folder_item.h
@@ -42,8 +42,8 @@
 #define TREEITEM_H
 
 #include <QList>
-#include <QVariant>
 #include <QModelIndex>
+#include <QVariant>
 
 class FolderItem
 {
diff --git a/YACReaderLibrary/db/folder_model.cpp b/YACReaderLibrary/db/folder_model.cpp
index 5d36f447..de9b6b7a 100644
--- a/YACReaderLibrary/db/folder_model.cpp
+++ b/YACReaderLibrary/db/folder_model.cpp
@@ -1,11 +1,10 @@
 #include "folder_model.h"
 
-#include "folder_item.h"
 #include "data_base_management.h"
-#include "folder.h"
 #include "db_helper.h"
+#include "folder.h"
+#include "folder_item.h"
 #include "qnaturalsorting.h"
-
 #include "yacreader_global.h"
 
 #include <QFileIconProvider>
diff --git a/YACReaderLibrary/db/folder_model.h b/YACReaderLibrary/db/folder_model.h
index 84a759d2..f1cf381b 100644
--- a/YACReaderLibrary/db/folder_model.h
+++ b/YACReaderLibrary/db/folder_model.h
@@ -1,19 +1,19 @@
 #ifndef TREEMODEL_H
 #define TREEMODEL_H
 
-#include <QAbstractItemModel>
-#include <QSortFilterProxyModel>
-#include <QModelIndex>
-#include <QVariant>
-#include <QSqlQuery>
-#include <QSqlDatabase>
-#include <QUrl>
-#include <QIcon>
-
 #include "folder.h"
 #include "folder_query_result_processor.h"
-#include "yacreader_global.h"
 #include "themable.h"
+#include "yacreader_global.h"
+
+#include <QAbstractItemModel>
+#include <QIcon>
+#include <QModelIndex>
+#include <QSortFilterProxyModel>
+#include <QSqlDatabase>
+#include <QSqlQuery>
+#include <QUrl>
+#include <QVariant>
 
 class FolderItem;
 
diff --git a/YACReaderLibrary/db/folder_query_result_processor.cpp b/YACReaderLibrary/db/folder_query_result_processor.cpp
index c936c509..6ce4705c 100644
--- a/YACReaderLibrary/db/folder_query_result_processor.cpp
+++ b/YACReaderLibrary/db/folder_query_result_processor.cpp
@@ -1,8 +1,8 @@
 #include "folder_query_result_processor.h"
 
+#include "data_base_management.h"
 #include "folder_item.h"
 #include "folder_model.h"
-#include "data_base_management.h"
 #include "search_query.h"
 
 #include <QSqlDatabase>
diff --git a/YACReaderLibrary/db/folder_query_result_processor.h b/YACReaderLibrary/db/folder_query_result_processor.h
index fd966aee..5114e7d0 100644
--- a/YACReaderLibrary/db/folder_query_result_processor.h
+++ b/YACReaderLibrary/db/folder_query_result_processor.h
@@ -1,10 +1,10 @@
 #ifndef FOLDER_QUERY_RESULT_PROCESSOR_H
 #define FOLDER_QUERY_RESULT_PROCESSOR_H
 
-#include <QObject>
-
 #include "concurrent_queue.h"
 
+#include <QObject>
+
 class FolderItem;
 class FolderModel;
 class QSqlQuery;
diff --git a/YACReaderLibrary/db/query_parser.cpp b/YACReaderLibrary/db/query_parser.cpp
index 81a7df16..e79cde4f 100644
--- a/YACReaderLibrary/db/query_parser.cpp
+++ b/YACReaderLibrary/db/query_parser.cpp
@@ -2,6 +2,7 @@
 
 #include <QDateTime>
 #include <QVariant>
+
 #include <numeric>
 #include <stdexcept>
 
diff --git a/YACReaderLibrary/db/query_parser.h b/YACReaderLibrary/db/query_parser.h
index 3e22c9dd..1e1f5ee5 100644
--- a/YACReaderLibrary/db/query_parser.h
+++ b/YACReaderLibrary/db/query_parser.h
@@ -3,11 +3,12 @@
 
 #include "query_lexer.h"
 
-#include <map>
 #include <QSqlQuery>
+
+#include <list>
+#include <map>
 #include <string>
 #include <vector>
-#include <list>
 
 #define SEARCH_FOLDERS_QUERY "SELECT DISTINCT f.* FROM folder f LEFT JOIN comic c ON (f.id = c.parentId) INNER JOIN comic_info ci ON (c.comicInfoId = ci.id) WHERE "
 #define SEARCH_COMICS_QUERY "SELECT ci.number,ci.title,c.fileName,ci.numPages,c.id,c.parentId,c.path,ci.hash,ci.read,ci.currentPage,ci.rating,ci.hasBeenOpened,ci.date,ci.added,ci.type,ci.lastTimeOpened,ci.series,ci.volume,ci.storyArc FROM comic c INNER JOIN comic_info ci ON (c.comicInfoId = ci.id) LEFT JOIN folder f ON (f.id == c.parentId) WHERE "
diff --git a/YACReaderLibrary/db/reading_list_item.cpp b/YACReaderLibrary/db/reading_list_item.cpp
index 0fd02f3d..985fe4aa 100644
--- a/YACReaderLibrary/db/reading_list_item.cpp
+++ b/YACReaderLibrary/db/reading_list_item.cpp
@@ -1,11 +1,11 @@
 #include "reading_list_item.h"
-#include "qnaturalsorting.h"
-
-#include <QFileIconProvider>
 
 #include "QsLog.h"
+#include "qnaturalsorting.h"
 #include "theme_manager.h"
 
+#include <QFileIconProvider>
+
 ListItem::ListItem(const QList<QVariant> &data)
     : itemData(data)
 {
diff --git a/YACReaderLibrary/db/reading_list_item.h b/YACReaderLibrary/db/reading_list_item.h
index 81876887..61bfbf6e 100644
--- a/YACReaderLibrary/db/reading_list_item.h
+++ b/YACReaderLibrary/db/reading_list_item.h
@@ -1,10 +1,10 @@
 #ifndef READING_LIST_ITEM_H
 #define READING_LIST_ITEM_H
 
+#include "reading_list_model.h"
+
 #include <QIcon>
 #include <QVariant>
-
-#include "reading_list_model.h"
 // TODO add propper constructors, using QList<QVariant> is not safe
 
 class ListItem
diff --git a/YACReaderLibrary/db/reading_list_model.cpp b/YACReaderLibrary/db/reading_list_model.cpp
index ca19bc55..d503042a 100644
--- a/YACReaderLibrary/db/reading_list_model.cpp
+++ b/YACReaderLibrary/db/reading_list_model.cpp
@@ -1,17 +1,14 @@
 #include "reading_list_model.h"
 
-#include "reading_list_item.h"
-
-#include "data_base_management.h"
-#include "qnaturalsorting.h"
-#include "db_helper.h"
-
 #include "QsLog.h"
+#include "data_base_management.h"
+#include "db_helper.h"
+#include "qnaturalsorting.h"
+#include "reading_list_item.h"
+#include "yacreader_global_gui.h"
 
 #include <QSqlRecord>
 
-#include "yacreader_global_gui.h"
-
 ReadingListModel::ReadingListModel(QObject *parent)
     : QAbstractItemModel(parent), rootItem(0)
 {
diff --git a/YACReaderLibrary/db/reading_list_model.h b/YACReaderLibrary/db/reading_list_model.h
index 2e0b73b2..7f5efb51 100644
--- a/YACReaderLibrary/db/reading_list_model.h
+++ b/YACReaderLibrary/db/reading_list_model.h
@@ -1,15 +1,15 @@
 #ifndef READING_LIST_MODEL_H
 #define READING_LIST_MODEL_H
 
-#include <QAbstractItemModel>
-#include <QSortFilterProxyModel>
-#include <QModelIndex>
-#include <QVariant>
-#include <QSqlQuery>
-#include <QSqlDatabase>
-
 #include "yacreader_global.h"
 
+#include <QAbstractItemModel>
+#include <QModelIndex>
+#include <QSortFilterProxyModel>
+#include <QSqlDatabase>
+#include <QSqlQuery>
+#include <QVariant>
+
 class LabelItem;
 class SpecialListItem;
 class ReadingListItem;
diff --git a/YACReaderLibrary/db/search_query.cpp b/YACReaderLibrary/db/search_query.cpp
index bd1d6cd3..0ede13fa 100644
--- a/YACReaderLibrary/db/search_query.cpp
+++ b/YACReaderLibrary/db/search_query.cpp
@@ -1,9 +1,10 @@
 
 #include "search_query.h"
+
 #include "query_parser.h"
 
-#include <QtCore>
 #include <QSqlQuery>
+#include <QtCore>
 
 QSqlQuery foldersSearchQuery(QSqlDatabase &db, const QString &filter)
 {
diff --git a/YACReaderLibrary/db_helper.cpp b/YACReaderLibrary/db_helper.cpp
index ea08ce1b..a0c4d473 100644
--- a/YACReaderLibrary/db_helper.cpp
+++ b/YACReaderLibrary/db_helper.cpp
@@ -1,31 +1,29 @@
 #include "db_helper.h"
 
-#include <QMap>
-#include <QString>
-#include <QList>
-#include <QDateTime>
-#include <QFile>
-#include <QFileInfo>
-#include <QCoreApplication>
-#include <QTextStream>
-#include <QSqlDatabase>
-#include <QSqlError>
-#include <QSqlRecord>
-#include <QSqlQuery>
-
-#include <algorithm>
-
-#include "reading_list.h"
-#include "library_item.h"
+#include "QsLog.h"
 #include "comic_db.h"
 #include "data_base_management.h"
 #include "folder.h"
-#include "yacreader_libraries.h"
-#include "yacreader_global.h"
-
+#include "library_item.h"
 #include "qnaturalsorting.h"
+#include "reading_list.h"
+#include "yacreader_global.h"
+#include "yacreader_libraries.h"
 
-#include "QsLog.h"
+#include <QCoreApplication>
+#include <QDateTime>
+#include <QFile>
+#include <QFileInfo>
+#include <QList>
+#include <QMap>
+#include <QSqlDatabase>
+#include <QSqlError>
+#include <QSqlQuery>
+#include <QSqlRecord>
+#include <QString>
+#include <QTextStream>
+
+#include <algorithm>
 
 using namespace YACReader;
 
diff --git a/YACReaderLibrary/db_helper.h b/YACReaderLibrary/db_helper.h
index 56d22670..c67b3892 100644
--- a/YACReaderLibrary/db_helper.h
+++ b/YACReaderLibrary/db_helper.h
@@ -2,10 +2,11 @@
 #define DB_HELPER_H
 
 class QString;
-#include <QMap>
-#include <QList>
 #include "yacreader_global.h"
 
+#include <QList>
+#include <QMap>
+
 class ComicDB;
 class Folder;
 class LibraryItem;
diff --git a/YACReaderLibrary/empty_container_info.h b/YACReaderLibrary/empty_container_info.h
index 9adbfa9d..a2c19be3 100644
--- a/YACReaderLibrary/empty_container_info.h
+++ b/YACReaderLibrary/empty_container_info.h
@@ -1,6 +1,8 @@
 #ifndef EMPTY_CONTAINER_INFO_H
 #define EMPTY_CONTAINER_INFO_H
 
+#include "themable.h"
+
 #include <QLabel>
 #include <QPaintEvent>
 #include <QPixmap>
@@ -8,8 +10,6 @@
 #include <QVBoxLayout>
 #include <QWidget>
 
-#include "themable.h"
-
 class EmptyContainerInfo : public QWidget, protected Themable
 {
     Q_OBJECT
diff --git a/YACReaderLibrary/export_comics_info_dialog.cpp b/YACReaderLibrary/export_comics_info_dialog.cpp
index dac2ac80..9b06cd43 100644
--- a/YACReaderLibrary/export_comics_info_dialog.cpp
+++ b/YACReaderLibrary/export_comics_info_dialog.cpp
@@ -1,13 +1,13 @@
 #include "export_comics_info_dialog.h"
 
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QFileDialog>
-#include <QDir>
-#include <QMessageBox>
-
 #include "data_base_management.h"
 
+#include <QDir>
+#include <QFileDialog>
+#include <QHBoxLayout>
+#include <QMessageBox>
+#include <QVBoxLayout>
+
 ExportComicsInfoDialog::ExportComicsInfoDialog(QWidget *parent)
     : QDialog(parent)
 {
diff --git a/YACReaderLibrary/export_library_dialog.cpp b/YACReaderLibrary/export_library_dialog.cpp
index 066f7192..0548b501 100644
--- a/YACReaderLibrary/export_library_dialog.cpp
+++ b/YACReaderLibrary/export_library_dialog.cpp
@@ -1,9 +1,10 @@
 #include "export_library_dialog.h"
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QFileDialog>
-#include <QMessageBox>
+
 #include <QDir>
+#include <QFileDialog>
+#include <QHBoxLayout>
+#include <QMessageBox>
+#include <QVBoxLayout>
 
 ExportLibraryDialog::ExportLibraryDialog(QWidget *parent)
     : QDialog(parent), progressCount(0)
diff --git a/YACReaderLibrary/export_library_dialog.h b/YACReaderLibrary/export_library_dialog.h
index 5321dcb4..32a9c847 100644
--- a/YACReaderLibrary/export_library_dialog.h
+++ b/YACReaderLibrary/export_library_dialog.h
@@ -6,11 +6,11 @@
 #include <QDialog>
 #include <QLabel>
 #include <QLineEdit>
+#include <QProgressBar>
 #include <QPushButton>
 #include <QString>
 #include <QThread>
 #include <QTimer>
-#include <QProgressBar>
 
 class ExportLibraryDialog : public QDialog, protected Themable
 {
diff --git a/YACReaderLibrary/folder_content_view.cpp b/YACReaderLibrary/folder_content_view.cpp
index ec01ab00..ec6a5d27 100644
--- a/YACReaderLibrary/folder_content_view.cpp
+++ b/YACReaderLibrary/folder_content_view.cpp
@@ -1,13 +1,12 @@
 #include "folder_content_view.h"
 
+#include "QsLog.h"
+#include "comic.h"
+#include "comic_files_manager.h"
 #include "folder_model.h"
 #include "grid_comics_view.h"
 #include "yacreader_global_gui.h"
 #include "yacreader_tool_bar_stretch.h"
-#include "comic.h"
-#include "comic_files_manager.h"
-
-#include "QsLog.h"
 
 #include <QApplication>
 #include <QHBoxLayout>
diff --git a/YACReaderLibrary/folder_content_view.h b/YACReaderLibrary/folder_content_view.h
index 3e15797a..22d12477 100644
--- a/YACReaderLibrary/folder_content_view.h
+++ b/YACReaderLibrary/folder_content_view.h
@@ -1,17 +1,16 @@
 #ifndef FOLDERCONTENTVIEW_H
 #define FOLDERCONTENTVIEW_H
 
+#include "comic_db.h"
+#include "comic_model.h"
+#include "folder.h"
+#include "themable.h"
+
 #include <QLabel>
 #include <QSlider>
 #include <QToolBar>
 #include <QWidget>
 
-#include "comic_model.h"
-#include "themable.h"
-
-#include "folder.h"
-#include "comic_db.h"
-
 class FolderModel;
 class ComicModel;
 class YACReaderToolBarStretch;
diff --git a/YACReaderLibrary/grid_comics_view.cpp b/YACReaderLibrary/grid_comics_view.cpp
index 601d9df5..804891e9 100644
--- a/YACReaderLibrary/grid_comics_view.cpp
+++ b/YACReaderLibrary/grid_comics_view.cpp
@@ -1,5 +1,14 @@
 #include "grid_comics_view.h"
 
+#include "QsLog.h"
+#include "comic.h"
+#include "comic_db.h"
+#include "comic_files_manager.h"
+#include "current_comic_view_helper.h"
+#include "yacreader_comic_info_helper.h"
+#include "yacreader_comics_selection_helper.h"
+#include "yacreader_global_gui.h"
+
 #include <QApplication>
 #include <QDrag>
 #include <QHBoxLayout>
@@ -10,15 +19,6 @@
 #include <QToolBar>
 #include <QVBoxLayout>
 
-#include "yacreader_global_gui.h"
-#include "comic.h"
-#include "comic_files_manager.h"
-#include "QsLog.h"
-#include "comic_db.h"
-#include "yacreader_comics_selection_helper.h"
-#include "yacreader_comic_info_helper.h"
-#include "current_comic_view_helper.h"
-
 GridComicsView::GridComicsView(QWidget *parent)
     : ComicsView(parent), filterEnabled(false), smallZoomLabel(nullptr), bigZoomLabel(nullptr)
 {
diff --git a/YACReaderLibrary/grid_comics_view.h b/YACReaderLibrary/grid_comics_view.h
index 9f60201d..b3b674ff 100644
--- a/YACReaderLibrary/grid_comics_view.h
+++ b/YACReaderLibrary/grid_comics_view.h
@@ -1,14 +1,13 @@
 #ifndef GRID_COMICS_VIEW_H
 #define GRID_COMICS_VIEW_H
 
+#include "comic_db.h"
 #include "comics_view.h"
 #include "themable.h"
 
 #include <QLabel>
 #include <QModelIndex>
 
-#include "comic_db.h"
-
 class QAbstractListModel;
 class QItemSelectionModel;
 class QQuickWidget;
diff --git a/YACReaderLibrary/import_comics_info_dialog.cpp b/YACReaderLibrary/import_comics_info_dialog.cpp
index 3018c572..0f7c7f79 100644
--- a/YACReaderLibrary/import_comics_info_dialog.cpp
+++ b/YACReaderLibrary/import_comics_info_dialog.cpp
@@ -1,12 +1,12 @@
 #include "import_comics_info_dialog.h"
 
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QFileDialog>
-#include <QProgressBar>
-
 #include "data_base_management.h"
 
+#include <QFileDialog>
+#include <QHBoxLayout>
+#include <QProgressBar>
+#include <QVBoxLayout>
+
 ImportComicsInfoDialog::ImportComicsInfoDialog(QWidget *parent)
     : QDialog(parent)
 {
diff --git a/YACReaderLibrary/import_comics_info_dialog.h b/YACReaderLibrary/import_comics_info_dialog.h
index 37d7d8e9..c0cf4222 100644
--- a/YACReaderLibrary/import_comics_info_dialog.h
+++ b/YACReaderLibrary/import_comics_info_dialog.h
@@ -3,12 +3,11 @@
 
 #include "themable.h"
 
-#include <QDialog>
 #include <QDialog>
 #include <QLabel>
 #include <QLineEdit>
-#include <QPushButton>
 #include <QProgressBar>
+#include <QPushButton>
 #include <QThread>
 
 class Importer : public QThread
diff --git a/YACReaderLibrary/import_library_dialog.cpp b/YACReaderLibrary/import_library_dialog.cpp
index aad7b823..944cbb28 100644
--- a/YACReaderLibrary/import_library_dialog.cpp
+++ b/YACReaderLibrary/import_library_dialog.cpp
@@ -1,10 +1,10 @@
 #include "import_library_dialog.h"
 
-#include <QHBoxLayout>
-#include <QVBoxLayout>
+#include <QCloseEvent>
 #include <QFileDialog>
 #include <QGridLayout>
-#include <QCloseEvent>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
 
 ImportLibraryDialog::ImportLibraryDialog(QWidget *parent)
     : QDialog(parent), progressCount(0)
diff --git a/YACReaderLibrary/import_library_dialog.h b/YACReaderLibrary/import_library_dialog.h
index de1cceed..87462aa7 100644
--- a/YACReaderLibrary/import_library_dialog.h
+++ b/YACReaderLibrary/import_library_dialog.h
@@ -1,14 +1,14 @@
 #ifndef IMPORT_LIBRARY_DIALOG_H
 #define IMPORT_LIBRARY_DIALOG_H
-#include "yacreader_libraries.h"
 #include "themable.h"
+#include "yacreader_libraries.h"
 
 #include <QDialog>
 #include <QLabel>
 #include <QLineEdit>
+#include <QProgressBar>
 #include <QPushButton>
 #include <QThread>
-#include <QProgressBar>
 
 class ImportLibraryDialog : public QDialog, protected Themable
 {
diff --git a/YACReaderLibrary/import_widget.cpp b/YACReaderLibrary/import_widget.cpp
index f899353f..9c393581 100644
--- a/YACReaderLibrary/import_widget.cpp
+++ b/YACReaderLibrary/import_widget.cpp
@@ -1,24 +1,23 @@
 #include "import_widget.h"
 
-#include <QLabel>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QPushButton>
-#include <QGraphicsView>
-#include <QGraphicsScene>
-#include <QGraphicsPixmapItem>
-#include <QScrollBar>
 #include <QGraphicsItemAnimation>
+#include <QGraphicsPixmapItem>
+#include <QGraphicsScene>
+#include <QGraphicsView>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QPushButton>
+#include <QScrollBar>
 #include <QTimeLine>
+#include <QVBoxLayout>
 // TODO: is QGLWidget needed here???
 // #include <QGLWidget>
-#include <QTimer>
 #include <QElapsedTimer>
-#include <QToolButton>
-#include <QResizeEvent>
-
-#include <QPropertyAnimation>
 #include <QGraphicsOpacityEffect>
+#include <QPropertyAnimation>
+#include <QResizeEvent>
+#include <QTimer>
+#include <QToolButton>
 
 class YACReaderActivityIndicatorWidget : public QWidget
 {
diff --git a/YACReaderLibrary/import_widget.h b/YACReaderLibrary/import_widget.h
index 9e54ba5e..945b38aa 100644
--- a/YACReaderLibrary/import_widget.h
+++ b/YACReaderLibrary/import_widget.h
@@ -1,6 +1,8 @@
 #ifndef IMPORT_WIDGET_H
 #define IMPORT_WIDGET_H
 
+#include "themable.h"
+
 #include <QElapsedTimer>
 #include <QGraphicsScene>
 #include <QGraphicsView>
@@ -9,10 +11,9 @@
 #include <QPropertyAnimation>
 #include <QPushButton>
 #include <QString>
+#include <QToolButton>
 #include <QWidget>
 
-#include "themable.h"
-
 class ImportWidget : public QWidget, protected Themable
 {
     Q_OBJECT
diff --git a/YACReaderLibrary/info_comics_view.cpp b/YACReaderLibrary/info_comics_view.cpp
index b801b6d5..47d118cb 100644
--- a/YACReaderLibrary/info_comics_view.cpp
+++ b/YACReaderLibrary/info_comics_view.cpp
@@ -1,18 +1,17 @@
 #include "info_comics_view.h"
 
-#include <QQmlProperty>
-#include <QQuickItem>
-#include <QQuickWidget>
-#include <QToolBar>
-#include <QVBoxLayout>
-
+#include "QsLog.h"
 #include "comic.h"
 #include "comic_files_manager.h"
 #include "comic_model.h"
 #include "yacreader_comic_info_helper.h"
 #include "yacreader_comics_selection_helper.h"
 
-#include "QsLog.h"
+#include <QQmlProperty>
+#include <QQuickItem>
+#include <QQuickWidget>
+#include <QToolBar>
+#include <QVBoxLayout>
 
 InfoComicsView::InfoComicsView(QWidget *parent)
     : ComicsView(parent), flow(nullptr), list(nullptr)
diff --git a/YACReaderLibrary/info_comics_view.h b/YACReaderLibrary/info_comics_view.h
index 596b60c4..d898cee4 100644
--- a/YACReaderLibrary/info_comics_view.h
+++ b/YACReaderLibrary/info_comics_view.h
@@ -2,9 +2,10 @@
 #define INFOCOMICSVIEW_H
 
 #include "comics_view.h"
-#include <QQmlContext>
 #include "themable.h"
 
+#include <QQmlContext>
+
 class QQuickView;
 
 class YACReaderComicsSelectionHelper;
diff --git a/YACReaderLibrary/initial_comic_info_extractor.cpp b/YACReaderLibrary/initial_comic_info_extractor.cpp
index 23f96ef0..9cdef918 100644
--- a/YACReaderLibrary/initial_comic_info_extractor.cpp
+++ b/YACReaderLibrary/initial_comic_info_extractor.cpp
@@ -1,11 +1,12 @@
 #include "initial_comic_info_extractor.h"
 
-#include <QsLog.h>
-#include "pdf_comic.h"
 #include "comic.h"
 #include "compressed_archive.h"
-#include "qnaturalsorting.h"
 #include "cover_utils.h"
+#include "pdf_comic.h"
+#include "qnaturalsorting.h"
+
+#include <QsLog.h>
 
 using namespace YACReader;
 
diff --git a/YACReaderLibrary/ip_config_helper.cpp b/YACReaderLibrary/ip_config_helper.cpp
index 38c58188..8f33e477 100644
--- a/YACReaderLibrary/ip_config_helper.cpp
+++ b/YACReaderLibrary/ip_config_helper.cpp
@@ -1,7 +1,9 @@
-#include <QNetworkInterface>
 #include "ip_config_helper.h"
+
 #include "qnaturalsorting.h"
 
+#include <QNetworkInterface>
+
 // 192.168 (most comon local subnet for ips are always put first)
 // IPs are sorted using natoral sorting
 
diff --git a/YACReaderLibrary/ip_config_helper.h b/YACReaderLibrary/ip_config_helper.h
index 8cabe1d3..b5fac6ed 100644
--- a/YACReaderLibrary/ip_config_helper.h
+++ b/YACReaderLibrary/ip_config_helper.h
@@ -1,4 +1,8 @@
 #ifndef YR_IP_CONFIG_HELPER
 #define YR_IP_CONFIG_HELPER
+
+#include <QList>
+#include <QString>
+
 QList<QString> getIpAddresses();
 #endif
diff --git a/YACReaderLibrary/libraries_update_coordinator.cpp b/YACReaderLibrary/libraries_update_coordinator.cpp
index 703b5d96..9743aef3 100644
--- a/YACReaderLibrary/libraries_update_coordinator.cpp
+++ b/YACReaderLibrary/libraries_update_coordinator.cpp
@@ -2,8 +2,8 @@
 #include "libraries_update_coordinator.h"
 
 #include "library_creator.h"
-#include "yacreader_libraries.h"
 #include "yacreader_global.h"
+#include "yacreader_libraries.h"
 
 using namespace YACReader;
 
diff --git a/YACReaderLibrary/library_creator.cpp b/YACReaderLibrary/library_creator.cpp
index 139dea24..4bfdfffb 100644
--- a/YACReaderLibrary/library_creator.cpp
+++ b/YACReaderLibrary/library_creator.cpp
@@ -1,24 +1,22 @@
 #include "library_creator.h"
 
-#include <QMutex>
+#include "QsLog.h"
+#include "comic.h"
+#include "data_base_management.h"
+#include "db_helper.h"
+#include "initial_comic_info_extractor.h"
+#include "pdf_comic.h"
+#include "qnaturalsorting.h"
+#include "xml_info_parser.h"
+#include "yacreader_global.h"
+
+#include <QCoreApplication>
 #include <QDebug>
+#include <QLibrary>
+#include <QMutex>
 #include <QSqlError>
 #include <QSqlQuery>
 #include <QSqlRecord>
-#include <QCoreApplication>
-#include <QLibrary>
-
-#include "data_base_management.h"
-#include "qnaturalsorting.h"
-#include "db_helper.h"
-
-#include "initial_comic_info_extractor.h"
-#include "xml_info_parser.h"
-#include "comic.h"
-#include "pdf_comic.h"
-#include "yacreader_global.h"
-
-#include "QsLog.h"
 
 #include <algorithm>
 
diff --git a/YACReaderLibrary/library_creator.h b/YACReaderLibrary/library_creator.h
index 401e08cd..cdba5aec 100644
--- a/YACReaderLibrary/library_creator.h
+++ b/YACReaderLibrary/library_creator.h
@@ -1,19 +1,20 @@
 #ifndef __LIBRARY_CREATOR_H
 #define __LIBRARY_CREATOR_H
 
-#include <QObject>
-#include <QString>
+#include "comic_db.h"
+#include "folder.h"
+
+#include <QByteArray>
 #include <QDir>
 #include <QFile>
-#include <QByteArray>
-#include <QRegExp>
-#include <QProcess>
-#include <QtCore>
 #include <QMutex>
-#include <QThread>
+#include <QObject>
+#include <QProcess>
+#include <QRegExp>
 #include <QSqlDatabase>
-#include "folder.h"
-#include "comic_db.h"
+#include <QString>
+#include <QThread>
+#include <QtCore>
 
 class LibraryCreator : public QThread
 {
diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp
index d1689ede..8e455b95 100644
--- a/YACReaderLibrary/library_window.cpp
+++ b/YACReaderLibrary/library_window.cpp
@@ -5,105 +5,85 @@
 
 #include <QApplication>
 #include <QDesktopServices>
+#include <QDir>
+#include <QFileDialog>
+#include <QFileIconProvider>
 #include <QHBoxLayout>
+#include <QHeaderView>
 #include <QInputDialog>
-#include <QWindow>
+#include <QLabel>
 #include <QMenu>
+#include <QMenuBar>
 #include <QMessageBox>
+#include <QProcess>
 #include <QProgressDialog>
+#include <QSettings>
 #include <QSplitter>
 #include <QSqlError>
 #include <QStackedWidget>
-#include <QLabel>
 #include <QToolBar>
 #include <QToolButton>
-#include <QDir>
-#include <QHeaderView>
-#include <QMenuBar>
-#include <QProcess>
+#include <QWindow>
 #include <QtCore>
-#include <QFileDialog>
-#include <QHBoxLayout>
-#include <QFileIconProvider>
-#include <QSettings>
-#include <QHeaderView>
 
 #include <algorithm>
 #include <future>
 
 #ifdef Q_OS_WIN
 #include <qt_windows.h>
+
 #include <shellapi.h>
 #endif
 
-#include "folder_item.h"
-#include "data_base_management.h"
-#include "no_libraries_widget.h"
-#include "import_widget.h"
-
-#include "yacreader_search_line_edit.h"
-#include "comic_db.h"
-#include "library_creator.h"
-#include "package_manager.h"
-#include "xml_info_library_scanner.h"
-#include "create_library_dialog.h"
-#include "rename_library_dialog.h"
-#include "properties_dialog.h"
-#include "export_library_dialog.h"
-#include "import_library_dialog.h"
-#include "export_comics_info_dialog.h"
-#include "import_comics_info_dialog.h"
-#include "add_library_dialog.h"
-#include "options_dialog.h"
-#include "help_about_dialog.h"
-#include "server_config_dialog.h"
-#include "comic_model.h"
-#include "yacreader_tool_bar_stretch.h"
-
-#include "yacreader_titled_toolbar.h"
-#include "yacreader_main_toolbar.h"
-
-#include "yacreader_sidebar.h"
-
-#include "comics_remover.h"
-#include "yacreader_library_list_widget.h"
-#include "yacreader_folders_view.h"
-#include "yacreader_reading_lists_view.h"
-
-#include "comic_vine_dialog.h"
-#include "api_key_dialog.h"
-
-#include "comics_view.h"
-
-#include "edit_shortcuts_dialog.h"
-#include "shortcuts_manager.h"
-
-#include "comic_files_manager.h"
-
-#include "reading_list_model.h"
-#include "add_label_dialog.h"
-
-#include "yacreader_history_controller.h"
-#include "db_helper.h"
-
-#include "reading_list_item.h"
-
-#include "yacreader_content_views_manager.h"
-#include "folder_content_view.h"
-
-#include "trayicon_controller.h"
-
-#include "whats_new_controller.h"
-
-#include "library_comic_opener.h"
-
-#include "recent_visibility_coordinator.h"
-
-#include "cover_utils.h"
-
 #include "QsLog.h"
-
+#include "add_label_dialog.h"
+#include "add_library_dialog.h"
+#include "api_key_dialog.h"
+#include "comic_db.h"
+#include "comic_files_manager.h"
+#include "comic_model.h"
+#include "comic_vine_dialog.h"
+#include "comics_remover.h"
+#include "comics_view.h"
+#include "cover_utils.h"
+#include "create_library_dialog.h"
+#include "data_base_management.h"
+#include "db_helper.h"
+#include "edit_shortcuts_dialog.h"
+#include "export_comics_info_dialog.h"
+#include "export_library_dialog.h"
+#include "folder_content_view.h"
+#include "folder_item.h"
+#include "help_about_dialog.h"
+#include "import_comics_info_dialog.h"
+#include "import_library_dialog.h"
+#include "import_widget.h"
+#include "library_comic_opener.h"
+#include "library_creator.h"
+#include "no_libraries_widget.h"
+#include "options_dialog.h"
+#include "package_manager.h"
+#include "properties_dialog.h"
+#include "reading_list_item.h"
+#include "reading_list_model.h"
+#include "recent_visibility_coordinator.h"
+#include "rename_library_dialog.h"
+#include "server_config_dialog.h"
+#include "shortcuts_manager.h"
+#include "trayicon_controller.h"
+#include "whats_new_controller.h"
+#include "xml_info_library_scanner.h"
+#include "yacreader_content_views_manager.h"
+#include "yacreader_folders_view.h"
+#include "yacreader_history_controller.h"
 #include "yacreader_http_server.h"
+#include "yacreader_library_list_widget.h"
+#include "yacreader_main_toolbar.h"
+#include "yacreader_reading_lists_view.h"
+#include "yacreader_search_line_edit.h"
+#include "yacreader_sidebar.h"
+#include "yacreader_titled_toolbar.h"
+#include "yacreader_tool_bar_stretch.h"
 extern YACReaderHttpServer *httpServer;
 
 #include <KDSignalThrottler.h>
diff --git a/YACReaderLibrary/library_window.h b/YACReaderLibrary/library_window.h
index 4e5e0a88..ec25b09c 100644
--- a/YACReaderLibrary/library_window.h
+++ b/YACReaderLibrary/library_window.h
@@ -1,25 +1,22 @@
 #ifndef __LIBRARYWINDOW_H
 #define __LIBRARYWINDOW_H
 
+#include "comic_db.h"
+#include "comic_model.h"
+#include "comic_query_result_processor.h"
+#include "folder.h"
+#include "folder_query_result_processor.h"
+#include "libraries_update_coordinator.h"
+#include "library_window_actions.h"
+#include "themable.h"
+#include "yacreader_global.h"
+#include "yacreader_libraries.h"
+#include "yacreader_navigation_controller.h"
+
+#include <QFileInfo>
 #include <QMainWindow>
 #include <QMap>
 #include <QModelIndex>
-#include <QFileInfo>
-
-#include "library_window_actions.h"
-#include "yacreader_global.h"
-#include "yacreader_libraries.h"
-#include "libraries_update_coordinator.h"
-
-#include "yacreader_navigation_controller.h"
-#include "comic_query_result_processor.h"
-#include "folder_query_result_processor.h"
-
-#include "themable.h"
-
-#include "comic_model.h"
-#include "comic_db.h"
-#include "folder.h"
 
 #include <future>
 #include <memory>
diff --git a/YACReaderLibrary/library_window_actions.cpp b/YACReaderLibrary/library_window_actions.cpp
index 4c6edbde..76957dcb 100644
--- a/YACReaderLibrary/library_window_actions.cpp
+++ b/YACReaderLibrary/library_window_actions.cpp
@@ -1,18 +1,17 @@
 #include "library_window_actions.h"
 
 #include "edit_shortcuts_dialog.h"
-#include "library_window.h"
-#include "shortcuts_manager.h"
-#include "yacreader_history_controller.h"
-#include "recent_visibility_coordinator.h"
-
-#include "help_about_dialog.h"
 #include "export_library_dialog.h"
-#include "yacreader_content_views_manager.h"
+#include "help_about_dialog.h"
+#include "library_window.h"
+#include "recent_visibility_coordinator.h"
 #include "server_config_dialog.h"
-#include "yacreader_folders_view.h"
-#include "yacreader_options_dialog.h"
+#include "shortcuts_manager.h"
 #include "theme_manager.h"
+#include "yacreader_content_views_manager.h"
+#include "yacreader_folders_view.h"
+#include "yacreader_history_controller.h"
+#include "yacreader_options_dialog.h"
 
 #include <QtCore>
 
diff --git a/YACReaderLibrary/library_window_actions.h b/YACReaderLibrary/library_window_actions.h
index 583595a4..0cffabdb 100644
--- a/YACReaderLibrary/library_window_actions.h
+++ b/YACReaderLibrary/library_window_actions.h
@@ -1,11 +1,11 @@
 #ifndef LIBRARY_WINDOW_ACTIONS_H
 #define LIBRARY_WINDOW_ACTIONS_H
 
+#include "qaction.h"
+
 #include <QAction>
 #include <QSettings>
 
-#include "qaction.h"
-
 class LibraryWindow;
 class YACReaderHistoryController;
 class EditShortcutsDialog;
diff --git a/YACReaderLibrary/main.cpp b/YACReaderLibrary/main.cpp
index 141b6561..b14bd463 100644
--- a/YACReaderLibrary/main.cpp
+++ b/YACReaderLibrary/main.cpp
@@ -1,29 +1,29 @@
 #include "library_window.h"
 
 #include <QApplication>
-#include <QSettings>
-#include <QLocale>
 #include <QDir>
-#include <QSysInfo>
 #include <QFileInfo>
+#include <QLocale>
+#include <QSettings>
+#include <QSysInfo>
 #if !defined use_unarr && !defined use_libarchive
 #include <QLibrary>
 #endif
-#include <QCommandLineParser>
-#include <QImageReader>
-
-#include "yacreader_global.h"
-#include "yacreader_http_server.h"
-#include "yacreader_local_server.h"
+#include "app_language_utils.h"
+#include "appearance_configuration.h"
 #include "comic_db.h"
 #include "data_base_management.h"
 #include "db_helper.h"
-#include "yacreader_libraries.h"
 #include "exit_check.h"
-#include "appearance_configuration.h"
 #include "theme_manager.h"
 #include "theme_repository.h"
-#include "app_language_utils.h"
+#include "yacreader_global.h"
+#include "yacreader_http_server.h"
+#include "yacreader_libraries.h"
+#include "yacreader_local_server.h"
+
+#include <QCommandLineParser>
+#include <QImageReader>
 #ifdef Q_OS_MACOS
 #include "trayhandler.h"
 #endif
diff --git a/YACReaderLibrary/no_libraries_widget.cpp b/YACReaderLibrary/no_libraries_widget.cpp
index 7603db7f..ec5865a0 100644
--- a/YACReaderLibrary/no_libraries_widget.cpp
+++ b/YACReaderLibrary/no_libraries_widget.cpp
@@ -1,9 +1,9 @@
 #include "no_libraries_widget.h"
 
-#include <QLabel>
-#include <QVBoxLayout>
 #include <QHBoxLayout>
+#include <QLabel>
 #include <QPushButton>
+#include <QVBoxLayout>
 
 NoLibrariesWidget::NoLibrariesWidget(QWidget *parent)
     : QWidget(parent)
diff --git a/YACReaderLibrary/no_libraries_widget.h b/YACReaderLibrary/no_libraries_widget.h
index 9ccfb751..4e0ea74f 100644
--- a/YACReaderLibrary/no_libraries_widget.h
+++ b/YACReaderLibrary/no_libraries_widget.h
@@ -1,10 +1,10 @@
 #ifndef NO_LIBRARIES_WIDGET_H
 #define NO_LIBRARIES_WIDGET_H
 
-#include <QWidget>
-
 #include "themable.h"
 
+#include <QWidget>
+
 class QLabel;
 
 class NoLibrariesWidget : public QWidget, protected Themable
diff --git a/YACReaderLibrary/options_dialog.cpp b/YACReaderLibrary/options_dialog.cpp
index 288b162b..ff37d885 100644
--- a/YACReaderLibrary/options_dialog.cpp
+++ b/YACReaderLibrary/options_dialog.cpp
@@ -1,13 +1,12 @@
 #include "options_dialog.h"
 
-#include "yacreader_3d_flow_config_widget.h"
 #include "api_key_dialog.h"
+#include "app_language_utils.h"
 #include "appearance_tab_widget.h"
 #include "theme_factory.h"
 #include "theme_manager.h"
-
+#include "yacreader_3d_flow_config_widget.h"
 #include "yacreader_global_gui.h"
-#include "app_language_utils.h"
 
 #include <QGroupBox>
 #include <QHBoxLayout>
diff --git a/YACReaderLibrary/options_dialog.h b/YACReaderLibrary/options_dialog.h
index af878bfa..017a3ced 100644
--- a/YACReaderLibrary/options_dialog.h
+++ b/YACReaderLibrary/options_dialog.h
@@ -1,6 +1,9 @@
 #ifndef __OPTIONS_DIALOG_H
 #define __OPTIONS_DIALOG_H
 
+#include "yacreader_global.h"
+#include "yacreader_options_dialog.h"
+
 #include <QCheckBox>
 #include <QComboBox>
 #include <QLabel>
@@ -10,9 +13,6 @@
 #include <QTimeEdit>
 #include <QWidget>
 
-#include "yacreader_global.h"
-#include "yacreader_options_dialog.h"
-
 using namespace YACReader;
 
 class OptionsDialog : public YACReaderOptionsDialog
diff --git a/YACReaderLibrary/package_manager.cpp b/YACReaderLibrary/package_manager.cpp
index 38200f5c..2c8278d8 100644
--- a/YACReaderLibrary/package_manager.cpp
+++ b/YACReaderLibrary/package_manager.cpp
@@ -1,4 +1,5 @@
 #include "package_manager.h"
+
 #include <QCoreApplication>
 
 PackageManager::PackageManager()
diff --git a/YACReaderLibrary/properties_dialog.cpp b/YACReaderLibrary/properties_dialog.cpp
index b23d5dd8..4b43cd42 100644
--- a/YACReaderLibrary/properties_dialog.cpp
+++ b/YACReaderLibrary/properties_dialog.cpp
@@ -1,29 +1,28 @@
 #include "properties_dialog.h"
 
-#include "yacreader_global_gui.h"
-
 #include "cover_utils.h"
 #include "data_base_management.h"
+#include "db_helper.h"
 #include "initial_comic_info_extractor.h"
+#include "yacreader_cover_label.h"
 #include "yacreader_field_edit.h"
 #include "yacreader_field_plain_text_edit.h"
-#include "db_helper.h"
-#include "yacreader_cover_label.h"
+#include "yacreader_global_gui.h"
 
-#include <QComboBox>
-#include <QHBoxLayout>
 #include <QApplication>
-#include <QSizePolicy>
-#include <QFormLayout>
 #include <QCheckBox>
-#include <QTabWidget>
-#include <QIntValidator>
-#include <QFileInfo>
-#include <QLabel>
+#include <QComboBox>
 #include <QDialogButtonBox>
-#include <QToolButton>
-#include <QPushButton>
+#include <QFileInfo>
+#include <QFormLayout>
+#include <QHBoxLayout>
+#include <QIntValidator>
+#include <QLabel>
 #include <QMessageBox>
+#include <QPushButton>
+#include <QSizePolicy>
+#include <QTabWidget>
+#include <QToolButton>
 
 using namespace YACReader;
 
diff --git a/YACReaderLibrary/properties_dialog.h b/YACReaderLibrary/properties_dialog.h
index f4dcdd96..c4f9e345 100644
--- a/YACReaderLibrary/properties_dialog.h
+++ b/YACReaderLibrary/properties_dialog.h
@@ -2,7 +2,6 @@
 #define __PROPERTIES_DIALOG_H
 
 #include <QDialog>
-
 #include <QIntValidator>
 
 class QGridLayout;
diff --git a/YACReaderLibrary/recent_visibility_coordinator.h b/YACReaderLibrary/recent_visibility_coordinator.h
index 518c9c17..b6e917ce 100644
--- a/YACReaderLibrary/recent_visibility_coordinator.h
+++ b/YACReaderLibrary/recent_visibility_coordinator.h
@@ -2,9 +2,9 @@
 #ifndef RECENT_VISIBILITY_COORDINATOR_H
 #define RECENT_VISIBILITY_COORDINATOR_H
 
-#include "folder_model.h"
 #include "comic_model.h"
 #include "folder_content_view.h"
+#include "folder_model.h"
 
 class RecentVisibilityCoordinator : public QObject
 {
diff --git a/YACReaderLibrary/rename_library_dialog.cpp b/YACReaderLibrary/rename_library_dialog.cpp
index 724dfd34..0439aeac 100644
--- a/YACReaderLibrary/rename_library_dialog.cpp
+++ b/YACReaderLibrary/rename_library_dialog.cpp
@@ -1,8 +1,8 @@
 #include "rename_library_dialog.h"
 
+#include <QFileDialog>
 #include <QHBoxLayout>
 #include <QVBoxLayout>
-#include <QFileDialog>
 
 RenameLibraryDialog::RenameLibraryDialog(QWidget *parent)
     : QDialog(parent)
diff --git a/YACReaderLibrary/server/controllers/v2/comiccontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/comiccontroller_v2.cpp
index 816ac19e..7c71efc0 100644
--- a/YACReaderLibrary/server/controllers/v2/comiccontroller_v2.cpp
+++ b/YACReaderLibrary/server/controllers/v2/comiccontroller_v2.cpp
@@ -1,17 +1,13 @@
 #include "comiccontroller_v2.h"
 
-#include "db_helper.h"
-#include "yacreader_libraries.h"
-#include "yacreader_http_session.h"
-
 #include "../static.h"
-
-#include "comic_db.h"
-#include "comic.h"
-
-#include "qnaturalsorting.h"
-
 #include "QsLog.h"
+#include "comic.h"
+#include "comic_db.h"
+#include "db_helper.h"
+#include "qnaturalsorting.h"
+#include "yacreader_http_session.h"
+#include "yacreader_libraries.h"
 
 using stefanfrings::HttpRequest;
 using stefanfrings::HttpResponse;
diff --git a/YACReaderLibrary/server/controllers/v2/comiccontroller_v2.h b/YACReaderLibrary/server/controllers/v2/comiccontroller_v2.h
index f22aa631..7197e626 100644
--- a/YACReaderLibrary/server/controllers/v2/comiccontroller_v2.h
+++ b/YACReaderLibrary/server/controllers/v2/comiccontroller_v2.h
@@ -2,8 +2,8 @@
 #define COMICCONTROLLER_V2_H
 
 #include "httprequest.h"
-#include "httpresponse.h"
 #include "httprequesthandler.h"
+#include "httpresponse.h"
 
 class ComicControllerV2 : public stefanfrings::HttpRequestHandler
 {
diff --git a/YACReaderLibrary/server/controllers/v2/comiccontrollerinreadinglist_v2.cpp b/YACReaderLibrary/server/controllers/v2/comiccontrollerinreadinglist_v2.cpp
index 82b54030..bd026624 100644
--- a/YACReaderLibrary/server/controllers/v2/comiccontrollerinreadinglist_v2.cpp
+++ b/YACReaderLibrary/server/controllers/v2/comiccontrollerinreadinglist_v2.cpp
@@ -1,15 +1,12 @@
 #include "comiccontrollerinreadinglist_v2.h"
 
-#include "db_helper.h"
-#include "yacreader_libraries.h"
-#include "yacreader_http_session.h"
-
 #include "../static.h"
-
-#include "comic_db.h"
-#include "comic.h"
-
 #include "QsLog.h"
+#include "comic.h"
+#include "comic_db.h"
+#include "db_helper.h"
+#include "yacreader_http_session.h"
+#include "yacreader_libraries.h"
 
 using stefanfrings::HttpRequest;
 using stefanfrings::HttpResponse;
diff --git a/YACReaderLibrary/server/controllers/v2/comiccontrollerinreadinglist_v2.h b/YACReaderLibrary/server/controllers/v2/comiccontrollerinreadinglist_v2.h
index 424fcbf7..3f697abf 100644
--- a/YACReaderLibrary/server/controllers/v2/comiccontrollerinreadinglist_v2.h
+++ b/YACReaderLibrary/server/controllers/v2/comiccontrollerinreadinglist_v2.h
@@ -2,8 +2,8 @@
 #define COMICCONTROLLERINREADINGLISTV2_H
 
 #include "httprequest.h"
-#include "httpresponse.h"
 #include "httprequesthandler.h"
+#include "httpresponse.h"
 
 class ComicControllerInReadingListV2 : public stefanfrings::HttpRequestHandler
 {
diff --git a/YACReaderLibrary/server/controllers/v2/comicdownloadinfocontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/comicdownloadinfocontroller_v2.cpp
index 903fa9ae..ef414872 100644
--- a/YACReaderLibrary/server/controllers/v2/comicdownloadinfocontroller_v2.cpp
+++ b/YACReaderLibrary/server/controllers/v2/comicdownloadinfocontroller_v2.cpp
@@ -1,10 +1,9 @@
 #include "comicdownloadinfocontroller_v2.h"
 
-#include <QUrl>
-
+#include "comic_db.h"
 #include "db_helper.h"
 
-#include "comic_db.h"
+#include <QUrl>
 
 using stefanfrings::HttpRequest;
 using stefanfrings::HttpResponse;
diff --git a/YACReaderLibrary/server/controllers/v2/comicdownloadinfocontroller_v2.h b/YACReaderLibrary/server/controllers/v2/comicdownloadinfocontroller_v2.h
index a40f214d..4e32ff19 100644
--- a/YACReaderLibrary/server/controllers/v2/comicdownloadinfocontroller_v2.h
+++ b/YACReaderLibrary/server/controllers/v2/comicdownloadinfocontroller_v2.h
@@ -2,8 +2,8 @@
 #define COMICDOWNLOADINFOCONTROLLER_V2_H
 
 #include "httprequest.h"
-#include "httpresponse.h"
 #include "httprequesthandler.h"
+#include "httpresponse.h"
 
 class ComicDownloadInfoControllerV2 : public stefanfrings::HttpRequestHandler
 {
diff --git a/YACReaderLibrary/server/controllers/v2/comicfullinfocontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/comicfullinfocontroller_v2.cpp
index 2f5af2fe..12dd01bc 100644
--- a/YACReaderLibrary/server/controllers/v2/comicfullinfocontroller_v2.cpp
+++ b/YACReaderLibrary/server/controllers/v2/comicfullinfocontroller_v2.cpp
@@ -1,13 +1,12 @@
 #include "comicfullinfocontroller_v2.h"
 
-#include <QUrl>
-
-#include "db_helper.h"
 #include "comic_db.h"
-
+#include "db_helper.h"
 #include "yacreader_libraries.h"
 #include "yacreader_server_data_helper.h"
 
+#include <QUrl>
+
 using stefanfrings::HttpRequest;
 using stefanfrings::HttpResponse;
 using namespace std;
diff --git a/YACReaderLibrary/server/controllers/v2/comicfullinfocontroller_v2.h b/YACReaderLibrary/server/controllers/v2/comicfullinfocontroller_v2.h
index 031232ee..e7bae830 100644
--- a/YACReaderLibrary/server/controllers/v2/comicfullinfocontroller_v2.h
+++ b/YACReaderLibrary/server/controllers/v2/comicfullinfocontroller_v2.h
@@ -2,8 +2,8 @@
 #define COMICFULLINFOCONTROLLER_V2_H
 
 #include "httprequest.h"
-#include "httpresponse.h"
 #include "httprequesthandler.h"
+#include "httpresponse.h"
 
 class ComicFullinfoController_v2 : public stefanfrings::HttpRequestHandler
 {
diff --git a/YACReaderLibrary/server/controllers/v2/covercontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/covercontroller_v2.cpp
index e0bb5a35..aa374149 100644
--- a/YACReaderLibrary/server/controllers/v2/covercontroller_v2.cpp
+++ b/YACReaderLibrary/server/controllers/v2/covercontroller_v2.cpp
@@ -1,8 +1,10 @@
 #include "covercontroller_v2.h"
+
 #include "db_helper.h" //get libraries
-#include <QImage>
-#include "yacreader_libraries.h"
 #include "yacreader_global.h"
+#include "yacreader_libraries.h"
+
+#include <QImage>
 
 using stefanfrings::HttpRequest;
 using stefanfrings::HttpResponse;
diff --git a/YACReaderLibrary/server/controllers/v2/covercontroller_v2.h b/YACReaderLibrary/server/controllers/v2/covercontroller_v2.h
index 7dc7d726..2b47b108 100644
--- a/YACReaderLibrary/server/controllers/v2/covercontroller_v2.h
+++ b/YACReaderLibrary/server/controllers/v2/covercontroller_v2.h
@@ -2,8 +2,8 @@
 #define COVERCONTROLLER_V2_H
 
 #include "httprequest.h"
-#include "httpresponse.h"
 #include "httprequesthandler.h"
+#include "httpresponse.h"
 
 class CoverControllerV2 : public stefanfrings::HttpRequestHandler
 {
diff --git a/YACReaderLibrary/server/controllers/v2/errorcontroller_v2.h b/YACReaderLibrary/server/controllers/v2/errorcontroller_v2.h
index 3b64416f..eda826d1 100644
--- a/YACReaderLibrary/server/controllers/v2/errorcontroller_v2.h
+++ b/YACReaderLibrary/server/controllers/v2/errorcontroller_v2.h
@@ -2,8 +2,8 @@
 #define ERRORCONTROLLER_V2_H
 
 #include "httprequest.h"
-#include "httpresponse.h"
 #include "httprequesthandler.h"
+#include "httpresponse.h"
 
 class ErrorControllerV2 : public stefanfrings::HttpRequestHandler
 {
diff --git a/YACReaderLibrary/server/controllers/v2/favoritescontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/favoritescontroller_v2.cpp
index a7bc39fb..b7e35dc5 100644
--- a/YACReaderLibrary/server/controllers/v2/favoritescontroller_v2.cpp
+++ b/YACReaderLibrary/server/controllers/v2/favoritescontroller_v2.cpp
@@ -1,8 +1,7 @@
 #include "favoritescontroller_v2.h"
 
-#include "db_helper.h"
 #include "comic_db.h"
-
+#include "db_helper.h"
 #include "yacreader_libraries.h"
 #include "yacreader_server_data_helper.h"
 
diff --git a/YACReaderLibrary/server/controllers/v2/favoritescontroller_v2.h b/YACReaderLibrary/server/controllers/v2/favoritescontroller_v2.h
index 5ab08463..d0de2944 100644
--- a/YACReaderLibrary/server/controllers/v2/favoritescontroller_v2.h
+++ b/YACReaderLibrary/server/controllers/v2/favoritescontroller_v2.h
@@ -2,8 +2,8 @@
 #define FAVORITESCONTROLLER_V2_H
 
 #include "httprequest.h"
-#include "httpresponse.h"
 #include "httprequesthandler.h"
+#include "httpresponse.h"
 
 class FavoritesControllerV2 : public stefanfrings::HttpRequestHandler
 {
diff --git a/YACReaderLibrary/server/controllers/v2/foldercontentcontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/foldercontentcontroller_v2.cpp
index 0ecc765d..9a2f118e 100644
--- a/YACReaderLibrary/server/controllers/v2/foldercontentcontroller_v2.cpp
+++ b/YACReaderLibrary/server/controllers/v2/foldercontentcontroller_v2.cpp
@@ -1,17 +1,14 @@
 #include "foldercontentcontroller_v2.h"
 
-#include <QUrl>
-
-#include "db_helper.h"
+#include "QsLog.h"
 #include "comic_db.h"
+#include "db_helper.h"
 #include "folder.h"
-
+#include "qnaturalsorting.h"
 #include "yacreader_libraries.h"
 #include "yacreader_server_data_helper.h"
 
-#include "qnaturalsorting.h"
-
-#include "QsLog.h"
+#include <QUrl>
 
 #include <chrono>
 
diff --git a/YACReaderLibrary/server/controllers/v2/foldercontentcontroller_v2.h b/YACReaderLibrary/server/controllers/v2/foldercontentcontroller_v2.h
index b856fe7f..d5eac13e 100644
--- a/YACReaderLibrary/server/controllers/v2/foldercontentcontroller_v2.h
+++ b/YACReaderLibrary/server/controllers/v2/foldercontentcontroller_v2.h
@@ -2,8 +2,8 @@
 #define FOLDERCONTENTCONTROLLER_V2_H
 
 #include "httprequest.h"
-#include "httpresponse.h"
 #include "httprequesthandler.h"
+#include "httpresponse.h"
 
 class FolderContentControllerV2 : public stefanfrings::HttpRequestHandler
 {
diff --git a/YACReaderLibrary/server/controllers/v2/folderinfocontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/folderinfocontroller_v2.cpp
index 5b5c1e3d..ff17afca 100644
--- a/YACReaderLibrary/server/controllers/v2/folderinfocontroller_v2.cpp
+++ b/YACReaderLibrary/server/controllers/v2/folderinfocontroller_v2.cpp
@@ -1,11 +1,10 @@
 #include "folderinfocontroller_v2.h"
 
-#include <QUrl>
-
-#include "db_helper.h" //get libraries
-
-#include "folder.h"
 #include "comic_db.h"
+#include "db_helper.h" //get libraries
+#include "folder.h"
+
+#include <QUrl>
 
 using stefanfrings::HttpRequest;
 using stefanfrings::HttpResponse;
diff --git a/YACReaderLibrary/server/controllers/v2/folderinfocontroller_v2.h b/YACReaderLibrary/server/controllers/v2/folderinfocontroller_v2.h
index 321fc424..ddac5fe0 100644
--- a/YACReaderLibrary/server/controllers/v2/folderinfocontroller_v2.h
+++ b/YACReaderLibrary/server/controllers/v2/folderinfocontroller_v2.h
@@ -2,8 +2,8 @@
 #define FOLDERINFOCONTROLLER_V2_H
 
 #include "httprequest.h"
-#include "httpresponse.h"
 #include "httprequesthandler.h"
+#include "httpresponse.h"
 
 class FolderInfoControllerV2 : public stefanfrings::HttpRequestHandler
 {
diff --git a/YACReaderLibrary/server/controllers/v2/foldermetadatacontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/foldermetadatacontroller_v2.cpp
index 8910dcc7..7d8d34b8 100644
--- a/YACReaderLibrary/server/controllers/v2/foldermetadatacontroller_v2.cpp
+++ b/YACReaderLibrary/server/controllers/v2/foldermetadatacontroller_v2.cpp
@@ -2,7 +2,6 @@
 
 #include "db_helper.h"
 #include "folder.h"
-
 #include "yacreader_libraries.h"
 #include "yacreader_server_data_helper.h"
 
diff --git a/YACReaderLibrary/server/controllers/v2/foldermetadatacontroller_v2.h b/YACReaderLibrary/server/controllers/v2/foldermetadatacontroller_v2.h
index 03980355..0e2ba892 100644
--- a/YACReaderLibrary/server/controllers/v2/foldermetadatacontroller_v2.h
+++ b/YACReaderLibrary/server/controllers/v2/foldermetadatacontroller_v2.h
@@ -2,8 +2,8 @@
 #define FOLDERMETADATACONTROLLERV2_H
 
 #include "httprequest.h"
-#include "httpresponse.h"
 #include "httprequesthandler.h"
+#include "httpresponse.h"
 
 class FolderMetadataControllerV2 : public stefanfrings::HttpRequestHandler
 {
diff --git a/YACReaderLibrary/server/controllers/v2/librariescontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/librariescontroller_v2.cpp
index ea949499..9eb73739 100644
--- a/YACReaderLibrary/server/controllers/v2/librariescontroller_v2.cpp
+++ b/YACReaderLibrary/server/controllers/v2/librariescontroller_v2.cpp
@@ -1,4 +1,5 @@
 #include "librariescontroller_v2.h"
+
 #include "db_helper.h" //get libraries
 #include "yacreader_libraries.h"
 
diff --git a/YACReaderLibrary/server/controllers/v2/librariescontroller_v2.h b/YACReaderLibrary/server/controllers/v2/librariescontroller_v2.h
index 521492c4..a09c7d36 100644
--- a/YACReaderLibrary/server/controllers/v2/librariescontroller_v2.h
+++ b/YACReaderLibrary/server/controllers/v2/librariescontroller_v2.h
@@ -2,8 +2,8 @@
 #define LIBRARIESCONTROLLER_V2_H
 
 #include "httprequest.h"
-#include "httpresponse.h"
 #include "httprequesthandler.h"
+#include "httpresponse.h"
 
 /**
   This controller displays a HTML form and dumps the submitted input.
diff --git a/YACReaderLibrary/server/controllers/v2/pagecontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/pagecontroller_v2.cpp
index bf9585cb..6755ccab 100644
--- a/YACReaderLibrary/server/controllers/v2/pagecontroller_v2.cpp
+++ b/YACReaderLibrary/server/controllers/v2/pagecontroller_v2.cpp
@@ -1,13 +1,11 @@
 #include "pagecontroller_v2.h"
 
 #include "../static.h"
-
 #include "comic.h"
 #include "yacreader_http_session.h"
 
 #include <QDataStream>
 #include <QPointer>
-
 #include <QsLog.h>
 
 using stefanfrings::HttpRequest;
diff --git a/YACReaderLibrary/server/controllers/v2/pagecontroller_v2.h b/YACReaderLibrary/server/controllers/v2/pagecontroller_v2.h
index 4bd71ce6..60806e5f 100644
--- a/YACReaderLibrary/server/controllers/v2/pagecontroller_v2.h
+++ b/YACReaderLibrary/server/controllers/v2/pagecontroller_v2.h
@@ -2,8 +2,8 @@
 #define PAGECONTROLLER_V2_H
 
 #include "httprequest.h"
-#include "httpresponse.h"
 #include "httprequesthandler.h"
+#include "httpresponse.h"
 
 class PageControllerV2 : public stefanfrings::HttpRequestHandler
 {
diff --git a/YACReaderLibrary/server/controllers/v2/readingcomicscontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/readingcomicscontroller_v2.cpp
index a63b3d7c..2b10a767 100644
--- a/YACReaderLibrary/server/controllers/v2/readingcomicscontroller_v2.cpp
+++ b/YACReaderLibrary/server/controllers/v2/readingcomicscontroller_v2.cpp
@@ -1,8 +1,7 @@
 #include "readingcomicscontroller_v2.h"
 
-#include "db_helper.h"
 #include "comic_db.h"
-
+#include "db_helper.h"
 #include "yacreader_libraries.h"
 #include "yacreader_server_data_helper.h"
 
diff --git a/YACReaderLibrary/server/controllers/v2/readingcomicscontroller_v2.h b/YACReaderLibrary/server/controllers/v2/readingcomicscontroller_v2.h
index 51c96061..5aa916c3 100644
--- a/YACReaderLibrary/server/controllers/v2/readingcomicscontroller_v2.h
+++ b/YACReaderLibrary/server/controllers/v2/readingcomicscontroller_v2.h
@@ -2,8 +2,8 @@
 #define READINGCOMICSCONTROLLER_V2_H
 
 #include "httprequest.h"
-#include "httpresponse.h"
 #include "httprequesthandler.h"
+#include "httpresponse.h"
 
 class ReadingComicsControllerV2 : public stefanfrings::HttpRequestHandler
 {
diff --git a/YACReaderLibrary/server/controllers/v2/readinglistcontentcontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/readinglistcontentcontroller_v2.cpp
index 0abb55fc..353324ac 100644
--- a/YACReaderLibrary/server/controllers/v2/readinglistcontentcontroller_v2.cpp
+++ b/YACReaderLibrary/server/controllers/v2/readinglistcontentcontroller_v2.cpp
@@ -1,8 +1,7 @@
 #include "readinglistcontentcontroller_v2.h"
 
-#include "db_helper.h"
 #include "comic_db.h"
-
+#include "db_helper.h"
 #include "yacreader_libraries.h"
 #include "yacreader_server_data_helper.h"
 
diff --git a/YACReaderLibrary/server/controllers/v2/readinglistcontentcontroller_v2.h b/YACReaderLibrary/server/controllers/v2/readinglistcontentcontroller_v2.h
index bdf482e1..40e6f7dc 100644
--- a/YACReaderLibrary/server/controllers/v2/readinglistcontentcontroller_v2.h
+++ b/YACReaderLibrary/server/controllers/v2/readinglistcontentcontroller_v2.h
@@ -2,8 +2,8 @@
 #define READINGLISTCONTENTCONTROLLER_V2_H
 
 #include "httprequest.h"
-#include "httpresponse.h"
 #include "httprequesthandler.h"
+#include "httpresponse.h"
 
 class ReadingListContentControllerV2 : public stefanfrings::HttpRequestHandler
 {
diff --git a/YACReaderLibrary/server/controllers/v2/readinglistinfocontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/readinglistinfocontroller_v2.cpp
index 7468bb40..51a48b16 100644
--- a/YACReaderLibrary/server/controllers/v2/readinglistinfocontroller_v2.cpp
+++ b/YACReaderLibrary/server/controllers/v2/readinglistinfocontroller_v2.cpp
@@ -1,10 +1,9 @@
 #include "readinglistinfocontroller_v2.h"
 
-#include <QUrl>
-
+#include "comic_db.h"
 #include "db_helper.h"
 
-#include "comic_db.h"
+#include <QUrl>
 
 using stefanfrings::HttpRequest;
 using stefanfrings::HttpResponse;
diff --git a/YACReaderLibrary/server/controllers/v2/readinglistinfocontroller_v2.h b/YACReaderLibrary/server/controllers/v2/readinglistinfocontroller_v2.h
index 32f42b26..43de4e8f 100644
--- a/YACReaderLibrary/server/controllers/v2/readinglistinfocontroller_v2.h
+++ b/YACReaderLibrary/server/controllers/v2/readinglistinfocontroller_v2.h
@@ -2,8 +2,8 @@
 #define READINGLISTINFOCONTROLLER_V2_H
 
 #include "httprequest.h"
-#include "httpresponse.h"
 #include "httprequesthandler.h"
+#include "httpresponse.h"
 
 class ReadingListInfoControllerV2 : public stefanfrings::HttpRequestHandler
 {
diff --git a/YACReaderLibrary/server/controllers/v2/readinglistscontroller_v2.h b/YACReaderLibrary/server/controllers/v2/readinglistscontroller_v2.h
index d319982d..ea156c15 100644
--- a/YACReaderLibrary/server/controllers/v2/readinglistscontroller_v2.h
+++ b/YACReaderLibrary/server/controllers/v2/readinglistscontroller_v2.h
@@ -2,8 +2,8 @@
 #define READINGLISTSCONTROLLER_V2_H
 
 #include "httprequest.h"
-#include "httpresponse.h"
 #include "httprequesthandler.h"
+#include "httpresponse.h"
 
 class ReadingListsControllerV2 : public stefanfrings::HttpRequestHandler
 {
diff --git a/YACReaderLibrary/server/controllers/v2/searchcontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/searchcontroller_v2.cpp
index e4a0632a..a8409132 100644
--- a/YACReaderLibrary/server/controllers/v2/searchcontroller_v2.cpp
+++ b/YACReaderLibrary/server/controllers/v2/searchcontroller_v2.cpp
@@ -3,8 +3,8 @@
 
 #include "data_base_management.h"
 #include "db_helper.h"
-#include "yacreader_libraries.h"
 #include "search_query.h"
+#include "yacreader_libraries.h"
 
 #include <QJsonDocument>
 #include <QSqlDatabase>
diff --git a/YACReaderLibrary/server/controllers/v2/searchcontroller_v2.h b/YACReaderLibrary/server/controllers/v2/searchcontroller_v2.h
index 52c1e778..8837aa5d 100644
--- a/YACReaderLibrary/server/controllers/v2/searchcontroller_v2.h
+++ b/YACReaderLibrary/server/controllers/v2/searchcontroller_v2.h
@@ -3,8 +3,8 @@
 #define SEARCHCONTROLLER_H
 
 #include "httprequest.h"
-#include "httpresponse.h"
 #include "httprequesthandler.h"
+#include "httpresponse.h"
 
 #include <QSqlQuery>
 
diff --git a/YACReaderLibrary/server/controllers/v2/synccontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/synccontroller_v2.cpp
index a64a1182..edba69f9 100644
--- a/YACReaderLibrary/server/controllers/v2/synccontroller_v2.cpp
+++ b/YACReaderLibrary/server/controllers/v2/synccontroller_v2.cpp
@@ -1,13 +1,13 @@
 #include "synccontroller_v2.h"
 
 #include "QsLog.h"
-#include <QUrl>
-
 #include "comic_db.h"
 #include "db_helper.h"
 #include "yacreader_libraries.h"
 #include "yacreader_server_data_helper.h"
 
+#include <QUrl>
+
 using stefanfrings::HttpRequest;
 using stefanfrings::HttpResponse;
 
diff --git a/YACReaderLibrary/server/controllers/v2/synccontroller_v2.h b/YACReaderLibrary/server/controllers/v2/synccontroller_v2.h
index ca7358c7..715a01c7 100644
--- a/YACReaderLibrary/server/controllers/v2/synccontroller_v2.h
+++ b/YACReaderLibrary/server/controllers/v2/synccontroller_v2.h
@@ -1,11 +1,11 @@
 #ifndef SYNCCONTROLLER_V2_H
 #define SYNCCONTROLLER_V2_H
 
-#include <QObject>
-
 #include "httprequest.h"
-#include "httpresponse.h"
 #include "httprequesthandler.h"
+#include "httpresponse.h"
+
+#include <QObject>
 
 class SyncControllerV2 : public stefanfrings::HttpRequestHandler
 {
diff --git a/YACReaderLibrary/server/controllers/v2/tagcontentcontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/tagcontentcontroller_v2.cpp
index 8aca99cf..301f665e 100644
--- a/YACReaderLibrary/server/controllers/v2/tagcontentcontroller_v2.cpp
+++ b/YACReaderLibrary/server/controllers/v2/tagcontentcontroller_v2.cpp
@@ -1,8 +1,7 @@
 #include "tagcontentcontroller_v2.h"
 
-#include "db_helper.h"
 #include "comic_db.h"
-
+#include "db_helper.h"
 #include "yacreader_libraries.h"
 #include "yacreader_server_data_helper.h"
 
diff --git a/YACReaderLibrary/server/controllers/v2/tagcontentcontroller_v2.h b/YACReaderLibrary/server/controllers/v2/tagcontentcontroller_v2.h
index 9d140479..95643994 100644
--- a/YACReaderLibrary/server/controllers/v2/tagcontentcontroller_v2.h
+++ b/YACReaderLibrary/server/controllers/v2/tagcontentcontroller_v2.h
@@ -2,8 +2,8 @@
 #define TAGCONTENTCONTROLLER_V2_H
 
 #include "httprequest.h"
-#include "httpresponse.h"
 #include "httprequesthandler.h"
+#include "httpresponse.h"
 
 class TagContentControllerV2 : public stefanfrings::HttpRequestHandler
 {
diff --git a/YACReaderLibrary/server/controllers/v2/taginfocontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/taginfocontroller_v2.cpp
index 21593067..e7d3205e 100644
--- a/YACReaderLibrary/server/controllers/v2/taginfocontroller_v2.cpp
+++ b/YACReaderLibrary/server/controllers/v2/taginfocontroller_v2.cpp
@@ -1,10 +1,9 @@
 #include "taginfocontroller_v2.h"
 
-#include <QUrl>
-
+#include "comic_db.h"
 #include "db_helper.h"
 
-#include "comic_db.h"
+#include <QUrl>
 
 using stefanfrings::HttpRequest;
 using stefanfrings::HttpResponse;
diff --git a/YACReaderLibrary/server/controllers/v2/taginfocontroller_v2.h b/YACReaderLibrary/server/controllers/v2/taginfocontroller_v2.h
index 78232c92..7617b4d5 100644
--- a/YACReaderLibrary/server/controllers/v2/taginfocontroller_v2.h
+++ b/YACReaderLibrary/server/controllers/v2/taginfocontroller_v2.h
@@ -2,8 +2,8 @@
 #define TAGINFOCONTROLLER_V2_H
 
 #include "httprequest.h"
-#include "httpresponse.h"
 #include "httprequesthandler.h"
+#include "httpresponse.h"
 
 class TagInfoControllerV2 : public stefanfrings::HttpRequestHandler
 {
diff --git a/YACReaderLibrary/server/controllers/v2/tagscontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/tagscontroller_v2.cpp
index 28337ec7..a60e4238 100644
--- a/YACReaderLibrary/server/controllers/v2/tagscontroller_v2.cpp
+++ b/YACReaderLibrary/server/controllers/v2/tagscontroller_v2.cpp
@@ -1,10 +1,8 @@
 #include "tagscontroller_v2.h"
 
 #include "db_helper.h"
-#include "yacreader_libraries.h"
-
 #include "reading_list.h"
-
+#include "yacreader_libraries.h"
 #include "yacreader_server_data_helper.h"
 
 using stefanfrings::HttpRequest;
diff --git a/YACReaderLibrary/server/controllers/v2/tagscontroller_v2.h b/YACReaderLibrary/server/controllers/v2/tagscontroller_v2.h
index 4748f82d..4a8e1f4b 100644
--- a/YACReaderLibrary/server/controllers/v2/tagscontroller_v2.h
+++ b/YACReaderLibrary/server/controllers/v2/tagscontroller_v2.h
@@ -2,8 +2,8 @@
 #define TAGSCONTROLLER_V2_H
 
 #include "httprequest.h"
-#include "httpresponse.h"
 #include "httprequesthandler.h"
+#include "httpresponse.h"
 
 class TagsControllerV2 : public stefanfrings::HttpRequestHandler
 {
diff --git a/YACReaderLibrary/server/controllers/v2/updatecomiccontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/updatecomiccontroller_v2.cpp
index 03401063..7e497974 100644
--- a/YACReaderLibrary/server/controllers/v2/updatecomiccontroller_v2.cpp
+++ b/YACReaderLibrary/server/controllers/v2/updatecomiccontroller_v2.cpp
@@ -1,12 +1,10 @@
 #include "updatecomiccontroller_v2.h"
 
-#include <QUrl>
-
+#include "QsLog.h"
+#include "comic_db.h"
 #include "db_helper.h"
 
-#include "comic_db.h"
-
-#include "QsLog.h"
+#include <QUrl>
 
 using stefanfrings::HttpRequest;
 using stefanfrings::HttpResponse;
diff --git a/YACReaderLibrary/server/controllers/v2/updatecomiccontroller_v2.h b/YACReaderLibrary/server/controllers/v2/updatecomiccontroller_v2.h
index 90a15b6f..59912d37 100644
--- a/YACReaderLibrary/server/controllers/v2/updatecomiccontroller_v2.h
+++ b/YACReaderLibrary/server/controllers/v2/updatecomiccontroller_v2.h
@@ -2,8 +2,8 @@
 #define UPDATECOMICCONTROLLER_V2_H
 
 #include "httprequest.h"
-#include "httpresponse.h"
 #include "httprequesthandler.h"
+#include "httpresponse.h"
 
 class UpdateComicControllerV2 : public stefanfrings::HttpRequestHandler
 {
diff --git a/YACReaderLibrary/server/controllers/versioncontroller.h b/YACReaderLibrary/server/controllers/versioncontroller.h
index 9824ed34..f38586a8 100644
--- a/YACReaderLibrary/server/controllers/versioncontroller.h
+++ b/YACReaderLibrary/server/controllers/versioncontroller.h
@@ -2,8 +2,8 @@
 #define VERSIONCONTROLLER_H
 
 #include "httprequest.h"
-#include "httpresponse.h"
 #include "httprequesthandler.h"
+#include "httpresponse.h"
 
 #include <QThread>
 
diff --git a/YACReaderLibrary/server/controllers/webui/statuspagecontroller.cpp b/YACReaderLibrary/server/controllers/webui/statuspagecontroller.cpp
index 8312bb88..fadf9911 100644
--- a/YACReaderLibrary/server/controllers/webui/statuspagecontroller.cpp
+++ b/YACReaderLibrary/server/controllers/webui/statuspagecontroller.cpp
@@ -1,8 +1,8 @@
 #include "statuspagecontroller.h"
 
+#include "db_helper.h"
 #include "template.h"
 #include "yacreader_global.h"
-#include "db_helper.h"
 #include "yacreader_libraries.h"
 
 #include <QSysInfo>
diff --git a/YACReaderLibrary/server/controllers/webui/statuspagecontroller.h b/YACReaderLibrary/server/controllers/webui/statuspagecontroller.h
index 22dae09f..4eccd086 100644
--- a/YACReaderLibrary/server/controllers/webui/statuspagecontroller.h
+++ b/YACReaderLibrary/server/controllers/webui/statuspagecontroller.h
@@ -2,8 +2,8 @@
 #define STATUSPAGE_CONTROLLER
 
 #include "httprequest.h"
-#include "httpresponse.h"
 #include "httprequesthandler.h"
+#include "httpresponse.h"
 
 class StatusPageController : public stefanfrings::HttpRequestHandler
 {
diff --git a/YACReaderLibrary/server/requestmapper.cpp b/YACReaderLibrary/server/requestmapper.cpp
index 7e181c63..10f3d2e3 100644
--- a/YACReaderLibrary/server/requestmapper.cpp
+++ b/YACReaderLibrary/server/requestmapper.cpp
@@ -1,39 +1,34 @@
 #include "requestmapper.h"
-#include "static.h"
-#include "staticfilecontroller.h"
-
-#include "controllers/versioncontroller.h"
-
-#include "controllers/v2/librariescontroller_v2.h"
-#include "controllers/v2/covercontroller_v2.h"
-#include "controllers/v2/comiccontroller_v2.h"
-#include "controllers/v2/folderinfocontroller_v2.h"
-#include "controllers/v2/pagecontroller_v2.h"
-#include "controllers/v2/updatecomiccontroller_v2.h"
-#include "controllers/v2/comicdownloadinfocontroller_v2.h"
-#include "controllers/v2/synccontroller_v2.h"
-#include "controllers/v2/foldercontentcontroller_v2.h"
-#include "controllers/v2/tagscontroller_v2.h"
-#include "controllers/v2/tagcontentcontroller_v2.h"
-#include "controllers/v2/taginfocontroller_v2.h"
-#include "controllers/v2/favoritescontroller_v2.h"
-#include "controllers/v2/readingcomicscontroller_v2.h"
-#include "controllers/v2/readinglistscontroller_v2.h"
-#include "controllers/v2/readinglistcontentcontroller_v2.h"
-#include "controllers/v2/readinglistinfocontroller_v2.h"
-#include "controllers/v2/comicfullinfocontroller_v2.h"
-#include "controllers/v2/comiccontrollerinreadinglist_v2.h"
-#include "controllers/v2/searchcontroller_v2.h"
-#include "controllers/v2/foldermetadatacontroller_v2.h"
-
-#include "controllers/webui/statuspagecontroller.h"
-
-#include "db_helper.h"
-#include "yacreader_libraries.h"
-
-#include "yacreader_http_session.h"
 
 #include "QsLog.h"
+#include "controllers/v2/comiccontroller_v2.h"
+#include "controllers/v2/comiccontrollerinreadinglist_v2.h"
+#include "controllers/v2/comicdownloadinfocontroller_v2.h"
+#include "controllers/v2/comicfullinfocontroller_v2.h"
+#include "controllers/v2/covercontroller_v2.h"
+#include "controllers/v2/favoritescontroller_v2.h"
+#include "controllers/v2/foldercontentcontroller_v2.h"
+#include "controllers/v2/folderinfocontroller_v2.h"
+#include "controllers/v2/foldermetadatacontroller_v2.h"
+#include "controllers/v2/librariescontroller_v2.h"
+#include "controllers/v2/pagecontroller_v2.h"
+#include "controllers/v2/readingcomicscontroller_v2.h"
+#include "controllers/v2/readinglistcontentcontroller_v2.h"
+#include "controllers/v2/readinglistinfocontroller_v2.h"
+#include "controllers/v2/readinglistscontroller_v2.h"
+#include "controllers/v2/searchcontroller_v2.h"
+#include "controllers/v2/synccontroller_v2.h"
+#include "controllers/v2/tagcontentcontroller_v2.h"
+#include "controllers/v2/taginfocontroller_v2.h"
+#include "controllers/v2/tagscontroller_v2.h"
+#include "controllers/v2/updatecomiccontroller_v2.h"
+#include "controllers/versioncontroller.h"
+#include "controllers/webui/statuspagecontroller.h"
+#include "db_helper.h"
+#include "static.h"
+#include "staticfilecontroller.h"
+#include "yacreader_http_session.h"
+#include "yacreader_libraries.h"
 
 #include <QRegExp>
 
diff --git a/YACReaderLibrary/server/requestmapper.h b/YACReaderLibrary/server/requestmapper.h
index 1767639e..3598b1e9 100644
--- a/YACReaderLibrary/server/requestmapper.h
+++ b/YACReaderLibrary/server/requestmapper.h
@@ -2,6 +2,7 @@
 #define REQUESTMAPPER_H
 
 #include "httprequesthandler.h"
+
 #include <QMutex>
 
 class RequestMapper : public stefanfrings::HttpRequestHandler
diff --git a/YACReaderLibrary/server/static.cpp b/YACReaderLibrary/server/static.cpp
index 509a0467..fd8a563a 100644
--- a/YACReaderLibrary/server/static.cpp
+++ b/YACReaderLibrary/server/static.cpp
@@ -4,6 +4,7 @@
 */
 
 #include "static.h"
+
 #include <QCoreApplication>
 #include <QDir>
 #include <QFile>
diff --git a/YACReaderLibrary/server/static.h b/YACReaderLibrary/server/static.h
index d97eef0e..48bf1d65 100644
--- a/YACReaderLibrary/server/static.h
+++ b/YACReaderLibrary/server/static.h
@@ -6,11 +6,11 @@
 #ifndef STATIC_H
 #define STATIC_H
 
-#include <QString>
 #include "staticfilecontroller.h"
-
 #include "yacreader_http_session_store.h"
 
+#include <QString>
+
 /**
   This class contains some static resources that are used by the application.
 */
diff --git a/YACReaderLibrary/server/yacreader_http_server.cpp b/YACReaderLibrary/server/yacreader_http_server.cpp
index 55f1bc3c..cf59e681 100644
--- a/YACReaderLibrary/server/yacreader_http_server.cpp
+++ b/YACReaderLibrary/server/yacreader_http_server.cpp
@@ -3,17 +3,17 @@
   @author Stefan Frings
 */
 
-#include "static.h"
 #include "yacreader_http_server.h"
+
+#include "static.h"
 // #include "dualfilelogger.h"
 #include "httplistener.h"
 #include "requestmapper.h"
 #include "staticfilecontroller.h"
-
 #include "yacreader_global.h"
 
-#include <QDir>
 #include <QCoreApplication>
+#include <QDir>
 
 /** Name of this application */
 #define APPNAME "YACReaderLibrary"
diff --git a/YACReaderLibrary/server/yacreader_http_session.h b/YACReaderLibrary/server/yacreader_http_session.h
index 995753e3..e1691aee 100644
--- a/YACReaderLibrary/server/yacreader_http_session.h
+++ b/YACReaderLibrary/server/yacreader_http_session.h
@@ -1,10 +1,10 @@
 #ifndef YACREADERHTTPSESSION_H
 #define YACREADERHTTPSESSION_H
 
-#include <QObject>
-
 #include "comic.h"
 
+#include <QObject>
+
 class YACReaderHttpSession : public QObject
 {
     Q_OBJECT
diff --git a/YACReaderLibrary/server/yacreader_http_session_store.cpp b/YACReaderLibrary/server/yacreader_http_session_store.cpp
index b8fa889a..0fe827cc 100644
--- a/YACReaderLibrary/server/yacreader_http_session_store.cpp
+++ b/YACReaderLibrary/server/yacreader_http_session_store.cpp
@@ -1,9 +1,9 @@
 #include "yacreader_http_session_store.h"
 
-#include <QMutexLocker>
-
 #include "yacreader_http_session.h"
 
+#include <QMutexLocker>
+
 YACReaderHttpSessionStore::YACReaderHttpSessionStore(QObject *parent)
     : QObject(parent)
 {
diff --git a/YACReaderLibrary/server/yacreader_server_data_helper.h b/YACReaderLibrary/server/yacreader_server_data_helper.h
index d495898e..f755bf0a 100644
--- a/YACReaderLibrary/server/yacreader_server_data_helper.h
+++ b/YACReaderLibrary/server/yacreader_server_data_helper.h
@@ -1,11 +1,12 @@
 #ifndef YACREADERSERVERDATAHELPER_H
 #define YACREADERSERVERDATAHELPER_H
 
-#include <QtCore>
-#include "folder.h"
 #include "comic_db.h"
+#include "folder.h"
 #include "reading_list.h"
 
+#include <QtCore>
+
 class YACReaderServerDataHelper
 {
 public:
diff --git a/YACReaderLibrary/server_config_dialog.cpp b/YACReaderLibrary/server_config_dialog.cpp
index 924349d2..21a36146 100644
--- a/YACReaderLibrary/server_config_dialog.cpp
+++ b/YACReaderLibrary/server_config_dialog.cpp
@@ -1,16 +1,16 @@
-#include <QGridLayout>
-#include <QSettings>
-#include <QPalette>
-#include <QBitmap>
-#include <QPainter>
-#include <QPixmap>
-
 #include "server_config_dialog.h"
-#include "yacreader_http_server.h"
-#include "yacreader_global_gui.h"
 
 #include "ip_config_helper.h"
 #include "qrcodegen.hpp"
+#include "yacreader_global_gui.h"
+#include "yacreader_http_server.h"
+
+#include <QBitmap>
+#include <QGridLayout>
+#include <QPainter>
+#include <QPalette>
+#include <QPixmap>
+#include <QSettings>
 
 extern YACReaderHttpServer *httpServer;
 
diff --git a/YACReaderLibrary/server_config_dialog.h b/YACReaderLibrary/server_config_dialog.h
index 0345d381..67014af4 100644
--- a/YACReaderLibrary/server_config_dialog.h
+++ b/YACReaderLibrary/server_config_dialog.h
@@ -1,14 +1,14 @@
 #ifndef __SERVER_CONFIG_DIALOG_H
 #define __SERVER_CONFIG_DIALOG_H
 
+#include "themable.h"
+
+#include <QCheckBox>
+#include <QComboBox>
 #include <QDialog>
 #include <QLabel>
 #include <QLineEdit>
 #include <QPushButton>
-#include <QComboBox>
-#include <QCheckBox>
-
-#include "themable.h"
 
 class ServerConfigDialog : public QDialog, protected Themable
 {
diff --git a/YACReaderLibrary/themes/theme.h b/YACReaderLibrary/themes/theme.h
index 6c208d69..9ade45fa 100644
--- a/YACReaderLibrary/themes/theme.h
+++ b/YACReaderLibrary/themes/theme.h
@@ -1,12 +1,12 @@
 #ifndef THEME_H
 #define THEME_H
 
-#include <QJsonObject>
-
-#include "yacreader_icon.h"
 #include "help_about_dialog_theme.h"
-#include "whats_new_dialog_theme.h"
 #include "theme_meta.h"
+#include "whats_new_dialog_theme.h"
+#include "yacreader_icon.h"
+
+#include <QJsonObject>
 
 struct MetadataScraperDialogThemeTemplates {
     QString defaultLabelQSS = "QLabel {color:%1; font-size:12px;font-family:Arial;}";
diff --git a/YACReaderLibrary/themes/theme_factory.cpp b/YACReaderLibrary/themes/theme_factory.cpp
index e7bcc688..a65359dc 100644
--- a/YACReaderLibrary/themes/theme_factory.cpp
+++ b/YACReaderLibrary/themes/theme_factory.cpp
@@ -1,13 +1,13 @@
 #include "theme_factory.h"
 
+#include "icon_utils.h"
+#include "yacreader_global.h"
+
 #include <QApplication>
 #include <QLinearGradient>
 #include <QPainter>
 #include <QPen>
 
-#include "icon_utils.h"
-#include "yacreader_global.h"
-
 struct MetadataScraperDialogParams {
     MetadataScraperDialogThemeTemplates t;
 
diff --git a/YACReaderLibrary/trayhandler.mm b/YACReaderLibrary/trayhandler.mm
index 05eb6502..cf1dbdae 100644
--- a/YACReaderLibrary/trayhandler.mm
+++ b/YACReaderLibrary/trayhandler.mm
@@ -2,9 +2,10 @@
 #include <QtGlobal>
 #undef __OBJC_BOOL_IS_BOOL
 
-#import <AppKit/AppKit.h>
 #include "trayhandler.h"
 
+#import <AppKit/AppKit.h>
+
 void OSXShowDockIcon()
 {
     [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
diff --git a/YACReaderLibrary/trayicon_controller.cpp b/YACReaderLibrary/trayicon_controller.cpp
index 2fbda2e0..4a9ae809 100644
--- a/YACReaderLibrary/trayicon_controller.cpp
+++ b/YACReaderLibrary/trayicon_controller.cpp
@@ -1,8 +1,7 @@
 #include "trayicon_controller.h"
 
-#include "yacreader_global_gui.h"
-
 #include "library_window.h"
+#include "yacreader_global_gui.h"
 
 #include <QApplication>
 #include <QMessageBox>
diff --git a/YACReaderLibrary/xml_info_library_scanner.cpp b/YACReaderLibrary/xml_info_library_scanner.cpp
index 20cadfbd..40855e36 100644
--- a/YACReaderLibrary/xml_info_library_scanner.cpp
+++ b/YACReaderLibrary/xml_info_library_scanner.cpp
@@ -1,16 +1,15 @@
 #include "xml_info_library_scanner.h"
 
-#include <QSqlRecord>
-
+#include "QsLog.h"
 #include "comic_db.h"
 #include "data_base_management.h"
 #include "db_helper.h"
+#include "folder_item.h"
 #include "initial_comic_info_extractor.h"
 #include "xml_info_parser.h"
 #include "yacreader_global.h"
-#include "folder_item.h"
 
-#include "QsLog.h"
+#include <QSqlRecord>
 
 using namespace YACReader;
 
diff --git a/YACReaderLibrary/xml_info_library_scanner.h b/YACReaderLibrary/xml_info_library_scanner.h
index b752a2e1..f0676ad7 100644
--- a/YACReaderLibrary/xml_info_library_scanner.h
+++ b/YACReaderLibrary/xml_info_library_scanner.h
@@ -1,8 +1,8 @@
 #ifndef XMLINFOLIBRARYSCANNER_H
 #define XMLINFOLIBRARYSCANNER_H
 
-#include <QtCore>
 #include <QSqlQuery>
+#include <QtCore>
 
 namespace YACReader {
 
diff --git a/YACReaderLibrary/yacreader_content_views_manager.cpp b/YACReaderLibrary/yacreader_content_views_manager.cpp
index 8d56c1ea..0d505a8d 100644
--- a/YACReaderLibrary/yacreader_content_views_manager.cpp
+++ b/YACReaderLibrary/yacreader_content_views_manager.cpp
@@ -1,22 +1,19 @@
 #include "yacreader_content_views_manager.h"
 
-#include "library_window.h"
-
 #include "classic_comics_view.h"
-#include "grid_comics_view.h"
-#include "folder_content_view.h"
-
-#include "yacreader_sidebar.h"
-
-#include "info_comics_view.h"
 #include "comics_view_transition.h"
-#include "empty_label_widget.h"
-#include "empty_special_list.h"
-#include "empty_reading_list_widget.h"
 #include "empty_folder_widget.h"
+#include "empty_label_widget.h"
+#include "empty_reading_list_widget.h"
+#include "empty_special_list.h"
+#include "folder_content_view.h"
+#include "grid_comics_view.h"
+#include "info_comics_view.h"
+#include "library_window.h"
 #include "no_search_results_widget.h"
-#include "yacreader_options_dialog.h"
 #include "options_dialog.h"
+#include "yacreader_options_dialog.h"
+#include "yacreader_sidebar.h"
 
 //--
 #include "yacreader_search_line_edit.h"
diff --git a/YACReaderLibrary/yacreader_content_views_manager.h b/YACReaderLibrary/yacreader_content_views_manager.h
index ed03b2d8..e78a1f62 100644
--- a/YACReaderLibrary/yacreader_content_views_manager.h
+++ b/YACReaderLibrary/yacreader_content_views_manager.h
@@ -1,12 +1,12 @@
 #ifndef YACREADERCONTENTVIEWSMANAGER_H
 #define YACREADERCONTENTVIEWSMANAGER_H
 
+#include "themable.h"
+#include "yacreader_global_gui.h"
+
 #include <QSettings>
 #include <QStackedWidget>
 
-#include "yacreader_global_gui.h"
-#include "themable.h"
-
 class LibraryWindow;
 
 class ComicsView;
diff --git a/YACReaderLibrary/yacreader_folders_view.cpp b/YACReaderLibrary/yacreader_folders_view.cpp
index 546a0695..54d413be 100644
--- a/YACReaderLibrary/yacreader_folders_view.cpp
+++ b/YACReaderLibrary/yacreader_folders_view.cpp
@@ -1,13 +1,10 @@
 #include "yacreader_folders_view.h"
 
-#include "yacreader_treeview.h"
-
-#include "folder_model.h"
-
+#include "QsLog.h"
 #include "comic.h"
 #include "comic_files_manager.h"
-
-#include "QsLog.h"
+#include "folder_model.h"
+#include "yacreader_treeview.h"
 
 YACReaderFoldersView::YACReaderFoldersView(QWidget *parent)
     : YACReaderTreeView(parent)
diff --git a/YACReaderLibrary/yacreader_folders_view.h b/YACReaderLibrary/yacreader_folders_view.h
index 534859db..30ac57c9 100644
--- a/YACReaderLibrary/yacreader_folders_view.h
+++ b/YACReaderLibrary/yacreader_folders_view.h
@@ -1,12 +1,12 @@
 #ifndef YACREADER_FOLDERS_VIEW_H
 #define YACREADER_FOLDERS_VIEW_H
 
-#include <QPainter>
-#include <QStyledItemDelegate>
-#include <QStyleOptionViewItem>
-
-#include "yacreader_treeview.h"
 #include "theme.h"
+#include "yacreader_treeview.h"
+
+#include <QPainter>
+#include <QStyleOptionViewItem>
+#include <QStyledItemDelegate>
 
 class YACReaderFoldersView : public YACReaderTreeView
 {
diff --git a/YACReaderLibrary/yacreader_history_controller.h b/YACReaderLibrary/yacreader_history_controller.h
index b51ecb8e..8bf539d6 100644
--- a/YACReaderLibrary/yacreader_history_controller.h
+++ b/YACReaderLibrary/yacreader_history_controller.h
@@ -1,9 +1,8 @@
 #ifndef YACREADER_HISTORY_CONTROLLER_H
 #define YACREADER_HISTORY_CONTROLLER_H
 
-#include <QObject>
-
 #include <QModelIndex>
+#include <QObject>
 
 class YACReaderHistoryController;
 
diff --git a/YACReaderLibrary/yacreader_libraries.cpp b/YACReaderLibrary/yacreader_libraries.cpp
index 2ac86ff3..54fea2fe 100644
--- a/YACReaderLibrary/yacreader_libraries.cpp
+++ b/YACReaderLibrary/yacreader_libraries.cpp
@@ -1,4 +1,5 @@
 #include "yacreader_libraries.h"
+
 #include "qnaturalsorting.h"
 #include "yacreader_global.h"
 
diff --git a/YACReaderLibrary/yacreader_local_server.cpp b/YACReaderLibrary/yacreader_local_server.cpp
index b506260d..f367eae5 100644
--- a/YACReaderLibrary/yacreader_local_server.cpp
+++ b/YACReaderLibrary/yacreader_local_server.cpp
@@ -1,16 +1,14 @@
 #include "yacreader_local_server.h"
 
+#include "QsLog.h"
+#include "comic_db.h"
+#include "db_helper.h"
+#include "yacreader_global.h"
+
 #include <QLocalServer>
 #include <QLocalSocket>
 #include <QPointer>
 
-#include "yacreader_global.h"
-#include "db_helper.h"
-
-#include "comic_db.h"
-
-#include "QsLog.h"
-
 using namespace YACReader;
 
 QMutex YACReaderClientConnectionWorker::dbMutex;
diff --git a/YACReaderLibrary/yacreader_local_server.h b/YACReaderLibrary/yacreader_local_server.h
index bb935c59..8a0432e4 100644
--- a/YACReaderLibrary/yacreader_local_server.h
+++ b/YACReaderLibrary/yacreader_local_server.h
@@ -1,9 +1,9 @@
 #ifndef YACREADER_LOCAL_SERVER_H
 #define YACREADER_LOCAL_SERVER_H
 
+#include <QMutex>
 #include <QObject>
 #include <QThread>
-#include <QMutex>
 
 class QLocalServer;
 class QLocalSocket;
diff --git a/YACReaderLibrary/yacreader_main_toolbar.cpp b/YACReaderLibrary/yacreader_main_toolbar.cpp
index 93a76a10..c074d41f 100644
--- a/YACReaderLibrary/yacreader_main_toolbar.cpp
+++ b/YACReaderLibrary/yacreader_main_toolbar.cpp
@@ -1,12 +1,12 @@
 #include "yacreader_main_toolbar.h"
 
-#include <QPainter>
-#include <QHBoxLayout>
-#include <QToolButton>
-#include <QLabel>
-#include <QResizeEvent>
-#include <QPaintEvent>
 #include <QAction>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QPaintEvent>
+#include <QPainter>
+#include <QResizeEvent>
+#include <QToolButton>
 
 YACReaderMainToolBar::YACReaderMainToolBar(QWidget *parent)
     : QWidget(parent)
diff --git a/YACReaderLibrary/yacreader_main_toolbar.h b/YACReaderLibrary/yacreader_main_toolbar.h
index 06d49043..9526f2ec 100644
--- a/YACReaderLibrary/yacreader_main_toolbar.h
+++ b/YACReaderLibrary/yacreader_main_toolbar.h
@@ -1,10 +1,10 @@
 #ifndef YACREADER_MAIN_TOOLBAR_H
 #define YACREADER_MAIN_TOOLBAR_H
 
-#include <QWidget>
-
 #include "themable.h"
 
+#include <QWidget>
+
 class QToolButton;
 class QLabel;
 class QResizeEvent;
diff --git a/YACReaderLibrary/yacreader_navigation_controller.cpp b/YACReaderLibrary/yacreader_navigation_controller.cpp
index 0fb74f3c..56b7623a 100644
--- a/YACReaderLibrary/yacreader_navigation_controller.cpp
+++ b/YACReaderLibrary/yacreader_navigation_controller.cpp
@@ -1,23 +1,22 @@
 #include "yacreader_navigation_controller.h"
 
-#include <QModelIndex>
-
-#include "library_window.h"
-#include "folder_item.h"
-#include "yacreader_history_controller.h"
+#include "QsLog.h"
 #include "comic_model.h"
-#include "folder_model.h"
-#include "reading_list_model.h"
 #include "comics_view.h"
-#include "folder_content_view.h"
-#include "yacreader_global.h"
 #include "empty_label_widget.h"
 #include "empty_special_list.h"
+#include "folder_content_view.h"
+#include "folder_item.h"
+#include "folder_model.h"
+#include "library_window.h"
+#include "reading_list_model.h"
 #include "yacreader_content_views_manager.h"
 #include "yacreader_folders_view.h"
+#include "yacreader_global.h"
+#include "yacreader_history_controller.h"
 #include "yacreader_reading_lists_view.h"
 
-#include "QsLog.h"
+#include <QModelIndex>
 
 YACReaderNavigationController::YACReaderNavigationController(LibraryWindow *parent, YACReaderContentViewsManager *contentViewsManager)
     : QObject(parent), libraryWindow(parent), contentViewsManager(contentViewsManager)
diff --git a/YACReaderLibrary/yacreader_reading_lists_view.h b/YACReaderLibrary/yacreader_reading_lists_view.h
index 566ab45e..9ad88345 100644
--- a/YACReaderLibrary/yacreader_reading_lists_view.h
+++ b/YACReaderLibrary/yacreader_reading_lists_view.h
@@ -1,12 +1,12 @@
 #ifndef YACREADER_READING_LISTS_VIEW_H
 #define YACREADER_READING_LISTS_VIEW_H
 
-#include <QPainter>
-#include <QStyledItemDelegate>
-#include <QStyleOptionViewItem>
-
 #include "yacreader_treeview.h"
 
+#include <QPainter>
+#include <QStyleOptionViewItem>
+#include <QStyledItemDelegate>
+
 class YACReaderReadingListsView : public YACReaderTreeView
 {
     Q_OBJECT
diff --git a/YACReaderLibraryServer/console_ui_library_creator.cpp b/YACReaderLibraryServer/console_ui_library_creator.cpp
index 9fa3d33f..e4f6a251 100644
--- a/YACReaderLibraryServer/console_ui_library_creator.cpp
+++ b/YACReaderLibraryServer/console_ui_library_creator.cpp
@@ -1,10 +1,10 @@
 #include "console_ui_library_creator.h"
 
-#include <iostream>
-
 #include "library_creator.h"
-#include "yacreader_libraries.h"
 #include "xml_info_library_scanner.h"
+#include "yacreader_libraries.h"
+
+#include <iostream>
 
 using namespace YACReader;
 
diff --git a/YACReaderLibraryServer/libraries_updater.cpp b/YACReaderLibraryServer/libraries_updater.cpp
index e39ef326..a2c1d625 100644
--- a/YACReaderLibraryServer/libraries_updater.cpp
+++ b/YACReaderLibraryServer/libraries_updater.cpp
@@ -1,8 +1,8 @@
 #include "libraries_updater.h"
 
+#include "data_base_management.h"
 #include "yacreader_global.h"
 #include "yacreader_libraries.h"
-#include "data_base_management.h"
 
 LibrariesUpdater::LibrariesUpdater()
 {
diff --git a/YACReaderLibraryServer/main.cpp b/YACReaderLibraryServer/main.cpp
index acd064e4..a774e426 100644
--- a/YACReaderLibraryServer/main.cpp
+++ b/YACReaderLibraryServer/main.cpp
@@ -1,28 +1,24 @@
-#include <QCoreApplication>
-#include <QSysInfo>
-#include <QDir>
-#include <QCommandLineParser>
-#include <QImageReader>
-
-#include "comic_db.h"
-#include "data_base_management.h"
-#include "db_helper.h"
-#include "yacreader_http_server.h"
-#include "yacreader_global.h"
-#include "yacreader_libraries.h"
-#include "yacreader_local_server.h"
-#include "global_info_provider.h"
-
-#include "libraries_update_coordinator.h"
-
-#include "libraries_updater.h"
-
-#include "console_ui_library_creator.h"
-
 #include "QsLog.h"
 #include "QsLogDest.h"
-#include "qrcodegen.hpp"
+#include "comic_db.h"
+#include "console_ui_library_creator.h"
+#include "data_base_management.h"
+#include "db_helper.h"
+#include "global_info_provider.h"
 #include "ip_config_helper.h"
+#include "libraries_update_coordinator.h"
+#include "libraries_updater.h"
+#include "qrcodegen.hpp"
+#include "yacreader_global.h"
+#include "yacreader_http_server.h"
+#include "yacreader_libraries.h"
+#include "yacreader_local_server.h"
+
+#include <QCommandLineParser>
+#include <QCoreApplication>
+#include <QDir>
+#include <QImageReader>
+#include <QSysInfo>
 
 using namespace QsLogging;
 
diff --git a/common/app_language_utils.h b/common/app_language_utils.h
index d76c63b9..e7496826 100644
--- a/common/app_language_utils.h
+++ b/common/app_language_utils.h
@@ -9,6 +9,7 @@
 #include <QRegularExpression>
 #include <QSet>
 #include <QTranslator>
+
 #include <algorithm>
 
 namespace YACReader::UiLanguage {
diff --git a/common/bookmarks.cpp b/common/bookmarks.cpp
index 872c4cc2..83bad65e 100644
--- a/common/bookmarks.cpp
+++ b/common/bookmarks.cpp
@@ -1,13 +1,13 @@
 #include "bookmarks.h"
-#include <QFile>
-#include <QDataStream>
-#include <QCoreApplication>
-#include <QFileInfo>
-
-#include <QList>
 
 #include "yacreader_global.h"
 
+#include <QCoreApplication>
+#include <QDataStream>
+#include <QFile>
+#include <QFileInfo>
+#include <QList>
+
 Bookmarks::Bookmarks()
     : lastPageIndex(0)
 {
diff --git a/common/bookmarks.h b/common/bookmarks.h
index 6c422659..3f36e40d 100644
--- a/common/bookmarks.h
+++ b/common/bookmarks.h
@@ -1,12 +1,11 @@
 #ifndef BOOKMARKS_H
 #define BOOKMARKS_H
 
-#include <QObject>
-#include <QMap>
-#include <QImage>
-#include <QString>
-#include <QMap>
 #include <QDateTime>
+#include <QImage>
+#include <QMap>
+#include <QObject>
+#include <QString>
 class BookmarksList
 {
 public:
diff --git a/common/check_new_version.cpp b/common/check_new_version.cpp
index bb773863..18646a5c 100644
--- a/common/check_new_version.cpp
+++ b/common/check_new_version.cpp
@@ -2,16 +2,15 @@
 
 #include "yacreader_global.h"
 
+#include <QEventLoop>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QNetworkRequest>
+#include <QRegExp>
+#include <QStringList>
+#include <QTimer>
 #include <QUrl>
 #include <QtGlobal>
-#include <QStringList>
-
-#include <QNetworkAccessManager>
-#include <QEventLoop>
-#include <QTimer>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QRegExp>
 
 #define PREVIOUS_VERSION_TESTING "6.0.0"
 
diff --git a/common/comic.cpp b/common/comic.cpp
index 0be6a3a0..7351bd14 100644
--- a/common/comic.cpp
+++ b/common/comic.cpp
@@ -1,20 +1,20 @@
 #include "comic.h"
 
+#include "QsLog.h"
+#include "bookmarks.h" //TODO desacoplar la dependencia con bookmarks
+#include "comic_db.h"
+#include "compressed_archive.h"
+#include "qnaturalsorting.h"
+
+#include <QCoreApplication>
+#include <QDir>
+#include <QFileInfoList>
 #include <QImageReader>
 #include <QPixmap>
 #include <QRegularExpression>
 #include <QString>
+
 #include <algorithm>
-#include <QDir>
-#include <QFileInfoList>
-#include <QCoreApplication>
-
-#include "bookmarks.h" //TODO desacoplar la dependencia con bookmarks
-#include "qnaturalsorting.h"
-#include "compressed_archive.h"
-#include "comic_db.h"
-
-#include "QsLog.h"
 
 enum YACReaderPageSortingMode {
     YACReaderNumericalSorting,
diff --git a/common/comic.h b/common/comic.h
index 91952e6f..6543ee11 100644
--- a/common/comic.h
+++ b/common/comic.h
@@ -1,12 +1,12 @@
 #ifndef __COMIC_H
 #define __COMIC_H
-#include <QtCore>
-#include <QImage>
-#include <QByteArray>
-#include <QMap>
-
-#include "extract_delegate.h"
 #include "bookmarks.h"
+#include "extract_delegate.h"
+
+#include <QByteArray>
+#include <QImage>
+#include <QMap>
+#include <QtCore>
 #ifndef NO_PDF
 #include "pdf_comic.h"
 #endif // NO_PDF
diff --git a/common/comic_db.cpp b/common/comic_db.cpp
index 9fa6edb3..04a49471 100644
--- a/common/comic_db.cpp
+++ b/common/comic_db.cpp
@@ -2,8 +2,8 @@
 
 #include "yacreader_global.h"
 
-#include <QVariant>
 #include <QFileInfo>
+#include <QVariant>
 
 //-----------------------------------------------------------------------------
 // COMIC------------------------------------------------------------------------
diff --git a/common/comic_db.h b/common/comic_db.h
index 9f3b70d6..c72a01ce 100644
--- a/common/comic_db.h
+++ b/common/comic_db.h
@@ -2,11 +2,12 @@
 #define __COMICDB_H
 
 #include "library_item.h"
-#include <QVariant>
-#include <QList>
-#include <QPixmap>
+
 #include <QImage>
+#include <QList>
 #include <QMetaType>
+#include <QPixmap>
+#include <QVariant>
 
 class ComicInfo : public QObject
 {
diff --git a/common/concurrent_queue.h b/common/concurrent_queue.h
index 380f6d5d..9d0d9f65 100644
--- a/common/concurrent_queue.h
+++ b/common/concurrent_queue.h
@@ -1,11 +1,12 @@
 #ifndef CONCURRENT_QUEUE_H
 #define CONCURRENT_QUEUE_H
 
-#include <thread>
-#include <mutex>
-#include <functional>
-#include <condition_variable>
 #include <queue>
+
+#include <condition_variable>
+#include <functional>
+#include <mutex>
+#include <thread>
 #include <vector>
 
 namespace YACReader {
diff --git a/common/global_info_provider.cpp b/common/global_info_provider.cpp
index 8ef36cc5..22828992 100644
--- a/common/global_info_provider.cpp
+++ b/common/global_info_provider.cpp
@@ -1,8 +1,8 @@
 #include "global_info_provider.h"
 
-#include <QtCore>
 #include <QImageReader>
 #include <QPaintDevice>
+#include <QtCore>
 
 #ifdef YACREADER_LIBRARY
 #include <QSqlDatabase>
diff --git a/common/http_worker.cpp b/common/http_worker.cpp
index 3ab184be..a0737be8 100644
--- a/common/http_worker.cpp
+++ b/common/http_worker.cpp
@@ -1,14 +1,13 @@
 #include "http_worker.h"
 
+#include <QEventLoop>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QNetworkRequest>
+#include <QStringList>
+#include <QTimer>
 #include <QUrl>
 #include <QtGlobal>
-#include <QStringList>
-
-#include <QNetworkAccessManager>
-#include <QEventLoop>
-#include <QTimer>
-#include <QNetworkRequest>
-#include <QNetworkReply>
 
 #define PREVIOUS_VERSION "6.0.0"
 
diff --git a/common/pdf_comic.cpp b/common/pdf_comic.cpp
index 9cdcd41c..6c309b1c 100644
--- a/common/pdf_comic.cpp
+++ b/common/pdf_comic.cpp
@@ -1,6 +1,7 @@
-#include "comic.h"
 #include "pdf_comic.h"
 
+#include "comic.h"
+
 #if defined USE_PDFIUM && !defined NO_PDF
 
 int pdfRead(void *param,
diff --git a/common/pdf_comic.h b/common/pdf_comic.h
index cc47d0cd..95060270 100644
--- a/common/pdf_comic.h
+++ b/common/pdf_comic.h
@@ -1,10 +1,10 @@
 #if !defined PDF_COMIC_H && !defined NO_PDF
 #define PDF_COMIC_H
 
-#include <QObject>
-#include <QImage>
 #include <QFile>
+#include <QImage>
 #include <QMutex>
+#include <QObject>
 #include <QtGlobal>
 
 #if defined Q_OS_MACOS && defined USE_PDFKIT
diff --git a/common/pdf_comic.mm b/common/pdf_comic.mm
index c242169a..b878707e 100644
--- a/common/pdf_comic.mm
+++ b/common/pdf_comic.mm
@@ -2,13 +2,13 @@
 
 #undef __OBJC_BOOL_IS_BOOL
 
-#import <AppKit/AppKit.h>
-#import <Foundation/Foundation.h>
-#import <ApplicationServices/ApplicationServices.h>
-
 #include "QsLog.h"
 #include "QsLogDest.h"
 
+#import <AppKit/AppKit.h>
+#import <ApplicationServices/ApplicationServices.h>
+#import <Foundation/Foundation.h>
+
 MacOSXPDFComic::MacOSXPDFComic()
 {
 }
diff --git a/common/qnaturalsorting.h b/common/qnaturalsorting.h
index 3dfc393b..ac3f217c 100644
--- a/common/qnaturalsorting.h
+++ b/common/qnaturalsorting.h
@@ -3,10 +3,11 @@
 #ifndef __QNATURALSORTING_H
 #define __QNATURALSORTING_H
 
-#include <QString>
-#include <QFileInfo>
 #include "library_item.h"
 
+#include <QFileInfo>
+#include <QString>
+
 int naturalCompare(const QString &s1, const QString &s2, Qt::CaseSensitivity caseSensitivity);
 bool naturalSortLessThanCS(const QString &left, const QString &right);
 bool naturalSortLessThanCI(const QString &left, const QString &right);
diff --git a/common/rhi/yacreader_comic_flow_rhi.cpp b/common/rhi/yacreader_comic_flow_rhi.cpp
index c57d38e9..abf3ab58 100644
--- a/common/rhi/yacreader_comic_flow_rhi.cpp
+++ b/common/rhi/yacreader_comic_flow_rhi.cpp
@@ -1,4 +1,5 @@
 #include "yacreader_comic_flow_rhi.h"
+
 #include <QImage>
 
 // YACReaderComicFlow3D implementation
diff --git a/common/rhi/yacreader_flow_rhi.cpp b/common/rhi/yacreader_flow_rhi.cpp
index 3cf29c0d..5d1a7405 100644
--- a/common/rhi/yacreader_flow_rhi.cpp
+++ b/common/rhi/yacreader_flow_rhi.cpp
@@ -1,4 +1,5 @@
 #include "yacreader_flow_rhi.h"
+
 #include <QFile>
 #include <QLabel>
 #if defined(YACREADER_RHI_PERF)
diff --git a/common/rhi/yacreader_flow_rhi.h b/common/rhi/yacreader_flow_rhi.h
index 89a479c7..ca7184dd 100644
--- a/common/rhi/yacreader_flow_rhi.h
+++ b/common/rhi/yacreader_flow_rhi.h
@@ -7,12 +7,13 @@
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
 
-#include <QRhiWidget>
-#include <rhi/qrhi.h>
-
 #include "flow_types.h"
-#include "yacreader_global.h"
 #include "scroll_management.h"
+#include "yacreader_global.h"
+
+#include <QRhiWidget>
+
+#include <rhi/qrhi.h>
 
 // the image/texture info struct
 struct YACReader3DImageRHI {
diff --git a/common/rhi/yacreader_page_flow_rhi.cpp b/common/rhi/yacreader_page_flow_rhi.cpp
index d3220071..f4af58d9 100644
--- a/common/rhi/yacreader_page_flow_rhi.cpp
+++ b/common/rhi/yacreader_page_flow_rhi.cpp
@@ -1,4 +1,5 @@
 #include "yacreader_page_flow_rhi.h"
+
 #include <QImage>
 
 // YACReaderPageFlow3D implementation
diff --git a/common/scroll_management.cpp b/common/scroll_management.cpp
index ddef42dc..f8e2683e 100644
--- a/common/scroll_management.cpp
+++ b/common/scroll_management.cpp
@@ -1,4 +1,5 @@
 #include "scroll_management.h"
+
 #include <QApplication>
 
 ScrollManagement::ScrollManagement()
diff --git a/common/themes/appearance_tab_widget.h b/common/themes/appearance_tab_widget.h
index 98195058..720827ce 100644
--- a/common/themes/appearance_tab_widget.h
+++ b/common/themes/appearance_tab_widget.h
@@ -6,6 +6,7 @@
 #include <QJsonObject>
 #include <QPointer>
 #include <QWidget>
+
 #include <functional>
 #include <optional>
 
diff --git a/common/themes/icon_utils.cpp b/common/themes/icon_utils.cpp
index 9430dae9..a0f01c10 100644
--- a/common/themes/icon_utils.cpp
+++ b/common/themes/icon_utils.cpp
@@ -1,10 +1,10 @@
 #include "icon_utils.h"
 
+#include "yacreader_global.h"
+
 #include <QPainter>
 #include <QSvgRenderer>
 
-#include "yacreader_global.h"
-
 QPixmap renderSvgToPixmap(const QString &svgPath, int logicalSize, qreal devicePixelRatio)
 {
     return renderSvgToPixmap(svgPath, logicalSize, logicalSize, devicePixelRatio);
diff --git a/common/themes/theme_editor_dialog.cpp b/common/themes/theme_editor_dialog.cpp
index 459f9b5b..c969aa29 100644
--- a/common/themes/theme_editor_dialog.cpp
+++ b/common/themes/theme_editor_dialog.cpp
@@ -1,27 +1,28 @@
 #include "theme_editor_dialog.h"
 
-#include <cmath>
+#include <QApplication>
+#include <QColorDialog>
 #include <QComboBox>
+#include <QFile>
+#include <QFileDialog>
 #include <QFormLayout>
 #include <QGroupBox>
-#include <QLabel>
-#include <QTreeWidget>
-#include <QTreeWidgetItem>
-#include <QColorDialog>
-#include <QVBoxLayout>
 #include <QHBoxLayout>
-#include <QPushButton>
 #include <QHeaderView>
-#include <QPixmap>
+#include <QInputDialog>
 #include <QJsonArray>
 #include <QJsonDocument>
-#include <QApplication>
-#include <QFileDialog>
-#include <QFile>
-#include <QInputDialog>
+#include <QLabel>
 #include <QLineEdit>
 #include <QMessageBox>
+#include <QPixmap>
+#include <QPushButton>
+#include <QTreeWidget>
+#include <QTreeWidgetItem>
 #include <QUuid>
+#include <QVBoxLayout>
+
+#include <cmath>
 
 // Role used to store the JSON path (QStringList) on each leaf item.
 static const int PathRole = Qt::UserRole;
diff --git a/common/worker_thread.h b/common/worker_thread.h
index dc1db19a..8b846d97 100644
--- a/common/worker_thread.h
+++ b/common/worker_thread.h
@@ -4,11 +4,11 @@
 #include "release_acquire_atomic.h"
 
 #include <cassert>
-#include <utility>
+#include <condition_variable>
 #include <functional>
 #include <mutex>
-#include <condition_variable>
 #include <thread>
+#include <utility>
 
 //! Usage:
 //!  1. call performTask();
diff --git a/common/yacreader_global.cpp b/common/yacreader_global.cpp
index f4da42d9..1054070f 100644
--- a/common/yacreader_global.cpp
+++ b/common/yacreader_global.cpp
@@ -1,9 +1,9 @@
 #include "yacreader_global.h"
 
-#include <QModelIndex>
-#include <QLibrary>
-#include <QFileInfo>
 #include <QCoreApplication>
+#include <QFileInfo>
+#include <QLibrary>
+#include <QModelIndex>
 
 using namespace YACReader;
 
diff --git a/common/yacreader_global.h b/common/yacreader_global.h
index c4718d77..b2a44e91 100644
--- a/common/yacreader_global.h
+++ b/common/yacreader_global.h
@@ -1,11 +1,11 @@
 #ifndef __YACREADER_GLOBAL_H
 #define __YACREADER_GLOBAL_H
 
-#include <QStandardPaths>
-#include <QDataStream>
-#include <QMetaType>
 #include <QAbstractItemModel>
+#include <QDataStream>
 #include <QDir>
+#include <QMetaType>
+#include <QStandardPaths>
 
 class QLibrary;
 
diff --git a/common/yacreader_global_gui.cpp b/common/yacreader_global_gui.cpp
index ccce5861..f86dc449 100644
--- a/common/yacreader_global_gui.cpp
+++ b/common/yacreader_global_gui.cpp
@@ -1,9 +1,9 @@
 #include "yacreader_global_gui.h"
 
-#include <QtCore>
 #include <QAction>
-#include <QImageReader>
 #include <QFileDialog>
+#include <QImageReader>
+#include <QtCore>
 
 using namespace YACReader;
 
diff --git a/common/yacreader_global_gui.h b/common/yacreader_global_gui.h
index 88d53a00..e8e1c419 100644
--- a/common/yacreader_global_gui.h
+++ b/common/yacreader_global_gui.h
@@ -3,8 +3,8 @@
 
 #include "yacreader_global.h"
 
-#include <QWidget>
 #include <QMimeData>
+#include <QWidget>
 
 #define PATH "PATH"
 #define UI_LANGUAGE "UI_LANGUAGE"
diff --git a/compressed_archive/7z_includes.h b/compressed_archive/7z_includes.h
index 34668e43..59be0178 100644
--- a/compressed_archive/7z_includes.h
+++ b/compressed_archive/7z_includes.h
@@ -1,6 +1,9 @@
 #ifndef _7Z_INCLUDES_H
 #define _7Z_INCLUDES_H
 
+// clang-format off
+// Umbrella header for 7zip. Include order is load-bearing:
+// MyInitGuid.h must precede all interface headers that use DEFINE_GUID.
 extern "C" {
 #include "lib7zip/C/Alloc.h"
 #include "lib7zip/C/7zTypes.h"
@@ -30,4 +33,6 @@ extern "C" {
 #include "lib7zip/CPP/7zip/Common/StreamObjects.h"
 #include "lib7zip/CPP/7zip/Common/StreamUtils.h"
 
+// clang-format on
+
 #endif // _7Z_INCLUDES_H
diff --git a/compressed_archive/StdAfx.h b/compressed_archive/StdAfx.h
index b23436e9..76d067d2 100644
--- a/compressed_archive/StdAfx.h
+++ b/compressed_archive/StdAfx.h
@@ -3,7 +3,7 @@
 #ifndef __STDAFX_H
 #define __STDAFX_H
 
-#include <windows.h>
 #include <stdio.h>
+#include <windows.h>
 
 #endif
diff --git a/compressed_archive/compressed_archive.cpp b/compressed_archive/compressed_archive.cpp
index 0926e14e..65aff55f 100644
--- a/compressed_archive/compressed_archive.cpp
+++ b/compressed_archive/compressed_archive.cpp
@@ -1,18 +1,16 @@
-#include <QtCore>
-
 #include "compressed_archive.h"
-#include "extract_delegate.h"
-#include "yacreader_global.h"
-
-#include <QLibrary>
-#include <QFileInfo>
-#include <QDebug>
-#include <QCoreApplication>
-
-#include "open_callbacks.h"
-#include "extract_callbacks.h"
 
 #include "QsLog.h"
+#include "extract_callbacks.h"
+#include "extract_delegate.h"
+#include "open_callbacks.h"
+#include "yacreader_global.h"
+
+#include <QCoreApplication>
+#include <QDebug>
+#include <QFileInfo>
+#include <QLibrary>
+#include <QtCore>
 
 #define _MY_WINAPI WINAPI
 
diff --git a/compressed_archive/compressed_archive.h b/compressed_archive/compressed_archive.h
index b691527e..90634f81 100644
--- a/compressed_archive/compressed_archive.h
+++ b/compressed_archive/compressed_archive.h
@@ -6,9 +6,9 @@
 class ExtractDelegate;
 
 class QLibrary;
-#include <QString>
 #include <QList>
 #include <QMap>
+#include <QString>
 
 struct SevenZipInterface;
 
diff --git a/compressed_archive/extract_callbacks.h b/compressed_archive/extract_callbacks.h
index 7acb50c9..54e251cb 100644
--- a/compressed_archive/extract_callbacks.h
+++ b/compressed_archive/extract_callbacks.h
@@ -3,6 +3,7 @@
 
 #include "7z_includes.h"
 #include "extract_delegate.h"
+
 #include <QDebug>
 
 using namespace NWindows;
diff --git a/compressed_archive/libarchive/compressed_archive.h b/compressed_archive/libarchive/compressed_archive.h
index d7accc4f..2df1fb9f 100644
--- a/compressed_archive/libarchive/compressed_archive.h
+++ b/compressed_archive/libarchive/compressed_archive.h
@@ -3,8 +3,8 @@
 
 #include "extract_delegate.h"
 
-#include <QObject>
 #include <QDebug>
+#include <QObject>
 
 extern "C" {
 #include <archive.h>
diff --git a/compressed_archive/open_callbacks.h b/compressed_archive/open_callbacks.h
index 0e46c1de..1c607b3a 100644
--- a/compressed_archive/open_callbacks.h
+++ b/compressed_archive/open_callbacks.h
@@ -2,6 +2,7 @@
 #define OPEN_CALLBACKS_H
 
 #include "7z_includes.h"
+
 #include <QDebug>
 //////////////////////////////////////////////////////////////
 // Archive Open callback class
diff --git a/compressed_archive/unarr/compressed_archive.cpp b/compressed_archive/unarr/compressed_archive.cpp
index 4dfdce90..1e074e6d 100644
--- a/compressed_archive/unarr/compressed_archive.cpp
+++ b/compressed_archive/unarr/compressed_archive.cpp
@@ -1,9 +1,10 @@
 #include "compressed_archive.h"
 
-#include <QFileInfo>
-#include <QDebug>
-
 #include "extract_delegate.h"
+
+#include <QDebug>
+#include <QFileInfo>
+
 #include <unarr.h>
 
 CompressedArchive::CompressedArchive(const QString &filePath, QObject *parent)
diff --git a/compressed_archive/unarr/compressed_archive.h b/compressed_archive/unarr/compressed_archive.h
index a16e07e4..07bd1c40 100644
--- a/compressed_archive/unarr/compressed_archive.h
+++ b/compressed_archive/unarr/compressed_archive.h
@@ -1,8 +1,9 @@
 #ifndef COMPRESSED_ARCHIVE_H
 #define COMPRESSED_ARCHIVE_H
 
-#include <QObject>
 #include "extract_delegate.h"
+
+#include <QObject>
 extern "C" {
 #include <unarr.h>
 }
diff --git a/custom_widgets/help_about_dialog.cpp b/custom_widgets/help_about_dialog.cpp
index 2b8de003..7c581735 100644
--- a/custom_widgets/help_about_dialog.cpp
+++ b/custom_widgets/help_about_dialog.cpp
@@ -1,17 +1,16 @@
 #include "help_about_dialog.h"
 
 #include "global_info_provider.h"
+#include "yacreader_global.h"
 
-#include <QtCore>
-#include <QVBoxLayout>
-#include <QTabWidget>
-#include <QTextBrowser>
 #include <QApplication>
 #include <QFile>
-#include <QTextStream>
 #include <QScreen>
-
-#include "yacreader_global.h"
+#include <QTabWidget>
+#include <QTextBrowser>
+#include <QTextStream>
+#include <QVBoxLayout>
+#include <QtCore>
 
 HelpAboutDialog::HelpAboutDialog(QWidget *parent)
     : QDialog(parent)
diff --git a/custom_widgets/help_about_dialog.h b/custom_widgets/help_about_dialog.h
index 2bf69160..c9310108 100644
--- a/custom_widgets/help_about_dialog.h
+++ b/custom_widgets/help_about_dialog.h
@@ -1,10 +1,10 @@
 #ifndef HELP_ABOUT_DIALOG_H
 #define HELP_ABOUT_DIALOG_H
 
-#include <QDialog>
-
 #include "themable.h"
 
+#include <QDialog>
+
 class QTabWidget;
 class QTextBrowser;
 
diff --git a/custom_widgets/whats_new_dialog.cpp b/custom_widgets/whats_new_dialog.cpp
index 8f6aa98f..0378bab5 100644
--- a/custom_widgets/whats_new_dialog.cpp
+++ b/custom_widgets/whats_new_dialog.cpp
@@ -1,5 +1,7 @@
 #include "whats_new_dialog.h"
 
+#include "yacreader_global.h"
+
 #include <QFrame>
 #include <QGridLayout>
 #include <QLabel>
@@ -8,8 +10,6 @@
 #include <QScrollBar>
 #include <QVBoxLayout>
 
-#include "yacreader_global.h"
-
 YACReader::WhatsNewDialog::WhatsNewDialog(QWidget *parent)
     : RoundedCornersDialog(parent)
 {
diff --git a/custom_widgets/yacreader_3d_flow_config_widget.cpp b/custom_widgets/yacreader_3d_flow_config_widget.cpp
index a3db5fef..a1bb4fe1 100644
--- a/custom_widgets/yacreader_3d_flow_config_widget.cpp
+++ b/custom_widgets/yacreader_3d_flow_config_widget.cpp
@@ -2,13 +2,13 @@
 
 #include "yacreader_spin_slider_widget.h"
 
-#include <QSlider>
-#include <QVBoxLayout>
+#include <QCheckBox>
 #include <QGroupBox>
-#include <QRadioButton>
 #include <QLabel>
 #include <QPushButton>
-#include <QCheckBox>
+#include <QRadioButton>
+#include <QSlider>
+#include <QVBoxLayout>
 
 YACReader3DFlowConfigWidget::YACReader3DFlowConfigWidget(QWidget *parent /* = 0 */)
     : QWidget(parent)
diff --git a/custom_widgets/yacreader_3d_flow_config_widget.h b/custom_widgets/yacreader_3d_flow_config_widget.h
index cdf855f9..692913f0 100644
--- a/custom_widgets/yacreader_3d_flow_config_widget.h
+++ b/custom_widgets/yacreader_3d_flow_config_widget.h
@@ -2,6 +2,7 @@
 #define YACREADER_3D_FLOW_CONFIG_WIDGET_H
 
 #include "flow_types.h" //TODO
+
 #include <QWidget>
 
 class QRadioButton;
diff --git a/custom_widgets/yacreader_busy_widget.cpp b/custom_widgets/yacreader_busy_widget.cpp
index 0ef081b3..67198bf8 100644
--- a/custom_widgets/yacreader_busy_widget.cpp
+++ b/custom_widgets/yacreader_busy_widget.cpp
@@ -1,9 +1,9 @@
 #include "yacreader_busy_widget.h"
 
 #include <QDebug>
+#include <QGradient>
 #include <QPainter>
 #include <QPixmapCache>
-#include <QGradient>
 
 YACReaderBusyWidget::YACReaderBusyWidget(QWidget *parent)
     : QWidget(parent)
diff --git a/custom_widgets/yacreader_cover_label.cpp b/custom_widgets/yacreader_cover_label.cpp
index 63a2db7a..791b5831 100644
--- a/custom_widgets/yacreader_cover_label.cpp
+++ b/custom_widgets/yacreader_cover_label.cpp
@@ -1,4 +1,5 @@
 #include "yacreader_cover_label.h"
+
 #include "yacreader_global_gui.h"
 
 YACReader::CoverLabel::CoverLabel(QWidget *parent)
diff --git a/custom_widgets/yacreader_cover_label.h b/custom_widgets/yacreader_cover_label.h
index 8d570c9f..6328087a 100644
--- a/custom_widgets/yacreader_cover_label.h
+++ b/custom_widgets/yacreader_cover_label.h
@@ -1,9 +1,9 @@
 #ifndef DROP_LABEL_H
 #define DROP_LABEL_H
 
-#include <QLabel>
 #include <QDragEnterEvent>
 #include <QDropEvent>
+#include <QLabel>
 #include <QMimeData>
 
 namespace YACReader {
diff --git a/custom_widgets/yacreader_dark_menu.cpp b/custom_widgets/yacreader_dark_menu.cpp
index 15c7f702..ce7e1fe6 100644
--- a/custom_widgets/yacreader_dark_menu.cpp
+++ b/custom_widgets/yacreader_dark_menu.cpp
@@ -1,8 +1,8 @@
 #include "yacreader_dark_menu.h"
 
+#include <QHBoxLayout>
 #include <QLabel>
 #include <QPixmap>
-#include <QHBoxLayout>
 
 YACReaderDarkMenu::YACReaderDarkMenu(QWidget *parent)
     : QMenu(parent)
diff --git a/custom_widgets/yacreader_library_item_widget.cpp b/custom_widgets/yacreader_library_item_widget.cpp
index 0bd5d2c5..1446a28a 100644
--- a/custom_widgets/yacreader_library_item_widget.cpp
+++ b/custom_widgets/yacreader_library_item_widget.cpp
@@ -1,11 +1,11 @@
 #include "yacreader_library_item_widget.h"
 
-#include <QHBoxLayout>
-
 #include "yacreader_global.h"
+
+#include <QHBoxLayout>
 #include <QLabel>
-#include <QToolButton>
 #include <QMouseEvent>
+#include <QToolButton>
 
 using namespace YACReader;
 
diff --git a/custom_widgets/yacreader_library_item_widget.h b/custom_widgets/yacreader_library_item_widget.h
index 33462b56..117f09bc 100644
--- a/custom_widgets/yacreader_library_item_widget.h
+++ b/custom_widgets/yacreader_library_item_widget.h
@@ -1,11 +1,11 @@
 #ifndef YACREADER_LIBRARY_ITEM_WIDGET_H
 #define YACREADER_LIBRARY_ITEM_WIDGET_H
 
-#include <QWidget>
-#include <QPixmap>
-
 #include "themable.h"
 
+#include <QPixmap>
+#include <QWidget>
+
 class QLabel;
 class QToolButton;
 class QMouseEvent;
diff --git a/custom_widgets/yacreader_library_list_widget.cpp b/custom_widgets/yacreader_library_list_widget.cpp
index 679024bf..a267a6f5 100644
--- a/custom_widgets/yacreader_library_list_widget.cpp
+++ b/custom_widgets/yacreader_library_list_widget.cpp
@@ -1,10 +1,11 @@
 #include "yacreader_library_list_widget.h"
 
-#include "yacreader_library_item_widget.h"
-#include <QVBoxLayout>
-#include <QMouseEvent>
-#include <QMenu>
 #include "qnaturalsorting.h"
+#include "yacreader_library_item_widget.h"
+
+#include <QMenu>
+#include <QMouseEvent>
+#include <QVBoxLayout>
 
 YACReaderLibraryListWidget::YACReaderLibraryListWidget(QWidget *parent)
     : QWidget(parent), currentLibraryIndex(-1)
diff --git a/custom_widgets/yacreader_macosx_toolbar.h b/custom_widgets/yacreader_macosx_toolbar.h
index f07de90c..d383865b 100644
--- a/custom_widgets/yacreader_macosx_toolbar.h
+++ b/custom_widgets/yacreader_macosx_toolbar.h
@@ -5,6 +5,7 @@
 
 #include "yacreader_main_toolbar.h"
 #include "yacreader_search_line_edit.h"
+
 #include <QMainWindow>
 
 class YACReaderMacOSXSearchLineEdit : public YACReaderSearchLineEdit
diff --git a/custom_widgets/yacreader_macosx_toolbar.mm b/custom_widgets/yacreader_macosx_toolbar.mm
index 487bc90f..2338eb30 100644
--- a/custom_widgets/yacreader_macosx_toolbar.mm
+++ b/custom_widgets/yacreader_macosx_toolbar.mm
@@ -1,11 +1,12 @@
 #include "yacreader_macosx_toolbar.h"
+
 #include "QtWidgets/qmainwindow.h"
 
 #include <QtWidgets>
 
 #import <AppKit/AppKit.h>
-#import <Foundation/Foundation.h>
 #import <Cocoa/Cocoa.h>
+#import <Foundation/Foundation.h>
 
 NSImage *QIconToNSImage(const QIcon &icon, const QSize &size, const QColor &color = QColor())
 {
diff --git a/custom_widgets/yacreader_options_dialog.cpp b/custom_widgets/yacreader_options_dialog.cpp
index 72f45ce8..99c214cd 100644
--- a/custom_widgets/yacreader_options_dialog.cpp
+++ b/custom_widgets/yacreader_options_dialog.cpp
@@ -4,12 +4,12 @@
 #include "yacreader_global_gui.h"
 #include "yacreader_spin_slider_widget.h"
 
-#include <QPushButton>
 #include <QCheckBox>
-#include <QRadioButton>
-#include <QSlider>
-#include <QSettings>
 #include <QGroupBox>
+#include <QPushButton>
+#include <QRadioButton>
+#include <QSettings>
+#include <QSlider>
 #include <QVBoxLayout>
 
 YACReaderOptionsDialog::YACReaderOptionsDialog(QWidget *parent)
diff --git a/custom_widgets/yacreader_search_line_edit.cpp b/custom_widgets/yacreader_search_line_edit.cpp
index 7c2b08f2..8090f2e0 100644
--- a/custom_widgets/yacreader_search_line_edit.cpp
+++ b/custom_widgets/yacreader_search_line_edit.cpp
@@ -1,8 +1,8 @@
 #include "yacreader_search_line_edit.h"
 
-#include <QToolButton>
-#include <QStyle>
 #include <QLabel>
+#include <QStyle>
+#include <QToolButton>
 
 YACReaderSearchLineEdit::YACReaderSearchLineEdit(QWidget *parent)
     : QLineEdit(parent), paddingLeft(0), paddingRight(0)
diff --git a/custom_widgets/yacreader_search_line_edit.h b/custom_widgets/yacreader_search_line_edit.h
index dbaeebd2..bca2b9a4 100644
--- a/custom_widgets/yacreader_search_line_edit.h
+++ b/custom_widgets/yacreader_search_line_edit.h
@@ -1,11 +1,11 @@
 #ifndef YACREADER_SEARCH_LINE_EDIT_H
 #define YACREADER_SEARCH_LINE_EDIT_H
 
-#include <QLineEdit>
-#include <QCompleter>
-
 #include "themable.h"
 
+#include <QCompleter>
+#include <QLineEdit>
+
 class QToolButton;
 class QLabel;
 
diff --git a/custom_widgets/yacreader_sidebar.cpp b/custom_widgets/yacreader_sidebar.cpp
index ade0550e..a4cd113d 100644
--- a/custom_widgets/yacreader_sidebar.cpp
+++ b/custom_widgets/yacreader_sidebar.cpp
@@ -1,15 +1,14 @@
 #include "yacreader_sidebar.h"
 
-#include <QPainter>
-#include <QLayout>
-
 #include "yacreader_folders_view.h"
-#include "yacreader_reading_lists_view.h"
-#include "yacreader_library_list_widget.h"
-#include "yacreader_titled_toolbar.h"
-
 #include "yacreader_global.h"
 #include "yacreader_global_gui.h"
+#include "yacreader_library_list_widget.h"
+#include "yacreader_reading_lists_view.h"
+#include "yacreader_titled_toolbar.h"
+
+#include <QLayout>
+#include <QPainter>
 
 YACReaderSideBar::YACReaderSideBar(QWidget *parent)
     : QWidget(parent)
diff --git a/custom_widgets/yacreader_sidebar.h b/custom_widgets/yacreader_sidebar.h
index 0d05c5a3..82e6933e 100644
--- a/custom_widgets/yacreader_sidebar.h
+++ b/custom_widgets/yacreader_sidebar.h
@@ -1,6 +1,8 @@
 #ifndef YACREADER_SIDEBAR_H
 #define YACREADER_SIDEBAR_H
 
+#include "themable.h"
+
 #include <QCloseEvent>
 #include <QColor>
 #include <QList>
@@ -9,8 +11,6 @@
 #include <QSplitter>
 #include <QWidget>
 
-#include "themable.h"
-
 class YACReaderFoldersView;
 class YACReaderLibraryListWidget;
 class YACReaderSearchLineEdit;
diff --git a/custom_widgets/yacreader_social_dialog.cpp b/custom_widgets/yacreader_social_dialog.cpp
index a42abaa7..8c0edf05 100644
--- a/custom_widgets/yacreader_social_dialog.cpp
+++ b/custom_widgets/yacreader_social_dialog.cpp
@@ -1,16 +1,16 @@
 #include "yacreader_social_dialog.h"
 
-#include <QVBoxLayout>
+#include "comic_db.h"
+
+#include <QGraphicsDropShadowEffect>
 #include <QHBoxLayout>
-#include <QProgressBar>
-#include <QPushButton>
 #include <QLabel>
 #include <QPainter>
-#include <QToolButton>
 #include <QPlainTextEdit>
-#include <QGraphicsDropShadowEffect>
-
-#include "comic_db.h"
+#include <QProgressBar>
+#include <QPushButton>
+#include <QToolButton>
+#include <QVBoxLayout>
 
 YACReaderSocialDialog::YACReaderSocialDialog(QWidget *parent)
     : QWidget(parent)
diff --git a/custom_widgets/yacreader_spin_slider_widget.cpp b/custom_widgets/yacreader_spin_slider_widget.cpp
index 708dfd01..092fc0e5 100644
--- a/custom_widgets/yacreader_spin_slider_widget.cpp
+++ b/custom_widgets/yacreader_spin_slider_widget.cpp
@@ -2,8 +2,8 @@
 
 #include <QHBoxLayout>
 #include <QLabel>
-#include <QSpinBox>
 #include <QSlider>
+#include <QSpinBox>
 
 YACReaderSpinSliderWidget::YACReaderSpinSliderWidget(QWidget *parent, bool strechableSlider)
     : QWidget(parent), tracking(true)
diff --git a/custom_widgets/yacreader_table_view.cpp b/custom_widgets/yacreader_table_view.cpp
index 08b67156..d434fb47 100644
--- a/custom_widgets/yacreader_table_view.cpp
+++ b/custom_widgets/yacreader_table_view.cpp
@@ -1,19 +1,17 @@
 #include "yacreader_table_view.h"
 
-#include "yacreader_global_gui.h"
-
-#include <QHeaderView>
-#include <QResizeEvent>
-#include <QPainter>
-#include <QDrag>
-#include <QMimeData>
-#include <QApplication>
-#include <QBuffer>
-
 #include "QsLog.h"
-
 #include "comic_item.h"
 #include "comic_model.h"
+#include "yacreader_global_gui.h"
+
+#include <QApplication>
+#include <QBuffer>
+#include <QDrag>
+#include <QHeaderView>
+#include <QMimeData>
+#include <QPainter>
+#include <QResizeEvent>
 
 YACReaderTableView::YACReaderTableView(QWidget *parent)
     : QTableView(parent), editing(false), myeditor(0)
diff --git a/custom_widgets/yacreader_table_view.h b/custom_widgets/yacreader_table_view.h
index f455854a..88d20b31 100644
--- a/custom_widgets/yacreader_table_view.h
+++ b/custom_widgets/yacreader_table_view.h
@@ -1,11 +1,11 @@
 #ifndef YACREADER_TABLE_VIEW_H
 #define YACREADER_TABLE_VIEW_H
 
-#include <QTableView>
-#include <QStyledItemDelegate>
-
 #include "themable.h"
 
+#include <QStyledItemDelegate>
+#include <QTableView>
+
 class QResizeEvent;
 
 class YACReaderTableView : public QTableView, protected Themable
diff --git a/custom_widgets/yacreader_titled_toolbar.h b/custom_widgets/yacreader_titled_toolbar.h
index 6856394a..2ab45f5f 100644
--- a/custom_widgets/yacreader_titled_toolbar.h
+++ b/custom_widgets/yacreader_titled_toolbar.h
@@ -1,13 +1,13 @@
 #ifndef YACREADER_TITLED_TOOLBAR_H
 #define YACREADER_TITLED_TOOLBAR_H
 
-#include <QWidget>
+#include "themable.h"
+
 #include <QLabel>
 #include <QPaintEvent>
 #include <QPainter>
 #include <QPoint>
-
-#include "themable.h"
+#include <QWidget>
 
 class QIcon;
 class BusyIndicator;
diff --git a/custom_widgets/yacreader_tool_bar_stretch.h b/custom_widgets/yacreader_tool_bar_stretch.h
index a200575a..8ddd4772 100644
--- a/custom_widgets/yacreader_tool_bar_stretch.h
+++ b/custom_widgets/yacreader_tool_bar_stretch.h
@@ -1,8 +1,8 @@
 #ifndef YACREADER_TOOL_BAR_STRETCH_H
 #define YACREADER_TOOL_BAR_STRETCH_H
 
-#include <QWidget>
 #include <QHBoxLayout>
+#include <QWidget>
 
 class YACReaderToolBarStretch : public QWidget
 {
diff --git a/custom_widgets/yacreader_treeview.h b/custom_widgets/yacreader_treeview.h
index a2d76daa..eb869cbd 100644
--- a/custom_widgets/yacreader_treeview.h
+++ b/custom_widgets/yacreader_treeview.h
@@ -1,6 +1,8 @@
 #ifndef YACREADER_TREEVIEW_H
 #define YACREADER_TREEVIEW_H
 
+#include "themable.h"
+
 #include <QDragEnterEvent>
 #include <QDragLeaveEvent>
 #include <QDragMoveEvent>
@@ -10,8 +12,6 @@
 #include <QTimer>
 #include <QTreeView>
 
-#include "themable.h"
-
 class YACReaderTreeView : public QTreeView, protected Themable
 {
     Q_OBJECT
diff --git a/image_processing/lancir.h b/image_processing/lancir.h
index eb301994..be2d8314 100644
--- a/image_processing/lancir.h
+++ b/image_processing/lancir.h
@@ -46,8 +46,8 @@
 #ifndef AVIR_CLANCIR_INCLUDED
 #define AVIR_CLANCIR_INCLUDED
 
-#include <cstring>
 #include <cmath>
+#include <cstring>
 
 #if __cplusplus >= 201103L
 
diff --git a/shortcuts_management/actions_shortcuts_model.cpp b/shortcuts_management/actions_shortcuts_model.cpp
index baf50c16..71528288 100644
--- a/shortcuts_management/actions_shortcuts_model.cpp
+++ b/shortcuts_management/actions_shortcuts_model.cpp
@@ -1,4 +1,5 @@
 #include "actions_shortcuts_model.h"
+
 #include "shortcuts_manager.h"
 
 #include <QAction>
diff --git a/shortcuts_management/edit_shortcut_item_delegate.h b/shortcuts_management/edit_shortcut_item_delegate.h
index cc6f0500..7293514a 100644
--- a/shortcuts_management/edit_shortcut_item_delegate.h
+++ b/shortcuts_management/edit_shortcut_item_delegate.h
@@ -2,9 +2,9 @@
 #define EDIT_SHORTCUT_ITEM_DELEGATE_H
 
 #include <QItemDelegate>
-#include <QLineEdit>
 #include <QKeyEvent>
 #include <QKeySequence>
+#include <QLineEdit>
 #include <QToolButton>
 
 class KeySequenceLineEdit : public QLineEdit
diff --git a/shortcuts_management/edit_shortcuts_dialog.cpp b/shortcuts_management/edit_shortcuts_dialog.cpp
index 50d7f5ef..149c940b 100644
--- a/shortcuts_management/edit_shortcuts_dialog.cpp
+++ b/shortcuts_management/edit_shortcuts_dialog.cpp
@@ -4,14 +4,14 @@
 #include "actions_shortcuts_model.h"
 #include "edit_shortcut_item_delegate.h"
 
-#include <QVBoxLayout>
-#include <QSplitter>
-#include <QListView>
-#include <QTableView>
-#include <QPushButton>
 #include <QHeaderView>
 #include <QLabel>
+#include <QListView>
 #include <QMessageBox>
+#include <QPushButton>
+#include <QSplitter>
+#include <QTableView>
+#include <QVBoxLayout>
 
 EditShortcutsDialog::EditShortcutsDialog(QWidget *parent)
     : QDialog(parent)
diff --git a/shortcuts_management/edit_shortcuts_dialog.h b/shortcuts_management/edit_shortcuts_dialog.h
index 08f26ee9..39c0b732 100644
--- a/shortcuts_management/edit_shortcuts_dialog.h
+++ b/shortcuts_management/edit_shortcuts_dialog.h
@@ -1,11 +1,11 @@
 #ifndef EDIT_SHORTCUTS_DIALOG_H
 #define EDIT_SHORTCUTS_DIALOG_H
 
+#include "themable.h"
+
 #include <QDialog>
 #include <QModelIndex>
 
-#include "themable.h"
-
 class QListView;
 class QTableView;
 
diff --git a/shortcuts_management/shortcuts_manager.cpp b/shortcuts_management/shortcuts_manager.cpp
index 8dc5c7b2..6ca75c21 100644
--- a/shortcuts_management/shortcuts_manager.cpp
+++ b/shortcuts_management/shortcuts_manager.cpp
@@ -1,9 +1,10 @@
 #include "shortcuts_manager.h"
 
-#include <QSettings>
-#include <QAction>
 #include "yacreader_global.h"
 
+#include <QAction>
+#include <QSettings>
+
 ShortcutsManager::ShortcutsManager()
 {
     initDefaultShorcuts();
diff --git a/shortcuts_management/shortcuts_manager.h b/shortcuts_management/shortcuts_manager.h
index 5cf01bdf..b8c6b90a 100644
--- a/shortcuts_management/shortcuts_manager.h
+++ b/shortcuts_management/shortcuts_manager.h
@@ -1,10 +1,10 @@
 #ifndef SHORTCUTS_MANAGER_H
 #define SHORTCUTS_MANAGER_H
 
-#include <QObject>
 #include <QKeySequence>
-#include <QString>
 #include <QMap>
+#include <QObject>
+#include <QString>
 
 class QAction;
 
diff --git a/tests/compressed_archive_test/main.cpp b/tests/compressed_archive_test/main.cpp
index f5b1e7eb..4f681c9f 100644
--- a/tests/compressed_archive_test/main.cpp
+++ b/tests/compressed_archive_test/main.cpp
@@ -1,10 +1,10 @@
 
-#include <QtCore/QCoreApplication>
-#include <QDir>
-#include <QElapsedTimer>
-
 #include "compressed_archive.h"
 
+#include <QDir>
+#include <QElapsedTimer>
+#include <QtCore/QCoreApplication>
+
 #include <iostream>
 
 using namespace std;