diff --git a/WallReel/Core/Config/data.hpp b/WallReel/Core/Config/data.hpp
index 5fd6382..ffb2acb 100644
--- a/WallReel/Core/Config/data.hpp
+++ b/WallReel/Core/Config/data.hpp
@@ -1,8 +1,6 @@
 #ifndef WALLREEL_CONFIG_DATA_HPP
 #define WALLREEL_CONFIG_DATA_HPP
 
-#include <qtmetamacros.h>
-
 #include <QColor>
 #include <QHash>
 #include <QList>
diff --git a/WallReel/Core/Config/manager.hpp b/WallReel/Core/Config/manager.hpp
index 3167b51..70d8839 100644
--- a/WallReel/Core/Config/manager.hpp
+++ b/WallReel/Core/Config/manager.hpp
@@ -1,5 +1,5 @@
-#ifndef WALLREEL_CONFIGMGR_HPP
-#define WALLREEL_CONFIGMGR_HPP
+#ifndef WALLREEL_CONFIG_MANAGER_HPP
+#define WALLREEL_CONFIG_MANAGER_HPP
 
 #include <QDir>
 
@@ -106,4 +106,4 @@ class Manager : public QObject {
 
 }  // namespace WallReel::Core::Config
 
-#endif  // WALLREEL_CONFIGMGR_HPP
+#endif  // WALLREEL_CONFIG_MANAGER_HPP
diff --git a/WallReel/Core/Image/data.hpp b/WallReel/Core/Image/data.hpp
index abd69d5..80434a5 100644
--- a/WallReel/Core/Image/data.hpp
+++ b/WallReel/Core/Image/data.hpp
@@ -1,5 +1,5 @@
-#ifndef WALLREEL_IMAGEDATA_HPP
-#define WALLREEL_IMAGEDATA_HPP
+#ifndef WALLREEL_IMAGE_DATA_HPP
+#define WALLREEL_IMAGE_DATA_HPP
 
 #include <QDir>
 #include <QFileInfo>
@@ -106,4 +106,4 @@ class Data {
 
 }  // namespace WallReel::Core::Image
 
-#endif  // WALLREEL_IMAGEDATA_HPP
+#endif  // WALLREEL_IMAGE_DATA_HPP
diff --git a/WallReel/Core/Image/manager.hpp b/WallReel/Core/Image/manager.hpp
index 9222f46..eb14891 100644
--- a/WallReel/Core/Image/manager.hpp
+++ b/WallReel/Core/Image/manager.hpp
@@ -1,5 +1,5 @@
-#ifndef WALLREEL_IMAGEMANAGER_HPP
-#define WALLREEL_IMAGEMANAGER_HPP
+#ifndef WALLREEL_IMAGE_MANAGER_HPP
+#define WALLREEL_IMAGE_MANAGER_HPP
 
 #include <QAbstractListModel>
 #include <QDir>
@@ -96,4 +96,4 @@ class Manager : public QObject {
 
 }  // namespace WallReel::Core::Image
 
-#endif  // WALLREEL_IMAGEMANAGER_HPP
+#endif  // WALLREEL_IMAGE_MANAGER_HPP
diff --git a/WallReel/Core/Image/model.hpp b/WallReel/Core/Image/model.hpp
index 2b0d72d..7dcd3aa 100644
--- a/WallReel/Core/Image/model.hpp
+++ b/WallReel/Core/Image/model.hpp
@@ -1,5 +1,5 @@
-#ifndef WALLREEL_IMAGEMODEL_HPP
-#define WALLREEL_IMAGEMODEL_HPP
+#ifndef WALLREEL_IMAGE_MODEL_HPP
+#define WALLREEL_IMAGE_MODEL_HPP
 
 #include <QAbstractListModel>
 #include <QSortFilterProxyModel>
@@ -78,10 +78,10 @@ class ProxyModel : public QSortFilterProxyModel {
 
   private:
     QString m_searchText;
-    Config::SortType m_sortType;
-    bool m_sortDescending;
+    Config::SortType m_sortType = Config::SortType::Date;
+    bool m_sortDescending       = true;
 };
 
 }  // namespace WallReel::Core::Image
 
