diff --git a/chatterino.pro b/chatterino.pro
index 857d08ae2..9f82a557f 100644
--- a/chatterino.pro
+++ b/chatterino.pro
@@ -147,20 +147,11 @@ SOURCES += \
     src/providers/twitch/TwitchMessageBuilder.cpp \
     src/providers/twitch/TwitchServer.cpp \
     src/providers/twitch/TwitchUser.cpp \
-    src/singletons/EmoteManager.cpp \
-    src/singletons/FontManager.cpp \
     src/singletons/helper/ChatterinoSetting.cpp \
     src/singletons/helper/GifTimer.cpp \
     src/singletons/helper/LoggingChannel.cpp \
     src/controllers/moderationactions/ModerationAction.cpp \
     src/singletons/IrcManager.cpp \
-    src/singletons/LoggingManager.cpp \
-    src/singletons/NativeMessagingManager.cpp \
-    src/singletons/PathManager.cpp \
-    src/singletons/ResourceManager.cpp \
-    src/singletons/SettingsManager.cpp \
-    src/singletons/ThemeManager.cpp \
-    src/singletons/UpdateManager.cpp \
     src/singletons/WindowManager.cpp \
     src/util/DebugCount.cpp \
     src/util/RapidjsonHelpers.cpp \
@@ -224,7 +215,16 @@ SOURCES += \
     src/widgets/TooltipWidget.cpp \
     src/widgets/Window.cpp \
     src/common/LinkParser.cpp \
-    src/controllers/moderationactions/ModerationActions.cpp
+    src/controllers/moderationactions/ModerationActions.cpp \
+    src/singletons/NativeMessaging.cpp \
+    src/singletons/Emotes.cpp \
+    src/singletons/Fonts.cpp \
+    src/singletons/Logging.cpp \
+    src/singletons/Paths.cpp \
+    src/singletons/Resources.cpp \
+    src/singletons/Settings.cpp \
+    src/singletons/Themes.cpp \
+    src/singletons/Updates.cpp
 
 HEADERS  += \
     src/Application.hpp \
@@ -301,20 +301,11 @@ HEADERS  += \
     src/providers/twitch/TwitchMessageBuilder.hpp \
     src/providers/twitch/TwitchServer.hpp \
     src/providers/twitch/TwitchUser.hpp \
-    src/singletons/EmoteManager.hpp \
-    src/singletons/FontManager.hpp \
     src/singletons/helper/ChatterinoSetting.hpp \
     src/singletons/helper/GifTimer.hpp \
     src/singletons/helper/LoggingChannel.hpp \
     src/controllers/moderationactions/ModerationAction.hpp \
     src/singletons/IrcManager.hpp \
-    src/singletons/LoggingManager.hpp \
-    src/singletons/NativeMessagingManager.hpp \
-    src/singletons/PathManager.hpp \
-    src/singletons/ResourceManager.hpp \
-    src/singletons/SettingsManager.hpp \
-    src/singletons/ThemeManager.hpp \
-    src/singletons/UpdateManager.hpp \
     src/singletons/WindowManager.hpp \
     src/util/Clamp.hpp \
     src/util/CombinePath.hpp \
@@ -394,7 +385,16 @@ HEADERS  += \
     src/providers/twitch/TwitchCommon.hpp \
     src/util/IsBigEndian.hpp \
     src/common/LinkParser.hpp \
-    src/controllers/moderationactions/ModerationActions.hpp
+    src/controllers/moderationactions/ModerationActions.hpp \
+    src/singletons/Emotes.hpp \
+    src/singletons/Fonts.hpp \
+    src/singletons/Logging.hpp \
+    src/singletons/Paths.hpp \
+    src/singletons/Resources.hpp \
+    src/singletons/Settings.hpp \
+    src/singletons/Themes.hpp \
+    src/singletons/Updates.hpp \
+    src/singletons/NativeMessaging.hpp
 
 RESOURCES += \ 
     resources/resources.qrc \
diff --git a/src/Application.cpp b/src/Application.cpp
index 8725ffc7f..afc9b0ad1 100644
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -8,14 +8,14 @@
 #include "controllers/taggedusers/TaggedUsersController.hpp"
 #include "providers/twitch/Pubsub.hpp"
 #include "providers/twitch/TwitchServer.hpp"
-#include "singletons/EmoteManager.hpp"
-#include "singletons/FontManager.hpp"
-#include "singletons/LoggingManager.hpp"
-#include "singletons/NativeMessagingManager.hpp"
-#include "singletons/PathManager.hpp"
-#include "singletons/ResourceManager.hpp"
-#include "singletons/SettingsManager.hpp"
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Emotes.hpp"
+#include "singletons/Fonts.hpp"
+#include "singletons/Logging.hpp"
+#include "singletons/NativeMessaging.hpp"
+#include "singletons/Paths.hpp"
+#include "singletons/Resources.hpp"
+#include "singletons/Settings.hpp"
+#include "singletons/Themes.hpp"
 #include "singletons/WindowManager.hpp"
 #include "util/IsBigEndian.hpp"
 #include "util/PostToThread.hpp"
diff --git a/src/Application.hpp b/src/Application.hpp
index 7b7ac1757..d85687cc0 100644
--- a/src/Application.hpp
+++ b/src/Application.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "singletons/IrcManager.hpp"
-#include "singletons/ResourceManager.hpp"
+#include "singletons/Resources.hpp"
 
 #include <QApplication>
 
diff --git a/src/common/Channel.cpp b/src/common/Channel.cpp
index b76432a26..4ab2c8bd8 100644
--- a/src/common/Channel.cpp
+++ b/src/common/Channel.cpp
@@ -3,9 +3,9 @@
 #include "Application.hpp"
 #include "debug/Log.hpp"
 #include "messages/Message.hpp"
-#include "singletons/EmoteManager.hpp"
+#include "singletons/Emotes.hpp"
 #include "singletons/IrcManager.hpp"