-#endif  // WALLREEL_IMAGEMODEL_HPP
+#endif  // WALLREEL_IMAGE_MODEL_HPP
diff --git a/WallReel/Core/Palette/data.hpp b/WallReel/Core/Palette/data.hpp
index 206c87b..897040b 100644
--- a/WallReel/Core/Palette/data.hpp
+++ b/WallReel/Core/Palette/data.hpp
@@ -1,8 +1,6 @@
 #ifndef WALLREEL_PALETTE_DATA_HPP
 #define WALLREEL_PALETTE_DATA_HPP
 
-#include <qcolor.h>
-
 #include <QColor>
 #include <QList>
 #include <QObject>
diff --git a/WallReel/Core/Palette/domcolor.hpp b/WallReel/Core/Palette/domcolor.hpp
index 2f763a6..67662c3 100644
--- a/WallReel/Core/Palette/domcolor.hpp
+++ b/WallReel/Core/Palette/domcolor.hpp
@@ -1,5 +1,5 @@
-#ifndef WALLREEL_CORE_PALETTE_DOMCOLOR_HPP
-#define WALLREEL_CORE_PALETTE_DOMCOLOR_HPP
+#ifndef WALLREEL_PALETTE_DOMCOLOR_HPP
+#define WALLREEL_PALETTE_DOMCOLOR_HPP
 
 #include <QImage>
 
@@ -15,4 +15,4 @@ QColor getDominantColor(const QImage& image);
 
 }  // namespace WallReel::Core::Palette
 
-#endif  // WALLREEL_CORE_PALETTE_DOMCOLOR_HPP
+#endif  // WALLREEL_PALETTE_DOMCOLOR_HPP
diff --git a/WallReel/Core/Palette/manager.cpp b/WallReel/Core/Palette/manager.cpp
index d842739..a69f47b 100644
--- a/WallReel/Core/Palette/manager.cpp
+++ b/WallReel/Core/Palette/manager.cpp
@@ -1,7 +1,5 @@
 #include "manager.hpp"
 
-#include <qcontainerfwd.h>
-
 #include "Palette/matchcolor.hpp"
 #include "Utils/misc.hpp"
 #include "logger.hpp"
diff --git a/WallReel/Core/Palette/manager.hpp b/WallReel/Core/Palette/manager.hpp
index c154fbb..2a030e8 100644
--- a/WallReel/Core/Palette/manager.hpp
+++ b/WallReel/Core/Palette/manager.hpp
@@ -1,8 +1,6 @@
 #ifndef WALLREEL_PALETTE_MANAGER_HPP
 #define WALLREEL_PALETTE_MANAGER_HPP
 
-#include <qcolor.h>
-
 #include "Config/data.hpp"
 #include "Image/manager.hpp"
 #include "data.hpp"
diff --git a/WallReel/Core/Palette/matchcolor.hpp b/WallReel/Core/Palette/matchcolor.hpp
index 21ef4cd..fae4e3c 100644
--- a/WallReel/Core/Palette/matchcolor.hpp
+++ b/WallReel/Core/Palette/matchcolor.hpp
@@ -1,5 +1,5 @@
-#ifndef WALLREEL_CORE_PALETTE_MATCHCOLOR_HPP
-#define WALLREEL_CORE_PALETTE_MATCHCOLOR_HPP
+#ifndef WALLREEL_PALETTE_MATCHCOLOR_HPP
+#define WALLREEL_PALETTE_MATCHCOLOR_HPP
 
 #include "data.hpp"
 
@@ -16,4 +16,4 @@ ColorItem bestMatch(const QColor& target, const QList<ColorItem>& candidates);
 
 }  // namespace WallReel::Core::Palette
 
-#endif  // WALLREEL_CORE_PALETTE_MATCHCOLOR_HPP
+#endif  // WALLREEL_PALETTE_MATCHCOLOR_HPP
diff --git a/WallReel/Core/Service/wallpaper.cpp b/WallReel/Core/Service/wallpaper.cpp
index 500ef41..7db7d2f 100644
--- a/WallReel/Core/Service/wallpaper.cpp
+++ b/WallReel/Core/Service/wallpaper.cpp
@@ -1,9 +1,5 @@
 #include "Service/wallpaper.hpp"
 
-#include <qprocess.h>
-
-#include <QColor>
-
 #include "logger.hpp"
 
 WALLREEL_DECLARE_SENDER("WallpaperService")
diff --git a/WallReel/Core/Service/wallpaper.hpp b/WallReel/Core/Service/wallpaper.hpp
index 3785a79..ab5806a 100644
--- a/WallReel/Core/Service/wallpaper.hpp
+++ b/WallReel/Core/Service/wallpaper.hpp
@@ -1,5 +1,5 @@
-#ifndef WALLREEL_WALLPAPERSERVICE_HPP
-#define WALLREEL_WALLPAPERSERVICE_HPP
+#ifndef WALLREEL_SERVICE_WALLPAPER_HPP
+#define WALLREEL_SERVICE_WALLPAPER_HPP
 
 #include <QProcess>
 #include <QTimer>
@@ -38,4 +38,4 @@ class WallpaperService : public QObject {
 
 }  // namespace WallReel::Core::Service
 
-#endif  // WALLREEL_WALLPAPERSERVICE_HPP
+#endif  // WALLREEL_SERVICE_WALLPAPER_HPP
diff --git a/WallReel/Core/Utils/misc.hpp b/WallReel/Core/Utils/misc.hpp
index 6052c8c..e92af63 100644
--- a/WallReel/Core/Utils/misc.hpp
+++ b/WallReel/Core/Utils/misc.hpp
@@ -1,5 +1,5 @@
-#ifndef WALLREEL_MISC_HPP
-#define WALLREEL_MISC_HPP
+#ifndef WALLREEL_UTILS_MISC_HPP
+#define WALLREEL_UTILS_MISC_HPP
 
 #include <QDir>
 #include <QFileInfo>
@@ -199,4 +199,4 @@ inline void printPath(const QString& path, std::FILE* out = stdout) {
 
 }  // namespace WallReel::Core::Utils
 
-#endif  // WALLREEL_MISC_HPP
+#endif  // WALLREEL_UTILS_MISC_HPP
diff --git a/WallReel/Core/Utils/texttemplate.hpp b/WallReel/Core/Utils/texttemplate.hpp
index b866fca..d1c65ed 100644
--- a/WallReel/Core/Utils/texttemplate.hpp
+++ b/WallReel/Core/Utils/texttemplate.hpp
@@ -1,5 +1,5 @@
-#ifndef TEXTTEMPLATE_HPP
-#define TEXTTEMPLATE_HPP
+#ifndef WALLREEL_UTILS_TEXTTEMPLATE_HPP
+#define WALLREEL_UTILS_TEXTTEMPLATE_HPP
 
 #include <QMap>
 #include <QRegularExpression>
@@ -139,4 +139,4 @@ inline QStringList extractTemplateKeys(const QString& templateStr) {
 
 }  // namespace WallReel::Core::Utils
 
-#endif  // TEXTTEMPLATE_HPP
+#endif  // WALLREEL_UTILS_TEXTTEMPLATE_HPP
diff --git a/WallReel/Core/appoptions.hpp b/WallReel/Core/appoptions.hpp
index 9238a6b..fad3d90 100644
--- a/WallReel/Core/appoptions.hpp
+++ b/WallReel/Core/appoptions.hpp
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef WALLREEL_CORE_APPOPTIONS_HPP
+#define WALLREEL_CORE_APPOPTIONS_HPP
 
 #include <QCommandLineParser>
 #include <QStringList>
@@ -36,3 +37,5 @@ class AppOptions {
 };
 
 }  // namespace WallReel::Core
+
+#endif  // WALLREEL_CORE_APPOPTIONS_HPP
diff --git a/WallReel/Core/logger.hpp b/WallReel/Core/logger.hpp
index 072c29f..ceafa6f 100644
--- a/WallReel/Core/logger.hpp
+++ b/WallReel/Core/logger.hpp
@@ -1,8 +1,6 @@
 #ifndef WALLREEL_LOGGER_HPP
 #define WALLREEL_LOGGER_HPP
 
-#include <qcontainerfwd.h>
-
 #include <QLoggingCategory>
 #include <QString>
 #include <cstdio>