-#include "singletons/LoggingManager.hpp"
+#include "singletons/Logging.hpp"
 #include "singletons/WindowManager.hpp"
 
 #include <QJsonArray>
diff --git a/src/common/CompletionModel.cpp b/src/common/CompletionModel.cpp
index 6c7eb83ab..b94969e2b 100644
--- a/src/common/CompletionModel.cpp
+++ b/src/common/CompletionModel.cpp
@@ -4,7 +4,7 @@
 #include "common/Common.hpp"
 #include "controllers/commands/CommandController.hpp"
 #include "debug/Log.hpp"
-#include "singletons/EmoteManager.hpp"
+#include "singletons/Emotes.hpp"
 
 #include <QtAlgorithms>
 
diff --git a/src/common/Emotemap.cpp b/src/common/Emotemap.cpp
index ce7ec011e..7b0042e4b 100644
--- a/src/common/Emotemap.cpp
+++ b/src/common/Emotemap.cpp
@@ -1,7 +1,7 @@
 #include "Emotemap.hpp"
 
 #include "Application.hpp"
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Settings.hpp"
 
 namespace chatterino {
 
diff --git a/src/common/NetworkRequest.hpp b/src/common/NetworkRequest.hpp
index 2c5716ecf..d67a00836 100644
--- a/src/common/NetworkRequest.hpp
+++ b/src/common/NetworkRequest.hpp
@@ -4,7 +4,7 @@
 #include "common/NetworkManager.hpp"
 #include "common/NetworkRequester.hpp"
 #include "common/NetworkWorker.hpp"
-#include "singletons/PathManager.hpp"
+#include "singletons/Paths.hpp"
 
 #include <rapidjson/document.h>
 #include <rapidjson/error/en.h>
diff --git a/src/controllers/commands/CommandController.cpp b/src/controllers/commands/CommandController.cpp
index e653f6e40..7a60733b3 100644
--- a/src/controllers/commands/CommandController.cpp
+++ b/src/controllers/commands/CommandController.cpp
@@ -8,8 +8,8 @@
 #include "messages/MessageBuilder.hpp"
 #include "providers/twitch/TwitchChannel.hpp"
 #include "providers/twitch/TwitchServer.hpp"
-#include "singletons/PathManager.hpp"
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Paths.hpp"
+#include "singletons/Settings.hpp"
 
 #include <QApplication>
 #include <QFile>
diff --git a/src/controllers/highlights/HighlightController.hpp b/src/controllers/highlights/HighlightController.hpp
index 1d693b0e9..4e8dfb6e2 100644
--- a/src/controllers/highlights/HighlightController.hpp
+++ b/src/controllers/highlights/HighlightController.hpp
@@ -3,7 +3,7 @@
 #include "common/SignalVector2.hpp"
 #include "controllers/highlights/HighlightPhrase.hpp"
 #include "messages/Message.hpp"
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Settings.hpp"
 
 namespace chatterino {
 
diff --git a/src/controllers/highlights/HighlightModel.cpp b/src/controllers/highlights/HighlightModel.cpp
index b068561df..fcc36c3b3 100644
--- a/src/controllers/highlights/HighlightModel.cpp
+++ b/src/controllers/highlights/HighlightModel.cpp
@@ -1,7 +1,7 @@
 #include "HighlightModel.hpp"
 
 #include "Application.hpp"
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Settings.hpp"
 #include "util/StandardItemHelper.hpp"
 
 namespace chatterino {
diff --git a/src/controllers/ignores/IgnoreController.hpp b/src/controllers/ignores/IgnoreController.hpp
index 01f630919..37ab7e3e7 100644
--- a/src/controllers/ignores/IgnoreController.hpp
+++ b/src/controllers/ignores/IgnoreController.hpp
@@ -2,7 +2,7 @@
 
 #include "common/SignalVector2.hpp"
 #include "controllers/ignores/IgnorePhrase.hpp"
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Settings.hpp"
 
 namespace chatterino {
 
diff --git a/src/controllers/ignores/IgnoreModel.cpp b/src/controllers/ignores/IgnoreModel.cpp
index e241a8650..869d2ec4f 100644
--- a/src/controllers/ignores/IgnoreModel.cpp
+++ b/src/controllers/ignores/IgnoreModel.cpp
@@ -1,7 +1,7 @@
 #include "IgnoreModel.hpp"
 
 #include "Application.hpp"
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Settings.hpp"
 #include "util/StandardItemHelper.hpp"
 
 namespace chatterino {
diff --git a/src/controllers/moderationactions/ModerationAction.cpp b/src/controllers/moderationactions/ModerationAction.cpp
index 4401163f1..a7312147f 100644
--- a/src/controllers/moderationactions/ModerationAction.cpp
+++ b/src/controllers/moderationactions/ModerationAction.cpp
@@ -1,7 +1,7 @@
 #include "ModerationAction.hpp"
 
 #include "Application.hpp"
-#include "singletons/ResourceManager.hpp"
+#include "singletons/Resources.hpp"
 
 namespace chatterino {
 
diff --git a/src/controllers/moderationactions/ModerationActions.cpp b/src/controllers/moderationactions/ModerationActions.cpp
index fc418f03b..9d5095647 100644
--- a/src/controllers/moderationactions/ModerationActions.cpp
+++ b/src/controllers/moderationactions/ModerationActions.cpp
@@ -1,7 +1,7 @@
 #include "ModerationActions.hpp"
 
 #include "Application.hpp"
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Settings.hpp"
 
 #include <QRegularExpression>
 
diff --git a/src/main.cpp b/src/main.cpp
index cd1a19483..498a9d0cc 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,8 +1,8 @@
 #include "Application.hpp"
 #include "common/NetworkManager.hpp"
-#include "singletons/NativeMessagingManager.hpp"
-#include "singletons/PathManager.hpp"
-#include "singletons/UpdateManager.hpp"
+#include "singletons/NativeMessaging.hpp"
+#include "singletons/Paths.hpp"
+#include "singletons/Updates.hpp"
 #include "util/DebugCount.hpp"
 #include "widgets/dialogs/LastRunCrashDialog.hpp"
 
diff --git a/src/messages/Image.cpp b/src/messages/Image.cpp
index 08e17d93e..efeefc7b5 100644
--- a/src/messages/Image.cpp
+++ b/src/messages/Image.cpp
@@ -4,7 +4,7 @@
 #include "common/NetworkManager.hpp"
 #include "common/UrlFetch.hpp"
 #include "debug/Log.hpp"
-#include "singletons/EmoteManager.hpp"
+#include "singletons/Emotes.hpp"
 #include "singletons/IrcManager.hpp"
 #include "singletons/WindowManager.hpp"
 #include "util/PostToThread.hpp"
diff --git a/src/messages/MessageBuilder.cpp b/src/messages/MessageBuilder.cpp
index 0a8e58f10..73a6b23c0 100644
--- a/src/messages/MessageBuilder.cpp
+++ b/src/messages/MessageBuilder.cpp
@@ -1,9 +1,9 @@
 #include "MessageBuilder.hpp"
 
 #include "common/LinkParser.hpp"
-#include "singletons/EmoteManager.hpp"
-#include "singletons/ResourceManager.hpp"
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Emotes.hpp"
+#include "singletons/Resources.hpp"
+#include "singletons/Themes.hpp"
 
 #include <QDateTime>
 
diff --git a/src/messages/MessageColor.hpp b/src/messages/MessageColor.hpp
index ce28613ca..61d13fdb8 100644
--- a/src/messages/MessageColor.hpp
+++ b/src/messages/MessageColor.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Themes.hpp"
 
 #include <QColor>
 
diff --git a/src/messages/MessageElement.cpp b/src/messages/MessageElement.cpp
index d3b6d1e7d..81d55b0d6 100644
--- a/src/messages/MessageElement.cpp
+++ b/src/messages/MessageElement.cpp
@@ -6,7 +6,7 @@
 #include "debug/Benchmark.hpp"
 #include "messages/layouts/MessageLayoutContainer.hpp"
 #include "messages/layouts/MessageLayoutElement.hpp"
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Settings.hpp"
 
 namespace chatterino {
 
diff --git a/src/messages/MessageElement.hpp b/src/messages/MessageElement.hpp
index f6880d25e..73a9173f1 100644
--- a/src/messages/MessageElement.hpp
+++ b/src/messages/MessageElement.hpp
@@ -4,7 +4,7 @@
 #include "messages/Image.hpp"
 #include "messages/Link.hpp"
 #include "messages/MessageColor.hpp"
-#include "singletons/FontManager.hpp"
+#include "singletons/Fonts.hpp"
 
 #include <QRect>
 #include <QString>
diff --git a/src/messages/layouts/MessageLayout.cpp b/src/messages/layouts/MessageLayout.cpp
index 057a4628c..772955fbc 100644
--- a/src/messages/layouts/MessageLayout.cpp
+++ b/src/messages/layouts/MessageLayout.cpp
@@ -2,8 +2,8 @@
 
 #include "Application.hpp"
 #include "debug/Benchmark.hpp"
-#include "singletons/EmoteManager.hpp"
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Emotes.hpp"
+#include "singletons/Settings.hpp"
 #include "singletons/WindowManager.hpp"
 
 #include <QApplication>
diff --git a/src/messages/layouts/MessageLayoutContainer.cpp b/src/messages/layouts/MessageLayoutContainer.cpp
index 60c98bcbd..97b68ec7b 100644
--- a/src/messages/layouts/MessageLayoutContainer.cpp
+++ b/src/messages/layouts/MessageLayoutContainer.cpp
@@ -3,7 +3,7 @@
 #include "Application.hpp"
 #include "MessageLayoutElement.hpp"
 #include "messages/Selection.hpp"
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Settings.hpp"
 
 #include <QDebug>
 #include <QPainter>
diff --git a/src/messages/layouts/MessageLayoutElement.hpp b/src/messages/layouts/MessageLayoutElement.hpp
index b4935f387..4d012b953 100644
--- a/src/messages/layouts/MessageLayoutElement.hpp
+++ b/src/messages/layouts/MessageLayoutElement.hpp
@@ -9,7 +9,7 @@
 
 #include "messages/Link.hpp"
 #include "messages/MessageColor.hpp"
-#include "singletons/FontManager.hpp"
+#include "singletons/Fonts.hpp"
 
 class QPainter;
 
diff --git a/src/providers/emoji/Emojis.cpp b/src/providers/emoji/Emojis.cpp
index ab9f13f86..1e57cd60b 100644
--- a/src/providers/emoji/Emojis.cpp
+++ b/src/providers/emoji/Emojis.cpp
@@ -2,7 +2,7 @@
 
 #include "Application.hpp"
 #include "debug/Log.hpp"
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Settings.hpp"
 
 #include <QFile>
 
diff --git a/src/providers/twitch/IrcMessageHandler.cpp b/src/providers/twitch/IrcMessageHandler.cpp
index e5f9903e9..9d1ea0d5e 100644
--- a/src/providers/twitch/IrcMessageHandler.cpp
+++ b/src/providers/twitch/IrcMessageHandler.cpp
@@ -9,7 +9,7 @@
 #include "providers/twitch/TwitchHelpers.hpp"
 #include "providers/twitch/TwitchMessageBuilder.hpp"
 #include "providers/twitch/TwitchServer.hpp"
-#include "singletons/ResourceManager.hpp"
+#include "singletons/Resources.hpp"
 #include "singletons/WindowManager.hpp"
 #include "util/IrcHelpers.hpp"
 
diff --git a/src/providers/twitch/TwitchChannel.cpp b/src/providers/twitch/TwitchChannel.cpp
index 2f78ddc1e..b9df15b27 100644
--- a/src/providers/twitch/TwitchChannel.cpp
+++ b/src/providers/twitch/TwitchChannel.cpp
@@ -6,9 +6,9 @@
 #include "messages/Message.hpp"
 #include "providers/twitch/Pubsub.hpp"
 #include "providers/twitch/TwitchMessageBuilder.hpp"
-#include "singletons/EmoteManager.hpp"
+#include "singletons/Emotes.hpp"
 #include "singletons/IrcManager.hpp"
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Settings.hpp"
 #include "util/PostToThread.hpp"
 
 #include <IrcConnection>
diff --git a/src/providers/twitch/TwitchChannel.hpp b/src/providers/twitch/TwitchChannel.hpp
index f6b6b09f8..083e947f7 100644
--- a/src/providers/twitch/TwitchChannel.hpp
+++ b/src/providers/twitch/TwitchChannel.hpp
@@ -5,7 +5,7 @@
 #include "common/Channel.hpp"
 #include "common/Common.hpp"
 #include "common/MutexValue.hpp"
-#include "singletons/EmoteManager.hpp"
+#include "singletons/Emotes.hpp"
 #include "singletons/IrcManager.hpp"
 #include "util/ConcurrentMap.hpp"
 
diff --git a/src/providers/twitch/TwitchMessageBuilder.cpp b/src/providers/twitch/TwitchMessageBuilder.cpp
index 177fe269d..2dc601571 100644
--- a/src/providers/twitch/TwitchMessageBuilder.cpp
+++ b/src/providers/twitch/TwitchMessageBuilder.cpp
@@ -6,11 +6,11 @@
 #include "controllers/ignores/IgnoreController.hpp"
 #include "debug/Log.hpp"
 #include "providers/twitch/TwitchChannel.hpp"
-#include "singletons/EmoteManager.hpp"
+#include "singletons/Emotes.hpp"
 #include "singletons/IrcManager.hpp"
-#include "singletons/ResourceManager.hpp"
-#include "singletons/SettingsManager.hpp"
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Resources.hpp"
+#include "singletons/Settings.hpp"
+#include "singletons/Themes.hpp"
 #include "singletons/WindowManager.hpp"
 #include "util/IrcHelpers.hpp"
 
diff --git a/src/providers/twitch/TwitchMessageBuilder.hpp b/src/providers/twitch/TwitchMessageBuilder.hpp
index 6f3a97e5d..280bdf631 100644
--- a/src/providers/twitch/TwitchMessageBuilder.hpp
+++ b/src/providers/twitch/TwitchMessageBuilder.hpp
@@ -2,7 +2,7 @@
 
 #include "messages/MessageBuilder.hpp"
 #include "messages/MessageParseArgs.hpp"
-#include "singletons/EmoteManager.hpp"
+#include "singletons/Emotes.hpp"
 
 #include <IrcMessage>
 
diff --git a/src/singletons/EmoteManager.cpp b/src/singletons/Emotes.cpp
similarity index 93%
rename from src/singletons/EmoteManager.cpp
rename to src/singletons/Emotes.cpp
index f0ffe3490..485fa6e76 100644
--- a/src/singletons/EmoteManager.cpp
+++ b/src/singletons/Emotes.cpp
@@ -1,4 +1,4 @@
-#include "singletons/EmoteManager.hpp"
+#include "singletons/Emotes.hpp"
 
 #include "Application.hpp"
 #include "controllers/accounts/AccountController.hpp"
diff --git a/src/singletons/EmoteManager.hpp b/src/singletons/Emotes.hpp
similarity index 100%
rename from src/singletons/EmoteManager.hpp
rename to src/singletons/Emotes.hpp
diff --git a/src/singletons/FontManager.cpp b/src/singletons/Fonts.cpp
similarity index 98%
rename from src/singletons/FontManager.cpp
rename to src/singletons/Fonts.cpp
index a9309b1b6..fdd9f4a3e 100644
--- a/src/singletons/FontManager.cpp
+++ b/src/singletons/Fonts.cpp
@@ -1,4 +1,4 @@
-#include "singletons/FontManager.hpp"
+#include "singletons/Fonts.hpp"
 
 #include <QDebug>
 #include <QtGlobal>
diff --git a/src/singletons/FontManager.hpp b/src/singletons/Fonts.hpp
similarity index 100%
rename from src/singletons/FontManager.hpp
rename to src/singletons/Fonts.hpp
diff --git a/src/singletons/LoggingManager.cpp b/src/singletons/Logging.cpp
similarity index 87%
rename from src/singletons/LoggingManager.cpp
rename to src/singletons/Logging.cpp
index df240458c..e59ff06d5 100644
--- a/src/singletons/LoggingManager.cpp
+++ b/src/singletons/Logging.cpp
@@ -1,9 +1,9 @@
-#include "singletons/LoggingManager.hpp"
+#include "singletons/Logging.hpp"
 
 #include "Application.hpp"
 #include "debug/Log.hpp"
-#include "singletons/PathManager.hpp"
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Paths.hpp"
+#include "singletons/Settings.hpp"
 
 #include <QDir>
 #include <QStandardPaths>
diff --git a/src/singletons/LoggingManager.hpp b/src/singletons/Logging.hpp
similarity index 100%
rename from src/singletons/LoggingManager.hpp
rename to src/singletons/Logging.hpp
diff --git a/src/singletons/NativeMessagingManager.cpp b/src/singletons/NativeMessaging.cpp
similarity index 95%
rename from src/singletons/NativeMessagingManager.cpp
rename to src/singletons/NativeMessaging.cpp
index 0b1acca10..bb4b93814 100644
--- a/src/singletons/NativeMessagingManager.cpp
+++ b/src/singletons/NativeMessaging.cpp
@@ -1,8 +1,8 @@
-#include "NativeMessagingManager.hpp"
+#include "NativeMessaging.hpp"
 
 #include "Application.hpp"
 #include "providers/twitch/TwitchServer.hpp"
-#include "singletons/PathManager.hpp"
+#include "singletons/Paths.hpp"
 #include "util/PostToThread.hpp"
 
 #include <QCoreApplication>
diff --git a/src/singletons/NativeMessagingManager.hpp b/src/singletons/NativeMessaging.hpp
similarity index 100%
rename from src/singletons/NativeMessagingManager.hpp
rename to src/singletons/NativeMessaging.hpp
diff --git a/src/singletons/PathManager.cpp b/src/singletons/Paths.cpp
similarity index 98%
rename from src/singletons/PathManager.cpp
rename to src/singletons/Paths.cpp
index 50427cbd2..836b01045 100644
--- a/src/singletons/PathManager.cpp
+++ b/src/singletons/Paths.cpp
@@ -1,4 +1,4 @@
-#include "singletons/PathManager.hpp"
+#include "singletons/Paths.hpp"
 
 #include <QCoreApplication>
 #include <QCryptographicHash>
diff --git a/src/singletons/PathManager.hpp b/src/singletons/Paths.hpp
similarity index 100%
rename from src/singletons/PathManager.hpp
rename to src/singletons/Paths.hpp
diff --git a/src/singletons/ResourceManager.cpp b/src/singletons/Resources.cpp
similarity index 99%
rename from src/singletons/ResourceManager.cpp
rename to src/singletons/Resources.cpp
index d8b88893a..3b0d4a605 100644
--- a/src/singletons/ResourceManager.cpp
+++ b/src/singletons/Resources.cpp
@@ -1,4 +1,4 @@
-#include "ResourceManager.hpp"
+#include "Resources.hpp"
 #include "common/UrlFetch.hpp"
 
 #include <QIcon>
diff --git a/src/singletons/ResourceManager.hpp b/src/singletons/Resources.hpp
similarity index 100%
rename from src/singletons/ResourceManager.hpp
rename to src/singletons/Resources.hpp
diff --git a/src/singletons/SettingsManager.cpp b/src/singletons/Settings.cpp
similarity index 95%
rename from src/singletons/SettingsManager.cpp
rename to src/singletons/Settings.cpp
index 074127e2a..24963d5b4 100644
--- a/src/singletons/SettingsManager.cpp
+++ b/src/singletons/Settings.cpp
@@ -1,9 +1,9 @@
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Settings.hpp"
 
 #include "Application.hpp"
 #include "debug/Log.hpp"
-#include "singletons/PathManager.hpp"
-#include "singletons/ResourceManager.hpp"
+#include "singletons/Paths.hpp"
+#include "singletons/Resources.hpp"
 #include "singletons/WindowManager.hpp"
 
 namespace chatterino {
diff --git a/src/singletons/SettingsManager.hpp b/src/singletons/Settings.hpp
similarity index 100%
rename from src/singletons/SettingsManager.hpp
rename to src/singletons/Settings.hpp
diff --git a/src/singletons/ThemeManager.cpp b/src/singletons/Themes.cpp
similarity index 99%
rename from src/singletons/ThemeManager.cpp
rename to src/singletons/Themes.cpp
index 5ebcef132..49f427531 100644
--- a/src/singletons/ThemeManager.cpp
+++ b/src/singletons/Themes.cpp
@@ -1,6 +1,6 @@
 #define LOOKUP_COLOR_COUNT 360
 
-#include "ThemeManager.hpp"
+#include "Themes.hpp"
 
 #include <QColor>
 
diff --git a/src/singletons/ThemeManager.hpp b/src/singletons/Themes.hpp
similarity index 100%
rename from src/singletons/ThemeManager.hpp
rename to src/singletons/Themes.hpp
diff --git a/src/singletons/UpdateManager.cpp b/src/singletons/Updates.cpp
similarity index 96%
rename from src/singletons/UpdateManager.cpp
rename to src/singletons/Updates.cpp
index 1a582e2b6..99240b091 100644
--- a/src/singletons/UpdateManager.cpp
+++ b/src/singletons/Updates.cpp
@@ -1,4 +1,4 @@
-#include "UpdateManager.hpp"
+#include "Updates.hpp"
 
 #include "common/NetworkRequest.hpp"
 #include "common/Version.hpp"
diff --git a/src/singletons/UpdateManager.hpp b/src/singletons/Updates.hpp
similarity index 100%
rename from src/singletons/UpdateManager.hpp
rename to src/singletons/Updates.hpp
diff --git a/src/singletons/WindowManager.cpp b/src/singletons/WindowManager.cpp
index 47ef6d740..a09874134 100644
--- a/src/singletons/WindowManager.cpp
+++ b/src/singletons/WindowManager.cpp
@@ -4,9 +4,9 @@
 #include "debug/AssertInGuiThread.hpp"
 #include "debug/Log.hpp"
 #include "providers/twitch/TwitchServer.hpp"
-#include "singletons/FontManager.hpp"
-#include "singletons/PathManager.hpp"
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Fonts.hpp"
+#include "singletons/Paths.hpp"
+#include "singletons/Themes.hpp"
 #include "util/Clamp.hpp"
 #include "widgets/AccountSwitchPopupWidget.hpp"
 #include "widgets/dialogs/SettingsDialog.hpp"
diff --git a/src/singletons/helper/ChatterinoSetting.cpp b/src/singletons/helper/ChatterinoSetting.cpp
index 9e3de9c24..664eff0da 100644
--- a/src/singletons/helper/ChatterinoSetting.cpp
+++ b/src/singletons/helper/ChatterinoSetting.cpp
@@ -1,6 +1,6 @@
 #include "singletons/helper/ChatterinoSetting.hpp"
 
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Settings.hpp"
 
 namespace chatterino {
 
diff --git a/src/singletons/helper/GifTimer.cpp b/src/singletons/helper/GifTimer.cpp
index 2c17e38b9..49fbd98bf 100644
--- a/src/singletons/helper/GifTimer.cpp
+++ b/src/singletons/helper/GifTimer.cpp
@@ -1,7 +1,7 @@
 #include "singletons/helper/GifTimer.hpp"
 
 #include "Application.hpp"
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Settings.hpp"
 #include "singletons/WindowManager.hpp"
 
 namespace chatterino {
diff --git a/src/singletons/helper/LoggingChannel.cpp b/src/singletons/helper/LoggingChannel.cpp
index b62262e6b..cce98a505 100644
--- a/src/singletons/helper/LoggingChannel.cpp
+++ b/src/singletons/helper/LoggingChannel.cpp
@@ -2,8 +2,8 @@
 
 #include "Application.hpp"
 #include "debug/Log.hpp"
-#include "singletons/PathManager.hpp"
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Paths.hpp"
+#include "singletons/Settings.hpp"
 
 #include <QDir>
 
diff --git a/src/util/StreamLink.cpp b/src/util/StreamLink.cpp
index a009a2944..5d1b05c88 100644
--- a/src/util/StreamLink.cpp
+++ b/src/util/StreamLink.cpp
@@ -2,7 +2,7 @@
 
 #include "Application.hpp"
 #include "Helpers.hpp"
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Settings.hpp"
 #include "widgets/dialogs/QualityPopup.hpp"
 
 #include <QErrorMessage>
diff --git a/src/widgets/BaseWidget.cpp b/src/widgets/BaseWidget.cpp
index 9e33b20d9..e06cb633e 100644
--- a/src/widgets/BaseWidget.cpp
+++ b/src/widgets/BaseWidget.cpp
@@ -2,8 +2,8 @@
 
 #include "Application.hpp"
 #include "debug/Log.hpp"
-#include "singletons/SettingsManager.hpp"
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Settings.hpp"
+#include "singletons/Themes.hpp"
 #include "widgets/BaseWindow.hpp"
 
 #include <QChildEvent>
diff --git a/src/widgets/BaseWindow.cpp b/src/widgets/BaseWindow.cpp
index 8aa65cdc5..4484cab70 100644
--- a/src/widgets/BaseWindow.cpp
+++ b/src/widgets/BaseWindow.cpp
@@ -3,7 +3,7 @@
 #include "Application.hpp"
 #include "boost/algorithm/algorithm.hpp"
 #include "debug/Log.hpp"
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Settings.hpp"
 #include "singletons/WindowManager.hpp"
 #include "util/PostToThread.hpp"
 #include "util/WindowsHelper.hpp"
diff --git a/src/widgets/Label.hpp b/src/widgets/Label.hpp
index ed2d0d3aa..be20b7a6c 100644
--- a/src/widgets/Label.hpp
+++ b/src/widgets/Label.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "singletons/FontManager.hpp"
+#include "singletons/Fonts.hpp"
 #include "widgets/BaseWidget.hpp"
 
 #include <pajlada/signals/signalholder.hpp>
diff --git a/src/widgets/Notebook.cpp b/src/widgets/Notebook.cpp
index 8272e84bf..7ccc36845 100644
--- a/src/widgets/Notebook.cpp
+++ b/src/widgets/Notebook.cpp
@@ -2,7 +2,7 @@
 
 #include "Application.hpp"
 #include "debug/Log.hpp"
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Themes.hpp"
 #include "singletons/WindowManager.hpp"
 #include "widgets/Window.hpp"
 #include "widgets/dialogs/SettingsDialog.hpp"
diff --git a/src/widgets/Scrollbar.cpp b/src/widgets/Scrollbar.cpp
index ed0da5b57..16aa7218c 100644
--- a/src/widgets/Scrollbar.cpp
+++ b/src/widgets/Scrollbar.cpp
@@ -1,7 +1,7 @@
 #include "widgets/Scrollbar.hpp"
 
 #include "Application.hpp"
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Themes.hpp"
 #include "widgets/helper/ChannelView.hpp"
 
 #include <QDebug>
diff --git a/src/widgets/Scrollbar.hpp b/src/widgets/Scrollbar.hpp
index a5627bd77..dc9a167cf 100644
--- a/src/widgets/Scrollbar.hpp
+++ b/src/widgets/Scrollbar.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "messages/LimitedQueue.hpp"
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Settings.hpp"
 #include "widgets/BaseWidget.hpp"
 #include "widgets/helper/ScrollbarHighlight.hpp"
 
diff --git a/src/widgets/TooltipWidget.cpp b/src/widgets/TooltipWidget.cpp
index acaf1a1b6..d80dc89cd 100644
--- a/src/widgets/TooltipWidget.cpp
+++ b/src/widgets/TooltipWidget.cpp
@@ -1,8 +1,8 @@
 #include "TooltipWidget.hpp"
 
 #include "Application.hpp"
-#include "singletons/FontManager.hpp"
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Fonts.hpp"
+#include "singletons/Themes.hpp"
 
 #include <QDebug>
 #include <QDesktopWidget>
diff --git a/src/widgets/Window.cpp b/src/widgets/Window.cpp
index b0c52baeb..ae5da485b 100644
--- a/src/widgets/Window.cpp
+++ b/src/widgets/Window.cpp
@@ -5,8 +5,8 @@
 #include "controllers/accounts/AccountController.hpp"
 #include "providers/twitch/TwitchServer.hpp"
 #include "singletons/IrcManager.hpp"
-#include "singletons/SettingsManager.hpp"
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Settings.hpp"
+#include "singletons/Themes.hpp"
 #include "singletons/WindowManager.hpp"
 #include "widgets/AccountSwitchPopupWidget.hpp"
 #include "widgets/Notebook.hpp"
diff --git a/src/widgets/dialogs/LastRunCrashDialog.cpp b/src/widgets/dialogs/LastRunCrashDialog.cpp
index 0d36bd81f..349060fce 100644
--- a/src/widgets/dialogs/LastRunCrashDialog.cpp
+++ b/src/widgets/dialogs/LastRunCrashDialog.cpp
@@ -5,7 +5,7 @@
 #include <QPushButton>
 #include <QVBoxLayout>
 
-#include "singletons/UpdateManager.hpp"
+#include "singletons/Updates.hpp"
 #include "util/LayoutCreator.hpp"
 #include "util/PostToThread.hpp"
 
diff --git a/src/widgets/dialogs/UserInfoPopup.cpp b/src/widgets/dialogs/UserInfoPopup.cpp
index 03620fae2..1165f3f17 100644
--- a/src/widgets/dialogs/UserInfoPopup.cpp
+++ b/src/widgets/dialogs/UserInfoPopup.cpp
@@ -3,7 +3,7 @@
 #include "Application.hpp"
 #include "common/UrlFetch.hpp"
 #include "providers/twitch/TwitchChannel.hpp"
-#include "singletons/ResourceManager.hpp"
+#include "singletons/Resources.hpp"
 #include "util/LayoutCreator.hpp"
 #include "util/PostToThread.hpp"
 #include "widgets/Label.hpp"
diff --git a/src/widgets/helper/ChannelView.cpp b/src/widgets/helper/ChannelView.cpp
index de606282e..ecc7d29e0 100644
--- a/src/widgets/helper/ChannelView.cpp
+++ b/src/widgets/helper/ChannelView.cpp
@@ -7,8 +7,8 @@
 #include "messages/Message.hpp"
 #include "messages/layouts/MessageLayout.hpp"
 #include "providers/twitch/TwitchServer.hpp"
-#include "singletons/SettingsManager.hpp"
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Settings.hpp"
+#include "singletons/Themes.hpp"
 #include "singletons/WindowManager.hpp"
 #include "util/DistanceBetweenPoints.hpp"
 #include "widgets/TooltipWidget.hpp"
diff --git a/src/widgets/helper/DropPreview.cpp b/src/widgets/helper/DropPreview.cpp
index 21a126533..fa93085ec 100644
--- a/src/widgets/helper/DropPreview.cpp
+++ b/src/widgets/helper/DropPreview.cpp
@@ -1,6 +1,6 @@
 #include "widgets/helper/DropPreview.hpp"
 #include "Application.hpp"
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Themes.hpp"
 
 #include <QDebug>
 #include <QPainter>
diff --git a/src/widgets/helper/NotebookButton.cpp b/src/widgets/helper/NotebookButton.cpp
index 5e624c1c9..8d4f926ec 100644
--- a/src/widgets/helper/NotebookButton.cpp
+++ b/src/widgets/helper/NotebookButton.cpp
@@ -1,5 +1,5 @@
 #include "widgets/helper/NotebookButton.hpp"
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Themes.hpp"
 #include "widgets/Notebook.hpp"
 #include "widgets/helper/RippleEffectButton.hpp"
 #include "widgets/splits/SplitContainer.hpp"
diff --git a/src/widgets/helper/NotebookTab.cpp b/src/widgets/helper/NotebookTab.cpp
index ef471e15b..6244bfc68 100644
--- a/src/widgets/helper/NotebookTab.cpp
+++ b/src/widgets/helper/NotebookTab.cpp
@@ -3,8 +3,8 @@
 #include "Application.hpp"
 #include "common/Common.hpp"
 #include "debug/Log.hpp"
-#include "singletons/SettingsManager.hpp"
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Settings.hpp"
+#include "singletons/Themes.hpp"
 #include "util/Clamp.hpp"
 #include "util/Helpers.hpp"
 #include "widgets/Notebook.hpp"
diff --git a/src/widgets/helper/RippleEffectButton.cpp b/src/widgets/helper/RippleEffectButton.cpp
index 90492e1db..d5893bc2e 100644
--- a/src/widgets/helper/RippleEffectButton.cpp
+++ b/src/widgets/helper/RippleEffectButton.cpp
@@ -3,7 +3,7 @@
 #include <QDebug>
 #include <QPainter>
 
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Themes.hpp"
 
 namespace chatterino {
 
diff --git a/src/widgets/helper/RippleEffectLabel.cpp b/src/widgets/helper/RippleEffectLabel.cpp
index 4b9a006e2..78aa3321c 100644
--- a/src/widgets/helper/RippleEffectLabel.cpp
+++ b/src/widgets/helper/RippleEffectLabel.cpp
@@ -1,5 +1,5 @@
 #include "widgets/helper/RippleEffectLabel.hpp"
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Themes.hpp"
 #include "widgets/splits/SplitHeader.hpp"
 
 #include <QBrush>
diff --git a/src/widgets/helper/ScrollbarHighlight.cpp b/src/widgets/helper/ScrollbarHighlight.cpp
index 4ffd3536a..8e200dd2f 100644
--- a/src/widgets/helper/ScrollbarHighlight.cpp
+++ b/src/widgets/helper/ScrollbarHighlight.cpp
@@ -1,5 +1,5 @@
 #include "widgets/helper/ScrollbarHighlight.hpp"
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Themes.hpp"
 #include "widgets/Scrollbar.hpp"
 
 namespace chatterino {
diff --git a/src/widgets/helper/TitlebarButton.cpp b/src/widgets/helper/TitlebarButton.cpp
index 758697fed..53fba0656 100644
--- a/src/widgets/helper/TitlebarButton.cpp
+++ b/src/widgets/helper/TitlebarButton.cpp
@@ -1,6 +1,6 @@
 #include "TitlebarButton.hpp"
 
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Themes.hpp"
 
 namespace chatterino {
 
diff --git a/src/widgets/settingspages/HighlightingPage.cpp b/src/widgets/settingspages/HighlightingPage.cpp
index c437e93d9..03002a3e5 100644
--- a/src/widgets/settingspages/HighlightingPage.cpp
+++ b/src/widgets/settingspages/HighlightingPage.cpp
@@ -4,7 +4,7 @@
 #include "controllers/highlights/HighlightController.hpp"
 #include "controllers/highlights/HighlightModel.hpp"
 #include "debug/Log.hpp"
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Settings.hpp"
 #include "util/LayoutCreator.hpp"
 #include "util/StandardItemHelper.hpp"
 #include "widgets/helper/EditableModelView.hpp"
diff --git a/src/widgets/settingspages/IgnoreusersPage.cpp b/src/widgets/settingspages/IgnoreusersPage.cpp
index 9195bc856..d2c7d292d 100644
--- a/src/widgets/settingspages/IgnoreusersPage.cpp
+++ b/src/widgets/settingspages/IgnoreusersPage.cpp
@@ -4,7 +4,7 @@
 #include "controllers/accounts/AccountController.hpp"
 #include "controllers/ignores/IgnoreController.hpp"
 #include "controllers/ignores/IgnoreModel.hpp"
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Settings.hpp"
 #include "util/LayoutCreator.hpp"
 #include "widgets/helper/EditableModelView.hpp"
 
diff --git a/src/widgets/settingspages/ModerationPage.cpp b/src/widgets/settingspages/ModerationPage.cpp
index fed6c185d..20afe8ebe 100644
--- a/src/widgets/settingspages/ModerationPage.cpp
+++ b/src/widgets/settingspages/ModerationPage.cpp
@@ -3,8 +3,8 @@
 #include "Application.hpp"
 #include "controllers/taggedusers/TaggedUsersController.hpp"
 #include "controllers/taggedusers/TaggedUsersModel.hpp"
-#include "singletons/LoggingManager.hpp"
-#include "singletons/PathManager.hpp"
+#include "singletons/Logging.hpp"
+#include "singletons/Paths.hpp"
 #include "util/LayoutCreator.hpp"
 #include "widgets/helper/EditableModelView.hpp"
 
diff --git a/src/widgets/settingspages/SettingsPage.hpp b/src/widgets/settingspages/SettingsPage.hpp
index 2175da1d4..15fed970a 100644
--- a/src/widgets/settingspages/SettingsPage.hpp
+++ b/src/widgets/settingspages/SettingsPage.hpp
@@ -6,7 +6,7 @@
 #include <QSpinBox>
 #include <pajlada/signals/signal.hpp>
 
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Settings.hpp"
 
 namespace chatterino {
 
diff --git a/src/widgets/settingspages/SpecialChannelsPage.cpp b/src/widgets/settingspages/SpecialChannelsPage.cpp
index ccf859848..aad306c62 100644
--- a/src/widgets/settingspages/SpecialChannelsPage.cpp
+++ b/src/widgets/settingspages/SpecialChannelsPage.cpp
@@ -1,7 +1,7 @@
 #include "SpecialChannelsPage.hpp"
 
 #include "Application.hpp"
-#include "singletons/SettingsManager.hpp"
+#include "singletons/Settings.hpp"
 #include "util/LayoutCreator.hpp"
 
 #include <QGroupBox>
diff --git a/src/widgets/splits/Split.cpp b/src/widgets/splits/Split.cpp
index 87db97eb5..f96ccc765 100644
--- a/src/widgets/splits/Split.cpp
+++ b/src/widgets/splits/Split.cpp
@@ -7,8 +7,8 @@
 #include "providers/twitch/TwitchChannel.hpp"
 #include "providers/twitch/TwitchMessageBuilder.hpp"
 #include "providers/twitch/TwitchServer.hpp"
-#include "singletons/SettingsManager.hpp"
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Settings.hpp"
+#include "singletons/Themes.hpp"
 #include "singletons/WindowManager.hpp"
 #include "util/StreamLink.hpp"
 #include "widgets/Window.hpp"
diff --git a/src/widgets/splits/SplitContainer.cpp b/src/widgets/splits/SplitContainer.cpp
index 9c4c69ec0..08ce8d9b4 100644
--- a/src/widgets/splits/SplitContainer.cpp
+++ b/src/widgets/splits/SplitContainer.cpp
@@ -2,7 +2,7 @@
 #include "Application.hpp"
 #include "common/Common.hpp"
 #include "debug/AssertInGuiThread.hpp"
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Themes.hpp"
 #include "singletons/WindowManager.hpp"
 #include "util/Helpers.hpp"
 #include "util/LayoutCreator.hpp"
diff --git a/src/widgets/splits/SplitHeader.cpp b/src/widgets/splits/SplitHeader.cpp
index 8b6a31185..d44b57e8d 100644
--- a/src/widgets/splits/SplitHeader.cpp
+++ b/src/widgets/splits/SplitHeader.cpp
@@ -4,8 +4,8 @@
 #include "common/UrlFetch.hpp"
 #include "providers/twitch/TwitchChannel.hpp"
 #include "providers/twitch/TwitchServer.hpp"
-#include "singletons/ResourceManager.hpp"
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Resources.hpp"
+#include "singletons/Themes.hpp"
 #include "util/LayoutCreator.hpp"
 #include "widgets/Label.hpp"
 #include "widgets/TooltipWidget.hpp"
diff --git a/src/widgets/splits/SplitInput.cpp b/src/widgets/splits/SplitInput.cpp
index 544ac89b7..051e4328e 100644
--- a/src/widgets/splits/SplitInput.cpp
+++ b/src/widgets/splits/SplitInput.cpp
@@ -6,8 +6,8 @@
 #include "providers/twitch/TwitchChannel.hpp"
 #include "providers/twitch/TwitchServer.hpp"
 #include "singletons/IrcManager.hpp"
-#include "singletons/SettingsManager.hpp"
-#include "singletons/ThemeManager.hpp"
+#include "singletons/Settings.hpp"
+#include "singletons/Themes.hpp"
 #include "util/LayoutCreator.hpp"
 #include "widgets/Notebook.hpp"
 #include "widgets/splits/Split.hpp"
diff --git a/src/widgets/splits/SplitOverlay.cpp b/src/widgets/splits/SplitOverlay.cpp
index 58b870c3f..718930b74 100644
--- a/src/widgets/splits/SplitOverlay.cpp
+++ b/src/widgets/splits/SplitOverlay.cpp
@@ -9,7 +9,7 @@
 #include <QPushButton>
 
 #include "Application.hpp"
-#include "singletons/ResourceManager.hpp"
+#include "singletons/Resources.hpp"
 #include "widgets/splits/Split.hpp"
 #include "widgets/splits/SplitContainer.hpp"