From d89b62692ad9086cbcf396bb13b39c0f781c97a9 Mon Sep 17 00:00:00 2001
From: fourtf <tf.four@gmail.com>
Date: Wed, 8 Aug 2018 15:35:54 +0200
Subject: [PATCH 01/44] refined SplitHeader

---
 chatterino.pro                                |  13 +-
 src/messages/MessageBuilder.cpp               |   2 +
 src/singletons/Settings.hpp                   |   2 +-
 src/util/InitUpdateButton.cpp                 |   6 +-
 src/util/InitUpdateButton.hpp                 |   4 +-
 src/util/LayoutHelper.hpp                     |  40 ++
 src/widgets/BaseWindow.cpp                    |  10 +-
 src/widgets/BaseWindow.hpp                    |   8 +-
 src/widgets/Window.hpp                        |   2 +-
 src/widgets/dialogs/UserInfoPopup.cpp         |  56 +-
 src/widgets/dialogs/UserInfoPopup.hpp         |   2 +-
 .../{RippleEffectButton.cpp => Button.cpp}    |  46 +-
 .../{RippleEffectButton.hpp => Button.hpp}    |   4 +-
 src/widgets/helper/ChannelView.cpp            |   4 +-
 src/widgets/helper/ChannelView.hpp            |   4 +-
 ...{RippleEffectLabel.cpp => EffectLabel.cpp} |  12 +-
 ...{RippleEffectLabel.hpp => EffectLabel.hpp} |  10 +-
 src/widgets/helper/NotebookButton.cpp         |  12 +-
 src/widgets/helper/NotebookButton.hpp         |   4 +-
 src/widgets/helper/NotebookTab.cpp            |   8 +-
 src/widgets/helper/NotebookTab.hpp            |   4 +-
 src/widgets/helper/TitlebarButton.cpp         |   4 +-
 src/widgets/helper/TitlebarButton.hpp         |   4 +-
 src/widgets/settingspages/LookPage.cpp        |   4 +-
 src/widgets/splits/Split.cpp                  |  26 +-
 src/widgets/splits/Split.hpp                  |  39 +-
 src/widgets/splits/SplitHeader.cpp            | 485 ++++++++----------
 src/widgets/splits/SplitHeader.hpp            |  63 +--
 src/widgets/splits/SplitInput.cpp             |   4 +-
 src/widgets/splits/SplitInput.hpp             |   4 +-
 30 files changed, 422 insertions(+), 464 deletions(-)
 create mode 100644 src/util/LayoutHelper.hpp
 rename src/widgets/helper/{RippleEffectButton.cpp => Button.cpp} (83%)
 rename src/widgets/helper/{RippleEffectButton.hpp => Button.hpp} (95%)
 rename src/widgets/helper/{RippleEffectLabel.cpp => EffectLabel.cpp} (72%)
 rename src/widgets/helper/{RippleEffectLabel.hpp => EffectLabel.hpp} (59%)

diff --git a/chatterino.pro b/chatterino.pro
index 1c2145ea0..bd621b861 100644
--- a/chatterino.pro
+++ b/chatterino.pro
@@ -186,8 +186,6 @@ SOURCES += \
     src/widgets/helper/NotebookButton.cpp \
     src/widgets/helper/NotebookTab.cpp \
     src/widgets/helper/ResizingTextEdit.cpp \
-    src/widgets/helper/RippleEffectButton.cpp \
-    src/widgets/helper/RippleEffectLabel.cpp \
     src/widgets/helper/ScrollbarHighlight.cpp \
     src/widgets/helper/SearchPopup.cpp \
     src/widgets/helper/SettingsDialogTab.cpp \
@@ -250,7 +248,9 @@ SOURCES += \
     src/RunGui.cpp \
     src/BrowserExtension.cpp \
     src/util/FormatTime.cpp \
-    src/util/FunctionEventFilter.cpp
+    src/util/FunctionEventFilter.cpp \
+    src/widgets/helper/EffectLabel.cpp \
+    src/widgets/helper/Button.cpp
 
 HEADERS  += \
     src/Application.hpp \
@@ -374,8 +374,6 @@ HEADERS  += \
     src/widgets/helper/NotebookButton.hpp \
     src/widgets/helper/NotebookTab.hpp \
     src/widgets/helper/ResizingTextEdit.hpp \
-    src/widgets/helper/RippleEffectButton.hpp \
-    src/widgets/helper/RippleEffectLabel.hpp \
     src/widgets/helper/ScrollbarHighlight.hpp \
     src/widgets/helper/SearchPopup.hpp \
     src/widgets/helper/SettingsDialogTab.hpp \
@@ -448,7 +446,10 @@ HEADERS  += \
     src/RunGui.hpp \
     src/BrowserExtension.hpp \
     src/util/FormatTime.hpp \
-    src/util/FunctionEventFilter.hpp
+    src/util/FunctionEventFilter.hpp \
+    src/widgets/helper/EffectLabel.hpp \
+    src/util/LayoutHelper.hpp \
+    src/widgets/helper/Button.hpp
 
 RESOURCES += \ 
     resources/resources.qrc \
diff --git a/src/messages/MessageBuilder.cpp b/src/messages/MessageBuilder.cpp
index 42c537c67..f4ebd2301 100644
--- a/src/messages/MessageBuilder.cpp
+++ b/src/messages/MessageBuilder.cpp
@@ -82,6 +82,7 @@ MessageBuilder::MessageBuilder(TimeoutMessageTag, const QString &username,
 }
 
 MessageBuilder::MessageBuilder(const BanAction &action, uint32_t count)
+    : MessageBuilder()
 {
     this->emplace<TimestampElement>();
     this->message().flags.set(MessageFlag::System);
@@ -127,6 +128,7 @@ MessageBuilder::MessageBuilder(const BanAction &action, uint32_t count)
 }
 
 MessageBuilder::MessageBuilder(const UnbanAction &action)
+    : MessageBuilder()
 {
     this->emplace<TimestampElement>();
     this->message().flags.set(MessageFlag::System);
diff --git a/src/singletons/Settings.hpp b/src/singletons/Settings.hpp
index 3db58f9c2..fbc813b4a 100644
--- a/src/singletons/Settings.hpp
+++ b/src/singletons/Settings.hpp
@@ -161,6 +161,6 @@ private:
     std::unique_ptr<rapidjson::Document> snapshot_;
 };
 
-[[deprecated]] Settings *getSettings();
+Settings *getSettings();
 
 }  // namespace chatterino
diff --git a/src/util/InitUpdateButton.cpp b/src/util/InitUpdateButton.cpp
index d10ba2bc1..25d131635 100644
--- a/src/util/InitUpdateButton.cpp
+++ b/src/util/InitUpdateButton.cpp
@@ -1,18 +1,18 @@
 #include "InitUpdateButton.hpp"
 
 #include "widgets/dialogs/UpdateDialog.hpp"
-#include "widgets/helper/RippleEffectButton.hpp"
+#include "widgets/helper/Button.hpp"
 
 namespace chatterino {
 
-void initUpdateButton(RippleEffectButton &button,
+void initUpdateButton(Button &button,
                       std::unique_ptr<UpdateDialog> &handle,
                       pajlada::Signals::SignalHolder &signalHolder)
 {
     button.hide();
 
     // show update prompt when clicking the button
-    QObject::connect(&button, &RippleEffectButton::clicked, [&button, &handle] {
+    QObject::connect(&button, &Button::clicked, [&button, &handle] {
         (void)(handle);
 
         auto dialog = new UpdateDialog();
diff --git a/src/util/InitUpdateButton.hpp b/src/util/InitUpdateButton.hpp
index 17237d593..e95fcd7bd 100644
--- a/src/util/InitUpdateButton.hpp
+++ b/src/util/InitUpdateButton.hpp
@@ -10,10 +10,10 @@ class SignalHolder;
 
 namespace chatterino {
 
-class RippleEffectButton;
+class Button;
 class UpdateDialog;
 
-void initUpdateButton(RippleEffectButton &button,
+void initUpdateButton(Button &button,
                       std::unique_ptr<UpdateDialog> &handle,
                       pajlada::Signals::SignalHolder &signalHolder);
 
diff --git a/src/util/LayoutHelper.hpp b/src/util/LayoutHelper.hpp
new file mode 100644
index 000000000..b996aa084
--- /dev/null
+++ b/src/util/LayoutHelper.hpp
@@ -0,0 +1,40 @@
+#pragma once
+
+#include <QLayout>
+#include <QWidget>
+#include <boost/variant.hpp>
+
+namespace chatterino {
+
+using LayoutItem = boost::variant<QWidget *, QLayout *>;
+
+template <typename T>
+T *makeLayout(std::initializer_list<LayoutItem> items)
+{
+    auto t = new T;
+
+    for (auto &item : items) {
+        switch (item.which()) {
+            case 0:
+                t->addItem(new QWidgetItem(boost::get<QWidget *>(item)));
+                break;
+            case 1:
+                t->addItem(boost::get<QLayout *>(item));
+                break;
+        }
+    }
+
+    return t;
+}
+
+template <typename T, typename With>
+T *makeWidget(With with)
+{
+    auto t = new T;
+
+    with(t);
+
+    return t;
+}
+
+}  // namespace chatterino
diff --git a/src/widgets/BaseWindow.cpp b/src/widgets/BaseWindow.cpp
index 424b96e6d..e435bf6e8 100644
--- a/src/widgets/BaseWindow.cpp
+++ b/src/widgets/BaseWindow.cpp
@@ -9,7 +9,7 @@
 #include "util/WindowsHelper.hpp"
 #include "widgets/Label.hpp"
 #include "widgets/TooltipWidget.hpp"
-#include "widgets/helper/RippleEffectLabel.hpp"
+#include "widgets/helper/EffectLabel.hpp"
 #include "widgets/helper/Shortcut.hpp"
 
 #include <QApplication>
@@ -239,7 +239,7 @@ void BaseWindow::themeChangedEvent()
             this->ui_.titleLabel->setPalette(palette_title);
         }
 
-        for (RippleEffectButton *button : this->ui_.buttons) {
+        for (Button *button : this->ui_.buttons) {
             button->setMouseEffectColor(this->theme->window.text);
         }
     } else {
@@ -371,15 +371,15 @@ TitleBarButton *BaseWindow::addTitleBarButton(
     return button;
 }
 
-RippleEffectLabel *BaseWindow::addTitleBarLabel(std::function<void()> onClicked)
+EffectLabel *BaseWindow::addTitleBarLabel(std::function<void()> onClicked)
 {
-    RippleEffectLabel *button = new RippleEffectLabel;
+    EffectLabel *button = new EffectLabel;
     button->setScaleIndependantHeight(30);
 
     this->ui_.buttons.push_back(button);
     this->ui_.titlebarBox->insertWidget(1, button);
 
-    QObject::connect(button, &RippleEffectLabel::clicked, this,
+    QObject::connect(button, &EffectLabel::clicked, this,
                      [onClicked] { onClicked(); });
 
     return button;
diff --git a/src/widgets/BaseWindow.hpp b/src/widgets/BaseWindow.hpp
index dbfb4b46b..eac2ee55e 100644
--- a/src/widgets/BaseWindow.hpp
+++ b/src/widgets/BaseWindow.hpp
@@ -12,8 +12,8 @@ typedef struct tagMSG MSG;
 
 namespace chatterino {
 
-class RippleEffectButton;
-class RippleEffectLabel;
+class Button;
+class EffectLabel;
 class TitleBarButton;
 
 class BaseWindow : public BaseWidget
@@ -38,7 +38,7 @@ public:
     bool hasCustomWindowFrame();
     TitleBarButton *addTitleBarButton(const TitleBarButton::Style &style,
                                       std::function<void()> onClicked);
-    RippleEffectLabel *addTitleBarLabel(std::function<void()> onClicked);
+    EffectLabel *addTitleBarLabel(std::function<void()> onClicked);
 
     void setStayInScreenRect(bool value);
     bool getStayInScreenRect() const;
@@ -109,7 +109,7 @@ private:
         TitleBarButton *maxButton = nullptr;
         TitleBarButton *exitButton = nullptr;
         QWidget *layoutBase = nullptr;
-        std::vector<RippleEffectButton *> buttons;
+        std::vector<Button *> buttons;
     } ui_;
 
     pajlada::Signals::SignalHolder connections_;
diff --git a/src/widgets/Window.hpp b/src/widgets/Window.hpp
index 9c6f2eb69..438f6b3e2 100644
--- a/src/widgets/Window.hpp
+++ b/src/widgets/Window.hpp
@@ -48,7 +48,7 @@ private:
     Type type_;
 
     SplitNotebook notebook_;
-    RippleEffectLabel *userLabel_ = nullptr;
+    EffectLabel *userLabel_ = nullptr;
     std::unique_ptr<UpdateDialog> updateDialogHandle_;
 
     pajlada::Signals::SignalHolder signalHolder_;
diff --git a/src/widgets/dialogs/UserInfoPopup.cpp b/src/widgets/dialogs/UserInfoPopup.cpp
index 1c8a58a71..e822da8b7 100644
--- a/src/widgets/dialogs/UserInfoPopup.cpp
+++ b/src/widgets/dialogs/UserInfoPopup.cpp
@@ -11,8 +11,8 @@
 #include "util/PostToThread.hpp"
 #include "widgets/Label.hpp"
 #include "widgets/dialogs/LogsPopup.hpp"
+#include "widgets/helper/EffectLabel.hpp"
 #include "widgets/helper/Line.hpp"
-#include "widgets/helper/RippleEffectLabel.hpp"
 
 #include <QCheckBox>
 #include <QDesktopServices>
@@ -46,14 +46,13 @@ UserInfoPopup::UserInfoPopup()
     auto head = layout.emplace<QHBoxLayout>().withoutMargin();
     {
         // avatar
-        auto avatar = head.emplace<RippleEffectButton>(nullptr).assign(
-            &this->ui_.avatarButton);
+        auto avatar =
+            head.emplace<Button>(nullptr).assign(&this->ui_.avatarButton);
         avatar->setScaleIndependantSize(100, 100);
-        QObject::connect(avatar.getElement(), &RippleEffectButton::clicked,
-                         [this] {
-                             QDesktopServices::openUrl(
-                                 QUrl("https://twitch.tv/" + this->userName_));
-                         });
+        QObject::connect(avatar.getElement(), &Button::clicked, [this] {
+            QDesktopServices::openUrl(
+                QUrl("https://twitch.tv/" + this->userName_));
+        });
 
         // items on the right
         auto vbox = head.emplace<QVBoxLayout>();
@@ -82,33 +81,31 @@ UserInfoPopup::UserInfoPopup()
         user.emplace<QCheckBox>("Ignore").assign(&this->ui_.ignore);
         user.emplace<QCheckBox>("Ignore highlights")
             .assign(&this->ui_.ignoreHighlights);
-        auto viewLogs = user.emplace<RippleEffectLabel2>(this);
+        auto viewLogs = user.emplace<EffectLabel2>(this);
         viewLogs->getLabel().setText("Online logs");
 
-        auto mod = user.emplace<RippleEffectButton>(this);
+        auto mod = user.emplace<Button>(this);
         mod->setPixmap(app->resources->buttons.mod);
         mod->setScaleIndependantSize(30, 30);
-        auto unmod = user.emplace<RippleEffectButton>(this);
+        auto unmod = user.emplace<Button>(this);
         unmod->setPixmap(app->resources->buttons.unmod);
         unmod->setScaleIndependantSize(30, 30);
 
         user->addStretch(1);
 
-        QObject::connect(viewLogs.getElement(), &RippleEffectButton::clicked,
-                         [this] {
-                             auto logs = new LogsPopup();
-                             logs->setInfo(this->channel_, this->userName_);
-                             logs->setAttribute(Qt::WA_DeleteOnClose);
-                             logs->show();
-                         });
+        QObject::connect(viewLogs.getElement(), &Button::clicked, [this] {
+            auto logs = new LogsPopup();
+            logs->setInfo(this->channel_, this->userName_);
+            logs->setAttribute(Qt::WA_DeleteOnClose);
+            logs->show();
+        });
 
-        QObject::connect(
-            mod.getElement(), &RippleEffectButton::clicked,
-            [this] { this->channel_->sendMessage("/mod " + this->userName_); });
-        QObject::connect(
-            unmod.getElement(), &RippleEffectButton::clicked, [this] {
-                this->channel_->sendMessage("/unmod " + this->userName_);
-            });
+        QObject::connect(mod.getElement(), &Button::clicked, [this] {
+            this->channel_->sendMessage("/mod " + this->userName_);
+        });
+        QObject::connect(unmod.getElement(), &Button::clicked, [this] {
+            this->channel_->sendMessage("/unmod " + this->userName_);
+        });
 
         // userstate
         this->userStateChanged_.connect([this, mod, unmod]() mutable {
@@ -429,14 +426,13 @@ UserInfoPopup::TimeoutWidget::TimeoutWidget()
             auto hbox = vbox.emplace<QHBoxLayout>().withoutMargin();
             hbox->setSpacing(0);
             {
-                auto button = hbox.emplace<RippleEffectButton>(nullptr);
+                auto button = hbox.emplace<Button>(nullptr);
                 button->setPixmap(pixmap);
                 button->setScaleIndependantSize(buttonHeight, buttonHeight);
                 button->setBorderColor(QColor(255, 255, 255, 127));
 
                 QObject::connect(
-                    button.getElement(), &RippleEffectButton::clicked,
-                    [this, action] {
+                    button.getElement(), &Button::clicked, [this, action] {
                         this->buttonClicked.invoke(std::make_pair(action, -1));
                     });
             }
@@ -458,7 +454,7 @@ UserInfoPopup::TimeoutWidget::TimeoutWidget()
             hbox->setSpacing(0);
 
             for (const auto &item : items) {
-                auto a = hbox.emplace<RippleEffectLabel2>();
+                auto a = hbox.emplace<EffectLabel2>();
                 a->getLabel().setText(std::get<0>(item));
 
                 if (std::get<0>(item).length() > 1) {
@@ -468,7 +464,7 @@ UserInfoPopup::TimeoutWidget::TimeoutWidget()
                 }
                 a->setBorderColor(color1);
 
-                QObject::connect(a.getElement(), &RippleEffectLabel2::clicked,
+                QObject::connect(a.getElement(), &EffectLabel2::clicked,
                                  [this, timeout = std::get<1>(item)] {
                                      this->buttonClicked.invoke(std::make_pair(
                                          Action::Timeout, timeout));
diff --git a/src/widgets/dialogs/UserInfoPopup.hpp b/src/widgets/dialogs/UserInfoPopup.hpp
index 704d0801d..3dd13a464 100644
--- a/src/widgets/dialogs/UserInfoPopup.hpp
+++ b/src/widgets/dialogs/UserInfoPopup.hpp
@@ -40,7 +40,7 @@ private:
     std::shared_ptr<bool> hack_;
 
     struct {
-        RippleEffectButton *avatarButton = nullptr;
+        Button *avatarButton = nullptr;
         // RippleEffectLabel2 *viewLogs = nullptr;
 
         Label *nameLabel = nullptr;
diff --git a/src/widgets/helper/RippleEffectButton.cpp b/src/widgets/helper/Button.cpp
similarity index 83%
rename from src/widgets/helper/RippleEffectButton.cpp
rename to src/widgets/helper/Button.cpp
index fa0d1d253..a3ee7df5b 100644
--- a/src/widgets/helper/RippleEffectButton.cpp
+++ b/src/widgets/helper/Button.cpp
@@ -1,4 +1,4 @@
-#include "RippleEffectButton.hpp"
+#include "Button.hpp"
 
 #include <QApplication>
 #include <QDebug>
@@ -10,11 +10,11 @@
 
 namespace chatterino {
 
-RippleEffectButton::RippleEffectButton(BaseWidget *parent)
+Button::Button(BaseWidget *parent)
     : BaseWidget(parent)
 {
     connect(&effectTimer_, &QTimer::timeout, this,
-            &RippleEffectButton::onMouseEffectTimeout);
+            &Button::onMouseEffectTimeout);
 
     this->effectTimer_.setInterval(20);
     this->effectTimer_.start();
@@ -22,64 +22,64 @@ RippleEffectButton::RippleEffectButton(BaseWidget *parent)
     this->setMouseTracking(true);
 }
 
-void RippleEffectButton::setMouseEffectColor(boost::optional<QColor> color)
+void Button::setMouseEffectColor(boost::optional<QColor> color)
 {
     this->mouseEffectColor_ = color;
 }
 
-void RippleEffectButton::setPixmap(const QPixmap &_pixmap)
+void Button::setPixmap(const QPixmap &_pixmap)
 {
     this->pixmap_ = _pixmap;
     this->update();
 }
 
-const QPixmap &RippleEffectButton::getPixmap() const
+const QPixmap &Button::getPixmap() const
 {
     return this->pixmap_;
 }
 
-void RippleEffectButton::setDim(bool value)
+void Button::setDim(bool value)
 {
     this->dimPixmap_ = value;
 
     this->update();
 }
 
-bool RippleEffectButton::getDim() const
+bool Button::getDim() const
 {
     return this->dimPixmap_;
 }
 
-void RippleEffectButton::setEnable(bool value)
+void Button::setEnable(bool value)
 {
     this->enabled_ = value;
 
     this->update();
 }
 
-bool RippleEffectButton::getEnable() const
+bool Button::getEnable() const
 {
     return this->enabled_;
 }
 
-qreal RippleEffectButton::getCurrentDimAmount() const
+qreal Button::getCurrentDimAmount() const
 {
     return this->dimPixmap_ && !this->mouseOver_ ? 0.7 : 1;
 }
 
-void RippleEffectButton::setBorderColor(const QColor &color)
+void Button::setBorderColor(const QColor &color)
 {
     this->borderColor_ = color;
 
     this->update();
 }
 
-const QColor &RippleEffectButton::getBorderColor() const
+const QColor &Button::getBorderColor() const
 {
     return this->borderColor_;
 }
 
-void RippleEffectButton::setMenu(std::unique_ptr<QMenu> menu)
+void Button::setMenu(std::unique_ptr<QMenu> menu)
 {
     this->menu_ = std::move(menu);
 
@@ -93,7 +93,7 @@ void RippleEffectButton::setMenu(std::unique_ptr<QMenu> menu)
         }));
 }
 
-void RippleEffectButton::paintEvent(QPaintEvent *)
+void Button::paintEvent(QPaintEvent *)
 {
     QPainter painter(this);
 
@@ -126,7 +126,7 @@ void RippleEffectButton::paintEvent(QPaintEvent *)
     }
 }
 
-void RippleEffectButton::fancyPaint(QPainter &painter)
+void Button::fancyPaint(QPainter &painter)
 {
     if (!this->enabled_) {
         return;
@@ -169,17 +169,17 @@ void RippleEffectButton::fancyPaint(QPainter &painter)
     }
 }
 
-void RippleEffectButton::enterEvent(QEvent *)
+void Button::enterEvent(QEvent *)
 {
     this->mouseOver_ = true;
 }
 
-void RippleEffectButton::leaveEvent(QEvent *)
+void Button::leaveEvent(QEvent *)
 {
     this->mouseOver_ = false;
 }
 
-void RippleEffectButton::mousePressEvent(QMouseEvent *event)
+void Button::mousePressEvent(QMouseEvent *event)
 {
     if (!this->enabled_) {
         return;
@@ -200,7 +200,7 @@ void RippleEffectButton::mousePressEvent(QMouseEvent *event)
     }
 }
 
-void RippleEffectButton::mouseReleaseEvent(QMouseEvent *event)
+void Button::mouseReleaseEvent(QMouseEvent *event)
 {
     if (!this->enabled_) {
         return;
@@ -217,7 +217,7 @@ void RippleEffectButton::mouseReleaseEvent(QMouseEvent *event)
     }
 }
 
-void RippleEffectButton::mouseMoveEvent(QMouseEvent *event)
+void Button::mouseMoveEvent(QMouseEvent *event)
 {
     if (!this->enabled_) {
         return;
@@ -228,7 +228,7 @@ void RippleEffectButton::mouseMoveEvent(QMouseEvent *event)
     this->update();
 }
 
-void RippleEffectButton::onMouseEffectTimeout()
+void Button::onMouseEffectTimeout()
 {
     bool performUpdate = false;
 
@@ -272,7 +272,7 @@ void RippleEffectButton::onMouseEffectTimeout()
     }
 }
 
-void RippleEffectButton::showMenu()
+void Button::showMenu()
 {
     if (!this->menu_) return;
 
diff --git a/src/widgets/helper/RippleEffectButton.hpp b/src/widgets/helper/Button.hpp
similarity index 95%
rename from src/widgets/helper/RippleEffectButton.hpp
rename to src/widgets/helper/Button.hpp
index 0e7b8fcdc..e75385bcd 100644
--- a/src/widgets/helper/RippleEffectButton.hpp
+++ b/src/widgets/helper/Button.hpp
@@ -13,7 +13,7 @@
 
 namespace chatterino {
 
-class RippleEffectButton : public BaseWidget
+class Button : public BaseWidget
 {
     Q_OBJECT
 
@@ -28,7 +28,7 @@ class RippleEffectButton : public BaseWidget
     };
 
 public:
-    RippleEffectButton(BaseWidget *parent);
+    Button(BaseWidget *parent = nullptr);
 
     void setMouseEffectColor(boost::optional<QColor> color);
     void setPixmap(const QPixmap &pixmap_);
diff --git a/src/widgets/helper/ChannelView.cpp b/src/widgets/helper/ChannelView.cpp
index 2dbf4d339..ca490dbaa 100644
--- a/src/widgets/helper/ChannelView.cpp
+++ b/src/widgets/helper/ChannelView.cpp
@@ -133,7 +133,7 @@ ChannelView::ChannelView(BaseWidget *parent)
             }
         }));
 
-    this->goToBottom_ = new RippleEffectLabel(this, 0);
+    this->goToBottom_ = new EffectLabel(this, 0);
     this->goToBottom_->setStyleSheet(
         "background-color: rgba(0,0,0,0.66); color: #FFF;");
     this->goToBottom_->getLabel().setText("More messages below");
@@ -143,7 +143,7 @@ ChannelView::ChannelView(BaseWidget *parent)
         this->layoutMessages();  //
     }));
 
-    QObject::connect(this->goToBottom_, &RippleEffectLabel::clicked, this, [=] {
+    QObject::connect(this->goToBottom_, &EffectLabel::clicked, this, [=] {
         QTimer::singleShot(180, [=] {
             this->scrollBar_.scrollToBottom(
                 app->settings->enableSmoothScrollingNewMessages.getValue());
diff --git a/src/widgets/helper/ChannelView.hpp b/src/widgets/helper/ChannelView.hpp
index 974bb3c0c..5072befd8 100644
--- a/src/widgets/helper/ChannelView.hpp
+++ b/src/widgets/helper/ChannelView.hpp
@@ -8,7 +8,7 @@
 #include "messages/layouts/MessageLayout.hpp"
 #include "widgets/BaseWidget.hpp"
 #include "widgets/Scrollbar.hpp"
-#include "widgets/helper/RippleEffectLabel.hpp"
+#include "widgets/helper/EffectLabel.hpp"
 
 #include <QPaintEvent>
 #include <QScroller>
@@ -115,7 +115,7 @@ private:
     ChannelPtr channel_;
 
     Scrollbar scrollBar_;
-    RippleEffectLabel *goToBottom_;
+    EffectLabel *goToBottom_;
 
     // This variable can be used to decide whether or not we should render the
     // "Show latest messages" button
diff --git a/src/widgets/helper/RippleEffectLabel.cpp b/src/widgets/helper/EffectLabel.cpp
similarity index 72%
rename from src/widgets/helper/RippleEffectLabel.cpp
rename to src/widgets/helper/EffectLabel.cpp
index a4a8180c1..7b1819981 100644
--- a/src/widgets/helper/RippleEffectLabel.cpp
+++ b/src/widgets/helper/EffectLabel.cpp
@@ -1,4 +1,4 @@
-#include "widgets/helper/RippleEffectLabel.hpp"
+#include "widgets/helper/EffectLabel.hpp"
 #include "singletons/Theme.hpp"
 #include "widgets/splits/SplitHeader.hpp"
 
@@ -7,8 +7,8 @@
 
 namespace chatterino {
 
-RippleEffectLabel::RippleEffectLabel(BaseWidget *parent, int spacing)
-    : RippleEffectButton(parent)
+EffectLabel::EffectLabel(BaseWidget *parent, int spacing)
+    : Button(parent)
     , label_(this)
 {
     setLayout(&this->hbox_);
@@ -21,8 +21,8 @@ RippleEffectLabel::RippleEffectLabel(BaseWidget *parent, int spacing)
     this->hbox_.addSpacing(spacing);
 }
 
-RippleEffectLabel2::RippleEffectLabel2(BaseWidget *parent, int padding)
-    : RippleEffectButton(parent)
+EffectLabel2::EffectLabel2(BaseWidget *parent, int padding)
+    : Button(parent)
     , label_(this)
 {
     auto *hbox = new QHBoxLayout(this);
@@ -37,7 +37,7 @@ RippleEffectLabel2::RippleEffectLabel2(BaseWidget *parent, int padding)
     //    hbox.addSpacing(spacing);
 }
 
-Label &RippleEffectLabel2::getLabel()
+Label &EffectLabel2::getLabel()
 {
     return this->label_;
 }
diff --git a/src/widgets/helper/RippleEffectLabel.hpp b/src/widgets/helper/EffectLabel.hpp
similarity index 59%
rename from src/widgets/helper/RippleEffectLabel.hpp
rename to src/widgets/helper/EffectLabel.hpp
index b8ada5518..ea13671a9 100644
--- a/src/widgets/helper/RippleEffectLabel.hpp
+++ b/src/widgets/helper/EffectLabel.hpp
@@ -2,7 +2,7 @@
 
 #include "widgets/BaseWidget.hpp"
 #include "widgets/Label.hpp"
-#include "widgets/helper/RippleEffectButton.hpp"
+#include "widgets/helper/Button.hpp"
 #include "widgets/helper/SignalLabel.hpp"
 
 #include <QHBoxLayout>
@@ -12,10 +12,10 @@
 
 namespace chatterino {
 
-class RippleEffectLabel : public RippleEffectButton
+class EffectLabel : public Button
 {
 public:
-    explicit RippleEffectLabel(BaseWidget *parent = nullptr, int spacing = 6);
+    explicit EffectLabel(BaseWidget *parent = nullptr, int spacing = 6);
 
     SignalLabel &getLabel()
     {
@@ -27,10 +27,10 @@ private:
     SignalLabel label_;
 };
 
-class RippleEffectLabel2 : public RippleEffectButton
+class EffectLabel2 : public Button
 {
 public:
-    explicit RippleEffectLabel2(BaseWidget *parent = nullptr, int padding = 6);
+    explicit EffectLabel2(BaseWidget *parent = nullptr, int padding = 6);
 
     Label &getLabel();
 
diff --git a/src/widgets/helper/NotebookButton.cpp b/src/widgets/helper/NotebookButton.cpp
index b086194c6..926c42c24 100644
--- a/src/widgets/helper/NotebookButton.cpp
+++ b/src/widgets/helper/NotebookButton.cpp
@@ -1,7 +1,7 @@
 #include "widgets/helper/NotebookButton.hpp"
 #include "singletons/Theme.hpp"
 #include "widgets/Notebook.hpp"
-#include "widgets/helper/RippleEffectButton.hpp"
+#include "widgets/helper/Button.hpp"
 #include "widgets/splits/SplitContainer.hpp"
 
 #include <QMouseEvent>
@@ -14,7 +14,7 @@
 namespace chatterino {
 
 NotebookButton::NotebookButton(Notebook *parent)
-    : RippleEffectButton(parent)
+    : Button(parent)
     , parent_(parent)
 {
     this->setAcceptDrops(true);
@@ -122,7 +122,7 @@ void NotebookButton::paintEvent(QPaintEvent *event)
         default:;
     }
 
-    RippleEffectButton::paintEvent(event);
+    Button::paintEvent(event);
 }
 
 void NotebookButton::mouseReleaseEvent(QMouseEvent *event)
@@ -135,7 +135,7 @@ void NotebookButton::mouseReleaseEvent(QMouseEvent *event)
         emit clicked();
     }
 
-    RippleEffectButton::mouseReleaseEvent(event);
+    Button::mouseReleaseEvent(event);
 }
 
 void NotebookButton::dragEnterEvent(QDragEnterEvent *event)
@@ -149,7 +149,7 @@ void NotebookButton::dragEnterEvent(QDragEnterEvent *event)
     auto e = new QMouseEvent(QMouseEvent::MouseButtonPress,
                              QPointF(this->width() / 2, this->height() / 2),
                              Qt::LeftButton, Qt::LeftButton, 0);
-    RippleEffectButton::mousePressEvent(e);
+    Button::mousePressEvent(e);
     delete e;
 }
 
@@ -161,7 +161,7 @@ void NotebookButton::dragLeaveEvent(QDragLeaveEvent *)
     auto e = new QMouseEvent(QMouseEvent::MouseButtonRelease,
                              QPointF(this->width() / 2, this->height() / 2),
                              Qt::LeftButton, Qt::LeftButton, 0);
-    RippleEffectButton::mouseReleaseEvent(e);
+    Button::mouseReleaseEvent(e);
     delete e;
 }
 
diff --git a/src/widgets/helper/NotebookButton.hpp b/src/widgets/helper/NotebookButton.hpp
index 1a8a9cd71..adbb452c4 100644
--- a/src/widgets/helper/NotebookButton.hpp
+++ b/src/widgets/helper/NotebookButton.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "RippleEffectButton.hpp"
+#include "Button.hpp"
 
 #include <QWidget>
 
@@ -8,7 +8,7 @@ namespace chatterino {
 
 class Notebook;
 
-class NotebookButton : public RippleEffectButton
+class NotebookButton : public Button
 {
     Q_OBJECT
 
diff --git a/src/widgets/helper/NotebookTab.cpp b/src/widgets/helper/NotebookTab.cpp
index c9c55ff2c..5581f5e50 100644
--- a/src/widgets/helper/NotebookTab.cpp
+++ b/src/widgets/helper/NotebookTab.cpp
@@ -21,7 +21,7 @@
 namespace chatterino {
 
 NotebookTab::NotebookTab(Notebook *notebook)
-    : RippleEffectButton(notebook)
+    : Button(notebook)
     , positionChangedAnimation_(this, "pos")
     , notebook_(notebook)
     , menu_(this)
@@ -404,7 +404,7 @@ void NotebookTab::enterEvent(QEvent *event)
 
     this->update();
 
-    RippleEffectButton::enterEvent(event);
+    Button::enterEvent(event);
 }
 
 void NotebookTab::leaveEvent(QEvent *event)
@@ -414,7 +414,7 @@ void NotebookTab::leaveEvent(QEvent *event)
 
     this->update();
 
-    RippleEffectButton::leaveEvent(event);
+    Button::leaveEvent(event);
 }
 
 void NotebookTab::dragEnterEvent(QDragEnterEvent *event)
@@ -459,7 +459,7 @@ void NotebookTab::mouseMoveEvent(QMouseEvent *event)
         }
     }
 
-    RippleEffectButton::mouseMoveEvent(event);
+    Button::mouseMoveEvent(event);
 }
 
 QRect NotebookTab::getXRect()
diff --git a/src/widgets/helper/NotebookTab.hpp b/src/widgets/helper/NotebookTab.hpp
index 911e71e4a..a97e1a23b 100644
--- a/src/widgets/helper/NotebookTab.hpp
+++ b/src/widgets/helper/NotebookTab.hpp
@@ -2,7 +2,7 @@
 
 #include "common/Common.hpp"
 #include "widgets/BaseWidget.hpp"
-#include "widgets/helper/RippleEffectButton.hpp"
+#include "widgets/helper/Button.hpp"
 
 #include <QMenu>
 #include <QPropertyAnimation>
@@ -17,7 +17,7 @@ namespace chatterino {
 class Notebook;
 class SplitContainer;
 
-class NotebookTab : public RippleEffectButton
+class NotebookTab : public Button
 {
     Q_OBJECT
 
diff --git a/src/widgets/helper/TitlebarButton.cpp b/src/widgets/helper/TitlebarButton.cpp
index 238cd261d..c92e94ba6 100644
--- a/src/widgets/helper/TitlebarButton.cpp
+++ b/src/widgets/helper/TitlebarButton.cpp
@@ -5,7 +5,7 @@
 namespace chatterino {
 
 TitleBarButton::TitleBarButton()
-    : RippleEffectButton(nullptr)
+    : Button(nullptr)
 {
 }
 
@@ -119,7 +119,7 @@ void TitleBarButton::paintEvent(QPaintEvent *event)
         default:;
     }
 
-    RippleEffectButton::paintEvent(event);
+    Button::paintEvent(event);
     //    this->fancyPaint(painter);
 }
 
diff --git a/src/widgets/helper/TitlebarButton.hpp b/src/widgets/helper/TitlebarButton.hpp
index 2ca354bcb..33777660f 100644
--- a/src/widgets/helper/TitlebarButton.hpp
+++ b/src/widgets/helper/TitlebarButton.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "widgets/helper/RippleEffectButton.hpp"
+#include "widgets/helper/Button.hpp"
 
 namespace chatterino {
 
-class TitleBarButton : public RippleEffectButton
+class TitleBarButton : public Button
 {
 public:
     enum Style {
diff --git a/src/widgets/settingspages/LookPage.cpp b/src/widgets/settingspages/LookPage.cpp
index 0e1eda885..6f775ee34 100644
--- a/src/widgets/settingspages/LookPage.cpp
+++ b/src/widgets/settingspages/LookPage.cpp
@@ -323,10 +323,10 @@ ChannelPtr LookPage::createPreviewChannel()
         MessageBuilder builder;
         builder.emplace<TimestampElement>(QTime(8, 13, 42));
         builder.emplace<ImageElement>(Image::fromNonOwningPixmap(&getApp()->resources->twitch.moderator), MessageElementFlag::BadgeChannelAuthority);
-        builder.emplace<ImageElement>(Image::fromNonOwningPixmap(&getApp()->resources->twitch.subscriber), MessageElementFlag::BadgeSubscription);
+        builder.emplace<ImageElement>(Image::fromNonOwningPixmap(&getApp()->resources->twitch.subscriber, 0.25), MessageElementFlag::BadgeSubscription);
         builder.emplace<TextElement>("username1:", MessageElementFlag::Username, QColor("#0094FF"), FontStyle::ChatMediumBold);
         builder.emplace<TextElement>("This is a preview message", MessageElementFlag::Text);
-        builder.emplace<ImageElement>(Image::fromNonOwningPixmap(&getApp()->resources->pajaDank), MessageElementFlag::AlwaysShow);
+        builder.emplace<ImageElement>(Image::fromNonOwningPixmap(&getApp()->resources->pajaDank, 0.25), MessageElementFlag::AlwaysShow);
         builder.emplace<TextElement>("@fourtf", MessageElementFlag::BoldUsername, MessageColor::Text, FontStyle::ChatMediumBold);
         builder.emplace<TextElement>("@fourtf", MessageElementFlag::NonBoldUsername);
         channel->addMessage(builder.release());
diff --git a/src/widgets/splits/Split.cpp b/src/widgets/splits/Split.cpp
index 8f28c70f8..f1f2a463f 100644
--- a/src/widgets/splits/Split.cpp
+++ b/src/widgets/splits/Split.cpp
@@ -57,8 +57,6 @@ Split::Split(QWidget *parent)
     , input_(this)
     , overlay_(new SplitOverlay(this))
 {
-    auto app = getApp();
-
     this->setMouseTracking(true);
 
     this->vbox_.setSpacing(0);
@@ -70,13 +68,13 @@ Split::Split(QWidget *parent)
 
     // Initialize chat widget-wide hotkeys
     // CTRL+W: Close Split
-    createShortcut(this, "CTRL+W", &Split::doCloseSplit);
+    createShortcut(this, "CTRL+W", &Split::deleteFromContainer);
 
     // CTRL+R: Change Channel
-    createShortcut(this, "CTRL+R", &Split::doChangeChannel);
+    createShortcut(this, "CTRL+R", &Split::changeChannel);
 
     // CTRL+F: Search
-    createShortcut(this, "CTRL+F", &Split::showSearchPopup);
+    createShortcut(this, "CTRL+F", &Split::showSearch);
 
     // F12
     createShortcut(this, "F10", [] {
@@ -104,7 +102,7 @@ Split::Split(QWidget *parent)
     });
 
     this->input_.textChanged.connect([=](const QString &newText) {
-        if (app->settings->showEmptyInput) {
+        if (getSettings()->showEmptyInput) {
             return;
         }
 
@@ -115,7 +113,7 @@ Split::Split(QWidget *parent)
         }
     });
 
-    app->settings->showEmptyInput.connect(
+    getSettings()->showEmptyInput.connect(
         [this](const bool &showEmptyInput, auto) {
             if (!showEmptyInput && this->input_.getInputText().length() == 0) {
                 this->input_.hide();
@@ -362,21 +360,21 @@ void Split::handleModifiers(Qt::KeyboardModifiers modifiers)
 }
 
 /// Slots
-void Split::doAddSplit()
+void Split::addSibling()
 {
     if (this->container_) {
         this->container_->appendNewSplit(true);
     }
 }
 
-void Split::doCloseSplit()
+void Split::deleteFromContainer()
 {
     if (this->container_) {
         this->container_->deleteSplit(this);
     }
 }
 
-void Split::doChangeChannel()
+void Split::changeChannel()
 {
     this->showChangeChannelPopup("Change channel", false, [](bool) {});
 
@@ -388,7 +386,7 @@ void Split::doChangeChannel()
     }
 }
 
-void Split::doPopup()
+void Split::popup()
 {
     auto app = getApp();
     Window &window = app->windows->createWindow(Window::Type::Popup);
@@ -402,7 +400,7 @@ void Split::doPopup()
     window.show();
 }
 
-void Split::doClearChat()
+void Split::clear()
 {
     this->view_.clearMessages();
 }
@@ -417,7 +415,7 @@ void Split::openInBrowser()
     }
 }
 
-void Split::openInPopupPlayer()
+void Split::openBrowserPlayer()
 {
     ChannelPtr channel = this->getChannel();
     if (auto twitchChannel = dynamic_cast<TwitchChannel *>(channel.get())) {
@@ -548,7 +546,7 @@ void Split::copyToClipboard()
     QApplication::clipboard()->setText(this->view_.getSelectedText());
 }
 
-void Split::showSearchPopup()
+void Split::showSearch()
 {
     SearchPopup *popup = new SearchPopup();
 
diff --git a/src/widgets/splits/Split.hpp b/src/widgets/splits/Split.hpp
index 81c8ac44b..eafddf5c2 100644
--- a/src/widgets/splits/Split.hpp
+++ b/src/widgets/splits/Split.hpp
@@ -9,7 +9,7 @@
 #include "messages/layouts/MessageLayoutElement.hpp"
 #include "widgets/BaseWidget.hpp"
 #include "widgets/helper/ChannelView.hpp"
-#include "widgets/helper/RippleEffectLabel.hpp"
+#include "widgets/helper/EffectLabel.hpp"
 #include "widgets/splits/SplitHeader.hpp"
 #include "widgets/splits/SplitInput.hpp"
 
@@ -125,39 +125,16 @@ private:
     std::vector<pajlada::Signals::ScopedConnection> managedConnections_;
 
 public slots:
-    // Add new split to the notebook page that this chat widget is in
-    // This is only activated from the menu now. Hotkey is handled in Notebook
-    void doAddSplit();
-
-    // Close current split (chat widget)
-    void doCloseSplit();
-
-    // Show a dialog for changing the current splits/chat widgets channel
-    void doChangeChannel();
-
-    // Open popup copy of this chat widget
-    // XXX: maybe make current chatwidget a popup instead?
-    void doPopup();
-
-    // Clear chat from all messages
-    void doClearChat();
-
-    // Open link to twitch channel in default browser
+    void addSibling();
+    void deleteFromContainer();
+    void changeChannel();
+    void popup();
+    void clear();
     void openInBrowser();
-
-    // Open popup player of twitch channel in default browser
-    void openInPopupPlayer();
-
-    // Open twitch channel stream through streamlink
+    void openBrowserPlayer();
     void openInStreamlink();
-
-    // Copy text from chat
     void copyToClipboard();
-
-    // Open a search popup
-    void showSearchPopup();
-
-    // Open viewer list of the channel
+    void showSearch();
     void showViewerList();
 };
 
diff --git a/src/widgets/splits/SplitHeader.cpp b/src/widgets/splits/SplitHeader.cpp
index c27014080..7c8571303 100644
--- a/src/widgets/splits/SplitHeader.cpp
+++ b/src/widgets/splits/SplitHeader.cpp
@@ -7,6 +7,7 @@
 #include "singletons/Resources.hpp"
 #include "singletons/Theme.hpp"
 #include "util/LayoutCreator.hpp"
+#include "util/LayoutHelper.hpp"
 #include "widgets/Label.hpp"
 #include "widgets/TooltipWidget.hpp"
 #include "widgets/splits/Split.hpp"
@@ -19,122 +20,168 @@
 #include <QMenu>
 #include <QMimeData>
 #include <QPainter>
+#include <cmath>
 
 #ifdef USEWEBENGINE
 #include "widgets/StreamView.hpp"
 #endif
 
 namespace chatterino {
+namespace {
+auto formatRoomMode(TwitchChannel &channel)
+{
+    QString text;
+
+    {
+        auto modes = channel.accessRoomModes();
+
+        if (modes->r9k) text += "r9k, ";
+        if (modes->slowMode)
+            text += QString("slow(%1), ").arg(QString::number(modes->slowMode));
+        if (modes->emoteOnly) text += "emote, ";
+        if (modes->submode) text += "sub, ";
+    }
+
+    if (text.length() > 2) {
+        text = text.mid(0, text.size() - 2);
+    }
+
+    if (!text.isEmpty()) {
+        static QRegularExpression commaReplacement("^(.+?, .+?,) (.+)$");
+
+        auto match = commaReplacement.match(text);
+        if (match.hasMatch())
+            text = match.captured(1) + '\n' + match.captured(2);
+    }
+
+    return text;
+}
+auto formatTooltip(const TwitchChannel::StreamStatus &s)
+{
+    return QStringList{"<style>.center { text-align: center; }</style>",
+                       "<p class=\"center\">",
+                       s.title,
+                       "<br><br>",
+                       s.game,
+                       "<br>",
+                       s.rerun ? "Vod-casting" : "Live",
+                       " for ",
+                       s.uptime,
+                       " with ",
+                       QString::number(s.viewerCount),
+                       " viewers",
+                       "</p>"}
+        .join("");
+}
+auto formatTitle(const TwitchChannel::StreamStatus &s, Settings &settings)
+{
+    auto title = QString();
+
+    // live
+    if (s.rerun)
+        title += " (rerun)";
+    else if (s.streamType.isEmpty())
+        title += " (" + s.streamType + ")";
+    else
+        title += " (live)";
+
+    // description
+    if (settings.showViewerCount)
+        title += " - " + QString::number(s.viewerCount) + " viewers";
+    if (settings.showTitle) title += " - " + s.title;
+    if (settings.showGame) title += " - " + s.game;
+    if (settings.showUptime) title += "  - uptime: " + s.uptime;
+
+    return title;
+}
+auto distance(QPoint a, QPoint b)
+{
+    auto x = std::abs(a.x() - b.x());
+    auto y = std::abs(a.y() - b.y());
+
+    return std::sqrt(x * x + y * y);
+}
+}  // namespace
 
 SplitHeader::SplitHeader(Split *_split)
     : BaseWidget(_split)
     , split_(_split)
 {
-    this->split_->focused.connect([this]() { this->themeChangedEvent(); });
-    this->split_->focusLost.connect([this]() { this->themeChangedEvent(); });
-
-    auto app = getApp();
-
-    LayoutCreator<SplitHeader> layoutCreator(this);
-    auto layout = layoutCreator.emplace<QHBoxLayout>().withoutMargin();
-    layout->setSpacing(0);
-    {
-        // channel name label
-        auto title = layout.emplace<Label>().assign(&this->titleLabel);
-        title->setSizePolicy(QSizePolicy::MinimumExpanding,
-                             QSizePolicy::Preferred);
-        title->setCentered(true);
-        title->setHasOffset(false);
-
-        // mode button
-        auto mode = layout.emplace<RippleEffectLabel>(nullptr).assign(
-            &this->modeButton_);
-
-        mode->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
-        mode->hide();
-
-        this->setupModeLabel(*mode);
-
-        mode->setMenu(this->createChatModeMenu());
-
-        // moderation mode
-        auto moderator = layout.emplace<RippleEffectButton>(this).assign(
-            &this->moderationButton_);
-
-        QObject::connect(
-            moderator.getElement(), &RippleEffectButton::clicked, this,
-            [this, moderator]() mutable {
-                this->split_->setModerationMode(
-                    !this->split_->getModerationMode());
-
-                moderator->setDim(!this->split_->getModerationMode());
-            });
-
-        this->updateModerationModeIcon();
-
-        // dropdown label
-        auto dropdown = layout.emplace<RippleEffectButton>(this).assign(
-            &this->dropdownButton_);
-        dropdown->setMouseTracking(true);
-        //        dropdown->setPixmap(*app->resources->splitHeaderContext->getPixmap());
-        //        dropdown->setScaleIndependantSize(23, 23);
-        dropdown->setMenu(this->createMainMenu());
-        QObject::connect(dropdown.getElement(),
-                         &RippleEffectButton::leftMousePress, this, [this] {});
-    }
-
-    // ---- misc
-    this->layout()->setMargin(0);
-    this->scaleChangedEvent(this->getScale());
-
-    this->updateChannelText();
-
-    this->initializeChannelSignals();
-
-    this->split_->channelChanged.connect([this]() {
-        this->initializeChannelSignals();  //
-    });
-
-    this->managedConnect(app->accounts->twitch.currentUserChanged,
-                         [this] { this->updateModerationModeIcon(); });
+    this->initializeLayout();
 
     this->setMouseTracking(true);
+    this->updateChannelText();
+    this->handleChannelChanged();
+    this->updateModerationModeIcon();
 
-    // Update title on title-settings-change
-    getSettings()->showViewerCount.connect(
-        [this](const auto &, const auto &) { this->updateChannelText(); },
-        this->managedConnections_);
-    getSettings()->showTitle.connect(
-        [this](const auto &, const auto &) { this->updateChannelText(); },
-        this->managedConnections_);
-    getSettings()->showGame.connect(
-        [this](const auto &, const auto &) { this->updateChannelText(); },
-        this->managedConnections_);
-    getSettings()->showUptime.connect(
-        [this](const auto &, const auto &) { this->updateChannelText(); },
-        this->managedConnections_);
+    this->split_->focused.connect([this]() { this->themeChangedEvent(); });
+    this->split_->focusLost.connect([this]() { this->themeChangedEvent(); });
+    this->split_->channelChanged.connect(
+        [this]() { this->handleChannelChanged(); });
+
+    this->managedConnect(getApp()->accounts->twitch.currentUserChanged,
+                         [this] { this->updateModerationModeIcon(); });
+
+    auto _ = [this](const auto &, const auto &) { this->updateChannelText(); };
+    getSettings()->showViewerCount.connect(_, this->managedConnections_);
+    getSettings()->showTitle.connect(_, this->managedConnections_);
+    getSettings()->showGame.connect(_, this->managedConnections_);
+    getSettings()->showUptime.connect(_, this->managedConnections_);
 }
 
-SplitHeader::~SplitHeader()
+void SplitHeader::initializeLayout()
 {
-    this->onlineStatusChangedConnection_.disconnect();
+    auto layout = makeLayout<QHBoxLayout>(
+        {// title
+         this->titleLabel = makeWidget<Label>([](auto w) {
+             w->setSizePolicy(QSizePolicy::MinimumExpanding,
+                              QSizePolicy::Preferred);
+             w->setCentered(true);
+             w->setHasOffset(false);
+         }),
+         // mode
+         this->modeButton_ = makeWidget<EffectLabel>([&](auto w) {
+             w->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
+             w->hide();
+             this->initializeModeSignals(*w);
+             w->setMenu(this->createChatModeMenu());
+         }),
+         // moderator
+         this->moderationButton_ = makeWidget<Button>([&](auto w) {
+             QObject::connect(w, &Button::clicked, this, [this, w]() mutable {
+                 this->split_->setModerationMode(
+                     !this->split_->getModerationMode());
+
+                 w->setDim(!this->split_->getModerationMode());
+             });
+         }),
+         // dropdown
+         this->dropdownButton_ = makeWidget<Button>([&](auto w) {
+             w->setMouseTracking(true);
+             w->setMenu(this->createMainMenu());
+             QObject::connect(w, &Button::leftMousePress, this, [this] {});
+         })});
+
+    layout->setMargin(0);
+    layout->setSpacing(0);
+    this->setLayout(layout);
 }
 
 std::unique_ptr<QMenu> SplitHeader::createMainMenu()
 {
     auto menu = std::make_unique<QMenu>();
-    menu->addAction("New split", this->split_, &Split::doAddSplit,
-                    QKeySequence(tr("Ctrl+T")));
-    menu->addAction("Close split", this->split_, &Split::doCloseSplit,
-                    QKeySequence(tr("Ctrl+W")));
-    menu->addAction("Change channel", this->split_, &Split::doChangeChannel,
-                    QKeySequence(tr("Ctrl+R")));
+    menu->addAction("New split", this->split_, &Split::addSibling,
+                    QKeySequence("Ctrl+T"));
+    menu->addAction("Close split", this->split_, &Split::deleteFromContainer,
+                    QKeySequence("Ctrl+W"));
+    menu->addAction("Change channel", this->split_, &Split::changeChannel,
+                    QKeySequence("Ctrl+R"));
     menu->addSeparator();
     menu->addAction("Viewer list", this->split_, &Split::showViewerList);
-    menu->addAction("Search", this->split_, &Split::showSearchPopup,
-                    QKeySequence(tr("Ctrl+F")));
+    menu->addAction("Search", this->split_, &Split::showSearch,
+                    QKeySequence("Ctrl+F"));
     menu->addSeparator();
-    menu->addAction("Popup", this->split_, &Split::doPopup);
+    menu->addAction("Popup", this->split_, &Split::popup);
 #ifdef USEWEBENGINE
     this->dropdownMenu.addAction("Start watching", this, [this] {
         ChannelPtr _channel = this->split->getChannel();
@@ -151,13 +198,12 @@ std::unique_ptr<QMenu> SplitHeader::createMainMenu()
     menu->addAction("Open in browser", this->split_, &Split::openInBrowser);
 #ifndef USEWEBENGINE
     menu->addAction("Open player in browser", this->split_,
-                    &Split::openInPopupPlayer);
+                    &Split::openBrowserPlayer);
 #endif
     menu->addAction("Open streamlink", this->split_, &Split::openInStreamlink);
     menu->addSeparator();
-    menu->addAction("Reload channel emotes", this,
-                    SLOT(menuReloadChannelEmotes()));
-    menu->addAction("Reconnect", this, SLOT(menuManualReconnect()));
+    menu->addAction("Reload channel emotes", this, SLOT(reloadChannelEmotes()));
+    menu->addAction("Reconnect", this, SLOT(reconnect()));
     //    menu->addAction("Clear messages", this->split_, &Split::doClearChat);
     //    menu->addSeparator();
     //    menu->addAction("Show changelog", this, SLOT(menuShowChangelog()));
@@ -201,16 +247,10 @@ std::unique_ptr<QMenu> SplitHeader::createChatModeMenu()
             setSub->setChecked(roomModes->submode);
         }));
 
-    auto toggle = [this](const QString &_command, QAction *action) mutable {
-        QString command = _command;
-
-        if (!action->isChecked()) {
-            command += "off";
-        };
+    auto toggle = [this](const QString &command, QAction *action) mutable {
+        this->split_->getChannel().get()->sendMessage(
+            command + (action->isChecked() ? "" : "off"));
         action->setChecked(!action->isChecked());
-
-        qDebug() << command;
-        this->split_->getChannel().get()->sendMessage(command);
     };
 
     QObject::connect(
@@ -227,12 +267,12 @@ std::unique_ptr<QMenu> SplitHeader::createChatModeMenu()
             setSlow->setChecked(false);
             return;
         };
-        bool ok;
-        int slowSec = QInputDialog::getInt(this, "", "Seconds:", 10, 0, 500, 1,
-                                           &ok, Qt::FramelessWindowHint);
+        auto ok = bool();
+        auto seconds = QInputDialog::getInt(this, "", "Seconds:", 10, 0, 500, 1,
+                                            &ok, Qt::FramelessWindowHint);
         if (ok) {
             this->split_->getChannel().get()->sendMessage(
-                QString("/slow %1").arg(slowSec));
+                QString("/slow %1").arg(seconds));
         } else {
             setSlow->setChecked(false);
         }
@@ -250,74 +290,47 @@ void SplitHeader::updateRoomModes()
     this->modeUpdateRequested_.invoke();
 }
 
-void SplitHeader::setupModeLabel(RippleEffectLabel &label)
+void SplitHeader::initializeModeSignals(EffectLabel &label)
 {
-    this->managedConnections_.push_back(
-        this->modeUpdateRequested_.connect([this, &label] {
-            auto twitchChannel =
-                dynamic_cast<TwitchChannel *>(this->split_->getChannel().get());
+    this->modeUpdateRequested_.connect([this, &label] {
+        auto twitchChannel =
+            dynamic_cast<TwitchChannel *>(this->split_->getChannel().get());
 
-            // return if the channel is not a twitch channel
-            if (twitchChannel == nullptr) {
-                label.hide();
-                return;
-            }
+        // return if the channel is not a twitch channel
+        if (twitchChannel == nullptr) {
+            label.hide();
+            return;
+        }
 
-            // set lable enabled
-            label.setEnable(twitchChannel->hasModRights());
+        // set lable enabled
+        label.setEnable(twitchChannel->hasModRights());
 
-            // set the label text
-            QString text;
+        // set the label text
+        auto text = formatRoomMode(*twitchChannel);
 
-            {
-                auto roomModes = twitchChannel->accessRoomModes();
-
-                if (roomModes->r9k) text += "r9k, ";
-                if (roomModes->slowMode)
-                    text += QString("slow(%1), ")
-                                .arg(QString::number(roomModes->slowMode));
-                if (roomModes->emoteOnly) text += "emote, ";
-                if (roomModes->submode) text += "sub, ";
-            }
-
-            if (text.length() > 2) {
-                text = text.mid(0, text.size() - 2);
-            }
-
-            if (text.isEmpty()) {
-                if (twitchChannel->hasModRights()) {
-                    label.getLabel().setText("none");
-                    label.show();
-                } else {
-                    label.hide();
-                }
-            } else {
-                static QRegularExpression commaReplacement("^.+?, .+?,( ).+$");
-                QRegularExpressionMatch match = commaReplacement.match(text);
-                if (match.hasMatch()) {
-                    text = text.mid(0, match.capturedStart(1)) + '\n' +
-                           text.mid(match.capturedEnd(1));
-                }
-
-                label.getLabel().setText(text);
+        if (text.isEmpty()) {
+            if (twitchChannel->hasModRights()) {
+                label.getLabel().setText("none");
                 label.show();
+            } else {
+                label.hide();
             }
-        }));
+        } else {
+            label.getLabel().setText(text);
+            label.show();
+        }
+    });
 }
 
-void SplitHeader::initializeChannelSignals()
+void SplitHeader::handleChannelChanged()
 {
-    // Disconnect any previous signal first
-    this->onlineStatusChangedConnection_.disconnect();
+    this->channelConnections_.clear();
 
     auto channel = this->split_->getChannel();
-    TwitchChannel *twitchChannel = dynamic_cast<TwitchChannel *>(channel.get());
-
-    if (twitchChannel) {
-        this->managedConnections_.emplace_back(
-            twitchChannel->liveStatusChanged.connect([this]() {
-                this->updateChannelText();  //
-            }));
+    if (auto twitchChannel = dynamic_cast<TwitchChannel *>(channel.get())) {
+        this->channelConnections_.emplace_back(
+            twitchChannel->liveStatusChanged.connect(
+                [this]() { this->updateChannelText(); }));
     }
 }
 
@@ -328,89 +341,47 @@ void SplitHeader::scaleChangedEvent(float scale)
     this->setFixedHeight(w);
     this->dropdownButton_->setFixedWidth(w);
     this->moderationButton_->setFixedWidth(w);
-    //    this->titleLabel->setFont(
-    //        FontManager::getInstance().getFont(FontStyle::Medium, scale));
 }
 
 void SplitHeader::updateChannelText()
 {
     auto indirectChannel = this->split_->getIndirectChannel();
     auto channel = this->split_->getChannel();
+    this->isLive_ = false;
+    this->tooltipText_ = QString();
 
-    QString title = channel->getName();
+    auto title = channel->getName();
 
-    if (indirectChannel.getType() == Channel::Type::TwitchWatching) {
+    if (indirectChannel.getType() == Channel::Type::TwitchWatching)
         title = "watching: " + (title.isEmpty() ? "none" : title);
-    }
 
-    TwitchChannel *twitchChannel = dynamic_cast<TwitchChannel *>(channel.get());
-
-    if (twitchChannel != nullptr) {
+    if (auto twitchChannel = dynamic_cast<TwitchChannel *>(channel.get())) {
         const auto streamStatus = twitchChannel->accessStreamStatus();
 
         if (streamStatus->live) {
             this->isLive_ = true;
-            this->tooltip_ = "<style>.center    { text-align: center; }</style>"
-                             "<p class = \"center\">" +
-                             streamStatus->title + "<br><br>" +
-                             streamStatus->game + "<br>" +
-                             (streamStatus->rerun ? "Vod-casting" : "Live") +
-                             " for " + streamStatus->uptime + " with " +
-                             QString::number(streamStatus->viewerCount) +
-                             " viewers"
-                             "</p>";
-            if (streamStatus->rerun) {
-                title += " (rerun)";
-            } else if (streamStatus->streamType.isEmpty()) {
-                title += " (" + streamStatus->streamType + ")";
-            } else {
-                title += " (live)";
-            }
-            if (getSettings()->showViewerCount) {
-                title += " - " + QString::number(streamStatus->viewerCount) +
-                         " viewers";
-            }
-            if (getSettings()->showTitle) {
-                title += " - " + streamStatus->title;
-            }
-            if (getSettings()->showGame) {
-                title += " - " + streamStatus->game;
-            }
-            if (getSettings()->showUptime) {
-                title += "  - uptime: " + streamStatus->uptime;
-            }
-        } else {
-            this->tooltip_ = QString();
+            this->tooltipText_ = formatTooltip(*streamStatus);
+            title += formatTitle(*streamStatus, *getSettings());
         }
     }
 
-    if (title.isEmpty()) {
-        title = "<empty>";
-    }
-
-    this->isLive_ = false;
-    this->titleLabel->setText(title);
+    this->titleLabel->setText(title.isEmpty() ? "<empty>" : title);
 }
 
 void SplitHeader::updateModerationModeIcon()
 {
-    auto app = getApp();
-
     this->moderationButton_->setPixmap(
         this->split_->getModerationMode()
-            ? app->resources->buttons.modModeEnabled
-            : app->resources->buttons.modModeDisabled);
-
-    bool modButtonVisible = false;
-    ChannelPtr channel = this->split_->getChannel();
+            ? getApp()->resources->buttons.modModeEnabled
+            : getApp()->resources->buttons.modModeDisabled);
 
+    auto channel = this->split_->getChannel();
     auto twitchChannel = dynamic_cast<TwitchChannel *>(channel.get());
 
-    if (twitchChannel != nullptr && twitchChannel->hasModRights()) {
-        modButtonVisible = true;
-    }
-
-    this->moderationButton_->setVisible(modButtonVisible);
+    if (twitchChannel != nullptr && twitchChannel->hasModRights())
+        this->moderationButton_->show();
+    else
+        this->moderationButton_->hide();
 }
 
 void SplitHeader::paintEvent(QPaintEvent *)
@@ -436,7 +407,7 @@ void SplitHeader::mousePressEvent(QMouseEvent *event)
 void SplitHeader::mouseReleaseEvent(QMouseEvent *event)
 {
     if (this->dragging_ && event->button() == Qt::LeftButton) {
-        QPoint pos = event->globalPos();
+        auto pos = event->globalPos();
 
         if (!showingHelpTooltip_) {
             this->showingHelpTooltip_ = true;
@@ -448,18 +419,18 @@ void SplitHeader::mouseReleaseEvent(QMouseEvent *event)
                     return;
                 }
 
-                TooltipWidget *widget = new TooltipWidget();
+                auto tooltip = new TooltipWidget();
 
-                widget->setText("Double click or press <Ctrl+R> to change the "
-                                "channel.\nClick and "
-                                "drag to move the split.");
-                widget->setAttribute(Qt::WA_DeleteOnClose);
-                widget->move(pos);
-                widget->show();
-                widget->raise();
+                tooltip->setText("Double click or press <Ctrl+R> to change the "
+                                 "channel.\nClick and "
+                                 "drag to move the split.");
+                tooltip->setAttribute(Qt::WA_DeleteOnClose);
+                tooltip->move(pos);
+                tooltip->show();
+                tooltip->raise();
 
-                QTimer::singleShot(3000, widget, [this, widget] {
-                    widget->close();
+                QTimer::singleShot(3000, tooltip, [this, tooltip] {
+                    tooltip->close();
                     this->showingHelpTooltip_ = false;
                 });
             });
@@ -472,10 +443,7 @@ void SplitHeader::mouseReleaseEvent(QMouseEvent *event)
 void SplitHeader::mouseMoveEvent(QMouseEvent *event)
 {
     if (this->dragging_) {
-        if (std::abs(this->dragStart_.x() - event->pos().x()) >
-                int(12 * this->getScale()) ||
-            std::abs(this->dragStart_.y() - event->pos().y()) >
-                int(12 * this->getScale())) {
+        if (distance(this->dragStart_, event->pos()) > 15 * this->getScale()) {
             this->split_->drag();
             this->dragging_ = false;
         }
@@ -485,20 +453,20 @@ void SplitHeader::mouseMoveEvent(QMouseEvent *event)
 void SplitHeader::mouseDoubleClickEvent(QMouseEvent *event)
 {
     if (event->button() == Qt::LeftButton) {
-        this->split_->doChangeChannel();
+        this->split_->changeChannel();
     }
     this->doubleClicked_ = true;
 }
 
 void SplitHeader::enterEvent(QEvent *event)
 {
-    if (!this->tooltip_.isEmpty()) {
-        auto tooltipWidget = TooltipWidget::getInstance();
-        tooltipWidget->moveTo(
-            this, this->mapToGlobal(this->rect().bottomLeft()), false);
-        tooltipWidget->setText(this->tooltip_);
-        tooltipWidget->show();
-        tooltipWidget->raise();
+    if (!this->tooltipText_.isEmpty()) {
+        auto tooltip = TooltipWidget::getInstance();
+        tooltip->moveTo(this, this->mapToGlobal(this->rect().bottomLeft()),
+                        false);
+        tooltip->setText(this->tooltipText_);
+        tooltip->show();
+        tooltip->raise();
     }
 
     BaseWidget::enterEvent(event);
@@ -511,13 +479,9 @@ void SplitHeader::leaveEvent(QEvent *event)
     BaseWidget::leaveEvent(event);
 }
 
-void SplitHeader::rightButtonClicked()
-{
-}
-
 void SplitHeader::themeChangedEvent()
 {
-    QPalette palette;
+    auto palette = QPalette();
 
     if (this->split_->hasFocus()) {
         palette.setColor(QPalette::Foreground,
@@ -525,41 +489,32 @@ void SplitHeader::themeChangedEvent()
     } else {
         palette.setColor(QPalette::Foreground, this->theme->splits.header.text);
     }
+    this->titleLabel->setPalette(palette);
 
+    // --
     if (this->theme->isLightTheme()) {
         this->dropdownButton_->setPixmap(getApp()->resources->buttons.menuDark);
     } else {
         this->dropdownButton_->setPixmap(
             getApp()->resources->buttons.menuLight);
     }
-
-    this->titleLabel->setPalette(palette);
 }
 
-void SplitHeader::menuMoveSplit()
+void SplitHeader::moveSplit()
 {
 }
 
-void SplitHeader::menuReloadChannelEmotes()
+void SplitHeader::reloadChannelEmotes()
 {
     auto channel = this->split_->getChannel();
-    TwitchChannel *twitchChannel = dynamic_cast<TwitchChannel *>(channel.get());
 
-    if (twitchChannel) {
+    if (auto twitchChannel = dynamic_cast<TwitchChannel *>(channel.get()))
         twitchChannel->refreshChannelEmotes();
-    }
 }
 
-void SplitHeader::menuManualReconnect()
-{
-    auto app = getApp();
-
-    // fourtf: connection
-    app->twitch.server->connect();
-}
-
-void SplitHeader::menuShowChangelog()
+void SplitHeader::reconnect()
 {
+    getApp()->twitch.server->connect();
 }
 
 }  // namespace chatterino
diff --git a/src/widgets/splits/SplitHeader.hpp b/src/widgets/splits/SplitHeader.hpp
index 4846829fe..96941da5a 100644
--- a/src/widgets/splits/SplitHeader.hpp
+++ b/src/widgets/splits/SplitHeader.hpp
@@ -1,37 +1,29 @@
 #pragma once
 
 #include "widgets/BaseWidget.hpp"
-#include "widgets/helper/RippleEffectLabel.hpp"
-#include "widgets/helper/SignalLabel.hpp"
 
-#include <QAction>
-#include <QHBoxLayout>
-#include <QLabel>
 #include <QMenu>
-#include <QMouseEvent>
-#include <QPaintEvent>
 #include <QPoint>
-#include <QWidget>
+#include <memory>
 #include <pajlada/settings/setting.hpp>
 #include <pajlada/signals/connection.hpp>
 #include <pajlada/signals/signalholder.hpp>
-
 #include <vector>
 
 namespace chatterino {
 
-class Split;
+class Button;
+class EffectLabel;
 class Label;
+class Split;
 
-class SplitHeader : public BaseWidget, pajlada::Signals::SignalHolder
+class SplitHeader final : public BaseWidget, pajlada::Signals::SignalHolder
 {
     Q_OBJECT
 
 public:
     explicit SplitHeader(Split *_chatWidget);
-    virtual ~SplitHeader() override;
 
-    // Update channel text from chat widget
     void updateChannelText();
     void updateModerationModeIcon();
     void updateRoomModes();
@@ -49,41 +41,38 @@ protected:
     virtual void mouseDoubleClickEvent(QMouseEvent *event) override;
 
 private:
-    void rightButtonClicked();
-    void initializeChannelSignals();
-    void setupModeLabel(RippleEffectLabel &label);
+    void initializeLayout();
+    void initializeModeSignals(EffectLabel &label);
     std::unique_ptr<QMenu> createMainMenu();
     std::unique_ptr<QMenu> createChatModeMenu();
+    void handleChannelChanged();
 
-    Split *split_;
+    Split *const split_{};
+    QString tooltipText_{};
+    bool isLive_{false};
 
-    QPoint dragStart_;
-    bool dragging_ = false;
-    bool doubleClicked_ = false;
-    bool showingHelpTooltip_ = false;
-
-    pajlada::Signals::Connection onlineStatusChangedConnection_;
-
-    RippleEffectButton *dropdownButton_{};
-    //    Label *titleLabel{};
+    // ui
+    Button *dropdownButton_{};
     Label *titleLabel{};
-    RippleEffectLabel *modeButton_{};
-    RippleEffectButton *moderationButton_{};
+    EffectLabel *modeButton_{};
+    Button *moderationButton_{};
 
-    bool menuVisible_{};
+    // states
+    QPoint dragStart_{};
+    bool dragging_{false};
+    bool doubleClicked_{false};
+    bool showingHelpTooltip_{false};
+    bool menuVisible_{false};
 
+    // signals
     pajlada::Signals::NoArgSignal modeUpdateRequested_;
-
-    QString tooltip_;
-    bool isLive_;
-
     std::vector<pajlada::Signals::ScopedConnection> managedConnections_;
+    std::vector<pajlada::Signals::ScopedConnection> channelConnections_;
 
 public slots:
-    void menuMoveSplit();
-    void menuReloadChannelEmotes();
-    void menuManualReconnect();
-    void menuShowChangelog();
+    void moveSplit();
+    void reloadChannelEmotes();
+    void reconnect();
 };
 
 }  // namespace chatterino
diff --git a/src/widgets/splits/SplitInput.cpp b/src/widgets/splits/SplitInput.cpp
index b4f9fc5ec..e524e6317 100644
--- a/src/widgets/splits/SplitInput.cpp
+++ b/src/widgets/splits/SplitInput.cpp
@@ -61,7 +61,7 @@ void SplitInput::initLayout()
         textEditLength->setAlignment(Qt::AlignRight);
 
         box->addStretch(1);
-        box.emplace<RippleEffectLabel>().assign(&this->ui_.emoteButton);
+        box.emplace<EffectLabel>().assign(&this->ui_.emoteButton);
     }
 
     this->ui_.emoteButton->getLabel().setTextFormat(Qt::RichText);
@@ -79,7 +79,7 @@ void SplitInput::initLayout()
 
     // open emote popup
     QObject::connect(
-        this->ui_.emoteButton, &RippleEffectLabel::clicked, [this] {
+        this->ui_.emoteButton, &EffectLabel::clicked, [this] {
             if (!this->emotePopup_) {
                 this->emotePopup_ = std::make_unique<EmotePopup>();
                 this->emotePopup_->linkClicked.connect(
diff --git a/src/widgets/splits/SplitInput.hpp b/src/widgets/splits/SplitInput.hpp
index 42a8f082b..ddcf2c97d 100644
--- a/src/widgets/splits/SplitInput.hpp
+++ b/src/widgets/splits/SplitInput.hpp
@@ -3,7 +3,7 @@
 #include "widgets/BaseWidget.hpp"
 #include "widgets/dialogs/EmotePopup.hpp"
 #include "widgets/helper/ResizingTextEdit.hpp"
-#include "widgets/helper/RippleEffectLabel.hpp"
+#include "widgets/helper/EffectLabel.hpp"
 
 #include <QHBoxLayout>
 #include <QLabel>
@@ -50,7 +50,7 @@ private:
     struct {
         ResizingTextEdit *textEdit;
         QLabel *textEditLength;
-        RippleEffectLabel *emoteButton;
+        EffectLabel *emoteButton;
 
         QHBoxLayout *hbox;
     } ui_;

From 5957b8729863cd7db9a4551c4d8ee7af25296e9c Mon Sep 17 00:00:00 2001
From: fourtf <tf.four@gmail.com>
Date: Wed, 8 Aug 2018 15:50:43 +0200
Subject: [PATCH 02/44] minor changes

---
 src/widgets/splits/SplitHeader.cpp | 43 +++++++++++-------------------
 1 file changed, 16 insertions(+), 27 deletions(-)

diff --git a/src/widgets/splits/SplitHeader.cpp b/src/widgets/splits/SplitHeader.cpp
index 7c8571303..882f0b9eb 100644
--- a/src/widgets/splits/SplitHeader.cpp
+++ b/src/widgets/splits/SplitHeader.cpp
@@ -28,7 +28,7 @@
 
 namespace chatterino {
 namespace {
-auto formatRoomMode(TwitchChannel &channel)
+auto formatRoomMode(TwitchChannel &channel) -> QString
 {
     QString text;
 
@@ -54,6 +54,8 @@ auto formatRoomMode(TwitchChannel &channel)
             text = match.captured(1) + '\n' + match.captured(2);
     }
 
+    if (text.isEmpty() && channel.hasModRights()) return "none";
+
     return text;
 }
 auto formatTooltip(const TwitchChannel::StreamStatus &s)
@@ -156,11 +158,8 @@ void SplitHeader::initializeLayout()
              });
          }),
          // dropdown
-         this->dropdownButton_ = makeWidget<Button>([&](auto w) {
-             w->setMouseTracking(true);
-             w->setMenu(this->createMainMenu());
-             QObject::connect(w, &Button::leftMousePress, this, [this] {});
-         })});
+         this->dropdownButton_ = makeWidget<Button>(
+             [&](auto w) { w->setMenu(this->createMainMenu()); })});
 
     layout->setMargin(0);
     layout->setSpacing(0);
@@ -293,32 +292,22 @@ void SplitHeader::updateRoomModes()
 void SplitHeader::initializeModeSignals(EffectLabel &label)
 {
     this->modeUpdateRequested_.connect([this, &label] {
-        auto twitchChannel =
-            dynamic_cast<TwitchChannel *>(this->split_->getChannel().get());
+        if (auto twitchChannel = dynamic_cast<TwitchChannel *>(
+                this->split_->getChannel().get()))  //
+        {
+            label.setEnable(twitchChannel->hasModRights());
 
-        // return if the channel is not a twitch channel
-        if (twitchChannel == nullptr) {
-            label.hide();
-            return;
-        }
+            // set the label text
+            auto text = formatRoomMode(*twitchChannel);
 
-        // set lable enabled
-        label.setEnable(twitchChannel->hasModRights());
-
-        // set the label text
-        auto text = formatRoomMode(*twitchChannel);
-
-        if (text.isEmpty()) {
-            if (twitchChannel->hasModRights()) {
-                label.getLabel().setText("none");
+            if (!text.isEmpty()) {
+                label.getLabel().setText(text);
                 label.show();
-            } else {
-                label.hide();
+                return;
             }
-        } else {
-            label.getLabel().setText(text);
-            label.show();
         }
+
+        label.hide();
     });
 }
 

From bdfe24035b4a7b424f4f91a356727d7e75e102cc Mon Sep 17 00:00:00 2001
From: fourtf <tf.four@gmail.com>
Date: Wed, 8 Aug 2018 19:42:14 +0200
Subject: [PATCH 03/44] fixed rectangle being off by 1 pixel in split container

---
 src/messages/Image.cpp                        |  2 +-
 src/providers/twitch/TwitchMessageBuilder.cpp |  6 ++----
 src/widgets/splits/SplitContainer.cpp         | 17 +++++++++++------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/messages/Image.cpp b/src/messages/Image.cpp
index 5935c4a01..5202405ed 100644
--- a/src/messages/Image.cpp
+++ b/src/messages/Image.cpp
@@ -140,7 +140,7 @@ ImagePtr Image::fromUrl(const Url &url, qreal scale)
     if (!shared) {
         cache[url] = shared = ImagePtr(new Image(url, scale));
     } else {
-        Warn("same image loaded multiple times: {}", url.string);
+        // Warn("same image loaded multiple times: {}", url.string);
     }
 
     return shared;
diff --git a/src/providers/twitch/TwitchMessageBuilder.cpp b/src/providers/twitch/TwitchMessageBuilder.cpp
index 8eafa7dd6..740cccc05 100644
--- a/src/providers/twitch/TwitchMessageBuilder.cpp
+++ b/src/providers/twitch/TwitchMessageBuilder.cpp
@@ -31,8 +31,7 @@ TwitchMessageBuilder::TwitchMessageBuilder(
     , originalMessage_(_ircMessage->content())
     , action_(_ircMessage->isAction())
 {
-    auto app = getApp();
-    this->usernameColor_ = app->themes->messages.textColors.system;
+    this->usernameColor_ = getApp()->themes->messages.textColors.system;
 }
 
 TwitchMessageBuilder::TwitchMessageBuilder(
@@ -46,8 +45,7 @@ TwitchMessageBuilder::TwitchMessageBuilder(
     , originalMessage_(content)
     , action_(isAction)
 {
-    auto app = getApp();
-    this->usernameColor_ = app->themes->messages.textColors.system;
+    this->usernameColor_ = getApp()->themes->messages.textColors.system;
 }
 
 bool TwitchMessageBuilder::isIgnored() const
diff --git a/src/widgets/splits/SplitContainer.cpp b/src/widgets/splits/SplitContainer.cpp
index 371bfcef5..4d7cc9482 100644
--- a/src/widgets/splits/SplitContainer.cpp
+++ b/src/widgets/splits/SplitContainer.cpp
@@ -326,25 +326,30 @@ void SplitContainer::layout()
 
         Node *node = this->baseNode_.findNodeContainingSplit(split);
 
+        // left
         _dropRects.push_back(
             DropRect(QRect(g.left(), g.top(), g.width() / 3, g.height()),
                      Position(node, Direction::Left)));
-        _dropRects.push_back(DropRect(QRect(g.left() + g.width() / 3 * 2,
-                                            g.top(), g.width() / 3, g.height()),
+        // right
+        _dropRects.push_back(DropRect(QRect(g.right() - g.width() / 3, g.top(),
+                                            g.width() / 3, g.height()),
                                       Position(node, Direction::Right)));
 
+        // top
         _dropRects.push_back(
             DropRect(QRect(g.left(), g.top(), g.width(), g.height() / 2),
                      Position(node, Direction::Above)));
-        _dropRects.push_back(DropRect(QRect(g.left(), g.top() + g.height() / 2,
-                                            g.width(), g.height() / 2),
-                                      Position(node, Direction::Below)));
+        // bottom
+        _dropRects.push_back(
+            DropRect(QRect(g.left(), g.bottom() - g.height() / 2, g.width(),
+                           g.height() / 2),
+                     Position(node, Direction::Below)));
     }
 
     if (this->splits_.empty()) {
         QRect g = this->rect();
         _dropRects.push_back(
-            DropRect(QRect(g.left(), g.top(), g.width(), g.height()),
+            DropRect(QRect(g.left(), g.top(), g.width() - 1, g.height() - 1),
                      Position(nullptr, Direction::Below)));
     }
 

From 94813fe3dfa1f2f73c7aa410b339ea197b706d2a Mon Sep 17 00:00:00 2001
From: fourtf <tf.four@gmail.com>
Date: Wed, 8 Aug 2018 20:06:20 +0200
Subject: [PATCH 04/44] added subfunctions for ChannelView()

---
 src/widgets/helper/ChannelView.cpp | 140 ++++++++++++-----------------
 src/widgets/helper/ChannelView.hpp |   9 +-
 2 files changed, 67 insertions(+), 82 deletions(-)

diff --git a/src/widgets/helper/ChannelView.cpp b/src/widgets/helper/ChannelView.cpp
index ca490dbaa..1615d15ba 100644
--- a/src/widgets/helper/ChannelView.cpp
+++ b/src/widgets/helper/ChannelView.cpp
@@ -95,70 +95,11 @@ ChannelView::ChannelView(BaseWidget *parent)
     : BaseWidget(parent)
     , scrollBar_(this)
 {
-    auto app = getApp();
-
     this->setMouseTracking(true);
 
-    this->connections_.push_back(app->windows->wordFlagsChanged.connect([this] {
-        this->layoutMessages();
-        this->update();
-    }));
-
-    this->scrollBar_.getCurrentValueChanged().connect([this] {
-        // Whenever the scrollbar value has been changed, re-render the
-        // ChatWidgetView
-        this->actuallyLayoutMessages(true);
-
-        //        if (!this->isPaused()) {
-        this->goToBottom_->setVisible(this->enableScrollingToBottom_ &&
-                                      this->scrollBar_.isVisible() &&
-                                      !this->scrollBar_.isAtBottom());
-        //        }
-
-        this->queueUpdate();
-    });
-
-    this->scrollBar_.getDesiredValueChanged().connect([this] {
-        this->pausedByScrollingUp_ = !this->scrollBar_.isAtBottom();
-    });
-
-    this->connections_.push_back(app->windows->repaintGifs.connect([&] {
-        this->queueUpdate();  //
-    }));
-
-    this->connections_.push_back(
-        app->windows->layout.connect([&](Channel *channel) {
-            if (channel == nullptr || this->channel_.get() == channel) {
-                this->layoutMessages();
-            }
-        }));
-
-    this->goToBottom_ = new EffectLabel(this, 0);
-    this->goToBottom_->setStyleSheet(
-        "background-color: rgba(0,0,0,0.66); color: #FFF;");
-    this->goToBottom_->getLabel().setText("More messages below");
-    this->goToBottom_->setVisible(false);
-
-    this->connections_.emplace_back(app->fonts->fontChanged.connect([this] {
-        this->layoutMessages();  //
-    }));
-
-    QObject::connect(this->goToBottom_, &EffectLabel::clicked, this, [=] {
-        QTimer::singleShot(180, [=] {
-            this->scrollBar_.scrollToBottom(
-                app->settings->enableSmoothScrollingNewMessages.getValue());
-        });
-    });
-
-    //    this->updateTimer.setInterval(1000 / 60);
-    //    this->updateTimer.setSingleShot(true);
-    //    connect(&this->updateTimer, &QTimer::timeout, this, [this] {
-    //        if (this->updateQueued) {
-    //            this->updateQueued = false;
-    //            this->repaint();
-    //            this->updateTimer.start();
-    //        }
-    //    });
+    this->initializeLayout();
+    this->initializeScrollbar();
+    this->initializeSignals();
 
     this->pauseTimeout_.setSingleShot(true);
     QObject::connect(&this->pauseTimeout_, &QTimer::timeout, [this] {
@@ -167,31 +108,68 @@ ChannelView::ChannelView(BaseWidget *parent)
         this->layoutMessages();
     });
 
-    app->settings->showLastMessageIndicator.connect(
-        [this](auto, auto) {
-            this->update();  //
-        },
-        this->connections_);
-
-    this->layoutCooldown_ = new QTimer(this);
-    this->layoutCooldown_->setSingleShot(true);
-    this->layoutCooldown_->setInterval(66);
-
-    QObject::connect(this->layoutCooldown_, &QTimer::timeout, [this] {
-        if (this->layoutQueued_) {
-            this->layoutMessages();
-            this->layoutQueued_ = false;
-        }
-    });
-
-    QShortcut *shortcut = new QShortcut(QKeySequence("Ctrl+C"), this);
+    auto shortcut = new QShortcut(QKeySequence("Ctrl+C"), this);
     QObject::connect(shortcut, &QShortcut::activated, [this] {
         QGuiApplication::clipboard()->setText(this->getSelectedText());
     });
 }
 
-ChannelView::~ChannelView()
+void ChannelView::initializeLayout()
 {
+    this->goToBottom_ = new EffectLabel(this, 0);
+    this->goToBottom_->setStyleSheet(
+        "background-color: rgba(0,0,0,0.66); color: #FFF;");
+    this->goToBottom_->getLabel().setText("More messages below");
+    this->goToBottom_->setVisible(false);
+
+    QObject::connect(this->goToBottom_, &EffectLabel::clicked, this, [=] {
+        QTimer::singleShot(180, [=] {
+            this->scrollBar_.scrollToBottom(
+                getApp()
+                    ->settings->enableSmoothScrollingNewMessages.getValue());
+        });
+    });
+}
+
+void ChannelView::initializeScrollbar()
+{
+    this->scrollBar_.getCurrentValueChanged().connect([this] {
+        this->actuallyLayoutMessages(true);
+
+        this->goToBottom_->setVisible(this->enableScrollingToBottom_ &&
+                                      this->scrollBar_.isVisible() &&
+                                      !this->scrollBar_.isAtBottom());
+
+        this->queueUpdate();
+    });
+
+    this->scrollBar_.getDesiredValueChanged().connect([this] {
+        this->pausedByScrollingUp_ = !this->scrollBar_.isAtBottom();
+    });
+}
+
+void ChannelView::initializeSignals()
+{
+    this->connections_.push_back(
+        getApp()->windows->wordFlagsChanged.connect([this] {
+            this->layoutMessages();
+            this->update();
+        }));
+
+    getApp()->settings->showLastMessageIndicator.connect(
+        [this](auto, auto) { this->update(); }, this->connections_);
+
+    connections_.push_back(
+        getApp()->windows->repaintGifs.connect([&] { this->queueUpdate(); }));
+
+    connections_.push_back(
+        getApp()->windows->layout.connect([&](Channel *channel) {
+            if (channel == nullptr || this->channel_.get() == channel)
+                this->layoutMessages();
+        }));
+
+    connections_.push_back(getApp()->fonts->fontChanged.connect(
+        [this] { this->layoutMessages(); }));
 }
 
 void ChannelView::themeChangedEvent()
diff --git a/src/widgets/helper/ChannelView.hpp b/src/widgets/helper/ChannelView.hpp
index 5072befd8..cb8ad990f 100644
--- a/src/widgets/helper/ChannelView.hpp
+++ b/src/widgets/helper/ChannelView.hpp
@@ -27,7 +27,6 @@ class ChannelView : public BaseWidget
 
 public:
     explicit ChannelView(BaseWidget *parent = nullptr);
-    virtual ~ChannelView() override;
 
     void queueUpdate();
     Scrollbar &getScrollBar();
@@ -77,6 +76,14 @@ protected:
                          QPoint &relativePos, int &index);
 
 private:
+    void initializeLayout();
+    void initializeScrollbar();
+    void initializeSignals();
+
+    // void messageAppended(MessagePtr &message);
+    // void messageAddedAtStart(std::vector<MessagePtr> &messages);
+    // void messageRemoveFromStart(MessagePtr &message);
+
     void updatePauseStatus();
     void detachChannel();
     void actuallyLayoutMessages(bool causedByScollbar = false);

From e1f180ac283ac973c2564255421b2bdfcce2bd84 Mon Sep 17 00:00:00 2001
From: fourtf <tf.four@gmail.com>
Date: Thu, 9 Aug 2018 06:22:55 +0200
Subject: [PATCH 05/44] added qt version number to about tab

---
 chatterino.pro                                 |  6 ++++--
 resources/settings/emote.svg                   | 12 ++++++++++++
 src/messages/MessageContainer.cpp              |  9 +++++++++
 src/messages/MessageContainer.hpp              | 13 +++++++++++++
 src/widgets/BaseWindow.cpp                     |  2 --
 src/widgets/settingspages/AboutPage.cpp        | 14 +++++++++++++-
 src/widgets/settingspages/AccountsPage.cpp     |  2 +-
 src/widgets/settingspages/CommandPage.cpp      |  2 +-
 src/widgets/settingspages/EmotesPage.cpp       |  2 +-
 src/widgets/settingspages/FeelPage.cpp         |  2 +-
 src/widgets/settingspages/HighlightingPage.cpp |  2 +-
 src/widgets/settingspages/LookPage.cpp         |  2 +-
 12 files changed, 57 insertions(+), 11 deletions(-)
 create mode 100644 resources/settings/emote.svg
 create mode 100644 src/messages/MessageContainer.cpp
 create mode 100644 src/messages/MessageContainer.hpp

diff --git a/chatterino.pro b/chatterino.pro
index bd621b861..0db816192 100644
--- a/chatterino.pro
+++ b/chatterino.pro
@@ -250,7 +250,8 @@ SOURCES += \
     src/util/FormatTime.cpp \
     src/util/FunctionEventFilter.cpp \
     src/widgets/helper/EffectLabel.cpp \
-    src/widgets/helper/Button.cpp
+    src/widgets/helper/Button.cpp \
+    src/messages/MessageContainer.cpp
 
 HEADERS  += \
     src/Application.hpp \
@@ -449,7 +450,8 @@ HEADERS  += \
     src/util/FunctionEventFilter.hpp \
     src/widgets/helper/EffectLabel.hpp \
     src/util/LayoutHelper.hpp \
-    src/widgets/helper/Button.hpp
+    src/widgets/helper/Button.hpp \
+    src/messages/MessageContainer.hpp
 
 RESOURCES += \ 
     resources/resources.qrc \
diff --git a/resources/settings/emote.svg b/resources/settings/emote.svg
new file mode 100644
index 000000000..10e25c9f5
--- /dev/null
+++ b/resources/settings/emote.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M50,100c27.7,0,50-22.3,50-50S77.7,0,50,0S0,22.3,0,50S22.3,100,50,100z M33.3,46.2c4.2,0,8.3-3.3,8.3-8.3
+	s-4.2-8.3-8.3-8.3S25,32.9,25,37.9S29.2,46.2,33.3,46.2z M50,91.7C27,91.7,8.3,73,8.3,50S27,8.3,50,8.3S91.7,27,91.7,50
+	S73,91.7,50,91.7z M23.3,63.1c16.2,10.3,37.1,10.4,53.2,0.1l-4.3-7c-13.7,8.5-31,8.4-44.5-0.1L23.3,63.1z M67.1,46.2
+	c4.2,0,8.3-3.3,8.3-8.3s-4.2-8.3-8.3-8.3s-8.3,3.3-8.3,8.3S62.9,46.2,67.1,46.2z"/>
+</svg>
diff --git a/src/messages/MessageContainer.cpp b/src/messages/MessageContainer.cpp
new file mode 100644
index 000000000..2d47cb906
--- /dev/null
+++ b/src/messages/MessageContainer.cpp
@@ -0,0 +1,9 @@
+#include "MessageContainer.hpp"
+
+namespace chatterino {
+
+MessageContainer::MessageContainer()
+{
+}
+
+}  // namespace chatterino
diff --git a/src/messages/MessageContainer.hpp b/src/messages/MessageContainer.hpp
new file mode 100644
index 000000000..781135e60
--- /dev/null
+++ b/src/messages/MessageContainer.hpp
@@ -0,0 +1,13 @@
+#pragma once
+
+#include <deque>
+
+namespace chatterino {
+
+class MessageContainer
+{
+public:
+    MessageContainer();
+};
+
+}  // namespace chatterino
diff --git a/src/widgets/BaseWindow.cpp b/src/widgets/BaseWindow.cpp
index e435bf6e8..db9bd0774 100644
--- a/src/widgets/BaseWindow.cpp
+++ b/src/widgets/BaseWindow.cpp
@@ -104,8 +104,6 @@ void BaseWindow::init()
                 QSizePolicy policy(QSizePolicy::Ignored,
                                    QSizePolicy::Preferred);
                 policy.setHorizontalStretch(1);
-                //            title->setBaseSize(0, 0);
-                //                title->setScaledContents(true);
                 title->setSizePolicy(policy);
                 buttonLayout->addWidget(title);
                 this->ui_.titleLabel = title;
diff --git a/src/widgets/settingspages/AboutPage.cpp b/src/widgets/settingspages/AboutPage.cpp
index 3826c1aa8..710e5e915 100644
--- a/src/widgets/settingspages/AboutPage.cpp
+++ b/src/widgets/settingspages/AboutPage.cpp
@@ -17,7 +17,7 @@
 namespace chatterino {
 
 AboutPage::AboutPage()
-    : SettingsPage("About", ":/images/about.svg")
+    : SettingsPage("About", ":/settings/about.svg")
 {
     LayoutCreator<AboutPage> layoutCreator(this);
 
@@ -179,6 +179,18 @@ AboutPage::AboutPage()
         }
     }
 
+    auto buildInfo = QStringList();
+    buildInfo += "Qt " QT_VERSION_STR;
+#ifdef USEWINSDK
+    buildInfo += "Windows SDK";
+#endif
+#ifdef _MSC_FULL_VER
+    buildInfo += "MSVC " + QString::number(_MSC_FULL_VER, 10);
+#endif
+
+    auto buildText = QString("Built with " + buildInfo.join(", "));
+    layout.emplace<QLabel>(buildText);
+
     layout->addStretch(1);
 }
 
diff --git a/src/widgets/settingspages/AccountsPage.cpp b/src/widgets/settingspages/AccountsPage.cpp
index 1aa3feaaa..88c37a12d 100644
--- a/src/widgets/settingspages/AccountsPage.cpp
+++ b/src/widgets/settingspages/AccountsPage.cpp
@@ -17,7 +17,7 @@
 namespace chatterino {
 
 AccountsPage::AccountsPage()
-    : SettingsPage("Accounts", ":/images/accounts.svg")
+    : SettingsPage("Accounts", ":/settings/accounts.svg")
 {
     auto *app = getApp();
 
diff --git a/src/widgets/settingspages/CommandPage.cpp b/src/widgets/settingspages/CommandPage.cpp
index 23624962b..bb3a60c59 100644
--- a/src/widgets/settingspages/CommandPage.cpp
+++ b/src/widgets/settingspages/CommandPage.cpp
@@ -27,7 +27,7 @@
 namespace chatterino {
 
 CommandPage::CommandPage()
-    : SettingsPage("Commands", ":/images/commands.svg")
+    : SettingsPage("Commands", ":/settings/commands.svg")
 {
     auto app = getApp();
 
diff --git a/src/widgets/settingspages/EmotesPage.cpp b/src/widgets/settingspages/EmotesPage.cpp
index 63a200c35..c7250490e 100644
--- a/src/widgets/settingspages/EmotesPage.cpp
+++ b/src/widgets/settingspages/EmotesPage.cpp
@@ -5,7 +5,7 @@
 namespace chatterino {
 
 EmotesPage::EmotesPage()
-    : SettingsPage("Emotes", ":/images/emote.svg")
+    : SettingsPage("Emotes", ":/settings/emote.svg")
 {
     //    SettingManager &settings = SettingManager::getInstance();
     //    LayoutCreator<EmotesPage> layoutCreator(this);
diff --git a/src/widgets/settingspages/FeelPage.cpp b/src/widgets/settingspages/FeelPage.cpp
index 3567fe44a..d20c859c7 100644
--- a/src/widgets/settingspages/FeelPage.cpp
+++ b/src/widgets/settingspages/FeelPage.cpp
@@ -18,7 +18,7 @@
 namespace chatterino {
 
 FeelPage::FeelPage()
-    : SettingsPage("Feel", ":/images/behave.svg")
+    : SettingsPage("Feel", ":/settings/behave.svg")
 {
     auto app = getApp();
     LayoutCreator<FeelPage> layoutCreator(this);
diff --git a/src/widgets/settingspages/HighlightingPage.cpp b/src/widgets/settingspages/HighlightingPage.cpp
index daca460f7..455c0d377 100644
--- a/src/widgets/settingspages/HighlightingPage.cpp
+++ b/src/widgets/settingspages/HighlightingPage.cpp
@@ -30,7 +30,7 @@
 namespace chatterino {
 
 HighlightingPage::HighlightingPage()
-    : SettingsPage("Highlights", ":/images/notifications.svg")
+    : SettingsPage("Highlights", ":/settings/notifications.svg")
 {
     auto app = getApp();
     LayoutCreator<HighlightingPage> layoutCreator(this);
diff --git a/src/widgets/settingspages/LookPage.cpp b/src/widgets/settingspages/LookPage.cpp
index 6f775ee34..6f7032e46 100644
--- a/src/widgets/settingspages/LookPage.cpp
+++ b/src/widgets/settingspages/LookPage.cpp
@@ -37,7 +37,7 @@
 namespace chatterino {
 
 LookPage::LookPage()
-    : SettingsPage("Look", ":/images/theme.svg")
+    : SettingsPage("Look", ":/settings/theme.svg")
 {
     this->initializeUi();
 }

From 81f2f8781a74197411d69808aa25555b4677235b Mon Sep 17 00:00:00 2001
From: fourtf <tf.four@gmail.com>
Date: Thu, 9 Aug 2018 15:13:11 +0200
Subject: [PATCH 06/44] fixed window frame for qt 5.11.1

---
 src/widgets/BaseWindow.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/widgets/BaseWindow.cpp b/src/widgets/BaseWindow.cpp
index db9bd0774..eccde0f97 100644
--- a/src/widgets/BaseWindow.cpp
+++ b/src/widgets/BaseWindow.cpp
@@ -459,7 +459,11 @@ bool BaseWindow::nativeEvent(const QByteArray &eventType, void *message,
                              long *result)
 {
 #ifdef USEWINSDK
+#if (QT_VERSION == QT_VERSION_CHECK(5, 11, 1))
+    MSG *msg = *reinterpret_cast<MSG **>(message);
+#else
     MSG *msg = reinterpret_cast<MSG *>(message);
+#endif
 
     bool returnValue = false;
 

From cb235ef532c5e3b9e9d49016e6b221b9585f9d10 Mon Sep 17 00:00:00 2001
From: fourtf <tf.four@gmail.com>
Date: Thu, 9 Aug 2018 16:20:09 +0200
Subject: [PATCH 07/44] fixed ocd inducing 1 pixel offsets

---
 src/widgets/splits/SplitContainer.cpp | 19 +++++++++------
 src/widgets/splits/SplitInput.cpp     | 34 +++++++++++++--------------
 2 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/src/widgets/splits/SplitContainer.cpp b/src/widgets/splits/SplitContainer.cpp
index 4d7cc9482..c7ae6c798 100644
--- a/src/widgets/splits/SplitContainer.cpp
+++ b/src/widgets/splits/SplitContainer.cpp
@@ -40,12 +40,12 @@ SplitContainer::SplitContainer(Notebook *parent)
         this->layout();
 
         if (modifiers == showResizeHandlesModifiers) {
-            for (std::unique_ptr<ResizeHandle> &handle : this->resizeHandles_) {
+            for (auto &handle : this->resizeHandles_) {
                 handle->show();
                 handle->raise();
             }
         } else {
-            for (std::unique_ptr<ResizeHandle> &handle : this->resizeHandles_) {
+            for (auto &handle : this->resizeHandles_) {
                 handle->hide();
             }
         }
@@ -89,7 +89,7 @@ void SplitContainer::hideResizeHandles()
 {
     this->overlay_.hide();
 
-    for (std::unique_ptr<ResizeHandle> &handle : this->resizeHandles_) {
+    for (auto &handle : this->resizeHandles_) {
         handle->hide();
     }
 }
@@ -311,7 +311,7 @@ void SplitContainer::focusSplitRecursive(Node *node, Direction direction)
 
 void SplitContainer::layout()
 {
-    this->baseNode_.geometry_ = this->rect();
+    this->baseNode_.geometry_ = this->rect().adjusted(0, 0, -1, -1);
 
     std::vector<DropRect> _dropRects;
     std::vector<ResizeRect> _resizeRects;
@@ -904,7 +904,7 @@ void SplitContainer::Node::layout(bool addSpacing, float _scale,
         case Node::_Split: {
             QRect rect = this->geometry_.toRect();
             this->split_->setGeometry(
-                rect.marginsRemoved(QMargins(1, 1, 1, 1)));
+                rect.marginsRemoved(QMargins(1, 1, 0, 0)));
         } break;
         case Node::VerticalContainer:
         case Node::HorizontalContainer: {
@@ -968,10 +968,10 @@ void SplitContainer::Node::layout(bool addSpacing, float _scale,
             }
 
             // iterate children
-            qreal pos = isVertical ? childRect.top() : childRect.left();
+            auto pos = int(isVertical ? childRect.top() : childRect.left());
             for (std::unique_ptr<Node> &child : this->children_) {
                 // set rect
-                QRectF rect = childRect;
+                QRect rect = childRect.toRect();
                 if (isVertical) {
                     rect.setTop(pos);
                     rect.setHeight(
@@ -987,6 +987,11 @@ void SplitContainer::Node::layout(bool addSpacing, float _scale,
                                   sizeMultiplier);
                 }
 
+                if (child == this->children_.back()) {
+                    rect.setRight(childRect.right() - 1);
+                    rect.setBottom(childRect.bottom() - 1);
+                }
+
                 child->geometry_ = rect;
                 child->layout(addSpacing, _scale, dropRects, resizeRects);
 
diff --git a/src/widgets/splits/SplitInput.cpp b/src/widgets/splits/SplitInput.cpp
index e524e6317..65bc37e5c 100644
--- a/src/widgets/splits/SplitInput.cpp
+++ b/src/widgets/splits/SplitInput.cpp
@@ -78,23 +78,21 @@ void SplitInput::initLayout()
     }));
 
     // open emote popup
-    QObject::connect(
-        this->ui_.emoteButton, &EffectLabel::clicked, [this] {
-            if (!this->emotePopup_) {
-                this->emotePopup_ = std::make_unique<EmotePopup>();
-                this->emotePopup_->linkClicked.connect(
-                    [this](const Link &link) {
-                        if (link.type == Link::InsertText) {
-                            this->insertText(link.value + " ");
-                        }
-                    });
-            }
+    QObject::connect(this->ui_.emoteButton, &EffectLabel::clicked, [this] {
+        if (!this->emotePopup_) {
+            this->emotePopup_ = std::make_unique<EmotePopup>();
+            this->emotePopup_->linkClicked.connect([this](const Link &link) {
+                if (link.type == Link::InsertText) {
+                    this->insertText(link.value + " ");
+                }
+            });
+        }
 
-            this->emotePopup_->resize(int(300 * this->emotePopup_->getScale()),
-                                      int(500 * this->emotePopup_->getScale()));
-            this->emotePopup_->loadChannel(this->split_->getChannel());
-            this->emotePopup_->show();
-        });
+        this->emotePopup_->resize(int(300 * this->emotePopup_->getScale()),
+                                  int(500 * this->emotePopup_->getScale()));
+        this->emotePopup_->loadChannel(this->split_->getChannel());
+        this->emotePopup_->show();
+    });
 
     // clear channelview selection when selecting in the input
     QObject::connect(this->ui_.textEdit, &QTextEdit::copyAvailable,
@@ -346,7 +344,7 @@ void SplitInput::paintEvent(QPaintEvent *)
 
     if (this->theme->isLightTheme()) {
         int s = int(3 * this->getScale());
-        QRect rect = this->rect().marginsRemoved(QMargins(s, s, s, s));
+        QRect rect = this->rect().marginsRemoved(QMargins(s - 1, s - 1, s, s));
 
         painter.fillRect(rect, this->theme->splits.input.background);
 
@@ -354,7 +352,7 @@ void SplitInput::paintEvent(QPaintEvent *)
         painter.drawRect(rect);
     } else {
         int s = int(1 * this->getScale());
-        QRect rect = this->rect().marginsRemoved(QMargins(s, s, s, s));
+        QRect rect = this->rect().marginsRemoved(QMargins(s - 1, s - 1, s, s));
 
         painter.fillRect(rect, this->theme->splits.input.background);
 

From 878daf6eee4266f5feb2e15c5a71aff099353ec5 Mon Sep 17 00:00:00 2001
From: fourtf <tf.four@gmail.com>
Date: Thu, 9 Aug 2018 16:44:04 +0200
Subject: [PATCH 08/44] added link to license

---
 resources/licenses/emoji-data-source.txt | 21 +++++++++++++++++++++
 src/widgets/helper/Button.cpp            |  2 ++
 src/widgets/settingspages/AboutPage.cpp  |  3 ++-
 src/widgets/splits/SplitContainer.cpp    |  2 +-
 4 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 resources/licenses/emoji-data-source.txt

diff --git a/resources/licenses/emoji-data-source.txt b/resources/licenses/emoji-data-source.txt
new file mode 100644
index 000000000..85ddb3c0f
--- /dev/null
+++ b/resources/licenses/emoji-data-source.txt
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 Cal Henderson
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/src/widgets/helper/Button.cpp b/src/widgets/helper/Button.cpp
index a3ee7df5b..2e035c02c 100644
--- a/src/widgets/helper/Button.cpp
+++ b/src/widgets/helper/Button.cpp
@@ -197,6 +197,8 @@ void Button::mousePressEvent(QMouseEvent *event)
 
     if (this->menu_ && !this->menuVisible_) {
         QTimer::singleShot(80, this, [this] { this->showMenu(); });
+        this->mouseDown_ = false;
+        this->mouseOver_ = false;
     }
 }
 
diff --git a/src/widgets/settingspages/AboutPage.cpp b/src/widgets/settingspages/AboutPage.cpp
index 710e5e915..758467391 100644
--- a/src/widgets/settingspages/AboutPage.cpp
+++ b/src/widgets/settingspages/AboutPage.cpp
@@ -111,7 +111,8 @@ AboutPage::AboutPage()
             l.emplace<QLabel>("Apple emojis provided by <a href=\"https://apple.com\">Apple</a>")->setOpenExternalLinks(true);
             l.emplace<QLabel>("Google emojis provided by <a href=\"https://google.com\">Google</a>")->setOpenExternalLinks(true);
             l.emplace<QLabel>("Messenger emojis provided by <a href=\"https://facebook.com\">Facebook</a>")->setOpenExternalLinks(true);
-            l.emplace<QLabel>("Emoji datasource provided by <a href=\"https://www.iamcal.com/\">Cal Henderson</a>")->setOpenExternalLinks(true);
+            l.emplace<QLabel>("Emoji datasource provided by <a href=\"https://www.iamcal.com/\">Cal Henderson</a>"
+                              "(<a href=\"https://github.com/iamcal/emoji-data/blob/master/LICENSE\">show license</a>)")->setOpenExternalLinks(true);
             // clang-format on
         }
 
diff --git a/src/widgets/splits/SplitContainer.cpp b/src/widgets/splits/SplitContainer.cpp
index c7ae6c798..ecbadc21d 100644
--- a/src/widgets/splits/SplitContainer.cpp
+++ b/src/widgets/splits/SplitContainer.cpp
@@ -311,7 +311,7 @@ void SplitContainer::focusSplitRecursive(Node *node, Direction direction)
 
 void SplitContainer::layout()
 {
-    this->baseNode_.geometry_ = this->rect().adjusted(0, 0, -1, -1);
+    this->baseNode_.geometry_ = this->rect().adjusted(-1, -1, 0, 0);
 
     std::vector<DropRect> _dropRects;
     std::vector<ResizeRect> _resizeRects;

From bb76a632f4bf2af5513d965d333dcfa68782697a Mon Sep 17 00:00:00 2001
From: fourtf <tf.four@gmail.com>
Date: Thu, 9 Aug 2018 17:04:15 +0200
Subject: [PATCH 09/44] fixed image size now updating on load

---
 src/messages/Image.cpp | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/messages/Image.cpp b/src/messages/Image.cpp
index 5202405ed..e6991fe1e 100644
--- a/src/messages/Image.cpp
+++ b/src/messages/Image.cpp
@@ -261,16 +261,15 @@ void Image::load()
         QImageReader reader(&buffer);
 
         this->frames_ = readFrames(reader, this->url());
+
+        if (!loadedEventQueued) {
+            QTimer::singleShot(150, [] {
+                getApp()->windows->forceLayoutChannelViews();
+                loadedEventQueued = false;
+            });
+        }
         return Success;
     });
-    req.onError([this, weak = weakOf(this)](int) {
-        auto shared = weak.lock();
-        if (!shared) return false;
-
-        this->frames_ = std::vector<Frame>();
-
-        return false;
-    });
 
     req.execute();
 }

From 6344fa6b23952b19109887617f52c9f91d45e51d Mon Sep 17 00:00:00 2001
From: fourtf <tf.four@gmail.com>
Date: Thu, 9 Aug 2018 18:39:46 +0200
Subject: [PATCH 10/44] loading images on their own thread

---
 src/common/Channel.cpp             |   2 -
 src/debug/Benchmark.hpp            |   6 +-
 src/messages/Image.cpp             | 107 +++++++++++++++++++++++------
 src/messages/Image.hpp             |   7 +-
 src/widgets/helper/ChannelView.cpp |   4 +-
 5 files changed, 96 insertions(+), 30 deletions(-)

diff --git a/src/common/Channel.cpp b/src/common/Channel.cpp
index 6511d6a2e..3adcccd2f 100644
--- a/src/common/Channel.cpp
+++ b/src/common/Channel.cpp
@@ -98,8 +98,6 @@ void Channel::addOrReplaceTimeout(MessagePtr message)
     for (int i = snapshotLength - 1; i >= end; --i) {
         auto &s = snapshot[i];
 
-        qDebug() << s->parseTime << minimumTime;
-
         if (s->parseTime < minimumTime) {
             break;
         }
diff --git a/src/debug/Benchmark.hpp b/src/debug/Benchmark.hpp
index 5eeb6cb36..5faa1a537 100644
--- a/src/debug/Benchmark.hpp
+++ b/src/debug/Benchmark.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
-#include <QDebug>
+#include "debug/Log.hpp"
+
 #include <QElapsedTimer>
 #include <boost/current_function.hpp>
 #include <boost/noncopyable.hpp>
@@ -29,8 +30,7 @@ public:
 
     ~BenchmarkGuard()
     {
-        qDebug() << this->name << float(timer.nsecsElapsed()) / 1000000.0f
-                 << "ms";
+        Log("{} {} ms", this->name, float(timer.nsecsElapsed()) / 1000000.0f);
     }
 
     qreal getElapsedMs()
diff --git a/src/messages/Image.cpp b/src/messages/Image.cpp
index e6991fe1e..b91ea1a44 100644
--- a/src/messages/Image.cpp
+++ b/src/messages/Image.cpp
@@ -3,6 +3,7 @@
 #include "Application.hpp"
 #include "common/NetworkRequest.hpp"
 #include "debug/AssertInGuiThread.hpp"
+#include "debug/Benchmark.hpp"
 #include "debug/Log.hpp"
 #include "singletons/Emotes.hpp"
 #include "singletons/WindowManager.hpp"
@@ -15,7 +16,6 @@
 #include <QNetworkReply>
 #include <QNetworkRequest>
 #include <QTimer>
-
 #include <functional>
 #include <thread>
 
@@ -81,11 +81,11 @@ const QPixmap *Frames::first() const
 }
 
 // functions
-std::vector<Frame> readFrames(QImageReader &reader, const Url &url)
+std::vector<ParseFrame> readFrames(QImageReader &reader, const Url &url)
 {
-    std::vector<Frame> frames;
+    std::vector<ParseFrame> frames;
 
-    if (reader.imageCount() <= 0) {
+    if (reader.imageCount() == 0) {
         Log("Error while reading image {}: '{}'", url.string,
             reader.errorString());
         return frames;
@@ -94,14 +94,14 @@ std::vector<Frame> readFrames(QImageReader &reader, const Url &url)
     QImage image;
     for (int index = 0; index < reader.imageCount(); ++index) {
         if (reader.read(&image)) {
-            auto pixmap = std::make_unique<QPixmap>(QPixmap::fromImage(image));
+            QPixmap::fromImage(image);
 
             int duration = std::max(20, reader.nextImageDelay());
-            frames.push_back(Frame{std::move(pixmap), duration});
+            frames.push_back(ParseFrame{image, duration});
         }
     }
 
-    if (frames.size() != 0) {
+    if (frames.size() == 0) {
         Log("Error while reading image {}: '{}'", url.string,
             reader.errorString());
     }
@@ -123,11 +123,65 @@ void queueLoadedEvent()
         });
     }
 }
+
+// parsed
+template <typename Assign>
+void asd(std::queue<std::pair<Assign, std::vector<Frame>>> &queued,
+         std::mutex &mutex, std::atomic_bool &loadedEventQueued)
+{
+    std::lock_guard<std::mutex> lock(mutex);
+    int i = 0;
+
+    while (!queued.empty()) {
+        queued.front().first(std::move(queued.front().second));
+        queued.pop();
+
+        if (++i > 50) {
+            QTimer::singleShot(3,
+                               [&] { asd(queued, mutex, loadedEventQueued); });
+            return;
+        }
+    }
+
+    getApp()->windows->forceLayoutChannelViews();
+    loadedEventQueued = false;
+}
+
+template <typename Assign>
+auto makeConvertCallback(std::vector<ParseFrame> parsed, Assign assign)
+{
+    return [parsed = std::move(parsed), assign] {
+        // BenchmarkGuard guard("convert image");
+
+        // convert to pixmap
+        auto frames = std::vector<Frame>();
+        std::transform(parsed.begin(), parsed.end(), std::back_inserter(frames),
+                       [](auto &frame) {
+                           return Frame{std::make_unique<QPixmap>(
+                                            QPixmap::fromImage(frame.image)),
+                                        frame.duration};
+                       });
+
+        // put into stack
+        static std::queue<std::pair<Assign, std::vector<Frame>>> queued;
+        static std::mutex mutex;
+
+        std::lock_guard<std::mutex> lock(mutex);
+        queued.emplace(assign, std::move(frames));
+
+        static std::atomic_bool loadedEventQueued{false};
+
+        if (!loadedEventQueued) {
+            loadedEventQueued = true;
+
+            QTimer::singleShot(100,
+                               [=] { asd(queued, mutex, loadedEventQueued); });
+        }
+    };
+}
 }  // namespace
 
 // IMAGE2
-std::atomic<bool> Image::loadedEventQueued{false};
-
 ImagePtr Image::fromUrl(const Url &url, qreal scale)
 {
     static std::unordered_map<Url, std::weak_ptr<Image>> cache;
@@ -249,25 +303,36 @@ void Image::load()
     NetworkRequest req(this->url().string);
     req.setCaller(&this->object_);
     req.setUseQuickLoadCache(true);
-    req.onSuccess([this, weak = weakOf(this)](auto result) -> Outcome {
+    req.onSuccess([that = this, weak = weakOf(this)](auto result) -> Outcome {
         assertInGuiThread();
 
         auto shared = weak.lock();
         if (!shared) return Failure;
 
-        // const cast since we are only reading from it
-        QBuffer buffer(const_cast<QByteArray *>(&result.getData()));
-        buffer.open(QIODevice::ReadOnly);
-        QImageReader reader(&buffer);
+        static auto parseThread = [] {
+            auto thread = std::make_unique<QThread>();
+            thread->start();
+            return thread;
+        }();
 
-        this->frames_ = readFrames(reader, this->url());
+        postToThread(
+            [data = result.getData(), weak, that] {
+                // BenchmarkGuard guard("parse image");
+
+                // const cast since we are only reading from it
+                QBuffer buffer(const_cast<QByteArray *>(&data));
+                buffer.open(QIODevice::ReadOnly);
+                QImageReader reader(&buffer);
+                auto parsed = readFrames(reader, that->url());
+
+                postToThread(
+                    makeConvertCallback(std::move(parsed), [weak](auto frames) {
+                        if (auto shared = weak.lock())
+                            shared->frames_ = std::move(frames);
+                    }));
+            },
+            parseThread.get());
 
-        if (!loadedEventQueued) {
-            QTimer::singleShot(150, [] {
-                getApp()->windows->forceLayoutChannelViews();
-                loadedEventQueued = false;
-            });
-        }
         return Success;
     });
 
diff --git a/src/messages/Image.hpp b/src/messages/Image.hpp
index 50af47f4e..b5c4d1f58 100644
--- a/src/messages/Image.hpp
+++ b/src/messages/Image.hpp
@@ -4,6 +4,7 @@
 
 #include <QPixmap>
 #include <QString>
+#include <QThread>
 #include <atomic>
 #include <boost/noncopyable.hpp>
 #include <boost/variant.hpp>
@@ -19,6 +20,10 @@ struct Frame {
     Pixmap pixmap;
     int duration;
 };
+struct ParseFrame {
+    QImage image;
+    int duration;
+};
 class Frames
 {
 public:
@@ -77,7 +82,5 @@ private:
     bool shouldLoad_{false};
     Frames frames_{};
     QObject object_{};
-
-    static std::atomic<bool> loadedEventQueued;
 };
 }  // namespace chatterino
diff --git a/src/widgets/helper/ChannelView.cpp b/src/widgets/helper/ChannelView.cpp
index 1615d15ba..e1dca8cfb 100644
--- a/src/widgets/helper/ChannelView.cpp
+++ b/src/widgets/helper/ChannelView.cpp
@@ -205,7 +205,7 @@ void ChannelView::layoutMessages()
 
 void ChannelView::actuallyLayoutMessages(bool causedByScrollbar)
 {
-    //    BenchmarkGuard benchmark("layout messages");
+    //    BenchmarkGuard benchmark("layout");
 
     auto app = getApp();
 
@@ -633,7 +633,7 @@ void ChannelView::updatePauseStatus()
 
 void ChannelView::paintEvent(QPaintEvent * /*event*/)
 {
-    //    BenchmarkGuard benchmark("paint event");
+    //    BenchmarkGuard benchmark("paint");
 
     QPainter painter(this);
 

From edfae49cc9b2eac9dd7f49b2bffd9599675e3208 Mon Sep 17 00:00:00 2001
From: fourtf <tf.four@gmail.com>
Date: Fri, 10 Aug 2018 18:56:17 +0200
Subject: [PATCH 11/44] simplified Image

---
 chatterino.pro                                |   4 +-
 src/common/Emotemap.cpp                       |  46 ------
 src/common/Emotemap.hpp                       |  27 ----
 src/common/FlagsEnum.hpp                      |  38 ++---
 src/common/NetworkData.hpp                    |   1 +
 src/common/NetworkRequest.cpp                 |  17 ++-
 src/common/NetworkRequest.hpp                 |  11 +-
 .../moderationactions/ModerationAction.cpp    |   3 +-
 src/messages/Emote.hpp                        |  25 ----
 src/messages/Image.cpp                        | 137 ++++++------------
 src/messages/Image.hpp                        |  28 ++--
 src/messages/ImageSet.cpp                     |   4 +-
 src/messages/ImageSet.hpp                     |   2 -
 src/messages/MessageElement.cpp               |   3 +-
 src/messages/MessageElement.hpp               |   1 -
 src/providers/emoji/Emojis.hpp                |   1 -
 src/providers/twitch/TwitchChannel.cpp        |  77 +++++-----
 src/providers/twitch/TwitchChannel.hpp        |   3 +-
 src/providers/twitch/TwitchEmotes.hpp         |   1 -
 src/providers/twitch/TwitchMessageBuilder.cpp |  21 ++-
 src/widgets/helper/ChannelView.cpp            |   2 +-
 src/widgets/settingspages/LookPage.cpp        |   8 +-
 22 files changed, 146 insertions(+), 314 deletions(-)
 delete mode 100644 src/common/Emotemap.cpp
 delete mode 100644 src/common/Emotemap.hpp

diff --git a/chatterino.pro b/chatterino.pro
index 0db816192..c41cea5a9 100644
--- a/chatterino.pro
+++ b/chatterino.pro
@@ -6,7 +6,7 @@
 
 message(----)
 
-QT                += widgets core gui network multimedia svg
+QT                += widgets core gui network multimedia svg concurrent
 CONFIG            += communi
 COMMUNI           += core model util
 CONFIG            += c++14
@@ -105,7 +105,6 @@ SOURCES += \
     src/Application.cpp \
     src/common/Channel.cpp \
     src/common/CompletionModel.cpp \
-    src/common/Emotemap.cpp \
     src/common/NetworkData.cpp \
     src/common/NetworkManager.cpp \
     src/common/NetworkRequest.cpp \
@@ -258,7 +257,6 @@ HEADERS  += \
     src/common/Channel.hpp \
     src/common/Common.hpp \
     src/common/CompletionModel.hpp \
-    src/common/Emotemap.hpp \
     src/common/FlagsEnum.hpp \
     src/common/LockedObject.hpp \
     src/common/MutexValue.hpp \
diff --git a/src/common/Emotemap.cpp b/src/common/Emotemap.cpp
deleted file mode 100644
index 9bfae628b..000000000
--- a/src/common/Emotemap.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-#include "Emotemap.hpp"
-
-#include "Application.hpp"
-#include "singletons/Settings.hpp"
-
-namespace chatterino {
-
-// EmoteData::EmoteData(Image *image)
-//    : image1x(image)
-//{
-//}
-
-//// Emotes must have a 1x image to be valid
-// bool EmoteData::isValid() const
-//{
-//    return this->image1x != nullptr;
-//}
-
-// Image *EmoteData::getImage(float scale) const
-//{
-//    int quality = getApp()->settings->preferredEmoteQuality;
-
-//    if (quality == 0) {
-//        scale *= getApp()->settings->emoteScale.getValue();
-//        quality = [&] {
-//            if (scale <= 1)
-//                return 1;
-//            if (scale <= 2)
-//                return 2;
-//            return 3;
-//        }();
-//    }
-
-//    Image *_image;
-//    if (quality == 3 && this->image3x != nullptr) {
-//        _image = this->image3x;
-//    } else if (quality >= 2 && this->image2x != nullptr) {
-//        _image = this->image2x;
-//    } else {
-//        _image = this->image1x;
-//    }
-
-//    return _image;
-//}
-
-}  // namespace chatterino
diff --git a/src/common/Emotemap.hpp b/src/common/Emotemap.hpp
deleted file mode 100644
index 8c219bc67..000000000
--- a/src/common/Emotemap.hpp
+++ /dev/null
@@ -1,27 +0,0 @@
-#pragma once
-
-#include "messages/Image.hpp"
-#include "util/ConcurrentMap.hpp"
-
-namespace chatterino {
-
-// struct EmoteData {
-//    EmoteData() = default;
-
-//    EmoteData(Image *image);
-
-//    // Emotes must have a 1x image to be valid
-//    bool isValid() const;
-//    Image *getImage(float scale) const;
-
-//    // Link to the emote page i.e.
-//    https://www.frankerfacez.com/emoticon/144722-pajaCringe QString pageLink;
-
-//    Image *image1x = nullptr;
-//    Image *image2x = nullptr;
-//    Image *image3x = nullptr;
-//};
-
-// using EmoteMap = ConcurrentMap<QString, EmoteData>;
-
-}  // namespace chatterino
diff --git a/src/common/FlagsEnum.hpp b/src/common/FlagsEnum.hpp
index 000c3da70..c5be885e5 100644
--- a/src/common/FlagsEnum.hpp
+++ b/src/common/FlagsEnum.hpp
@@ -4,19 +4,17 @@
 
 namespace chatterino {
 
-// = std::enable_if<std::is_enum<T>::value>::type
-
 template <typename T, typename Q = typename std::underlying_type<T>::type>
 class FlagsEnum
 {
 public:
     FlagsEnum()
-        : value(static_cast<T>(0))
+        : value_(static_cast<T>(0))
     {
     }
 
     FlagsEnum(T value)
-        : value(value)
+        : value_(value)
     {
     }
 
@@ -29,22 +27,22 @@ public:
 
     bool operator==(const FlagsEnum<T> &other)
     {
-        return this->value == other.value;
+        return this->value_ == other.value_;
     }
 
     bool operator!=(const FlagsEnum &other)
     {
-        return this->value != other.value;
+        return this->value_ != other.value_;
     }
 
     void set(T flag)
     {
-        reinterpret_cast<Q &>(this->value) |= static_cast<Q>(flag);
+        reinterpret_cast<Q &>(this->value_) |= static_cast<Q>(flag);
     }
 
     void unset(T flag)
     {
-        reinterpret_cast<Q &>(this->value) &= ~static_cast<Q>(flag);
+        reinterpret_cast<Q &>(this->value_) &= ~static_cast<Q>(flag);
     }
 
     void set(T flag, bool value)
@@ -57,33 +55,17 @@ public:
 
     bool has(T flag) const
     {
-        return static_cast<Q>(this->value) & static_cast<Q>(flag);
+        return static_cast<Q>(this->value_) & static_cast<Q>(flag);
     }
 
-    // bool hasAny(std::initializer_list<T> flags) const
-    //{
-    //    for (auto flag : flags) {
-    //        if (this->has(flag)) return true;
-    //    }
-    //    return false;
-    //}
-
     bool hasAny(FlagsEnum flags) const
     {
-        return static_cast<Q>(this->value) & static_cast<Q>(flags.value);
+        return static_cast<Q>(this->value_) & static_cast<Q>(flags.value_);
     }
 
-    // bool hasAll(std::initializer_list<T> flags) const
-    //{
-    //    for (auto flag : flags) {
-    //        if (!this->has(flag)) return false;
-    //    }
-    //    return true;
-    //}
-
     bool hasAll(FlagsEnum<T> flags) const
     {
-        return (static_cast<Q>(this->value) & static_cast<Q>(flags.value)) &&
+        return (static_cast<Q>(this->value_) & static_cast<Q>(flags.value_)) &&
                static_cast<Q>(flags->value);
     }
 
@@ -93,7 +75,7 @@ public:
     }
 
 private:
-    T value;
+    T value_{};
 };
 
 }  // namespace chatterino
diff --git a/src/common/NetworkData.hpp b/src/common/NetworkData.hpp
index d7fbf84ba..2d149fc09 100644
--- a/src/common/NetworkData.hpp
+++ b/src/common/NetworkData.hpp
@@ -19,6 +19,7 @@ struct NetworkData {
     QNetworkRequest request_;
     const QObject *caller_ = nullptr;
     bool useQuickLoadCache_{};
+    bool executeConcurrently{};
 
     NetworkReplyCreatedCallback onReplyCreated_;
     NetworkErrorCallback onError_;
diff --git a/src/common/NetworkRequest.cpp b/src/common/NetworkRequest.cpp
index 352762c3f..464061be4 100644
--- a/src/common/NetworkRequest.cpp
+++ b/src/common/NetworkRequest.cpp
@@ -8,6 +8,7 @@
 #include "util/DebugCount.hpp"
 
 #include <QFile>
+#include <QtConcurrent>
 #include <cassert>
 
 namespace chatterino {
@@ -80,6 +81,11 @@ void NetworkRequest::setTimeout(int ms)
     this->timer->timeoutMS_ = ms;
 }
 
+void NetworkRequest::setExecuteConcurrently(bool value)
+{
+    this->data->executeConcurrently = value;
+}
+
 void NetworkRequest::makeAuthorizedV5(const QString &clientID,
                                       const QString &oauthToken)
 {
@@ -228,7 +234,16 @@ void NetworkRequest::doRequest()
             NetworkResult result(bytes);
 
             DebugCount::increase("http request success");
-            data->onSuccess_(result);
+            Log("starting {}", data->request_.url().toString());
+            if (data->onSuccess_) {
+                if (data->executeConcurrently)
+                    QtConcurrent::run(
+                        [onSuccess = std::move(data->onSuccess_),
+                         result = std::move(result)] { onSuccess(result); });
+                else
+                    data->onSuccess_(result);
+            }
+            Log("finished {}", data->request_.url().toString());
 
             reply->deleteLater();
         };
diff --git a/src/common/NetworkRequest.hpp b/src/common/NetworkRequest.hpp
index 8112a4852..ea1361faf 100644
--- a/src/common/NetworkRequest.hpp
+++ b/src/common/NetworkRequest.hpp
@@ -27,19 +27,15 @@ class NetworkRequest
     bool executed_ = false;
 
 public:
-    NetworkRequest() = delete;
-    NetworkRequest(const NetworkRequest &other) = delete;
-    NetworkRequest &operator=(const NetworkRequest &other) = delete;
-
-    NetworkRequest(NetworkRequest &&other) = default;
-    NetworkRequest &operator=(NetworkRequest &&other) = default;
-
     explicit NetworkRequest(
         const std::string &url,
         NetworkRequestType requestType = NetworkRequestType::Get);
     explicit NetworkRequest(
         QUrl url, NetworkRequestType requestType = NetworkRequestType::Get);
 
+    NetworkRequest(NetworkRequest &&other) = default;
+    NetworkRequest &operator=(NetworkRequest &&other) = default;
+
     ~NetworkRequest();
 
     void setRequestType(NetworkRequestType newRequestType);
@@ -55,6 +51,7 @@ public:
     void setRawHeader(const char *headerName, const QByteArray &value);
     void setRawHeader(const char *headerName, const QString &value);
     void setTimeout(int ms);
+    void setExecuteConcurrently(bool value);
     void makeAuthorizedV5(const QString &clientID,
                           const QString &oauthToken = QString());
 
diff --git a/src/controllers/moderationactions/ModerationAction.cpp b/src/controllers/moderationactions/ModerationAction.cpp
index 90abe815d..49d302b34 100644
--- a/src/controllers/moderationactions/ModerationAction.cpp
+++ b/src/controllers/moderationactions/ModerationAction.cpp
@@ -60,8 +60,7 @@ ModerationAction::ModerationAction(const QString &action)
         //     str);
         // }
     } else if (action.startsWith("/ban ")) {
-        this->image_ =
-            Image::fromNonOwningPixmap(&getApp()->resources->buttons.ban);
+        this->image_ = Image::fromPixmap(getApp()->resources->buttons.ban);
     } else {
         QString xD = action;
 
diff --git a/src/messages/Emote.hpp b/src/messages/Emote.hpp
index c5817752e..9c7b5f680 100644
--- a/src/messages/Emote.hpp
+++ b/src/messages/Emote.hpp
@@ -37,29 +37,4 @@ using EmoteIdMap = std::unordered_map<EmoteId, EmotePtr>;
 using WeakEmoteMap = std::unordered_map<EmoteName, std::weak_ptr<const Emote>>;
 using WeakEmoteIdMap = std::unordered_map<EmoteId, std::weak_ptr<const Emote>>;
 
-// struct EmoteData2 {
-//    EmoteName name;
-//    ImageSet images;
-//    Tooltip tooltip;
-//    Url homePage;
-//};
-//
-// class Emote
-//{
-// public:
-//    Emote(EmoteData2 &&data);
-//    Emote(const EmoteData2 &data);
-//
-//    const Url &getHomePage() const;
-//    const EmoteName &getName() const;
-//    const Tooltip &getTooltip() const;
-//    const ImageSet &getImages() const;
-//    const QString &getCopyString() const;
-//    bool operator==(const Emote &other) const;
-//    bool operator!=(const Emote &other) const;
-//
-// private:
-//    EmoteData2 data_;
-//};
-
 }  // namespace chatterino
diff --git a/src/messages/Image.cpp b/src/messages/Image.cpp
index b91ea1a44..29b093f36 100644
--- a/src/messages/Image.cpp
+++ b/src/messages/Image.cpp
@@ -21,22 +21,14 @@
 
 namespace chatterino {
 namespace {
-const QPixmap *getPixmap(const Pixmap &pixmap)
-{
-    if (pixmap.which() == 0)
-        return boost::get<const QPixmap *>(pixmap);
-    else
-        return boost::get<std::unique_ptr<QPixmap>>(pixmap).get();
-}
-
 // Frames
 Frames::Frames()
 {
     DebugCount::increase("images");
 }
 
-Frames::Frames(std::vector<Frame> &&frames)
-    : items_(std::move(frames))
+Frames::Frames(const QVector<Frame<QPixmap>> &frames)
+    : items_(frames)
 {
     DebugCount::increase("images");
     if (this->animated()) DebugCount::increase("animated images");
@@ -68,22 +60,22 @@ bool Frames::animated() const
     return this->items_.size() > 1;
 }
 
-const QPixmap *Frames::current() const
+boost::optional<QPixmap> Frames::current() const
 {
-    if (this->items_.size() == 0) return nullptr;
-    return getPixmap(this->items_[this->index_].pixmap);
+    if (this->items_.size() == 0) return boost::none;
+    return this->items_[this->index_].image;
 }
 
-const QPixmap *Frames::first() const
+boost::optional<QPixmap> Frames::first() const
 {
-    if (this->items_.size() == 0) return nullptr;
-    return getPixmap(this->items_.front().pixmap);
+    if (this->items_.size() == 0) return boost::none;
+    return this->items_.front().image;
 }
 
 // functions
-std::vector<ParseFrame> readFrames(QImageReader &reader, const Url &url)
+QVector<Frame<QImage>> readFrames(QImageReader &reader, const Url &url)
 {
-    std::vector<ParseFrame> frames;
+    QVector<Frame<QImage>> frames;
 
     if (reader.imageCount() == 0) {
         Log("Error while reading image {}: '{}'", url.string,
@@ -97,7 +89,7 @@ std::vector<ParseFrame> readFrames(QImageReader &reader, const Url &url)
             QPixmap::fromImage(image);
 
             int duration = std::max(20, reader.nextImageDelay());
-            frames.push_back(ParseFrame{image, duration});
+            frames.push_back(Frame<QImage>{image, duration});
         }
     }
 
@@ -109,36 +101,22 @@ std::vector<ParseFrame> readFrames(QImageReader &reader, const Url &url)
     return frames;
 }
 
-void queueLoadedEvent()
-{
-    static auto eventQueued = false;
-
-    if (!eventQueued) {
-        eventQueued = true;
-
-        QTimer::singleShot(250, [] {
-            getApp()->windows->incGeneration();
-            getApp()->windows->layoutChannelViews();
-            eventQueued = false;
-        });
-    }
-}
-
 // parsed
 template <typename Assign>
-void asd(std::queue<std::pair<Assign, std::vector<Frame>>> &queued,
-         std::mutex &mutex, std::atomic_bool &loadedEventQueued)
+void assignDelayed(
+    std::queue<std::pair<Assign, QVector<Frame<QPixmap>>>> &queued,
+    std::mutex &mutex, std::atomic_bool &loadedEventQueued)
 {
     std::lock_guard<std::mutex> lock(mutex);
     int i = 0;
 
     while (!queued.empty()) {
-        queued.front().first(std::move(queued.front().second));
+        queued.front().first(queued.front().second);
         queued.pop();
 
         if (++i > 50) {
-            QTimer::singleShot(3,
-                               [&] { asd(queued, mutex, loadedEventQueued); });
+            QTimer::singleShot(
+                3, [&] { assignDelayed(queued, mutex, loadedEventQueued); });
             return;
         }
     }
@@ -148,34 +126,31 @@ void asd(std::queue<std::pair<Assign, std::vector<Frame>>> &queued,
 }
 
 template <typename Assign>
-auto makeConvertCallback(std::vector<ParseFrame> parsed, Assign assign)
+auto makeConvertCallback(const QVector<Frame<QImage>> &parsed, Assign assign)
 {
-    return [parsed = std::move(parsed), assign] {
-        // BenchmarkGuard guard("convert image");
-
+    return [parsed, assign] {
         // convert to pixmap
-        auto frames = std::vector<Frame>();
+        auto frames = QVector<Frame<QPixmap>>();
         std::transform(parsed.begin(), parsed.end(), std::back_inserter(frames),
                        [](auto &frame) {
-                           return Frame{std::make_unique<QPixmap>(
-                                            QPixmap::fromImage(frame.image)),
-                                        frame.duration};
+                           return Frame<QPixmap>{
+                               QPixmap::fromImage(frame.image), frame.duration};
                        });
 
         // put into stack
-        static std::queue<std::pair<Assign, std::vector<Frame>>> queued;
+        static std::queue<std::pair<Assign, QVector<Frame<QPixmap>>>> queued;
         static std::mutex mutex;
 
         std::lock_guard<std::mutex> lock(mutex);
-        queued.emplace(assign, std::move(frames));
+        queued.emplace(assign, frames);
 
         static std::atomic_bool loadedEventQueued{false};
 
         if (!loadedEventQueued) {
             loadedEventQueued = true;
 
-            QTimer::singleShot(100,
-                               [=] { asd(queued, mutex, loadedEventQueued); });
+            QTimer::singleShot(
+                100, [=] { assignDelayed(queued, mutex, loadedEventQueued); });
         }
     };
 }
@@ -200,12 +175,7 @@ ImagePtr Image::fromUrl(const Url &url, qreal scale)
     return shared;
 }
 
-ImagePtr Image::fromOwningPixmap(std::unique_ptr<QPixmap> pixmap, qreal scale)
-{
-    return ImagePtr(new Image(std::move(pixmap), scale));
-}
-
-ImagePtr Image::fromNonOwningPixmap(QPixmap *pixmap, qreal scale)
+ImagePtr Image::fromPixmap(const QPixmap &pixmap, qreal scale)
 {
     return ImagePtr(new Image(pixmap, scale));
 }
@@ -228,20 +198,10 @@ Image::Image(const Url &url, qreal scale)
 {
 }
 
-Image::Image(std::unique_ptr<QPixmap> owning, qreal scale)
+Image::Image(const QPixmap &pixmap, qreal scale)
     : scale_(scale)
+    , frames_(QVector<Frame<QPixmap>>{Frame<QPixmap>{pixmap}})
 {
-    std::vector<Frame> vec;
-    vec.push_back(Frame{std::move(owning)});
-    this->frames_ = std::move(vec);
-}
-
-Image::Image(QPixmap *nonOwning, qreal scale)
-    : scale_(scale)
-{
-    std::vector<Frame> vec;
-    vec.push_back(Frame{nonOwning});
-    this->frames_ = std::move(vec);
 }
 
 const Url &Image::url() const
@@ -249,7 +209,7 @@ const Url &Image::url() const
     return this->url_;
 }
 
-const QPixmap *Image::pixmap() const
+boost::optional<QPixmap> Image::pixmap() const
 {
     assertInGuiThread();
 
@@ -266,7 +226,7 @@ qreal Image::scale() const
     return this->scale_;
 }
 
-bool Image::empty() const
+bool Image::isEmpty() const
 {
     return this->empty_;
 }
@@ -301,37 +261,24 @@ int Image::height() const
 void Image::load()
 {
     NetworkRequest req(this->url().string);
+    req.setExecuteConcurrently(true);
     req.setCaller(&this->object_);
     req.setUseQuickLoadCache(true);
     req.onSuccess([that = this, weak = weakOf(this)](auto result) -> Outcome {
-        assertInGuiThread();
-
         auto shared = weak.lock();
         if (!shared) return Failure;
 
-        static auto parseThread = [] {
-            auto thread = std::make_unique<QThread>();
-            thread->start();
-            return thread;
-        }();
+        auto data = result.getData();
 
-        postToThread(
-            [data = result.getData(), weak, that] {
-                // BenchmarkGuard guard("parse image");
+        // const cast since we are only reading from it
+        QBuffer buffer(const_cast<QByteArray *>(&data));
+        buffer.open(QIODevice::ReadOnly);
+        QImageReader reader(&buffer);
+        auto parsed = readFrames(reader, that->url());
 
-                // const cast since we are only reading from it
-                QBuffer buffer(const_cast<QByteArray *>(&data));
-                buffer.open(QIODevice::ReadOnly);
-                QImageReader reader(&buffer);
-                auto parsed = readFrames(reader, that->url());
-
-                postToThread(
-                    makeConvertCallback(std::move(parsed), [weak](auto frames) {
-                        if (auto shared = weak.lock())
-                            shared->frames_ = std::move(frames);
-                    }));
-            },
-            parseThread.get());
+        postToThread(makeConvertCallback(parsed, [weak](auto frames) {
+            if (auto shared = weak.lock()) shared->frames_ = frames;
+        }));
 
         return Success;
     });
@@ -341,7 +288,7 @@ void Image::load()
 
 bool Image::operator==(const Image &other) const
 {
-    if (this->empty() && other.empty()) return true;
+    if (this->isEmpty() && other.isEmpty()) return true;
     if (!this->url_.string.isEmpty() && this->url_ == other.url_) return true;
     if (this->frames_.first() == other.frames_.first()) return true;
 
diff --git a/src/messages/Image.hpp b/src/messages/Image.hpp
index b5c4d1f58..511ae9c48 100644
--- a/src/messages/Image.hpp
+++ b/src/messages/Image.hpp
@@ -5,6 +5,7 @@
 #include <QPixmap>
 #include <QString>
 #include <QThread>
+#include <QVector>
 #include <atomic>
 #include <boost/noncopyable.hpp>
 #include <boost/variant.hpp>
@@ -15,31 +16,27 @@
 
 namespace chatterino {
 namespace {
-using Pixmap = boost::variant<const QPixmap *, std::unique_ptr<QPixmap>>;
+template <typename Image>
 struct Frame {
-    Pixmap pixmap;
-    int duration;
-};
-struct ParseFrame {
-    QImage image;
+    Image image;
     int duration;
 };
 class Frames
 {
 public:
     Frames();
-    Frames(std::vector<Frame> &&frames);
+    Frames(const QVector<Frame<QPixmap>> &frames);
     ~Frames();
     Frames(Frames &&other) = default;
     Frames &operator=(Frames &&other) = default;
 
     bool animated() const;
     void advance();
-    const QPixmap *current() const;
-    const QPixmap *first() const;
+    boost::optional<QPixmap> current() const;
+    boost::optional<QPixmap> first() const;
 
 private:
-    std::vector<Frame> items_;
+    QVector<Frame<QPixmap>> items_;
     int index_{0};
     int durationOffset_{0};
 };
@@ -52,15 +49,13 @@ class Image : public std::enable_shared_from_this<Image>, boost::noncopyable
 {
 public:
     static ImagePtr fromUrl(const Url &url, qreal scale = 1);
-    static ImagePtr fromOwningPixmap(std::unique_ptr<QPixmap> pixmap,
-                                     qreal scale = 1);
-    static ImagePtr fromNonOwningPixmap(QPixmap *pixmap, qreal scale = 1);
+    static ImagePtr fromPixmap(const QPixmap &pixmap, qreal scale = 1);
     static ImagePtr getEmpty();
 
     const Url &url() const;
-    const QPixmap *pixmap() const;
+    boost::optional<QPixmap> pixmap() const;
     qreal scale() const;
-    bool empty() const;
+    bool isEmpty() const;
     int width() const;
     int height() const;
     bool animated() const;
@@ -71,8 +66,7 @@ public:
 private:
     Image();
     Image(const Url &url, qreal scale);
-    Image(std::unique_ptr<QPixmap> owning, qreal scale);
-    Image(QPixmap *nonOwning, qreal scale);
+    Image(const QPixmap &nonOwning, qreal scale);
 
     void load();
 
diff --git a/src/messages/ImageSet.cpp b/src/messages/ImageSet.cpp
index af3c5e6bd..0e500816f 100644
--- a/src/messages/ImageSet.cpp
+++ b/src/messages/ImageSet.cpp
@@ -71,11 +71,11 @@ const ImagePtr &ImageSet::getImage(float scale) const
             scale = 1;
     }
 
-    if (!this->imageX3_->empty() && quality == 3) {
+    if (!this->imageX3_->isEmpty() && quality == 3) {
         return this->imageX3_;
     }
 
-    if (!this->imageX2_->empty() && quality == 2) {
+    if (!this->imageX2_->isEmpty() && quality == 2) {
         return this->imageX3_;
     }
 
diff --git a/src/messages/ImageSet.hpp b/src/messages/ImageSet.hpp
index 8f2efab2d..e8872b0b7 100644
--- a/src/messages/ImageSet.hpp
+++ b/src/messages/ImageSet.hpp
@@ -21,8 +21,6 @@ public:
 
     const ImagePtr &getImage(float scale) const;
 
-    ImagePtr getImage(float scale);
-
     bool operator==(const ImageSet &other) const;
     bool operator!=(const ImageSet &other) const;
 
diff --git a/src/messages/MessageElement.cpp b/src/messages/MessageElement.cpp
index bca2c3072..e31076107 100644
--- a/src/messages/MessageElement.cpp
+++ b/src/messages/MessageElement.cpp
@@ -1,7 +1,6 @@
 #include "messages/MessageElement.hpp"
 
 #include "Application.hpp"
-#include "common/Emotemap.hpp"
 #include "controllers/moderationactions/ModerationActions.hpp"
 #include "debug/Benchmark.hpp"
 #include "messages/layouts/MessageLayoutContainer.hpp"
@@ -102,7 +101,7 @@ void EmoteElement::addToContainer(MessageLayoutContainer &container,
     if (flags.hasAny(this->getFlags())) {
         if (flags.has(MessageElementFlag::EmoteImages)) {
             auto image = this->emote_->images.getImage(container.getScale());
-            if (image->empty()) return;
+            if (image->isEmpty()) return;
 
             auto size = QSize(int(container.getScale() * image->width()),
                               int(container.getScale() * image->height()));
diff --git a/src/messages/MessageElement.hpp b/src/messages/MessageElement.hpp
index 82edadd85..79f222789 100644
--- a/src/messages/MessageElement.hpp
+++ b/src/messages/MessageElement.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "common/Emotemap.hpp"
 #include "common/FlagsEnum.hpp"
 #include "messages/Emote.hpp"
 #include "messages/Image.hpp"
diff --git a/src/providers/emoji/Emojis.hpp b/src/providers/emoji/Emojis.hpp
index 6a2f4e74e..c4ff69bbe 100644
--- a/src/providers/emoji/Emojis.hpp
+++ b/src/providers/emoji/Emojis.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "common/Emotemap.hpp"
 #include "common/SimpleSignalVector.hpp"
 #include "messages/Emote.hpp"
 #include "util/ConcurrentMap.hpp"
diff --git a/src/providers/twitch/TwitchChannel.cpp b/src/providers/twitch/TwitchChannel.cpp
index 7753f2668..57de91a5d 100644
--- a/src/providers/twitch/TwitchChannel.cpp
+++ b/src/providers/twitch/TwitchChannel.cpp
@@ -22,6 +22,32 @@
 #include <QTimer>
 
 namespace chatterino {
+namespace {
+auto parseRecentMessages(const QJsonObject &jsonRoot, TwitchChannel &channel)
+{
+    QJsonArray jsonMessages = jsonRoot.value("messages").toArray();
+    std::vector<MessagePtr> messages;
+
+    if (jsonMessages.empty()) return messages;
+
+    for (const auto jsonMessage : jsonMessages) {
+        auto content = jsonMessage.toString().toUtf8();
+        // passing nullptr as the channel makes the message invalid but we don't
+        // check for that anyways
+        auto message = Communi::IrcMessage::fromData(content, nullptr);
+        auto privMsg = dynamic_cast<Communi::IrcPrivateMessage *>(message);
+        assert(privMsg);
+
+        MessageParseArgs args;
+        TwitchMessageBuilder builder(&channel, privMsg, args);
+        if (!builder.isIgnored()) {
+            messages.push_back(builder.build());
+        }
+    }
+
+    return messages;
+}
+}  // namespace
 
 TwitchChannel::TwitchChannel(const QString &name)
     : Channel(name, Channel::Type::Twitch)
@@ -436,45 +462,23 @@ void TwitchChannel::loadRecentMessages()
     NetworkRequest request(genericURL.arg(this->getRoomId()));
     request.makeAuthorizedV5(getDefaultClientID());
     request.setCaller(QThread::currentThread());
+    // can't be concurrent right now due to SignalVector
+    //    request.setExecuteConcurrently(true);
 
-    request.onSuccess(
-        [this, weak = weakOf<Channel>(this)](auto result) -> Outcome {
-            ChannelPtr shared = weak.lock();
-            if (!shared) return Failure;
+    request.onSuccess([that = this](auto result) -> Outcome {
+        auto messages = parseRecentMessages(result.parseJson(), *that);
 
-            return this->parseRecentMessages(result.parseJson());
-        });
+        //        postToThread([that, weak = weakOf<Channel>(that),
+        //                      messages = std::move(messages)]() mutable {
+        that->addMessagesAtStart(messages);
+        //        });
+
+        return Success;
+    });
 
     request.execute();
 }
 
-Outcome TwitchChannel::parseRecentMessages(const QJsonObject &jsonRoot)
-{
-    QJsonArray jsonMessages = jsonRoot.value("messages").toArray();
-    if (jsonMessages.empty()) return Failure;
-
-    std::vector<MessagePtr> messages;
-
-    for (const auto jsonMessage : jsonMessages) {
-        auto content = jsonMessage.toString().toUtf8();
-        // passing nullptr as the channel makes the message invalid but we don't
-        // check for that anyways
-        auto message = Communi::IrcMessage::fromData(content, nullptr);
-        auto privMsg = dynamic_cast<Communi::IrcPrivateMessage *>(message);
-        assert(privMsg);
-
-        MessageParseArgs args;
-        TwitchMessageBuilder builder(this, privMsg, args);
-        if (!builder.isIgnored()) {
-            messages.push_back(builder.build());
-        }
-    }
-
-    this->addMessagesAtStart(messages);
-
-    return Success;
-}
-
 void TwitchChannel::refreshPubsub()
 {
     // listen to moderation actions
@@ -581,7 +585,7 @@ void TwitchChannel::loadBadges()
 
 void TwitchChannel::loadCheerEmotes()
 {
-    auto url = Url{"https://api.twitch.tv/kraken/bits/actions?channel_id=" +
+    /*auto url = Url{"https://api.twitch.tv/kraken/bits/actions?channel_id=" +
                    this->getRoomId()};
     auto request = NetworkRequest::twitchRequest(url.string);
     request.setCaller(QThread::currentThread());
@@ -589,6 +593,7 @@ void TwitchChannel::loadCheerEmotes()
     request.onSuccess(
         [this, weak = weakOf<Channel>(this)](auto result) -> Outcome {
             auto cheerEmoteSets = ParseCheermoteSets(result.parseRapidJson());
+            std::vector<CheerEmoteSet> emoteSets;
 
             for (auto &set : cheerEmoteSets) {
                 auto cheerEmoteSet = CheerEmoteSet();
@@ -631,13 +636,15 @@ void TwitchChannel::loadCheerEmotes()
                               return lhs.minBits < rhs.minBits;  //
                           });
 
-                this->cheerEmoteSets_.emplace_back(cheerEmoteSet);
+                emoteSets.emplace_back(cheerEmoteSet);
             }
+            *this->cheerEmoteSets_.access() = std::move(emoteSets);
 
             return Success;
         });
 
     request.execute();
+    */
 }
 
 boost::optional<EmotePtr> TwitchChannel::getTwitchBadge(
diff --git a/src/providers/twitch/TwitchChannel.hpp b/src/providers/twitch/TwitchChannel.hpp
index bc084d73f..320be3b36 100644
--- a/src/providers/twitch/TwitchChannel.hpp
+++ b/src/providers/twitch/TwitchChannel.hpp
@@ -116,7 +116,6 @@ private:
     void refreshViewerList();
     Outcome parseViewerList(const QJsonObject &jsonRoot);
     void loadRecentMessages();
-    Outcome parseRecentMessages(const QJsonObject &jsonRoot);
 
     void setLive(bool newLiveStatus);
 
@@ -144,7 +143,7 @@ private:
 
     // "subscribers": { "0": ... "3": ... "6": ...
     UniqueAccess<std::map<QString, std::map<QString, EmotePtr>>> badgeSets_;
-    std::vector<CheerEmoteSet> cheerEmoteSets_;
+    UniqueAccess<std::vector<CheerEmoteSet>> cheerEmoteSets_;
 
     // --
     QByteArray messageSuffix_;
diff --git a/src/providers/twitch/TwitchEmotes.hpp b/src/providers/twitch/TwitchEmotes.hpp
index 665e1e9cd..69cf65e5e 100644
--- a/src/providers/twitch/TwitchEmotes.hpp
+++ b/src/providers/twitch/TwitchEmotes.hpp
@@ -3,7 +3,6 @@
 #include <QString>
 #include <unordered_map>
 
-#include "common/Emotemap.hpp"
 #include "common/UniqueAccess.hpp"
 #include "messages/Emote.hpp"
 #include "providers/twitch/EmoteValue.hpp"
diff --git a/src/providers/twitch/TwitchMessageBuilder.cpp b/src/providers/twitch/TwitchMessageBuilder.cpp
index 740cccc05..eeb4ed4b0 100644
--- a/src/providers/twitch/TwitchMessageBuilder.cpp
+++ b/src/providers/twitch/TwitchMessageBuilder.cpp
@@ -715,41 +715,38 @@ void TwitchMessageBuilder::appendTwitchBadges()
             //}
         } else if (badge == "staff/1") {
             this->emplace<ImageElement>(
-                    Image::fromNonOwningPixmap(&app->resources->twitch.staff),
+                    Image::fromPixmap(app->resources->twitch.staff),
                     MessageElementFlag::BadgeGlobalAuthority)
                 ->setTooltip("Twitch Staff");
         } else if (badge == "admin/1") {
             this->emplace<ImageElement>(
-                    Image::fromNonOwningPixmap(&app->resources->twitch.admin),
+                    Image::fromPixmap(app->resources->twitch.admin),
                     MessageElementFlag::BadgeGlobalAuthority)
                 ->setTooltip("Twitch Admin");
         } else if (badge == "global_mod/1") {
             this->emplace<ImageElement>(
-                    Image::fromNonOwningPixmap(
-                        &app->resources->twitch.globalmod),
+                    Image::fromPixmap(app->resources->twitch.globalmod),
                     MessageElementFlag::BadgeGlobalAuthority)
                 ->setTooltip("Twitch Global Moderator");
         } else if (badge == "moderator/1") {
             // TODO: Implement custom FFZ moderator badge
             this->emplace<ImageElement>(
-                    Image::fromNonOwningPixmap(
-                        &app->resources->twitch.moderator),
+                    Image::fromPixmap(app->resources->twitch.moderator),
                     MessageElementFlag::BadgeChannelAuthority)
                 ->setTooltip("Twitch Channel Moderator");
         } else if (badge == "turbo/1") {
             this->emplace<ImageElement>(
-                    Image::fromNonOwningPixmap(&app->resources->twitch.turbo),
+                    Image::fromPixmap(app->resources->twitch.turbo),
                     MessageElementFlag::BadgeGlobalAuthority)
                 ->setTooltip("Twitch Turbo Subscriber");
         } else if (badge == "broadcaster/1") {
             this->emplace<ImageElement>(
-                    Image::fromNonOwningPixmap(
-                        &app->resources->twitch.broadcaster),
+                    Image::fromPixmap(app->resources->twitch.broadcaster),
                     MessageElementFlag::BadgeChannelAuthority)
                 ->setTooltip("Twitch Broadcaster");
         } else if (badge == "premium/1") {
             this->emplace<ImageElement>(
-                    Image::fromNonOwningPixmap(&app->resources->twitch.prime),
+                    Image::fromPixmap(app->resources->twitch.prime),
                     MessageElementFlag::BadgeVanity)
                 ->setTooltip("Twitch Prime Subscriber");
         } else if (badge.startsWith("partner/")) {
@@ -757,8 +754,8 @@ void TwitchMessageBuilder::appendTwitchBadges()
             switch (index) {
                 case 1: {
                     this->emplace<ImageElement>(
-                            Image::fromNonOwningPixmap(
-                                &app->resources->twitch.verified, 0.25),
+                            Image::fromPixmap(app->resources->twitch.verified,
+                                              0.25),
                             MessageElementFlag::BadgeVanity)
                         ->setTooltip("Twitch Verified");
                 } break;
diff --git a/src/widgets/helper/ChannelView.cpp b/src/widgets/helper/ChannelView.cpp
index e1dca8cfb..e8f90d0fc 100644
--- a/src/widgets/helper/ChannelView.cpp
+++ b/src/widgets/helper/ChannelView.cpp
@@ -52,7 +52,7 @@ void addEmoteContextMenuItems(const Emote &emote,
 
     // Add copy and open links for 1x, 2x, 3x
     auto addImageLink = [&](const ImagePtr &image, char scale) {
-        if (!image->empty()) {
+        if (!image->isEmpty()) {
             copyMenu->addAction(
                 QString(scale) + "x link", [url = image->url()] {
                     QApplication::clipboard()->setText(url.string);
diff --git a/src/widgets/settingspages/LookPage.cpp b/src/widgets/settingspages/LookPage.cpp
index 6f7032e46..8cdcfd5f9 100644
--- a/src/widgets/settingspages/LookPage.cpp
+++ b/src/widgets/settingspages/LookPage.cpp
@@ -322,11 +322,11 @@ ChannelPtr LookPage::createPreviewChannel()
     {
         MessageBuilder builder;
         builder.emplace<TimestampElement>(QTime(8, 13, 42));
-        builder.emplace<ImageElement>(Image::fromNonOwningPixmap(&getApp()->resources->twitch.moderator), MessageElementFlag::BadgeChannelAuthority);
-        builder.emplace<ImageElement>(Image::fromNonOwningPixmap(&getApp()->resources->twitch.subscriber, 0.25), MessageElementFlag::BadgeSubscription);
+        builder.emplace<ImageElement>(Image::fromPixmap(getApp()->resources->twitch.moderator), MessageElementFlag::BadgeChannelAuthority);
+        builder.emplace<ImageElement>(Image::fromPixmap(getApp()->resources->twitch.subscriber, 0.25), MessageElementFlag::BadgeSubscription);
         builder.emplace<TextElement>("username1:", MessageElementFlag::Username, QColor("#0094FF"), FontStyle::ChatMediumBold);
         builder.emplace<TextElement>("This is a preview message", MessageElementFlag::Text);
-        builder.emplace<ImageElement>(Image::fromNonOwningPixmap(&getApp()->resources->pajaDank, 0.25), MessageElementFlag::AlwaysShow);
+        builder.emplace<ImageElement>(Image::fromPixmap(getApp()->resources->pajaDank, 0.25), MessageElementFlag::AlwaysShow);
         builder.emplace<TextElement>("@fourtf", MessageElementFlag::BoldUsername, MessageColor::Text, FontStyle::ChatMediumBold);
         builder.emplace<TextElement>("@fourtf", MessageElementFlag::NonBoldUsername);
         channel->addMessage(builder.release());
@@ -334,7 +334,7 @@ ChannelPtr LookPage::createPreviewChannel()
     {
         MessageBuilder message;
         message.emplace<TimestampElement>(QTime(8, 15, 21));
-        message.emplace<ImageElement>(Image::fromNonOwningPixmap(&getApp()->resources->twitch.broadcaster), MessageElementFlag::BadgeChannelAuthority);
+        message.emplace<ImageElement>(Image::fromPixmap(getApp()->resources->twitch.broadcaster), MessageElementFlag::BadgeChannelAuthority);
         message.emplace<TextElement>("username2:", MessageElementFlag::Username, QColor("#FF6A00"), FontStyle::ChatMediumBold);
         message.emplace<TextElement>("This is another one", MessageElementFlag::Text);
         // message.emplace<ImageElement>(Image::fromNonOwningPixmap(&getApp()->resources->ppHop), MessageElementFlag::BttvEmote);

From cf9560508c1f5a8ee098117d1f8158a33130db04 Mon Sep 17 00:00:00 2001
From: fourtf <tf.four@gmail.com>
Date: Fri, 10 Aug 2018 19:00:14 +0200
Subject: [PATCH 12/44] improving code quality

---
 chatterino.pro                                |  3 +-
 src/BrowserExtension.cpp                      | 14 ++-
 src/RunGui.cpp                                | 52 +++++-----
 src/common/Channel.cpp                        | 47 ++++++++-
 src/common/Channel.hpp                        | 46 ++-------
 src/common/LinkParser.cpp                     | 96 +++++++++----------
 src/common/LinkParser.hpp                     | 11 +--
 src/common/LockedObject.hpp                   | 38 --------
 src/common/NetworkManager.cpp                 |  4 +-
 src/common/NetworkManager.hpp                 |  2 +-
 src/common/NetworkRequest.cpp                 |  6 +-
 src/common/NetworkRequest.hpp                 |  2 -
 src/common/Property.hpp                       | 34 -------
 .../highlights/HighlightBlacklistUser.hpp     |  2 +-
 .../highlights/HighlightPhrase.hpp            |  2 +-
 src/controllers/ignores/IgnorePhrase.hpp      |  2 +-
 src/providers/twitch/TwitchChannel.cpp        |  4 +-
 src/providers/twitch/TwitchChannel.hpp        |  2 +-
 src/singletons/NativeMessaging.cpp            |  2 +-
 src/singletons/Theme.hpp                      |  2 +-
 .../RapidJsonSerializeQString.hpp}            |  0
 src/util/RapidjsonHelpers.hpp                 |  2 +-
 src/widgets/splits/Split.hpp                  |  2 +-
 23 files changed, 143 insertions(+), 232 deletions(-)
 delete mode 100644 src/common/LockedObject.hpp
 delete mode 100644 src/common/Property.hpp
 rename src/{common/SerializeCustom.hpp => util/RapidJsonSerializeQString.hpp} (100%)

diff --git a/chatterino.pro b/chatterino.pro
index c41cea5a9..76730ccda 100644
--- a/chatterino.pro
+++ b/chatterino.pro
@@ -258,7 +258,6 @@ HEADERS  += \
     src/common/Common.hpp \
     src/common/CompletionModel.hpp \
     src/common/FlagsEnum.hpp \
-    src/common/LockedObject.hpp \
     src/common/MutexValue.hpp \
     src/common/NetworkCommon.hpp \
     src/common/NetworkData.hpp \
@@ -271,7 +270,7 @@ HEADERS  += \
     src/common/NullablePtr.hpp \
     src/common/Property.hpp \
     src/common/ProviderId.hpp \
-    src/common/SerializeCustom.hpp \
+    src/uril/RapidJsonSerializeQString.hpp \
     src/common/SignalVectorModel.hpp \
     src/common/Version.hpp \
     src/controllers/accounts/Account.hpp \
diff --git a/src/BrowserExtension.cpp b/src/BrowserExtension.cpp
index 75a6ef26f..5275e0648 100644
--- a/src/BrowserExtension.cpp
+++ b/src/BrowserExtension.cpp
@@ -31,11 +31,9 @@ void runLoop(NativeMessagingClient &client)
         char size_c[4];
         std::cin.read(size_c, 4);
 
-        if (std::cin.eof()) {
-            break;
-        }
+        if (std::cin.eof()) break;
 
-        uint32_t size = *reinterpret_cast<uint32_t *>(size_c);
+        auto size = *reinterpret_cast<uint32_t *>(size_c);
 
 #if 0
     bool bigEndian = isBigEndian();
@@ -50,12 +48,12 @@ void runLoop(NativeMessagingClient &client)
         }
 #endif
 
-        std::unique_ptr<char[]> b(new char[size + 1]);
-        std::cin.read(b.get(), size);
-        *(b.get() + size) = '\0';
+        std::unique_ptr<char[]> buffer(new char[size + 1]);
+        std::cin.read(buffer.get(), size);
+        *(buffer.get() + size) = '\0';
 
         client.sendMessage(
-            QByteArray::fromRawData(b.get(), static_cast<int32_t>(size)));
+            QByteArray::fromRawData(buffer.get(), static_cast<int32_t>(size)));
     }
 }
 }  // namespace
diff --git a/src/RunGui.cpp b/src/RunGui.cpp
index d6c4b0306..9fdcdb20c 100644
--- a/src/RunGui.cpp
+++ b/src/RunGui.cpp
@@ -27,35 +27,33 @@ void installCustomPalette()
 {
     // borrowed from
     // https://stackoverflow.com/questions/15035767/is-the-qt-5-dark-fusion-theme-available-for-windows
-    QPalette darkPalette = qApp->palette();
+    auto dark = qApp->palette();
 
-    darkPalette.setColor(QPalette::Window, QColor(22, 22, 22));
-    darkPalette.setColor(QPalette::WindowText, Qt::white);
-    darkPalette.setColor(QPalette::Text, Qt::white);
-    darkPalette.setColor(QPalette::Disabled, QPalette::WindowText,
-                         QColor(127, 127, 127));
-    darkPalette.setColor(QPalette::Base, QColor("#333"));
-    darkPalette.setColor(QPalette::AlternateBase, QColor("#444"));
-    darkPalette.setColor(QPalette::ToolTipBase, Qt::white);
-    darkPalette.setColor(QPalette::ToolTipText, Qt::white);
-    darkPalette.setColor(QPalette::Disabled, QPalette::Text,
-                         QColor(127, 127, 127));
-    darkPalette.setColor(QPalette::Dark, QColor(35, 35, 35));
-    darkPalette.setColor(QPalette::Shadow, QColor(20, 20, 20));
-    darkPalette.setColor(QPalette::Button, QColor(70, 70, 70));
-    darkPalette.setColor(QPalette::ButtonText, Qt::white);
-    darkPalette.setColor(QPalette::Disabled, QPalette::ButtonText,
-                         QColor(127, 127, 127));
-    darkPalette.setColor(QPalette::BrightText, Qt::red);
-    darkPalette.setColor(QPalette::Link, QColor(42, 130, 218));
-    darkPalette.setColor(QPalette::Highlight, QColor(42, 130, 218));
-    darkPalette.setColor(QPalette::Disabled, QPalette::Highlight,
-                         QColor(80, 80, 80));
-    darkPalette.setColor(QPalette::HighlightedText, Qt::white);
-    darkPalette.setColor(QPalette::Disabled, QPalette::HighlightedText,
-                         QColor(127, 127, 127));
+    dark.setColor(QPalette::Window, QColor(22, 22, 22));
+    dark.setColor(QPalette::WindowText, Qt::white);
+    dark.setColor(QPalette::Text, Qt::white);
+    dark.setColor(QPalette::Disabled, QPalette::WindowText,
+                  QColor(127, 127, 127));
+    dark.setColor(QPalette::Base, QColor("#333"));
+    dark.setColor(QPalette::AlternateBase, QColor("#444"));
+    dark.setColor(QPalette::ToolTipBase, Qt::white);
+    dark.setColor(QPalette::ToolTipText, Qt::white);
+    dark.setColor(QPalette::Disabled, QPalette::Text, QColor(127, 127, 127));
+    dark.setColor(QPalette::Dark, QColor(35, 35, 35));
+    dark.setColor(QPalette::Shadow, QColor(20, 20, 20));
+    dark.setColor(QPalette::Button, QColor(70, 70, 70));
+    dark.setColor(QPalette::ButtonText, Qt::white);
+    dark.setColor(QPalette::Disabled, QPalette::ButtonText,
+                  QColor(127, 127, 127));
+    dark.setColor(QPalette::BrightText, Qt::red);
+    dark.setColor(QPalette::Link, QColor(42, 130, 218));
+    dark.setColor(QPalette::Highlight, QColor(42, 130, 218));
+    dark.setColor(QPalette::Disabled, QPalette::Highlight, QColor(80, 80, 80));
+    dark.setColor(QPalette::HighlightedText, Qt::white);
+    dark.setColor(QPalette::Disabled, QPalette::HighlightedText,
+                  QColor(127, 127, 127));
 
-    qApp->setPalette(darkPalette);
+    qApp->setPalette(dark);
 }
 
 void initQt()
diff --git a/src/common/Channel.cpp b/src/common/Channel.cpp
index 3adcccd2f..d7f1659f4 100644
--- a/src/common/Channel.cpp
+++ b/src/common/Channel.cpp
@@ -18,6 +18,9 @@
 
 namespace chatterino {
 
+//
+// Channel
+//
 Channel::Channel(const QString &name, Type type)
     : completionModel(name)
     , name_(name)
@@ -67,8 +70,7 @@ void Channel::addMessage(MessagePtr message)
 
     const QString &username = message->loginName;
     if (!username.isEmpty()) {
-        // TODO: Add recent chatters display name. This should maybe be a
-        // setting
+        // TODO: Add recent chatters display name
         this->addRecentChatter(message);
     }
 
@@ -194,7 +196,6 @@ void Channel::replaceMessage(MessagePtr message, MessagePtr replacement)
 
 void Channel::addRecentChatter(const MessagePtr &message)
 {
-    // Do nothing by default
 }
 
 bool Channel::canSendMessage() const
@@ -232,9 +233,45 @@ void Channel::onConnected()
 {
 }
 
-std::weak_ptr<Channel> Channel::weak_from_this()
+//
+// Indirect channel
+//
+IndirectChannel::Data::Data(ChannelPtr _channel, Channel::Type _type)
+    : channel(_channel)
+    , type(_type)
 {
-    return std::weak_ptr<Channel>(this->shared_from_this());
+}
+
+IndirectChannel::IndirectChannel(ChannelPtr channel, Channel::Type type)
+    : data_(std::make_unique<Data>(channel, type))
+{
+}
+
+ChannelPtr IndirectChannel::get()
+{
+    return data_->channel;
+}
+
+void IndirectChannel::reset(ChannelPtr channel)
+{
+    assert(this->data_->type != Channel::Type::Direct);
+
+    this->data_->channel = channel;
+    this->data_->changed.invoke();
+}
+
+pajlada::Signals::NoArgSignal &IndirectChannel::getChannelChanged()
+{
+    return this->data_->changed;
+}
+
+Channel::Type IndirectChannel::getType()
+{
+    if (this->data_->type == Channel::Type::Direct) {
+        return this->get()->getType();
+    } else {
+        return this->data_->type;
+    }
 }
 
 }  // namespace chatterino
diff --git a/src/common/Channel.hpp b/src/common/Channel.hpp
index 429123c5a..cb93c1694 100644
--- a/src/common/Channel.hpp
+++ b/src/common/Channel.hpp
@@ -4,7 +4,6 @@
 #include "messages/Image.hpp"
 #include "messages/LimitedQueue.hpp"
 #include "messages/Message.hpp"
-#include "util/ConcurrentMap.hpp"
 
 #include <QString>
 #include <QTimer>
@@ -66,9 +65,6 @@ public:
 
     CompletionModel completionModel;
 
-    // pre c++17 polyfill
-    std::weak_ptr<Channel> weak_from_this();
-
 protected:
     virtual void onConnected();
 
@@ -88,47 +84,17 @@ class IndirectChannel
         Channel::Type type;
         pajlada::Signals::NoArgSignal changed;
 
-        Data() = delete;
-        Data(ChannelPtr _channel, Channel::Type _type)
-            : channel(_channel)
-            , type(_type)
-        {
-        }
+        Data(ChannelPtr channel, Channel::Type type);
     };
 
 public:
     IndirectChannel(ChannelPtr channel,
-                    Channel::Type type = Channel::Type::Direct)
-        : data_(new Data(channel, type))
-    {
-    }
+                    Channel::Type type = Channel::Type::Direct);
 
-    ChannelPtr get()
-    {
-        return data_->channel;
-    }
-
-    void update(ChannelPtr ptr)
-    {
-        assert(this->data_->type != Channel::Type::Direct);
-
-        this->data_->channel = ptr;
-        this->data_->changed.invoke();
-    }
-
-    pajlada::Signals::NoArgSignal &getChannelChanged()
-    {
-        return this->data_->changed;
-    }
-
-    Channel::Type getType()
-    {
-        if (this->data_->type == Channel::Type::Direct) {
-            return this->get()->getType();
-        } else {
-            return this->data_->type;
-        }
-    }
+    ChannelPtr get();
+    void reset(ChannelPtr channel);
+    pajlada::Signals::NoArgSignal &getChannelChanged();
+    Channel::Type getType();
 
 private:
     std::shared_ptr<Data> data_;
diff --git a/src/common/LinkParser.cpp b/src/common/LinkParser.cpp
index b4f63a156..a80c75641 100644
--- a/src/common/LinkParser.cpp
+++ b/src/common/LinkParser.cpp
@@ -5,69 +5,63 @@
 #include <QString>
 #include <QTextStream>
 
+// ip 0.0.0.0 - 224.0.0.0
+#define IP                                       \
+    "(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])"     \
+    "(?:\\.(?:1?\\d{1,2}|2[0-4]\\d|25[0-5])){2}" \
+    "(?:\\.(?:[1-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))"
+#define PORT "(?::\\d{2,5})"
+#define WEB_CHAR1 "[_a-z\\x{00a1}-\\x{ffff}0-9]"
+#define WEB_CHAR2 "[a-z\\x{00a1}-\\x{ffff}0-9]"
+
+#define SPOTIFY_1 "(?:artist|album|track|user:[^:]+:playlist):[a-zA-Z0-9]+"
+#define SPOTIFY_2 "user:[^:]+"
+#define SPOTIFY_3 "search:(?:[-\\w$\\.+!*'(),]+|%[a-fA-F0-9]{2})+"
+#define SPOTIFY_PARAMS "(?:" SPOTIFY_1 "|" SPOTIFY_2 "|" SPOTIFY_3 ")"
+#define SPOTIFY_LINK "(?x-mi:(spotify:" SPOTIFY_PARAMS "))"
+
+#define WEB_PROTOCOL "(?:(?:https?|ftps?)://)?"
+#define WEB_USER "(?:\\S+(?::\\S*)?@)?"
+#define WEB_HOST "(?:(?:" WEB_CHAR1 "-*)*" WEB_CHAR2 "+)"
+#define WEB_DOMAIN "(?:\\.(?:" WEB_CHAR2 "-*)*" WEB_CHAR2 "+)*"
+#define WEB_TLD "(?:" + tldData + ")"
+#define WEB_RESOURCE_PATH "(?:[/?#]\\S*)"
+#define WEB_LINK                                                              \
+    WEB_PROTOCOL WEB_USER "(?:" IP "|" WEB_HOST WEB_DOMAIN "\\." WEB_TLD PORT \
+                          "?" WEB_RESOURCE_PATH "?)"
+
+#define LINK "^(?:" SPOTIFY_LINK "|" WEB_LINK ")$"
+
 namespace chatterino {
 
 LinkParser::LinkParser(const QString &unparsedString)
 {
     static QRegularExpression linkRegex = [] {
         static QRegularExpression newLineRegex("\r?\n");
-        QFile tldFile(":/tlds.txt");
-        tldFile.open(QFile::ReadOnly);
+        QFile file(":/tlds.txt");
+        file.open(QFile::ReadOnly);
+        QTextStream tlds(&file);
+        tlds.setCodec("UTF-8");
 
-        QTextStream t1(&tldFile);
-        t1.setCodec("UTF-8");
+        // tldData gets injected into the LINK macro
+        auto tldData = tlds.readAll().replace(newLineRegex, "|");
+        (void)tldData;
 
-        // Read the TLDs in and replace the newlines with pipes
-        QString tldData = t1.readAll().replace(newLineRegex, "|");
-
-        const QString hyperlinkRegExp =
-            "^"
-            // Identifier for spotify
-            "(?x-mi:(spotify:(?:"
-            "(?:artist|album|track|user:[^:]+:playlist):"
-            "[a-zA-Z0-9]+|user:[^:]+|search:"
-            "(?:[-\\w$\\.+!*'(),]+|%[a-fA-F0-9]{2})+)))"
-            // If nothing matches then just go on
-            "|"
-            "^"
-            // Identifier for http and ftp
-            "(?:(?:https?|ftps?)://)?"
-            // user:pass authentication
-            "(?:\\S+(?::\\S*)?@)?"
-            "(?:"
-            // IP address dotted notation octets
-            // excludes loopback network 0.0.0.0
-            // excludes reserved space >= 224.0.0.0
-            // excludes network & broacast addresses
-            // (first & last IP address of each class)
-            "(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])"
-            "(?:\\.(?:1?\\d{1,2}|2[0-4]\\d|25[0-5])){2}"
-            "(?:\\.(?:[1-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))"
-            "|"
-            // host name
-            "(?:(?:[_a-z\\x{00a1}-\\x{ffff}0-9]-*)*[a-z\\x{00a1}-\\x{ffff}0-9]+"
-            ")"
-            // domain name
-            "(?:\\.(?:[a-z\\x{00a1}-\\x{ffff}0-9]-*)*[a-z\\x{00a1}-\\x{ffff}0-"
-            "9]+)*"
-            // TLD identifier
-            //"(?:\\.(?:[a-z\\x{00a1}-\\x{ffff}]{2,}))"
-            "(?:[\\.](?:" +
-            tldData +
-            "))"
-            "\\.?"
-            ")"
-            // port number
-            "(?::\\d{2,5})?"
-            // resource path
-            "(?:[/?#]\\S*)?"
-            "$";
-
-        return QRegularExpression(hyperlinkRegExp,
+        return QRegularExpression(LINK,
                                   QRegularExpression::CaseInsensitiveOption);
     }();
 
     this->match_ = linkRegex.match(unparsedString);
 }
 
+bool LinkParser::hasMatch() const
+{
+    return this->match_.hasMatch();
+}
+
+QString LinkParser::getCaptured() const
+{
+    return this->match_.captured();
+}
+
 }  // namespace chatterino
diff --git a/src/common/LinkParser.hpp b/src/common/LinkParser.hpp
index 3a1ad6fab..2d56cbde0 100644
--- a/src/common/LinkParser.hpp
+++ b/src/common/LinkParser.hpp
@@ -10,15 +10,8 @@ class LinkParser
 public:
     explicit LinkParser(const QString &unparsedString);
 
-    bool hasMatch() const
-    {
-        return this->match_.hasMatch();
-    }
-
-    QString getCaptured() const
-    {
-        return this->match_.captured();
-    }
+    bool hasMatch() const;
+    QString getCaptured() const;
 
 private:
     QRegularExpressionMatch match_;
diff --git a/src/common/LockedObject.hpp b/src/common/LockedObject.hpp
deleted file mode 100644
index 01ffe3b66..000000000
--- a/src/common/LockedObject.hpp
+++ /dev/null
@@ -1,38 +0,0 @@
-#pragma once
-
-#include <mutex>
-
-namespace chatterino {
-
-template <typename Type>
-class LockedObject
-{
-public:
-    LockedObject &operator=(const LockedObject<Type> &other)
-    {
-        this->mutex_.lock();
-
-        this->data = other.getValue();
-
-        this->mutex_.unlock();
-
-        return *this;
-    }
-
-    LockedObject &operator=(const Type &other)
-    {
-        this->mutex_.lock();
-
-        this->data = other;
-
-        this->mutex_.unlock();
-
-        return *this;
-    }
-
-private:
-    Type value_;
-    std::mutex mutex_;
-};
-
-}  // namespace chatterino
diff --git a/src/common/NetworkManager.cpp b/src/common/NetworkManager.cpp
index 5577afda5..1ff1bf635 100644
--- a/src/common/NetworkManager.cpp
+++ b/src/common/NetworkManager.cpp
@@ -5,11 +5,11 @@
 namespace chatterino {
 
 QThread NetworkManager::workerThread;
-QNetworkAccessManager NetworkManager::NaM;
+QNetworkAccessManager NetworkManager::accessManager;
 
 void NetworkManager::init()
 {
-    NetworkManager::NaM.moveToThread(&NetworkManager::workerThread);
+    NetworkManager::accessManager.moveToThread(&NetworkManager::workerThread);
     NetworkManager::workerThread.start();
 }
 
diff --git a/src/common/NetworkManager.hpp b/src/common/NetworkManager.hpp
index 0e59c0540..12c0c6a51 100644
--- a/src/common/NetworkManager.hpp
+++ b/src/common/NetworkManager.hpp
@@ -20,7 +20,7 @@ class NetworkManager : public QObject
 
 public:
     static QThread workerThread;
-    static QNetworkAccessManager NaM;
+    static QNetworkAccessManager accessManager;
 
     static void init();
     static void deinit();
diff --git a/src/common/NetworkRequest.cpp b/src/common/NetworkRequest.cpp
index 464061be4..f7a288206 100644
--- a/src/common/NetworkRequest.cpp
+++ b/src/common/NetworkRequest.cpp
@@ -186,14 +186,14 @@ void NetworkRequest::doRequest()
         auto reply = [&]() -> QNetworkReply * {
             switch (data->requestType_) {
                 case NetworkRequestType::Get:
-                    return NetworkManager::NaM.get(data->request_);
+                    return NetworkManager::accessManager.get(data->request_);
 
                 case NetworkRequestType::Put:
-                    return NetworkManager::NaM.put(data->request_,
+                    return NetworkManager::accessManager.put(data->request_,
                                                    data->payload_);
 
                 case NetworkRequestType::Delete:
-                    return NetworkManager::NaM.deleteResource(data->request_);
+                    return NetworkManager::accessManager.deleteResource(data->request_);
 
                 default:
                     return nullptr;
diff --git a/src/common/NetworkRequest.hpp b/src/common/NetworkRequest.hpp
index ea1361faf..09b2cccee 100644
--- a/src/common/NetworkRequest.hpp
+++ b/src/common/NetworkRequest.hpp
@@ -58,8 +58,6 @@ public:
     void execute();
 
 private:
-    // Returns true if the file was successfully loaded from cache
-    // Returns false if the cache file either didn't exist, or it contained
     // "invalid" data "invalid" is specified by the onSuccess callback
     Outcome tryLoadCachedFile();
 
diff --git a/src/common/Property.hpp b/src/common/Property.hpp
deleted file mode 100644
index 99d0efa48..000000000
--- a/src/common/Property.hpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#pragma once
-
-#include "boost/noncopyable.hpp"
-
-namespace chatterino {
-
-template <typename T>
-class Property final : boost::noncopyable
-{
-public:
-    Property()
-    {
-    }
-
-    Property(const T &value)
-        : value_(value)
-    {
-    }
-
-    T &operator=(const T &f)
-    {
-        return value_ = f;
-    }
-
-    operator T const &() const
-    {
-        return value_;
-    }
-
-protected:
-    T value_;
-};
-
-}  // namespace chatterino
diff --git a/src/controllers/highlights/HighlightBlacklistUser.hpp b/src/controllers/highlights/HighlightBlacklistUser.hpp
index 5376d9cf5..4ce8683d0 100644
--- a/src/controllers/highlights/HighlightBlacklistUser.hpp
+++ b/src/controllers/highlights/HighlightBlacklistUser.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/SerializeCustom.hpp"
+#include "util/RapidJsonSerializeQString.hpp"
 #include "util/RapidjsonHelpers.hpp"
 
 #include <QRegularExpression>
diff --git a/src/controllers/highlights/HighlightPhrase.hpp b/src/controllers/highlights/HighlightPhrase.hpp
index 77cd5936b..91abaadce 100644
--- a/src/controllers/highlights/HighlightPhrase.hpp
+++ b/src/controllers/highlights/HighlightPhrase.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/SerializeCustom.hpp"
+#include "util/RapidJsonSerializeQString.hpp"
 #include "util/RapidjsonHelpers.hpp"
 
 #include <QRegularExpression>
diff --git a/src/controllers/ignores/IgnorePhrase.hpp b/src/controllers/ignores/IgnorePhrase.hpp
index f42df8442..81eb83a87 100644
--- a/src/controllers/ignores/IgnorePhrase.hpp
+++ b/src/controllers/ignores/IgnorePhrase.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/SerializeCustom.hpp"
+#include "util/RapidJsonSerializeQString.hpp"
 #include "util/RapidjsonHelpers.hpp"
 
 #include <QRegularExpression>
diff --git a/src/providers/twitch/TwitchChannel.cpp b/src/providers/twitch/TwitchChannel.cpp
index 57de91a5d..04b0f2666 100644
--- a/src/providers/twitch/TwitchChannel.cpp
+++ b/src/providers/twitch/TwitchChannel.cpp
@@ -250,12 +250,12 @@ void TwitchChannel::addPartedUser(const QString &user)
 
 QString TwitchChannel::getRoomId() const
 {
-    return this->roomID_.get();
+    return *this->roomID_.access();
 }
 
 void TwitchChannel::setRoomId(const QString &id)
 {
-    this->roomID_.set(id);
+    (*this->roomID_.access()) = id;
     this->roomIdChanged.invoke();
     this->loadRecentMessages();
 }
diff --git a/src/providers/twitch/TwitchChannel.hpp b/src/providers/twitch/TwitchChannel.hpp
index 320be3b36..5befb6700 100644
--- a/src/providers/twitch/TwitchChannel.hpp
+++ b/src/providers/twitch/TwitchChannel.hpp
@@ -134,7 +134,7 @@ private:
     const QString popoutPlayerUrl_;
 
     bool mod_ = false;
-    MutexValue<QString> roomID_;
+    UniqueAccess<QString> roomID_;
 
     UniqueAccess<QStringList> joinedUsers_;
     bool joinedUsersMergeQueued_ = false;
diff --git a/src/singletons/NativeMessaging.cpp b/src/singletons/NativeMessaging.cpp
index 4afea4714..cd80f8021 100644
--- a/src/singletons/NativeMessaging.cpp
+++ b/src/singletons/NativeMessaging.cpp
@@ -200,7 +200,7 @@ void NativeMessagingServer::ReceiverThread::handleMessage(
         if (_type == "twitch") {
             postToThread([=] {
                 if (!name.isEmpty()) {
-                    app->twitch.server->watchingChannel.update(
+                    app->twitch.server->watchingChannel.reset(
                         app->twitch.server->getOrAddChannel(name));
                 }
 
diff --git a/src/singletons/Theme.hpp b/src/singletons/Theme.hpp
index 47bb6c3ef..5ee6f6d58 100644
--- a/src/singletons/Theme.hpp
+++ b/src/singletons/Theme.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "common/SerializeCustom.hpp"
 #include "common/Singleton.hpp"
+#include "util/RapidJsonSerializeQString.hpp"
 
 #include <QBrush>
 #include <QColor>
diff --git a/src/common/SerializeCustom.hpp b/src/util/RapidJsonSerializeQString.hpp
similarity index 100%
rename from src/common/SerializeCustom.hpp
rename to src/util/RapidJsonSerializeQString.hpp
diff --git a/src/util/RapidjsonHelpers.hpp b/src/util/RapidjsonHelpers.hpp
index db6db99f4..8dbfe07a2 100644
--- a/src/util/RapidjsonHelpers.hpp
+++ b/src/util/RapidjsonHelpers.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/SerializeCustom.hpp"
+#include "util/RapidJsonSerializeQString.hpp"
 
 #include <rapidjson/document.h>
 #include <pajlada/settings/serialize.hpp>
diff --git a/src/widgets/splits/Split.hpp b/src/widgets/splits/Split.hpp
index eafddf5c2..fc87307e7 100644
--- a/src/widgets/splits/Split.hpp
+++ b/src/widgets/splits/Split.hpp
@@ -2,11 +2,11 @@
 
 #include "common/Channel.hpp"
 #include "common/NullablePtr.hpp"
-#include "common/SerializeCustom.hpp"
 #include "messages/LimitedQueueSnapshot.hpp"
 #include "messages/MessageElement.hpp"
 #include "messages/layouts/MessageLayout.hpp"
 #include "messages/layouts/MessageLayoutElement.hpp"
+#include "uril/RapidJsonSerializeQString.hpp"
 #include "widgets/BaseWidget.hpp"
 #include "widgets/helper/ChannelView.hpp"
 #include "widgets/helper/EffectLabel.hpp"

From 6fa32607d3f6e182e47c6de2877fa46b13e4bfa9 Mon Sep 17 00:00:00 2001
From: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
Date: Sat, 11 Aug 2018 14:10:20 +0200
Subject: [PATCH 13/44] fix misspelling of the rapidjson include file thing

---
 chatterino.pro               | 2 +-
 src/widgets/splits/Split.hpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/chatterino.pro b/chatterino.pro
index 76730ccda..a7ff626a6 100644
--- a/chatterino.pro
+++ b/chatterino.pro
@@ -270,7 +270,7 @@ HEADERS  += \
     src/common/NullablePtr.hpp \
     src/common/Property.hpp \
     src/common/ProviderId.hpp \
-    src/uril/RapidJsonSerializeQString.hpp \
+    src/util/RapidJsonSerializeQString.hpp \
     src/common/SignalVectorModel.hpp \
     src/common/Version.hpp \
     src/controllers/accounts/Account.hpp \
diff --git a/src/widgets/splits/Split.hpp b/src/widgets/splits/Split.hpp
index fc87307e7..ca185dbdb 100644
--- a/src/widgets/splits/Split.hpp
+++ b/src/widgets/splits/Split.hpp
@@ -6,7 +6,7 @@
 #include "messages/MessageElement.hpp"
 #include "messages/layouts/MessageLayout.hpp"
 #include "messages/layouts/MessageLayoutElement.hpp"
-#include "uril/RapidJsonSerializeQString.hpp"
+#include "util/RapidJsonSerializeQString.hpp"
 #include "widgets/BaseWidget.hpp"
 #include "widgets/helper/ChannelView.hpp"
 #include "widgets/helper/EffectLabel.hpp"

From 7aa34ef9bc17568329784d8a284635a05afc5a04 Mon Sep 17 00:00:00 2001
From: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
Date: Sat, 11 Aug 2018 14:12:41 +0200
Subject: [PATCH 14/44] remove c++17 dependency

---
 src/common/UniqueAccess.hpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/common/UniqueAccess.hpp b/src/common/UniqueAccess.hpp
index 529ac0623..6e9f7a52e 100644
--- a/src/common/UniqueAccess.hpp
+++ b/src/common/UniqueAccess.hpp
@@ -88,7 +88,8 @@ public:
         return AccessGuard<T>(this->element_, this->mutex_);
     }
 
-    template <typename X = T, typename = std::enable_if_t<!std::is_const_v<X>>>
+    template <typename X = T,
+              typename = std::enable_if_t<!std::is_const<X>::value>>
     AccessGuard<const X> accessConst() const
     {
         return AccessGuard<const T>(this->element_, this->mutex_);

From 09b8a9d821ab6443ab044353799491e929911f84 Mon Sep 17 00:00:00 2001
From: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
Date: Sat, 11 Aug 2018 14:16:59 +0200
Subject: [PATCH 15/44] run distclean before making

---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 16780a908..621ef91eb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -6,12 +6,12 @@ pipeline {
             parallel {
                 stage('GCC') {
                     steps {
-                        sh 'mkdir -p build-linux-gcc && cd build-linux-gcc && qmake .. && make'
+                        sh 'mkdir -p build-linux-gcc && cd build-linux-gcc && make distclean; qmake .. && make'
                     }
                 }
                 stage('Clang') {
                     steps {
-                        sh 'mkdir -p build-linux-clang && cd build-linux-clang && qmake -spec linux-clang .. && make'
+                        sh 'mkdir -p build-linux-clang && cd build-linux-clang && make distclean; qmake -spec linux-clang .. && make'
                     }
                 }
             }

From c719bb6b74ff2463c935d767ec6246c0ca66b304 Mon Sep 17 00:00:00 2001
From: fourtf <tf.four@gmail.com>
Date: Sat, 11 Aug 2018 14:20:53 +0200
Subject: [PATCH 16/44] categorized emtotepopup

---
 chatterino.pro                                |   9 +-
 src/Application.cpp                           |   4 +-
 src/common/{MutexValue.hpp => Atomic.hpp}     |  13 +-
 src/common/CompletionModel.cpp                |   2 +-
 src/common/NetworkRequest.cpp                 |  15 +-
 src/common/NetworkResult.cpp                  |   2 +-
 src/common/SimpleSignalVector.hpp             |  34 ---
 src/common/UniqueAccess.hpp                   |   7 +-
 .../commands/CommandController.cpp            |   2 +-
 src/debug/Benchmark.cpp                       |  21 ++
 src/debug/Benchmark.hpp                       |  32 +--
 src/debug/Log.hpp                             |  13 +-
 src/main.cpp                                  |   6 +-
 src/messages/Emote.cpp                        |  62 +-----
 src/messages/Emote.hpp                        |   2 +
 src/messages/EmoteMap.cpp                     |  44 ----
 src/messages/EmoteMap.hpp                     |  20 --
 src/messages/Image.cpp                        |   6 +-
 src/messages/MessageBuilder.hpp               |   8 +
 src/messages/MessageParseArgs.hpp             |   7 -
 src/messages/Selection.hpp                    |   2 +-
 src/messages/layouts/MessageLayout.hpp        |   3 -
 .../layouts/MessageLayoutContainer.cpp        |   7 +-
 src/providers/bttv/BttvEmotes.cpp             | 115 ++++------
 src/providers/bttv/BttvEmotes.hpp             |  22 +-
 src/providers/emoji/Emojis.cpp                |   6 +-
 src/providers/emoji/Emojis.hpp                |   1 -
 src/providers/ffz/FfzEmotes.cpp               |  96 ++++-----
 src/providers/ffz/FfzEmotes.hpp               |  25 +--
 src/providers/irc/AbstractIrcServer.cpp       |   2 +-
 src/providers/twitch/IrcMessageHandler.cpp    |   8 +-
 src/providers/twitch/PartialTwitchUser.cpp    |   8 +-
 src/providers/twitch/PubsubClient.cpp         |  80 +++----
 src/providers/twitch/PubsubHelpers.hpp        |   4 +-
 src/providers/twitch/TwitchAccount.cpp        |  35 ++-
 src/providers/twitch/TwitchAccount.hpp        |   1 +
 src/providers/twitch/TwitchAccountManager.cpp |  12 +-
 src/providers/twitch/TwitchApi.cpp            |   8 +-
 src/providers/twitch/TwitchChannel.cpp        |  18 +-
 src/providers/twitch/TwitchChannel.hpp        |   2 +-
 src/providers/twitch/TwitchHelpers.cpp        |   2 +-
 src/providers/twitch/TwitchMessageBuilder.cpp |  12 +-
 src/providers/twitch/TwitchMessageBuilder.hpp |   1 -
 src/providers/twitch/TwitchServer.hpp         |   4 +-
 src/singletons/Emotes.cpp                     |   4 +-
 src/singletons/Settings.cpp                   |   6 +-
 src/singletons/WindowManager.cpp              |   2 +-
 src/singletons/helper/LoggingChannel.cpp      |   4 +-
 src/util/Helpers.hpp                          |   2 +-
 src/widgets/dialogs/EmotePopup.cpp            | 200 +++++++++---------
 src/widgets/dialogs/EmotePopup.hpp            |   6 +-
 src/widgets/dialogs/QualityPopup.cpp          |   2 +-
 src/widgets/helper/ChannelView.cpp            |  11 +-
 src/widgets/settingspages/AboutPage.cpp       |   2 +-
 src/widgets/splits/Split.cpp                  |   2 +-
 55 files changed, 420 insertions(+), 604 deletions(-)
 rename src/common/{MutexValue.hpp => Atomic.hpp} (66%)
 delete mode 100644 src/common/SimpleSignalVector.hpp
 create mode 100644 src/debug/Benchmark.cpp
 delete mode 100644 src/messages/EmoteMap.cpp
 delete mode 100644 src/messages/EmoteMap.hpp

diff --git a/chatterino.pro b/chatterino.pro
index a7ff626a6..7ddf1fd34 100644
--- a/chatterino.pro
+++ b/chatterino.pro
@@ -233,7 +233,6 @@ SOURCES += \
     src/providers/twitch/PubsubClient.cpp \
     src/providers/twitch/TwitchApi.cpp \
     src/messages/Emote.cpp \
-    src/messages/EmoteMap.cpp \
     src/messages/ImageSet.cpp \
     src/providers/bttv/BttvEmotes.cpp \
     src/providers/ffz/FfzEmotes.cpp \
@@ -250,7 +249,8 @@ SOURCES += \
     src/util/FunctionEventFilter.cpp \
     src/widgets/helper/EffectLabel.cpp \
     src/widgets/helper/Button.cpp \
-    src/messages/MessageContainer.cpp
+    src/messages/MessageContainer.cpp \
+    src/debug/Benchmark.cpp
 
 HEADERS  += \
     src/Application.hpp \
@@ -258,7 +258,7 @@ HEADERS  += \
     src/common/Common.hpp \
     src/common/CompletionModel.hpp \
     src/common/FlagsEnum.hpp \
-    src/common/MutexValue.hpp \
+    src/common/Atomic.hpp \
     src/common/NetworkCommon.hpp \
     src/common/NetworkData.hpp \
     src/common/NetworkManager.hpp \
@@ -305,7 +305,6 @@ HEADERS  += \
     src/messages/MessageBuilder.hpp \
     src/messages/MessageColor.hpp \
     src/messages/MessageElement.hpp \
-    src/messages/MessageParseArgs.hpp \
     src/messages/Selection.hpp \
     src/PrecompiledHeader.hpp \
     src/providers/emoji/Emojis.hpp \
@@ -414,7 +413,6 @@ HEADERS  += \
     src/singletons/Updates.hpp \
     src/singletons/NativeMessaging.hpp \
     src/singletons/Theme.hpp \
-    src/common/SimpleSignalVector.hpp \
     src/common/SignalVector.hpp \
     src/widgets/dialogs/LogsPopup.hpp \
     src/common/Singleton.hpp \
@@ -427,7 +425,6 @@ HEADERS  += \
     src/providers/twitch/PubsubClient.hpp \
     src/providers/twitch/TwitchApi.hpp \
     src/messages/Emote.hpp \
-    src/messages/EmoteMap.hpp \
     src/messages/EmoteCache.hpp \
     src/messages/ImageSet.hpp \
     src/common/Outcome.hpp \
diff --git a/src/Application.cpp b/src/Application.cpp
index c912597c8..85b4f382c 100644
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -113,11 +113,11 @@ void Application::initNm()
 void Application::initPubsub()
 {
     this->twitch.pubsub->signals_.whisper.sent.connect([](const auto &msg) {
-        Log("WHISPER SENT LOL");  //
+        log("WHISPER SENT LOL");  //
     });
 
     this->twitch.pubsub->signals_.whisper.received.connect([](const auto &msg) {
-        Log("WHISPER RECEIVED LOL");  //
+        log("WHISPER RECEIVED LOL");  //
     });
 
     this->twitch.pubsub->signals_.moderation.chatCleared.connect(
diff --git a/src/common/MutexValue.hpp b/src/common/Atomic.hpp
similarity index 66%
rename from src/common/MutexValue.hpp
rename to src/common/Atomic.hpp
index 112257370..39d8119f6 100644
--- a/src/common/MutexValue.hpp
+++ b/src/common/Atomic.hpp
@@ -6,14 +6,14 @@
 namespace chatterino {
 
 template <typename T>
-class MutexValue : boost::noncopyable
+class Atomic : boost::noncopyable
 {
 public:
-    MutexValue()
+    Atomic()
     {
     }
 
-    MutexValue(T &&val)
+    Atomic(T &&val)
         : value_(val)
     {
     }
@@ -32,6 +32,13 @@ public:
         this->value_ = val;
     }
 
+    void set(T &&val)
+    {
+        std::lock_guard<std::mutex> guard(this->mutex_);
+
+        this->value_ = std::move(val);
+    }
+
 private:
     mutable std::mutex mutex_;
     T value_;
diff --git a/src/common/CompletionModel.cpp b/src/common/CompletionModel.cpp
index bd0038107..f6dfd5b0c 100644
--- a/src/common/CompletionModel.cpp
+++ b/src/common/CompletionModel.cpp
@@ -104,7 +104,7 @@ int CompletionModel::rowCount(const QModelIndex &) const
 
 void CompletionModel::refresh()
 {
-    Log("[CompletionModel:{}] Refreshing...]", this->channelName_);
+    log("[CompletionModel:{}] Refreshing...]", this->channelName_);
 
     auto app = getApp();
 
diff --git a/src/common/NetworkRequest.cpp b/src/common/NetworkRequest.cpp
index f7a288206..f54192190 100644
--- a/src/common/NetworkRequest.cpp
+++ b/src/common/NetworkRequest.cpp
@@ -136,7 +136,7 @@ void NetworkRequest::execute()
         } break;
 
         default: {
-            Log("[Execute] Unhandled request type");
+            log("[Execute] Unhandled request type");
         } break;
     }
 }
@@ -190,10 +190,11 @@ void NetworkRequest::doRequest()
 
                 case NetworkRequestType::Put:
                     return NetworkManager::accessManager.put(data->request_,
-                                                   data->payload_);
+                                                             data->payload_);
 
                 case NetworkRequestType::Delete:
-                    return NetworkManager::accessManager.deleteResource(data->request_);
+                    return NetworkManager::accessManager.deleteResource(
+                        data->request_);
 
                 default:
                     return nullptr;
@@ -201,13 +202,13 @@ void NetworkRequest::doRequest()
         }();
 
         if (reply == nullptr) {
-            Log("Unhandled request type");
+            log("Unhandled request type");
             return;
         }
 
         if (timer->isStarted()) {
             timer->onTimeout(worker, [reply, data]() {
-                Log("Aborted!");
+                log("Aborted!");
                 reply->abort();
                 if (data->onError_) {
                     data->onError_(-2);
@@ -234,7 +235,7 @@ void NetworkRequest::doRequest()
             NetworkResult result(bytes);
 
             DebugCount::increase("http request success");
-            Log("starting {}", data->request_.url().toString());
+            // log("starting {}", data->request_.url().toString());
             if (data->onSuccess_) {
                 if (data->executeConcurrently)
                     QtConcurrent::run(
@@ -243,7 +244,7 @@ void NetworkRequest::doRequest()
                 else
                     data->onSuccess_(result);
             }
-            Log("finished {}", data->request_.url().toString());
+            // log("finished {}", data->request_.url().toString());
 
             reply->deleteLater();
         };
diff --git a/src/common/NetworkResult.cpp b/src/common/NetworkResult.cpp
index 443d0aa05..78884a421 100644
--- a/src/common/NetworkResult.cpp
+++ b/src/common/NetworkResult.cpp
@@ -31,7 +31,7 @@ rapidjson::Document NetworkResult::parseRapidJson() const
         ret.Parse(this->data_.data(), this->data_.length());
 
     if (result.Code() != rapidjson::kParseErrorNone) {
-        Log("JSON parse error: {} ({})",
+        log("JSON parse error: {} ({})",
             rapidjson::GetParseError_En(result.Code()), result.Offset());
         return ret;
     }
diff --git a/src/common/SimpleSignalVector.hpp b/src/common/SimpleSignalVector.hpp
deleted file mode 100644
index 6aca458f5..000000000
--- a/src/common/SimpleSignalVector.hpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#pragma once
-
-#include <pajlada/signals/signal.hpp>
-
-#include <mutex>
-#include <vector>
-
-namespace chatterino {
-
-template <typename TValue>
-class SimpleSignalVector
-{
-public:
-    SimpleSignalVector &operator=(std::vector<TValue> &other)
-    {
-        this->data_ = other;
-
-        this->updated.invoke();
-
-        return *this;
-    }
-
-    operator std::vector<TValue> &()
-    {
-        return this->data_;
-    }
-
-    pajlada::Signals::NoArgSignal updated;
-
-private:
-    std::vector<TValue> data_;
-};
-
-}  // namespace chatterino
diff --git a/src/common/UniqueAccess.hpp b/src/common/UniqueAccess.hpp
index 6e9f7a52e..30d6bee32 100644
--- a/src/common/UniqueAccess.hpp
+++ b/src/common/UniqueAccess.hpp
@@ -46,16 +46,15 @@ public:
     }
 
 private:
-    T *element_;
-    std::mutex *mutex_;
-    bool isValid_ = true;
+    T *element_{};
+    std::mutex *mutex_{};
+    bool isValid_{true};
 };
 
 template <typename T>
 class UniqueAccess
 {
 public:
-    //    template <typename X = decltype(T())>
     UniqueAccess()
         : element_(T())
     {
diff --git a/src/controllers/commands/CommandController.cpp b/src/controllers/commands/CommandController.cpp
index 111c06786..3aaefca8b 100644
--- a/src/controllers/commands/CommandController.cpp
+++ b/src/controllers/commands/CommandController.cpp
@@ -78,7 +78,7 @@ void CommandController::save()
 {
     QFile textFile(this->filePath_);
     if (!textFile.open(QIODevice::WriteOnly)) {
-        Log("[CommandController::saveCommands] Unable to open {} for writing",
+        log("[CommandController::saveCommands] Unable to open {} for writing",
             this->filePath_);
         return;
     }
diff --git a/src/debug/Benchmark.cpp b/src/debug/Benchmark.cpp
new file mode 100644
index 000000000..2ab28a680
--- /dev/null
+++ b/src/debug/Benchmark.cpp
@@ -0,0 +1,21 @@
+#include "Benchmark.hpp"
+
+namespace chatterino {
+
+BenchmarkGuard::BenchmarkGuard(const QString &_name)
+    : name_(_name)
+{
+    timer_.start();
+}
+
+BenchmarkGuard::~BenchmarkGuard()
+{
+    log("{} {} ms", this->name_, float(timer_.nsecsElapsed()) / 1000000.0f);
+}
+
+qreal BenchmarkGuard::getElapsedMs()
+{
+    return qreal(timer_.nsecsElapsed()) / 1000000.0;
+}
+
+}  // namespace chatterino
diff --git a/src/debug/Benchmark.hpp b/src/debug/Benchmark.hpp
index 5faa1a537..065048e8f 100644
--- a/src/debug/Benchmark.hpp
+++ b/src/debug/Benchmark.hpp
@@ -3,40 +3,20 @@
 #include "debug/Log.hpp"
 
 #include <QElapsedTimer>
-#include <boost/current_function.hpp>
 #include <boost/noncopyable.hpp>
 
-#define BENCH(x)     \
-    QElapsedTimer x; \
-    x.start();
-
-#define MARK(x)                                    \
-    qDebug() << BOOST_CURRENT_FUNCTION << __LINE__ \
-             << static_cast<float>(x.nsecsElapsed()) / 1000000.0 << "ms";
-
 namespace chatterino {
 
 class BenchmarkGuard : boost::noncopyable
 {
-    QElapsedTimer timer;
-    QString name;
-
 public:
-    BenchmarkGuard(const QString &_name)
-        : name(_name)
-    {
-        timer.start();
-    }
+    BenchmarkGuard(const QString &_name);
+    ~BenchmarkGuard();
+    qreal getElapsedMs();
 
-    ~BenchmarkGuard()
-    {
-        Log("{} {} ms", this->name, float(timer.nsecsElapsed()) / 1000000.0f);
-    }
-
-    qreal getElapsedMs()
-    {
-        return qreal(timer.nsecsElapsed()) / 1000000.0;
-    }
+private:
+    QElapsedTimer timer_;
+    QString name_;
 };
 
 }  // namespace chatterino
diff --git a/src/debug/Log.hpp b/src/debug/Log.hpp
index 51ef0f053..31536781a 100644
--- a/src/debug/Log.hpp
+++ b/src/debug/Log.hpp
@@ -8,17 +8,22 @@
 namespace chatterino {
 
 template <typename... Args>
-inline void Log(const std::string &formatString, Args &&... args)
+inline void log(const std::string &formatString, Args &&... args)
 {
     qDebug().noquote() << QTime::currentTime().toString("hh:mm:ss.zzz")
                        << fS(formatString, std::forward<Args>(args)...).c_str();
 }
 
 template <typename... Args>
-inline void Warn(const std::string &formatString, Args &&... args)
+inline void log(const char *formatString, Args &&... args)
 {
-    qWarning() << QTime::currentTime().toString("hh:mm:ss.zzz")
-               << fS(formatString, std::forward<Args>(args)...).c_str();
+    log(std::string(formatString), std::forward<Args>(args)...);
+}
+
+template <typename... Args>
+inline void log(const QString &formatString, Args &&... args)
+{
+    log(formatString.toStdString(), std::forward<Args>(args)...);
 }
 
 }  // namespace chatterino
diff --git a/src/main.cpp b/src/main.cpp
index 5f259a8be..4bf6e7daf 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5,13 +5,15 @@
 
 #include <QApplication>
 #include <QStringList>
-
-#include <messages/Image.hpp>
+#include <memory>
 
 using namespace chatterino;
 
 int main(int argc, char **argv)
 {
+    auto shared = std::make_shared<QString>();
+    log(std::atomic_is_lock_free(&shared));
+
     QApplication a(argc, argv);
 
     // convert char** to QStringList
diff --git a/src/messages/Emote.cpp b/src/messages/Emote.cpp
index 369725426..c5ff83e12 100644
--- a/src/messages/Emote.cpp
+++ b/src/messages/Emote.cpp
@@ -15,61 +15,13 @@ bool operator!=(const Emote &a, const Emote &b)
     return !(a == b);
 }
 
-// EmotePtr Emote::create(const EmoteData2 &data)
-//{
-//}
+EmotePtr cachedOrMakeEmotePtr(Emote &&emote, const EmoteMap &cache)
+{
+    // reuse old shared_ptr if nothing changed
+    auto it = cache.find(emote.name);
+    if (it != cache.end() && *it->second == emote) return it->second;
 
-// EmotePtr Emote::create(EmoteData2 &&data)
-//{
-//}
-
-// Emote::Emote(EmoteData2 &&data)
-//    : data_(data)
-//{
-//}
-//
-// Emote::Emote(const EmoteData2 &data)
-//    : data_(data)
-//{
-//}
-//
-// const Url &Emote::getHomePage() const
-//{
-//    return this->data_.homePage;
-//}
-//
-// const EmoteName &Emote::getName() const
-//{
-//    return this->data_.name;
-//}
-//
-// const Tooltip &Emote::getTooltip() const
-//{
-//    return this->data_.tooltip;
-//}
-//
-// const ImageSet &Emote::getImages() const
-//{
-//    return this->data_.images;
-//}
-//
-// const QString &Emote::getCopyString() const
-//{
-//    return this->data_.name.string;
-//}
-//
-// bool Emote::operator==(const Emote &other) const
-//{
-//    auto &a = this->data_;
-//    auto &b = other.data_;
-//
-//    return std::tie(a.homePage, a.name, a.tooltip, a.images) ==
-//           std::tie(b.homePage, b.name, b.tooltip, b.images);
-//}
-//
-// bool Emote::operator!=(const Emote &other) const
-//{
-//    return !this->operator==(other);
-//}
+    return std::make_shared<Emote>(std::move(emote));
+}
 
 }  // namespace chatterino
diff --git a/src/messages/Emote.hpp b/src/messages/Emote.hpp
index 9c7b5f680..cfde58492 100644
--- a/src/messages/Emote.hpp
+++ b/src/messages/Emote.hpp
@@ -37,4 +37,6 @@ using EmoteIdMap = std::unordered_map<EmoteId, EmotePtr>;
 using WeakEmoteMap = std::unordered_map<EmoteName, std::weak_ptr<const Emote>>;
 using WeakEmoteIdMap = std::unordered_map<EmoteId, std::weak_ptr<const Emote>>;
 
+EmotePtr cachedOrMakeEmotePtr(Emote &&emote, const EmoteMap &cache);
+
 }  // namespace chatterino
diff --git a/src/messages/EmoteMap.cpp b/src/messages/EmoteMap.cpp
deleted file mode 100644
index f940de852..000000000
--- a/src/messages/EmoteMap.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-#include "EmoteMap.hpp"
-
-#include "Application.hpp"
-#include "singletons/Settings.hpp"
-
-namespace chatterino {
-
-// EmoteData::EmoteData(Image *image)
-//    : image1x(image)
-//{
-//}
-
-//// Emotes must have a 1x image to be valid
-// bool EmoteData::isValid() const
-//{
-//    return this->image1x != nullptr;
-//}
-
-// Image *EmoteData::getImage(float scale) const
-//{
-//    int quality = getApp()->settings->preferredEmoteQuality;
-
-//    if (quality == 0) {
-//        scale *= getApp()->settings->emoteScale.getValue();
-//        quality = [&] {
-//            if (scale <= 1) return 1;
-//            if (scale <= 2) return 2;
-//            return 3;
-//        }();
-//    }
-
-//    Image *_image;
-//    if (quality == 3 && this->image3x != nullptr) {
-//        _image = this->image3x;
-//    } else if (quality >= 2 && this->image2x != nullptr) {
-//        _image = this->image2x;
-//    } else {
-//        _image = this->image1x;
-//    }
-
-//    return _image;
-//}
-
-}  // namespace chatterino
diff --git a/src/messages/EmoteMap.hpp b/src/messages/EmoteMap.hpp
deleted file mode 100644
index 30a0dfdd1..000000000
--- a/src/messages/EmoteMap.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-
-#include "boost/optional.hpp"
-#include "messages/Emote.hpp"
-
-namespace chatterino {
-
-// class EmoteMap
-//{
-// public:
-//    void add(Emote emote);
-//    void remove(const Emote &emote);
-//    void remove(const QString &name);
-
-// private:
-//};
-
-// using EmoteMap = ConcurrentMap<QString, EmoteData>;
-
-}  // namespace chatterino
diff --git a/src/messages/Image.cpp b/src/messages/Image.cpp
index 29b093f36..56286cdfe 100644
--- a/src/messages/Image.cpp
+++ b/src/messages/Image.cpp
@@ -78,7 +78,7 @@ QVector<Frame<QImage>> readFrames(QImageReader &reader, const Url &url)
     QVector<Frame<QImage>> frames;
 
     if (reader.imageCount() == 0) {
-        Log("Error while reading image {}: '{}'", url.string,
+        log("Error while reading image {}: '{}'", url.string,
             reader.errorString());
         return frames;
     }
@@ -94,7 +94,7 @@ QVector<Frame<QImage>> readFrames(QImageReader &reader, const Url &url)
     }
 
     if (frames.size() == 0) {
-        Log("Error while reading image {}: '{}'", url.string,
+        log("Error while reading image {}: '{}'", url.string,
             reader.errorString());
     }
 
@@ -200,7 +200,7 @@ Image::Image(const Url &url, qreal scale)
 
 Image::Image(const QPixmap &pixmap, qreal scale)
     : scale_(scale)
-    , frames_(QVector<Frame<QPixmap>>{Frame<QPixmap>{pixmap}})
+    , frames_(QVector<Frame<QPixmap>>{Frame<QPixmap>{pixmap, 1}})
 {
 }
 
diff --git a/src/messages/MessageBuilder.hpp b/src/messages/MessageBuilder.hpp
index 5ae197254..a2e78ec29 100644
--- a/src/messages/MessageBuilder.hpp
+++ b/src/messages/MessageBuilder.hpp
@@ -16,6 +16,14 @@ const TimeoutMessageTag timeoutMessage{};
 
 MessagePtr makeSystemMessage(const QString &text);
 
+struct MessageParseArgs {
+    bool disablePingSounds = false;
+    bool isReceivedWhisper = false;
+    bool isSentWhisper = false;
+    bool trimSubscriberUsername = false;
+    bool isStaffOrBroadcaster = false;
+};
+
 class MessageBuilder
 {
 public:
diff --git a/src/messages/MessageParseArgs.hpp b/src/messages/MessageParseArgs.hpp
index f3d732c4b..519262dc1 100644
--- a/src/messages/MessageParseArgs.hpp
+++ b/src/messages/MessageParseArgs.hpp
@@ -2,12 +2,5 @@
 
 namespace chatterino {
 
-struct MessageParseArgs {
-    bool disablePingSounds = false;
-    bool isReceivedWhisper = false;
-    bool isSentWhisper = false;
-    bool trimSubscriberUsername = false;
-    bool isStaffOrBroadcaster = false;
-};
 
 }  // namespace chatterino
diff --git a/src/messages/Selection.hpp b/src/messages/Selection.hpp
index dbed15d30..8eefc3a33 100644
--- a/src/messages/Selection.hpp
+++ b/src/messages/Selection.hpp
@@ -35,7 +35,7 @@ struct SelectionItem {
 
     bool operator>(const SelectionItem &b) const
     {
-        return b.operator<(*this);
+        return this->operator!=(b) && b.operator<(*this);
     }
 
     bool operator==(const SelectionItem &b) const
diff --git a/src/messages/layouts/MessageLayout.hpp b/src/messages/layouts/MessageLayout.hpp
index 629da9685..0f0d5cab3 100644
--- a/src/messages/layouts/MessageLayout.hpp
+++ b/src/messages/layouts/MessageLayout.hpp
@@ -31,13 +31,10 @@ public:
 
     const Message *getMessage();
 
-    // Height
     int getHeight() const;
 
-    // Flags
     MessageLayoutFlags flags;
 
-    // Layout
     bool layout(int width, float scale_, MessageElementFlags flags);
 
     // Painting
diff --git a/src/messages/layouts/MessageLayoutContainer.cpp b/src/messages/layouts/MessageLayoutContainer.cpp
index 5e6350433..699cfc604 100644
--- a/src/messages/layouts/MessageLayoutContainer.cpp
+++ b/src/messages/layouts/MessageLayoutContainer.cpp
@@ -126,9 +126,10 @@ void MessageLayoutContainer::breakLine()
     int xOffset = 0;
 
     if (this->flags_.has(MessageFlag::Centered) && this->elements_.size() > 0) {
-        xOffset = (width_ - this->elements_.at(this->elements_.size() - 1)
-                                ->getRect()
-                                .right()) /
+        xOffset = (width_ - this->elements_.at(0)->getRect().left() -
+                   this->elements_.at(this->elements_.size() - 1)
+                       ->getRect()
+                       .right()) /
                   2;
     }
 
diff --git a/src/providers/bttv/BttvEmotes.cpp b/src/providers/bttv/BttvEmotes.cpp
index b9ca7ba99..072212c21 100644
--- a/src/providers/bttv/BttvEmotes.cpp
+++ b/src/providers/bttv/BttvEmotes.cpp
@@ -10,9 +10,7 @@
 #include <QThread>
 
 namespace chatterino {
-
 namespace {
-
 Url getEmoteLink(QString urlTemplate, const EmoteId &id,
                  const QString &emoteScale)
 {
@@ -21,72 +19,14 @@ Url getEmoteLink(QString urlTemplate, const EmoteId &id,
     return {urlTemplate.replace("{{id}}", id.string)
                 .replace("{{image}}", emoteScale)};
 }
-
-}  // namespace
-
-AccessGuard<const EmoteMap> BttvEmotes::accessGlobalEmotes() const
-{
-    return this->globalEmotes_.accessConst();
-}
-
-boost::optional<EmotePtr> BttvEmotes::getGlobalEmote(const EmoteName &name)
-{
-    auto emotes = this->globalEmotes_.access();
-    auto it = emotes->find(name);
-
-    if (it == emotes->end()) return boost::none;
-    return it->second;
-}
-
-// FOURTF: never returns anything
-// boost::optional<EmotePtr> BttvEmotes::getEmote(const EmoteId &id)
-//{
-//    auto cache = this->channelEmoteCache_.access();
-//    auto it = cache->find(id);
-//
-//    if (it != cache->end()) {
-//        auto shared = it->second.lock();
-//        if (shared) {
-//            return shared;
-//        }
-//    }
-//
-//    return boost::none;
-//}
-
-void BttvEmotes::loadGlobalEmotes()
-{
-    auto request = NetworkRequest(QString(globalEmoteApiUrl));
-
-    request.setCaller(QThread::currentThread());
-    request.setTimeout(30000);
-    request.onSuccess([this](auto result) -> Outcome {
-        //        if (auto shared = weak.lock()) {
-        auto currentEmotes = this->globalEmotes_.access();
-
-        auto pair = this->parseGlobalEmotes(result.parseJson(), *currentEmotes);
-
-        if (pair.first) {
-            *currentEmotes = std::move(pair.second);
-        }
-
-        return pair.first;
-        //        }
-        return Failure;
-    });
-
-    request.execute();
-}
-
-std::pair<Outcome, EmoteMap> BttvEmotes::parseGlobalEmotes(
-    const QJsonObject &jsonRoot, const EmoteMap &currentEmotes)
+std::pair<Outcome, EmoteMap> parseGlobalEmotes(const QJsonObject &jsonRoot,
+                                               const EmoteMap &currentEmotes)
 {
     auto emotes = EmoteMap();
     auto jsonEmotes = jsonRoot.value("emotes").toArray();
-    auto urlTemplate =
-        QString("https:" + jsonRoot.value("urlTemplate").toString());
+    auto urlTemplate = qS("https:") + jsonRoot.value("urlTemplate").toString();
 
-    for (const QJsonValue &jsonEmote : jsonEmotes) {
+    for (auto jsonEmote : jsonEmotes) {
         auto id = EmoteId{jsonEmote.toObject().value("id").toString()};
         auto name = EmoteName{jsonEmote.toObject().value("code").toString()};
 
@@ -99,16 +39,49 @@ std::pair<Outcome, EmoteMap> BttvEmotes::parseGlobalEmotes(
              Tooltip{name.string + "<br />Global Bttv Emote"},
              Url{"https://manage.betterttv.net/emotes/" + id.string}});
 
-        auto it = currentEmotes.find(name);
-        if (it != currentEmotes.end() && *it->second == emote) {
-            // reuse old shared_ptr if nothing changed
-            emotes[name] = it->second;
-        } else {
-            emotes[name] = std::make_shared<Emote>(std::move(emote));
-        }
+        emotes[name] = cachedOrMakeEmotePtr(std::move(emote), currentEmotes);
     }
 
     return {Success, std::move(emotes)};
 }
+}  // namespace
+
+BttvEmotes::BttvEmotes()
+    : global_(std::make_shared<EmoteMap>())
+{
+}
+
+std::shared_ptr<const EmoteMap> BttvEmotes::global() const
+{
+    return this->global_.get();
+}
+
+boost::optional<EmotePtr> BttvEmotes::global(const EmoteName &name) const
+{
+    auto emotes = this->global_.get();
+    auto it = emotes->find(name);
+
+    if (it == emotes->end()) return boost::none;
+    return it->second;
+}
+
+void BttvEmotes::loadGlobal()
+{
+    auto request = NetworkRequest(QString(globalEmoteApiUrl));
+
+    request.setCaller(QThread::currentThread());
+    request.setTimeout(30000);
+
+    request.onSuccess([this](auto result) -> Outcome {
+        auto emotes = this->global_.get();
+        auto pair = parseGlobalEmotes(result.parseJson(), *emotes);
+        if (pair.first)
+            this->global_.set(
+                std::make_shared<EmoteMap>(std::move(pair.second)));
+        return pair.first;
+    });
+
+    request.execute();
+}
 
 }  // namespace chatterino
diff --git a/src/providers/bttv/BttvEmotes.hpp b/src/providers/bttv/BttvEmotes.hpp
index f85333df7..510f873fc 100644
--- a/src/providers/bttv/BttvEmotes.hpp
+++ b/src/providers/bttv/BttvEmotes.hpp
@@ -1,33 +1,25 @@
 #pragma once
 
 #include <memory>
-
-#include "common/UniqueAccess.hpp"
+#include "common/Atomic.hpp"
 #include "messages/Emote.hpp"
-#include "messages/EmoteCache.hpp"
 
 namespace chatterino {
 
-class BttvEmotes final : std::enable_shared_from_this<BttvEmotes>
+class BttvEmotes final
 {
     static constexpr const char *globalEmoteApiUrl =
         "https://api.betterttv.net/2/emotes";
 
 public:
-    // BttvEmotes();
+    BttvEmotes();
 
-    AccessGuard<const EmoteMap> accessGlobalEmotes() const;
-    boost::optional<EmotePtr> getGlobalEmote(const EmoteName &name);
-    boost::optional<EmotePtr> getEmote(const EmoteId &id);
-
-    void loadGlobalEmotes();
+    std::shared_ptr<const EmoteMap> global() const;
+    boost::optional<EmotePtr> global(const EmoteName &name) const;
+    void loadGlobal();
 
 private:
-    std::pair<Outcome, EmoteMap> parseGlobalEmotes(
-        const QJsonObject &jsonRoot, const EmoteMap &currentEmotes);
-
-    UniqueAccess<EmoteMap> globalEmotes_;
-    // UniqueAccess<WeakEmoteIdMap> channelEmoteCache_;
+    Atomic<std::shared_ptr<const EmoteMap>> global_;
 };
 
 }  // namespace chatterino
diff --git a/src/providers/emoji/Emojis.cpp b/src/providers/emoji/Emojis.cpp
index ec7bac2b8..06d4e798b 100644
--- a/src/providers/emoji/Emojis.cpp
+++ b/src/providers/emoji/Emojis.cpp
@@ -118,7 +118,7 @@ void Emojis::loadEmojis()
     rapidjson::ParseResult result = root.Parse(data.toUtf8(), data.length());
 
     if (result.Code() != rapidjson::kParseErrorNone) {
-        Log("JSON parse error: {} ({})",
+        log("JSON parse error: {} ({})",
             rapidjson::GetParseError_En(result.Code()), result.Offset());
         return;
     }
@@ -146,7 +146,7 @@ void Emojis::loadEmojis()
 
                 auto toneNameIt = toneNames.find(tone);
                 if (toneNameIt == toneNames.end()) {
-                    Log("Tone with key {} does not exist in tone names map",
+                    log("Tone with key {} does not exist in tone names map",
                         tone);
                     continue;
                 }
@@ -219,7 +219,7 @@ void Emojis::loadEmojiSet()
     auto app = getApp();
 
     app->settings->emojiSet.connect([=](const auto &emojiSet, auto) {
-        Log("Using emoji set {}", emojiSet);
+        log("Using emoji set {}", emojiSet);
         this->emojis.each([=](const auto &name,
                               std::shared_ptr<EmojiData> &emoji) {
             QString emojiSetToUse = emojiSet;
diff --git a/src/providers/emoji/Emojis.hpp b/src/providers/emoji/Emojis.hpp
index c4ff69bbe..18bd33522 100644
--- a/src/providers/emoji/Emojis.hpp
+++ b/src/providers/emoji/Emojis.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "common/SimpleSignalVector.hpp"
 #include "messages/Emote.hpp"
 #include "util/ConcurrentMap.hpp"
 
diff --git a/src/providers/ffz/FfzEmotes.cpp b/src/providers/ffz/FfzEmotes.cpp
index b5fe65aa2..be6d776c6 100644
--- a/src/providers/ffz/FfzEmotes.cpp
+++ b/src/providers/ffz/FfzEmotes.cpp
@@ -19,7 +19,6 @@ Url getEmoteLink(const QJsonObject &urls, const QString &emoteScale)
 
     return {"https:" + emote.toString()};
 }
-
 void fillInEmoteData(const QJsonObject &urls, const EmoteName &name,
                      const QString &tooltip, Emote &emoteData)
 {
@@ -34,52 +33,11 @@ void fillInEmoteData(const QJsonObject &urls, const EmoteName &name,
                  Image::fromUrl(url3x, 0.25)};
     emoteData.tooltip = {tooltip};
 }
-}  // namespace
-
-AccessGuard<const EmoteCache<EmoteName>> FfzEmotes::accessGlobalEmotes() const
-{
-    return this->globalEmotes_.accessConst();
-}
-
-boost::optional<EmotePtr> FfzEmotes::getEmote(const EmoteId &id)
-{
-    auto cache = this->channelEmoteCache_.access();
-    auto it = cache->find(id);
-
-    if (it != cache->end()) {
-        auto shared = it->second.lock();
-        if (shared) {
-            return shared;
-        }
-    }
-
-    return boost::none;
-}
-
-boost::optional<EmotePtr> FfzEmotes::getGlobalEmote(const EmoteName &name)
-{
-    return this->globalEmotes_.access()->get(name);
-}
-
-void FfzEmotes::loadGlobalEmotes()
-{
-    QString url("https://api.frankerfacez.com/v1/set/global");
-
-    NetworkRequest request(url);
-    request.setCaller(QThread::currentThread());
-    request.setTimeout(30000);
-    request.onSuccess([this](auto result) -> Outcome {
-        return this->parseGlobalEmotes(result.parseJson());
-    });
-
-    request.execute();
-}
-
-Outcome FfzEmotes::parseGlobalEmotes(const QJsonObject &jsonRoot)
+std::pair<Outcome, EmoteMap> parseGlobalEmotes(const QJsonObject &jsonRoot,
+                                               const EmoteMap &currentEmotes)
 {
     auto jsonSets = jsonRoot.value("sets").toObject();
-    auto emotes = this->globalEmotes_.access();
-    auto replacement = emotes->makeReplacment();
+    auto emotes = EmoteMap();
 
     for (auto jsonSet : jsonSets) {
         auto jsonEmotes = jsonSet.toObject().value("emoticons").toArray();
@@ -99,15 +57,55 @@ Outcome FfzEmotes::parseGlobalEmotes(const QJsonObject &jsonRoot)
                         .arg(id.string)
                         .arg(name.string)};
 
-            replacement.add(name, emote);
+            emotes[name] =
+                cachedOrMakeEmotePtr(std::move(emote), currentEmotes);
         }
     }
 
-    return Success;
+    return {Success, std::move(emotes)};
+}
+}  // namespace
+
+FfzEmotes::FfzEmotes()
+    : global_(std::make_shared<EmoteMap>())
+{
 }
 
-void FfzEmotes::loadChannelEmotes(const QString &channelName,
-                                  std::function<void(EmoteMap &&)> callback)
+std::shared_ptr<const EmoteMap> FfzEmotes::global() const
+{
+    return this->global_.get();
+}
+
+boost::optional<EmotePtr> FfzEmotes::global(const EmoteName &name) const
+{
+    auto emotes = this->global_.get();
+    auto it = emotes->find(name);
+    if (it != emotes->end()) return it->second;
+    return boost::none;
+}
+
+void FfzEmotes::loadGlobal()
+{
+    QString url("https://api.frankerfacez.com/v1/set/global");
+
+    NetworkRequest request(url);
+    request.setCaller(QThread::currentThread());
+    request.setTimeout(30000);
+
+    request.onSuccess([this](auto result) -> Outcome {
+        auto emotes = this->global();
+        auto pair = parseGlobalEmotes(result.parseJson(), *emotes);
+        if (pair.first)
+            this->global_.set(
+                std::make_shared<EmoteMap>(std::move(pair.second)));
+        return pair.first;
+    });
+
+    request.execute();
+}
+
+void FfzEmotes::loadChannel(const QString &channelName,
+                            std::function<void(EmoteMap &&)> callback)
 {
     // printf("[FFZEmotes] Reload FFZ Channel Emotes for channel %s\n",
     // qPrintable(channelName));
diff --git a/src/providers/ffz/FfzEmotes.hpp b/src/providers/ffz/FfzEmotes.hpp
index 2dd747e02..ccc850bff 100644
--- a/src/providers/ffz/FfzEmotes.hpp
+++ b/src/providers/ffz/FfzEmotes.hpp
@@ -2,7 +2,7 @@
 
 #include <memory>
 
-#include "common/UniqueAccess.hpp"
+#include "common/Atomic.hpp"
 #include "messages/Emote.hpp"
 #include "messages/EmoteCache.hpp"
 
@@ -16,24 +16,17 @@ class FfzEmotes final : std::enable_shared_from_this<FfzEmotes>
         "https://api.betterttv.net/2/channels/";
 
 public:
-    // FfzEmotes();
+    FfzEmotes();
 
-    static std::shared_ptr<FfzEmotes> create();
+    std::shared_ptr<const EmoteMap> global() const;
+    boost::optional<EmotePtr> global(const EmoteName &name) const;
 
-    AccessGuard<const EmoteCache<EmoteName>> accessGlobalEmotes() const;
-    boost::optional<EmotePtr> getGlobalEmote(const EmoteName &name);
-    boost::optional<EmotePtr> getEmote(const EmoteId &id);
+    void loadGlobal();
+    void loadChannel(const QString &channelName,
+                     std::function<void(EmoteMap &&)> callback);
 
-    void loadGlobalEmotes();
-    void loadChannelEmotes(const QString &channelName,
-                           std::function<void(EmoteMap &&)> callback);
-
-protected:
-    Outcome parseGlobalEmotes(const QJsonObject &jsonRoot);
-    Outcome parseChannelEmotes(const QJsonObject &jsonRoot);
-
-    UniqueAccess<EmoteCache<EmoteName>> globalEmotes_;
-    UniqueAccess<WeakEmoteIdMap> channelEmoteCache_;
+private:
+    Atomic<std::shared_ptr<const EmoteMap>> global_;
 };
 
 }  // namespace chatterino
diff --git a/src/providers/irc/AbstractIrcServer.cpp b/src/providers/irc/AbstractIrcServer.cpp
index 23bf47d26..b7995282f 100644
--- a/src/providers/irc/AbstractIrcServer.cpp
+++ b/src/providers/irc/AbstractIrcServer.cpp
@@ -131,7 +131,7 @@ std::shared_ptr<Channel> AbstractIrcServer::getOrAddChannel(
     chan->destroyed.connect([this, clojuresInCppAreShit] {
         // fourtf: issues when the server itself is destroyed
 
-        Log("[AbstractIrcServer::addChannel] {} was destroyed",
+        log("[AbstractIrcServer::addChannel] {} was destroyed",
             clojuresInCppAreShit);
         this->channels.remove(clojuresInCppAreShit);
 
diff --git a/src/providers/twitch/IrcMessageHandler.cpp b/src/providers/twitch/IrcMessageHandler.cpp
index 5d628e311..35c7c51d9 100644
--- a/src/providers/twitch/IrcMessageHandler.cpp
+++ b/src/providers/twitch/IrcMessageHandler.cpp
@@ -145,7 +145,7 @@ void IrcMessageHandler::handleClearChatMessage(Communi::IrcMessage *message)
     auto chan = app->twitch.server->getChannelOrEmpty(chanName);
 
     if (chan->isEmpty()) {
-        Log("[IrcMessageHandler:handleClearChatMessage] Twitch channel {} not "
+        log("[IrcMessageHandler:handleClearChatMessage] Twitch channel {} not "
             "found",
             chanName);
         return;
@@ -209,7 +209,7 @@ void IrcMessageHandler::handleUserStateMessage(Communi::IrcMessage *message)
 void IrcMessageHandler::handleWhisperMessage(Communi::IrcMessage *message)
 {
     auto app = getApp();
-    Log("Received whisper!");
+    log("Received whisper!");
     MessageParseArgs args;
 
     args.isReceivedWhisper = true;
@@ -326,7 +326,7 @@ void IrcMessageHandler::handleNoticeMessage(Communi::IrcNoticeMessage *message)
     auto channel = app->twitch.server->getChannelOrEmpty(channelName);
 
     if (channel->isEmpty()) {
-        Log("[IrcManager:handleNoticeMessage] Channel {} not found in channel "
+        log("[IrcManager:handleNoticeMessage] Channel {} not found in channel "
             "manager ",
             channelName);
         return;
@@ -366,7 +366,7 @@ void IrcMessageHandler::handleWriteConnectionNoticeMessage(
             return;
         }
 
-        Log("Showing notice message from write connection with message id '{}'",
+        log("Showing notice message from write connection with message id '{}'",
             msgID);
     }
 
diff --git a/src/providers/twitch/PartialTwitchUser.cpp b/src/providers/twitch/PartialTwitchUser.cpp
index 98fa2ba42..c3d9e5102 100644
--- a/src/providers/twitch/PartialTwitchUser.cpp
+++ b/src/providers/twitch/PartialTwitchUser.cpp
@@ -42,23 +42,23 @@ void PartialTwitchUser::getId(std::function<void(QString)> successCallback,
     request.onSuccess([successCallback](auto result) -> Outcome {
         auto root = result.parseJson();
         if (!root.value("users").isArray()) {
-            Log("API Error while getting user id, users is not an array");
+            log("API Error while getting user id, users is not an array");
             return Failure;
         }
 
         auto users = root.value("users").toArray();
         if (users.size() != 1) {
-            Log("API Error while getting user id, users array size is not 1");
+            log("API Error while getting user id, users array size is not 1");
             return Failure;
         }
         if (!users[0].isObject()) {
-            Log("API Error while getting user id, first user is not an object");
+            log("API Error while getting user id, first user is not an object");
             return Failure;
         }
         auto firstUser = users[0].toObject();
         auto id = firstUser.value("_id");
         if (!id.isString()) {
-            Log("API Error: while getting user id, first user object `_id` key "
+            log("API Error: while getting user id, first user object `_id` key "
                 "is not a "
                 "string");
             return Failure;
diff --git a/src/providers/twitch/PubsubClient.cpp b/src/providers/twitch/PubsubClient.cpp
index 7cdd343ce..7f591aebc 100644
--- a/src/providers/twitch/PubsubClient.cpp
+++ b/src/providers/twitch/PubsubClient.cpp
@@ -109,7 +109,7 @@ void PubSubClient::handlePong()
 {
     assert(this->awaitingPong_);
 
-    Log("Got pong!");
+    log("Got pong!");
 
     this->awaitingPong_ = false;
 }
@@ -144,7 +144,7 @@ void PubSubClient::ping()
                  }
 
                  if (self->awaitingPong_) {
-                     Log("No pong respnose, disconnect!");
+                     log("No pong respnose, disconnect!");
                      // TODO(pajlada): Label this connection as "disconnect me"
                  }
              });
@@ -166,7 +166,7 @@ bool PubSubClient::send(const char *payload)
                                 websocketpp::frame::opcode::text, ec);
 
     if (ec) {
-        Log("Error sending message {}: {}", payload, ec.message());
+        log("Error sending message {}: {}", payload, ec.message());
         // TODO(pajlada): Check which error code happened and maybe gracefully
         // handle it
 
@@ -207,26 +207,26 @@ PubSub::PubSub()
         action.state = ModeChangedAction::State::On;
 
         if (!data.HasMember("args")) {
-            Log("Missing required args member");
+            log("Missing required args member");
             return;
         }
 
         const auto &args = data["args"];
 
         if (!args.IsArray()) {
-            Log("args member must be an array");
+            log("args member must be an array");
             return;
         }
 
         if (args.Size() == 0) {
-            Log("Missing duration argument in slowmode on");
+            log("Missing duration argument in slowmode on");
             return;
         }
 
         const auto &durationArg = args[0];
 
         if (!durationArg.IsString()) {
-            Log("Duration arg must be a string");
+            log("Duration arg must be a string");
             return;
         }
 
@@ -314,7 +314,7 @@ PubSub::PubSub()
                 return;
             }
         } catch (const std::runtime_error &ex) {
-            Log("Error parsing moderation action: {}", ex.what());
+            log("Error parsing moderation action: {}", ex.what());
         }
 
         action.modded = false;
@@ -339,7 +339,7 @@ PubSub::PubSub()
                 return;
             }
         } catch (const std::runtime_error &ex) {
-            Log("Error parsing moderation action: {}", ex.what());
+            log("Error parsing moderation action: {}", ex.what());
         }
 
         action.modded = true;
@@ -380,7 +380,7 @@ PubSub::PubSub()
 
             this->signals_.moderation.userBanned.invoke(action);
         } catch (const std::runtime_error &ex) {
-            Log("Error parsing moderation action: {}", ex.what());
+            log("Error parsing moderation action: {}", ex.what());
         }
     };
 
@@ -410,7 +410,7 @@ PubSub::PubSub()
 
             this->signals_.moderation.userBanned.invoke(action);
         } catch (const std::runtime_error &ex) {
-            Log("Error parsing moderation action: {}", ex.what());
+            log("Error parsing moderation action: {}", ex.what());
         }
     };
 
@@ -436,7 +436,7 @@ PubSub::PubSub()
 
             this->signals_.moderation.userUnbanned.invoke(action);
         } catch (const std::runtime_error &ex) {
-            Log("Error parsing moderation action: {}", ex.what());
+            log("Error parsing moderation action: {}", ex.what());
         }
     };
 
@@ -462,7 +462,7 @@ PubSub::PubSub()
 
             this->signals_.moderation.userUnbanned.invoke(action);
         } catch (const std::runtime_error &ex) {
-            Log("Error parsing moderation action: {}", ex.what());
+            log("Error parsing moderation action: {}", ex.what());
         }
     };
 
@@ -493,7 +493,7 @@ void PubSub::addClient()
     auto con = this->websocketClient.get_connection(TWITCH_PUBSUB_URL, ec);
 
     if (ec) {
-        Log("Unable to establish connection: {}", ec.message());
+        log("Unable to establish connection: {}", ec.message());
         return;
     }
 
@@ -512,7 +512,7 @@ void PubSub::listenToWhispers(std::shared_ptr<TwitchAccount> account)
 
     std::string userID = account->getUserId().toStdString();
 
-    Log("Connection open!");
+    log("Connection open!");
     websocketpp::lib::error_code ec;
 
     std::vector<std::string> topics({"whispers." + userID});
@@ -520,7 +520,7 @@ void PubSub::listenToWhispers(std::shared_ptr<TwitchAccount> account)
     this->listen(createListenMessage(topics, account));
 
     if (ec) {
-        Log("Unable to send message to websocket server: {}", ec.message());
+        log("Unable to send message to websocket server: {}", ec.message());
         return;
     }
 }
@@ -544,11 +544,11 @@ void PubSub::listenToChannelModerationActions(
     std::string topic(fS("chat_moderator_actions.{}.{}", userID, channelID));
 
     if (this->isListeningToTopic(topic)) {
-        Log("We are already listening to topic {}", topic);
+        log("We are already listening to topic {}", topic);
         return;
     }
 
-    Log("Listen to topic {}", topic);
+    log("Listen to topic {}", topic);
 
     this->listenToTopic(topic, account);
 }
@@ -564,18 +564,18 @@ void PubSub::listenToTopic(const std::string &topic,
 void PubSub::listen(rapidjson::Document &&msg)
 {
     if (this->tryListen(msg)) {
-        Log("Successfully listened!");
+        log("Successfully listened!");
         return;
     }
 
-    Log("Added to the back of the queue");
+    log("Added to the back of the queue");
     this->requests.emplace_back(
         std::make_unique<rapidjson::Document>(std::move(msg)));
 }
 
 bool PubSub::tryListen(rapidjson::Document &msg)
 {
-    Log("tryListen with {} clients", this->clients.size());
+    log("tryListen with {} clients", this->clients.size());
     for (const auto &p : this->clients) {
         const auto &client = p.second;
         if (client->listen(msg)) {
@@ -608,13 +608,13 @@ void PubSub::onMessage(websocketpp::connection_hdl hdl,
     rapidjson::ParseResult res = msg.Parse(payload.c_str());
 
     if (!res) {
-        Log("Error parsing message '{}' from PubSub: {}", payload,
+        log("Error parsing message '{}' from PubSub: {}", payload,
             rapidjson::GetParseError_En(res.Code()));
         return;
     }
 
     if (!msg.IsObject()) {
-        Log("Error parsing message '{}' from PubSub. Root object is not an "
+        log("Error parsing message '{}' from PubSub. Root object is not an "
             "object",
             payload);
         return;
@@ -623,7 +623,7 @@ void PubSub::onMessage(websocketpp::connection_hdl hdl,
     std::string type;
 
     if (!rj::getSafe(msg, "type", type)) {
-        Log("Missing required string member `type` in message root");
+        log("Missing required string member `type` in message root");
         return;
     }
 
@@ -631,14 +631,14 @@ void PubSub::onMessage(websocketpp::connection_hdl hdl,
         this->handleListenResponse(msg);
     } else if (type == "MESSAGE") {
         if (!msg.HasMember("data")) {
-            Log("Missing required object member `data` in message root");
+            log("Missing required object member `data` in message root");
             return;
         }
 
         const auto &data = msg["data"];
 
         if (!data.IsObject()) {
-            Log("Member `data` must be an object");
+            log("Member `data` must be an object");
             return;
         }
 
@@ -654,7 +654,7 @@ void PubSub::onMessage(websocketpp::connection_hdl hdl,
 
         client.second->handlePong();
     } else {
-        Log("Unknown message type: {}", type);
+        log("Unknown message type: {}", type);
     }
 }
 
@@ -699,7 +699,7 @@ PubSub::WebsocketContextPtr PubSub::onTLSInit(websocketpp::connection_hdl hdl)
                          boost::asio::ssl::context::no_sslv2 |
                          boost::asio::ssl::context::single_dh_use);
     } catch (const std::exception &e) {
-        Log("Exception caught in OnTLSInit: {}", e.what());
+        log("Exception caught in OnTLSInit: {}", e.what());
     }
 
     return ctx;
@@ -714,12 +714,12 @@ void PubSub::handleListenResponse(const rapidjson::Document &msg)
         rj::getSafe(msg, "nonce", nonce);
 
         if (error.empty()) {
-            Log("Successfully listened to nonce {}", nonce);
+            log("Successfully listened to nonce {}", nonce);
             // Nothing went wrong
             return;
         }
 
-        Log("PubSub error: {} on nonce {}", error, nonce);
+        log("PubSub error: {} on nonce {}", error, nonce);
         return;
     }
 }
@@ -729,14 +729,14 @@ void PubSub::handleMessageResponse(const rapidjson::Value &outerData)
     QString topic;
 
     if (!rj::getSafe(outerData, "topic", topic)) {
-        Log("Missing required string member `topic` in outerData");
+        log("Missing required string member `topic` in outerData");
         return;
     }
 
     std::string payload;
 
     if (!rj::getSafe(outerData, "message", payload)) {
-        Log("Expected string message in outerData");
+        log("Expected string message in outerData");
         return;
     }
 
@@ -745,7 +745,7 @@ void PubSub::handleMessageResponse(const rapidjson::Value &outerData)
     rapidjson::ParseResult res = msg.Parse(payload.c_str());
 
     if (!res) {
-        Log("Error parsing message '{}' from PubSub: {}", payload,
+        log("Error parsing message '{}' from PubSub: {}", payload,
             rapidjson::GetParseError_En(res.Code()));
         return;
     }
@@ -754,7 +754,7 @@ void PubSub::handleMessageResponse(const rapidjson::Value &outerData)
         std::string whisperType;
 
         if (!rj::getSafe(msg, "type", whisperType)) {
-            Log("Bad whisper data");
+            log("Bad whisper data");
             return;
         }
 
@@ -765,7 +765,7 @@ void PubSub::handleMessageResponse(const rapidjson::Value &outerData)
         } else if (whisperType == "thread") {
             // Handle thread?
         } else {
-            Log("Invalid whisper type: {}", whisperType);
+            log("Invalid whisper type: {}", whisperType);
             assert(false);
             return;
         }
@@ -777,30 +777,30 @@ void PubSub::handleMessageResponse(const rapidjson::Value &outerData)
         std::string moderationAction;
 
         if (!rj::getSafe(data, "moderation_action", moderationAction)) {
-            Log("Missing moderation action in data: {}", rj::stringify(data));
+            log("Missing moderation action in data: {}", rj::stringify(data));
             return;
         }
 
         auto handlerIt = this->moderationActionHandlers.find(moderationAction);
 
         if (handlerIt == this->moderationActionHandlers.end()) {
-            Log("No handler found for moderation action {}", moderationAction);
+            log("No handler found for moderation action {}", moderationAction);
             return;
         }
 
         // Invoke handler function
         handlerIt->second(data, topicParts[2]);
     } else {
-        Log("Unknown topic: {}", topic);
+        log("Unknown topic: {}", topic);
         return;
     }
 }
 
 void PubSub::runThread()
 {
-    Log("Start pubsub manager thread");
+    log("Start pubsub manager thread");
     this->websocketClient.run();
-    Log("Done with pubsub manager thread");
+    log("Done with pubsub manager thread");
 }
 
 }  // namespace chatterino
diff --git a/src/providers/twitch/PubsubHelpers.hpp b/src/providers/twitch/PubsubHelpers.hpp
index a891edd4f..8b9b3f322 100644
--- a/src/providers/twitch/PubsubHelpers.hpp
+++ b/src/providers/twitch/PubsubHelpers.hpp
@@ -35,7 +35,7 @@ void runAfter(boost::asio::io_service &ioService, Duration duration,
 
     timer->async_wait([timer, cb](const boost::system::error_code &ec) {
         if (ec) {
-            Log("Error in runAfter: {}", ec.message());
+            log("Error in runAfter: {}", ec.message());
             return;
         }
 
@@ -52,7 +52,7 @@ void runAfter(std::shared_ptr<boost::asio::steady_timer> timer,
 
     timer->async_wait([timer, cb](const boost::system::error_code &ec) {
         if (ec) {
-            Log("Error in runAfter: {}", ec.message());
+            log("Error in runAfter: {}", ec.message());
             return;
         }
 
diff --git a/src/providers/twitch/TwitchAccount.cpp b/src/providers/twitch/TwitchAccount.cpp
index 0f8b79a44..95a8d37eb 100644
--- a/src/providers/twitch/TwitchAccount.cpp
+++ b/src/providers/twitch/TwitchAccount.cpp
@@ -143,7 +143,7 @@ void TwitchAccount::loadIgnores()
                 }
                 TwitchUser ignoredUser;
                 if (!rj::getSafe(userIt->value, ignoredUser)) {
-                    Log("Error parsing twitch user JSON {}",
+                    log("Error parsing twitch user JSON {}",
                         rj::stringify(userIt->value));
                     continue;
                 }
@@ -368,13 +368,13 @@ std::set<TwitchUser> TwitchAccount::getIgnores() const
 
 void TwitchAccount::loadEmotes()
 {
-    Log("Loading Twitch emotes for user {}", this->getUserName());
+    log("Loading Twitch emotes for user {}", this->getUserName());
 
     const auto &clientID = this->getOAuthClient();
     const auto &oauthToken = this->getOAuthToken();
 
     if (clientID.isEmpty() || oauthToken.isEmpty()) {
-        Log("Missing Client ID or OAuth token");
+        log("Missing Client ID or OAuth token");
         return;
     }
 
@@ -386,7 +386,7 @@ void TwitchAccount::loadEmotes()
     req.makeAuthorizedV5(this->getOAuthClient(), this->getOAuthToken());
 
     req.onError([=](int errorCode) {
-        Log("[TwitchAccount::loadEmotes] Error {}", errorCode);
+        log("[TwitchAccount::loadEmotes] Error {}", errorCode);
         if (errorCode == 203) {
             // onFinished(FollowResult_NotFollowing);
         } else {
@@ -420,7 +420,7 @@ void TwitchAccount::parseEmotes(const rapidjson::Document &root)
 
     auto emoticonSets = root.FindMember("emoticon_sets");
     if (emoticonSets == root.MemberEnd() || !emoticonSets->value.IsObject()) {
-        Log("No emoticon_sets in load emotes response");
+        log("No emoticon_sets in load emotes response");
         return;
     }
 
@@ -434,19 +434,19 @@ void TwitchAccount::parseEmotes(const rapidjson::Document &root)
         for (const rapidjson::Value &emoteJSON :
              emoteSetJSON.value.GetArray()) {
             if (!emoteJSON.IsObject()) {
-                Log("Emote value was invalid");
+                log("Emote value was invalid");
                 return;
             }
 
             uint64_t idNumber;
             if (!rj::getSafe(emoteJSON, "id", idNumber)) {
-                Log("No ID key found in Emote value");
+                log("No ID key found in Emote value");
                 return;
             }
 
             QString _code;
             if (!rj::getSafe(emoteJSON, "code", _code)) {
-                Log("No code key found in Emote value");
+                log("No code key found in Emote value");
                 return;
             }
 
@@ -468,7 +468,7 @@ void TwitchAccount::parseEmotes(const rapidjson::Document &root)
 void TwitchAccount::loadEmoteSetData(std::shared_ptr<EmoteSet> emoteSet)
 {
     if (!emoteSet) {
-        Log("null emote set sent");
+        log("null emote set sent");
         return;
     }
 
@@ -486,7 +486,7 @@ void TwitchAccount::loadEmoteSetData(std::shared_ptr<EmoteSet> emoteSet)
     req.setUseQuickLoadCache(true);
 
     req.onError([](int errorCode) -> bool {
-        Log("Error code {} while loading emote set data", errorCode);
+        log("Error code {} while loading emote set data", errorCode);
         return true;
     });
 
@@ -507,16 +507,15 @@ void TwitchAccount::loadEmoteSetData(std::shared_ptr<EmoteSet> emoteSet)
             return Failure;
         }
 
-        Log("Loaded twitch emote set data for {}!", emoteSet->key);
+        log("Loaded twitch emote set data for {}!", emoteSet->key);
 
-        if (type == "sub") {
-            emoteSet->text =
-                QString("Twitch Subscriber Emote (%1)").arg(channelName);
-        } else {
-            emoteSet->text =
-                QString("Twitch Account Emote (%1)").arg(channelName);
-        }
+        auto name = channelName;
+        name.detach();
+        name[0] = name[0].toUpper();
 
+        emoteSet->text = name;
+
+        emoteSet->type = type;
         emoteSet->channelName = channelName;
 
         return Success;
diff --git a/src/providers/twitch/TwitchAccount.hpp b/src/providers/twitch/TwitchAccount.hpp
index 1a180f5e2..21dfbac63 100644
--- a/src/providers/twitch/TwitchAccount.hpp
+++ b/src/providers/twitch/TwitchAccount.hpp
@@ -44,6 +44,7 @@ public:
         QString key;
         QString channelName;
         QString text;
+        QString type;
         std::vector<TwitchEmote> emotes;
     };
 
diff --git a/src/providers/twitch/TwitchAccountManager.cpp b/src/providers/twitch/TwitchAccountManager.cpp
index 7d4f932eb..18210c2fd 100644
--- a/src/providers/twitch/TwitchAccountManager.cpp
+++ b/src/providers/twitch/TwitchAccountManager.cpp
@@ -93,20 +93,20 @@ void TwitchAccountManager::reloadUsers()
 
         switch (this->addUser(userData)) {
             case AddUserResponse::UserAlreadyExists: {
-                Log("User {} already exists", userData.username);
+                log("User {} already exists", userData.username);
                 // Do nothing
             } break;
             case AddUserResponse::UserValuesUpdated: {
-                Log("User {} already exists, and values updated!",
+                log("User {} already exists, and values updated!",
                     userData.username);
                 if (userData.username == this->getCurrent()->getUserName()) {
-                    Log("It was the current user, so we need to reconnect "
+                    log("It was the current user, so we need to reconnect "
                         "stuff!");
                     this->currentUserChanged.invoke();
                 }
             } break;
             case AddUserResponse::UserAdded: {
-                Log("Added user {}", userData.username);
+                log("Added user {}", userData.username);
                 listUpdated = true;
             } break;
         }
@@ -125,12 +125,12 @@ void TwitchAccountManager::load()
         QString newUsername(QString::fromStdString(newValue));
         auto user = this->findUserByUsername(newUsername);
         if (user) {
-            Log("[AccountManager:currentUsernameChanged] User successfully "
+            log("[AccountManager:currentUsernameChanged] User successfully "
                 "updated to {}",
                 newUsername);
             this->currentUser_ = user;
         } else {
-            Log("[AccountManager:currentUsernameChanged] User successfully "
+            log("[AccountManager:currentUsernameChanged] User successfully "
                 "updated to anonymous");
             this->currentUser_ = this->anonymousUser_;
         }
diff --git a/src/providers/twitch/TwitchApi.cpp b/src/providers/twitch/TwitchApi.cpp
index 6b1e537c3..dc0329b69 100644
--- a/src/providers/twitch/TwitchApi.cpp
+++ b/src/providers/twitch/TwitchApi.cpp
@@ -20,25 +20,25 @@ void TwitchApi::findUserId(const QString user,
     request.onSuccess([successCallback](auto result) mutable -> Outcome {
         auto root = result.parseJson();
         if (!root.value("users").isArray()) {
-            Log("API Error while getting user id, users is not an array");
+            log("API Error while getting user id, users is not an array");
             successCallback("");
             return Failure;
         }
         auto users = root.value("users").toArray();
         if (users.size() != 1) {
-            Log("API Error while getting user id, users array size is not 1");
+            log("API Error while getting user id, users array size is not 1");
             successCallback("");
             return Failure;
         }
         if (!users[0].isObject()) {
-            Log("API Error while getting user id, first user is not an object");
+            log("API Error while getting user id, first user is not an object");
             successCallback("");
             return Failure;
         }
         auto firstUser = users[0].toObject();
         auto id = firstUser.value("_id");
         if (!id.isString()) {
-            Log("API Error: while getting user id, first user object `_id` key "
+            log("API Error: while getting user id, first user object `_id` key "
                 "is not a "
                 "string");
             successCallback("");
diff --git a/src/providers/twitch/TwitchChannel.cpp b/src/providers/twitch/TwitchChannel.cpp
index 04b0f2666..4d9445c75 100644
--- a/src/providers/twitch/TwitchChannel.cpp
+++ b/src/providers/twitch/TwitchChannel.cpp
@@ -56,7 +56,7 @@ TwitchChannel::TwitchChannel(const QString &name)
     , popoutPlayerUrl_("https://player.twitch.tv/?channel=" + name)
     , mod_(false)
 {
-    Log("[TwitchChannel:{}] Opened", name);
+    log("[TwitchChannel:{}] Opened", name);
 
     // this->refreshChannelEmotes();
     // this->refreshViewerList();
@@ -116,7 +116,7 @@ void TwitchChannel::refreshChannelEmotes()
             if (auto shared = weak.lock())  //
                 *this->bttvEmotes_.access() = emoteMap;
         });
-    getApp()->emotes->ffz.loadChannelEmotes(
+    getApp()->emotes->ffz.loadChannel(
         this->getName(), [this, weak = weakOf<Channel>(this)](auto &&emoteMap) {
             if (auto shared = weak.lock())
                 *this->ffzEmotes_.access() = emoteMap;
@@ -136,7 +136,7 @@ void TwitchChannel::sendMessage(const QString &message)
         return;
     }
 
-    Log("[TwitchChannel:{}] Send message: {}", this->getName(), message);
+    log("[TwitchChannel:{}] Send message: {}", this->getName(), message);
 
     // Do last message processing
     QString parsedMessage = app->emotes->emojis.replaceShortCodes(message);
@@ -350,13 +350,13 @@ void TwitchChannel::refreshLiveStatus()
     auto roomID = this->getRoomId();
 
     if (roomID.isEmpty()) {
-        Log("[TwitchChannel:{}] Refreshing live status (Missing ID)",
+        log("[TwitchChannel:{}] Refreshing live status (Missing ID)",
             this->getName());
         this->setLive(false);
         return;
     }
 
-    Log("[TwitchChannel:{}] Refreshing live status", this->getName());
+    log("[TwitchChannel:{}] Refreshing live status", this->getName());
 
     QString url("https://api.twitch.tv/kraken/streams/" + roomID);
 
@@ -381,12 +381,12 @@ void TwitchChannel::refreshLiveStatus()
 Outcome TwitchChannel::parseLiveStatus(const rapidjson::Document &document)
 {
     if (!document.IsObject()) {
-        Log("[TwitchChannel:refreshLiveStatus] root is not an object");
+        log("[TwitchChannel:refreshLiveStatus] root is not an object");
         return Failure;
     }
 
     if (!document.HasMember("stream")) {
-        Log("[TwitchChannel:refreshLiveStatus] Missing stream in root");
+        log("[TwitchChannel:refreshLiveStatus] Missing stream in root");
         return Failure;
     }
 
@@ -400,7 +400,7 @@ Outcome TwitchChannel::parseLiveStatus(const rapidjson::Document &document)
 
     if (!stream.HasMember("viewers") || !stream.HasMember("game") ||
         !stream.HasMember("channel") || !stream.HasMember("created_at")) {
-        Log("[TwitchChannel:refreshLiveStatus] Missing members in stream");
+        log("[TwitchChannel:refreshLiveStatus] Missing members in stream");
         this->setLive(false);
         return Failure;
     }
@@ -408,7 +408,7 @@ Outcome TwitchChannel::parseLiveStatus(const rapidjson::Document &document)
     const rapidjson::Value &streamChannel = stream["channel"];
 
     if (!streamChannel.IsObject() || !streamChannel.HasMember("status")) {
-        Log("[TwitchChannel:refreshLiveStatus] Missing member \"status\" in "
+        log("[TwitchChannel:refreshLiveStatus] Missing member \"status\" in "
             "channel");
         return Failure;
     }
diff --git a/src/providers/twitch/TwitchChannel.hpp b/src/providers/twitch/TwitchChannel.hpp
index 5befb6700..e41120cda 100644
--- a/src/providers/twitch/TwitchChannel.hpp
+++ b/src/providers/twitch/TwitchChannel.hpp
@@ -4,7 +4,7 @@
 
 #include "common/Channel.hpp"
 #include "common/Common.hpp"
-#include "common/MutexValue.hpp"
+#include "common/Atomic.hpp"
 #include "common/UniqueAccess.hpp"
 #include "messages/Emote.hpp"
 #include "singletons/Emotes.hpp"
diff --git a/src/providers/twitch/TwitchHelpers.cpp b/src/providers/twitch/TwitchHelpers.cpp
index f236b10cb..9999e125c 100644
--- a/src/providers/twitch/TwitchHelpers.cpp
+++ b/src/providers/twitch/TwitchHelpers.cpp
@@ -6,7 +6,7 @@ namespace chatterino {
 bool trimChannelName(const QString &channelName, QString &outChannelName)
 {
     if (channelName.length() < 3) {
-        Log("channel name length below 3");
+        log("channel name length below 3");
         return false;
     }
 
diff --git a/src/providers/twitch/TwitchMessageBuilder.cpp b/src/providers/twitch/TwitchMessageBuilder.cpp
index eeb4ed4b0..fef0e4a23 100644
--- a/src/providers/twitch/TwitchMessageBuilder.cpp
+++ b/src/providers/twitch/TwitchMessageBuilder.cpp
@@ -55,7 +55,7 @@ bool TwitchMessageBuilder::isIgnored() const
     // TODO(pajlada): Do we need to check if the phrase is valid first?
     for (const auto &phrase : app->ignores->phrases.getVector()) {
         if (phrase.isMatch(this->originalMessage_)) {
-            Log("Blocking message because it contains ignored phrase {}",
+            log("Blocking message because it contains ignored phrase {}",
                 phrase.getPattern());
             return true;
         }
@@ -68,7 +68,7 @@ bool TwitchMessageBuilder::isIgnored() const
         for (const auto &user :
              app->accounts->twitch.getCurrent()->getIgnores()) {
             if (sourceUserID == user.id) {
-                Log("Blocking message because it's from blocked user {}",
+                log("Blocking message because it's from blocked user {}",
                     user.name);
                 return true;
             }
@@ -533,7 +533,7 @@ void TwitchMessageBuilder::parseHighlights(bool isPastMsg)
     if (!app->highlights->blacklistContains(this->ircMessage->nick())) {
         for (const HighlightPhrase &highlight : activeHighlights) {
             if (highlight.isMatch(this->originalMessage_)) {
-                Log("Highlight because {} matches {}", this->originalMessage_,
+                log("Highlight because {} matches {}", this->originalMessage_,
                     highlight.getPattern());
                 doHighlight = true;
 
@@ -555,7 +555,7 @@ void TwitchMessageBuilder::parseHighlights(bool isPastMsg)
         }
         for (const HighlightPhrase &userHighlight : userHighlights) {
             if (userHighlight.isMatch(this->ircMessage->nick())) {
-                Log("Highlight because user {} sent a message",
+                log("Highlight because user {} sent a message",
                     this->ircMessage->nick());
                 doHighlight = true;
 
@@ -638,12 +638,12 @@ Outcome TwitchMessageBuilder::tryAppendEmote(const EmoteName &name)
     auto flags = MessageElementFlags();
     auto emote = boost::optional<EmotePtr>{};
 
-    if ((emote = getApp()->emotes->bttv.getGlobalEmote(name))) {
+    if ((emote = getApp()->emotes->bttv.global(name))) {
         flags = MessageElementFlag::BttvEmote;
     } else if (twitchChannel &&
                (emote = this->twitchChannel->getBttvEmote(name))) {
         flags = MessageElementFlag::BttvEmote;
-    } else if ((emote = getApp()->emotes->ffz.getGlobalEmote(name))) {
+    } else if ((emote = getApp()->emotes->ffz.global(name))) {
         flags = MessageElementFlag::FfzEmote;
     } else if (twitchChannel &&
                (emote = this->twitchChannel->getFfzEmote(name))) {
diff --git a/src/providers/twitch/TwitchMessageBuilder.hpp b/src/providers/twitch/TwitchMessageBuilder.hpp
index c82364a67..385fed932 100644
--- a/src/providers/twitch/TwitchMessageBuilder.hpp
+++ b/src/providers/twitch/TwitchMessageBuilder.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "messages/MessageBuilder.hpp"
-#include "messages/MessageParseArgs.hpp"
 #include "singletons/Emotes.hpp"
 
 #include <IrcMessage>
diff --git a/src/providers/twitch/TwitchServer.hpp b/src/providers/twitch/TwitchServer.hpp
index edc06ef6a..7e204173f 100644
--- a/src/providers/twitch/TwitchServer.hpp
+++ b/src/providers/twitch/TwitchServer.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/MutexValue.hpp"
+#include "common/Atomic.hpp"
 #include "common/Singleton.hpp"
 #include "providers/irc/AbstractIrcServer.hpp"
 #include "providers/twitch/TwitchAccount.hpp"
@@ -29,7 +29,7 @@ public:
 
     std::shared_ptr<Channel> getChannelOrEmptyByID(const QString &channelID);
 
-    MutexValue<QString> lastUserThatWhisperedMe;
+    Atomic<QString> lastUserThatWhisperedMe;
 
     const ChannelPtr whispersChannel;
     const ChannelPtr mentionsChannel;
diff --git a/src/singletons/Emotes.cpp b/src/singletons/Emotes.cpp
index 0be870a5e..cfc23f6d4 100644
--- a/src/singletons/Emotes.cpp
+++ b/src/singletons/Emotes.cpp
@@ -15,8 +15,8 @@ void Emotes::initialize(Settings &settings, Paths &paths)
         [] { getApp()->accounts->twitch.getCurrent()->loadEmotes(); });
 
     this->emojis.load();
-    this->bttv.loadGlobalEmotes();
-    this->ffz.loadGlobalEmotes();
+    this->bttv.loadGlobal();
+    this->ffz.loadGlobal();
 
     this->gifTimer.initialize();
 }
diff --git a/src/singletons/Settings.cpp b/src/singletons/Settings.cpp
index b380a0119..ea5318ab3 100644
--- a/src/singletons/Settings.cpp
+++ b/src/singletons/Settings.cpp
@@ -50,7 +50,7 @@ void Settings::saveSnapshot()
 
     this->snapshot_.reset(d);
 
-    Log("hehe: {}", pajlada::Settings::SettingManager::stringify(*d));
+    log("hehe: {}", pajlada::Settings::SettingManager::stringify(*d));
 }
 
 void Settings::restoreSnapshot()
@@ -64,14 +64,14 @@ void Settings::restoreSnapshot()
     for (const auto &weakSetting : _settings) {
         auto setting = weakSetting.lock();
         if (!setting) {
-            Log("Error stage 1 of loading");
+            log("Error stage 1 of loading");
             continue;
         }
 
         const char *path = setting->getPath().c_str();
 
         if (!snapshotObject.HasMember(path)) {
-            Log("Error stage 2 of loading");
+            log("Error stage 2 of loading");
             continue;
         }
 
diff --git a/src/singletons/WindowManager.cpp b/src/singletons/WindowManager.cpp
index 23b8c4e1b..8ff34c7bf 100644
--- a/src/singletons/WindowManager.cpp
+++ b/src/singletons/WindowManager.cpp
@@ -211,7 +211,7 @@ Window *WindowManager::windowAt(int index)
     if (index < 0 || (size_t)index >= this->windows_.size()) {
         return nullptr;
     }
-    Log("getting window at bad index {}", index);
+    log("getting window at bad index {}", index);
 
     return this->windows_.at(index);
 }
diff --git a/src/singletons/helper/LoggingChannel.cpp b/src/singletons/helper/LoggingChannel.cpp
index 97a0b8478..d70344448 100644
--- a/src/singletons/helper/LoggingChannel.cpp
+++ b/src/singletons/helper/LoggingChannel.cpp
@@ -65,13 +65,13 @@ void LoggingChannel::openLogFile()
         this->baseDirectory + QDir::separator() + this->subDirectory;
 
     if (!QDir().mkpath(directory)) {
-        Log("Unable to create logging path");
+        log("Unable to create logging path");
         return;
     }
 
     // Open file handle to log file of current date
     QString fileName = directory + QDir::separator() + baseFileName;
-    Log("Logging to {}", fileName);
+    log("Logging to {}", fileName);
     this->fileHandle.setFileName(fileName);
 
     this->fileHandle.open(QIODevice::Append);
diff --git a/src/util/Helpers.hpp b/src/util/Helpers.hpp
index b708728b1..1552ae404 100644
--- a/src/util/Helpers.hpp
+++ b/src/util/Helpers.hpp
@@ -6,7 +6,7 @@
 namespace chatterino {
 
 template <typename... Args>
-auto fS(Args &&... args) -> decltype(fmt::format(std::forward<Args>(args)...))
+auto fS(Args &&... args)
 {
     return fmt::format(std::forward<Args>(args)...);
 }
diff --git a/src/widgets/dialogs/EmotePopup.cpp b/src/widgets/dialogs/EmotePopup.cpp
index 3f8c6ac1d..b5dbb965b 100644
--- a/src/widgets/dialogs/EmotePopup.cpp
+++ b/src/widgets/dialogs/EmotePopup.cpp
@@ -2,6 +2,7 @@
 
 #include "Application.hpp"
 #include "controllers/accounts/AccountController.hpp"
+#include "debug/Benchmark.hpp"
 #include "messages/MessageBuilder.hpp"
 #include "providers/twitch/TwitchChannel.hpp"
 #include "widgets/Notebook.hpp"
@@ -11,36 +12,88 @@
 #include <QTabWidget>
 
 namespace chatterino {
+namespace {
+auto makeTitleMessage(const QString &title)
+{
+    MessageBuilder builder;
+    builder.emplace<TextElement>(title, MessageElementFlag::Text);
+    builder->flags.set(MessageFlag::Centered);
+    return builder.release();
+}
+auto makeEmoteMessage(const EmoteMap &map)
+{
+    MessageBuilder builder;
+    builder->flags.set(MessageFlag::Centered);
+    builder->flags.set(MessageFlag::DisableCompactEmotes);
+
+    for (const auto &emote : map) {
+        builder
+            .emplace<EmoteElement>(emote.second, MessageElementFlag::AlwaysShow)
+            ->setLink(Link(Link::InsertText, emote.first.string));
+    }
+
+    return builder.release();
+}
+void addEmoteSets(std::vector<std::shared_ptr<TwitchAccount::EmoteSet>> sets,
+                  Channel &globalChannel, Channel &subChannel)
+{
+    for (const auto &set : sets) {
+        auto &channel = set->key == "0" ? globalChannel : subChannel;
+
+        // TITLE
+        auto text =
+            set->key == "0" || set->text.isEmpty() ? "Twitch" : set->text;
+        channel.addMessage(makeTitleMessage(text));
+
+        // EMOTES
+        MessageBuilder builder;
+        builder->flags.set(MessageFlag::Centered);
+        builder->flags.set(MessageFlag::DisableCompactEmotes);
+
+        for (const auto &emote : set->emotes) {
+            builder
+                .emplace<EmoteElement>(
+                    getApp()->emotes->twitch.getOrCreateEmote(emote.id,
+                                                              emote.name),
+                    MessageElementFlag::AlwaysShow)
+                ->setLink(Link(Link::InsertText, emote.name.string));
+        }
+
+        channel.addMessage(builder.release());
+    }
+}
+}  // namespace
 
 EmotePopup::EmotePopup()
     : BaseWindow(nullptr, BaseWindow::EnableCustomFrame)
 {
-    this->viewEmotes_ = new ChannelView();
-    this->viewEmojis_ = new ChannelView();
-
-    this->viewEmotes_->setOverrideFlags(MessageElementFlags{
-        MessageElementFlag::Default, MessageElementFlag::AlwaysShow,
-        MessageElementFlag::EmoteImages});
-    this->viewEmojis_->setOverrideFlags(MessageElementFlags{
-        MessageElementFlag::Default, MessageElementFlag::AlwaysShow,
-        MessageElementFlag::EmoteImages});
-
-    this->viewEmotes_->setEnableScrollingToBottom(false);
-    this->viewEmojis_->setEnableScrollingToBottom(false);
-
-    auto *layout = new QVBoxLayout(this);
+    auto layout = new QVBoxLayout(this);
     this->getLayoutContainer()->setLayout(layout);
 
-    Notebook *notebook = new Notebook(this);
+    auto notebook = new Notebook(this);
     layout->addWidget(notebook);
     layout->setMargin(0);
 
-    notebook->addPage(this->viewEmotes_, "Emotes");
-    notebook->addPage(this->viewEmojis_, "Emojis");
+    auto makeView = [&](QString tabTitle) {
+        auto view = new ChannelView();
+
+        view->setOverrideFlags(MessageElementFlags{
+            MessageElementFlag::Default, MessageElementFlag::AlwaysShow,
+            MessageElementFlag::EmoteImages});
+        view->setEnableScrollingToBottom(false);
+        notebook->addPage(view, tabTitle);
+
+        return view;
+    };
+
+    this->subEmotesView_ = makeView("Subs");
+    this->channelEmotesView_ = makeView("Channel");
+    this->globalEmotesView_ = makeView("Global");
+    this->viewEmojis_ = makeView("Emojis");
 
     this->loadEmojis();
 
-    this->viewEmotes_->linkClicked.connect(
+    this->globalEmotesView_->linkClicked.connect(
         [this](const Link &link) { this->linkClicked.invoke(link); });
     this->viewEmojis_->linkClicked.connect(
         [this](const Link &link) { this->linkClicked.invoke(link); });
@@ -48,93 +101,41 @@ EmotePopup::EmotePopup()
 
 void EmotePopup::loadChannel(ChannelPtr _channel)
 {
+    BenchmarkGuard guard("loadChannel");
+
     this->setWindowTitle("Emotes from " + _channel->getName());
 
-    TwitchChannel *channel = dynamic_cast<TwitchChannel *>(_channel.get());
+    auto twitchChannel = dynamic_cast<TwitchChannel *>(_channel.get());
+    if (twitchChannel == nullptr) return;
 
-    if (channel == nullptr) {
-        return;
-    }
-
-    ChannelPtr emoteChannel(new Channel("", Channel::Type::None));
-
-    auto addEmotes = [&](const EmoteMap &map, const QString &title,
-                         const QString &emoteDesc) {
-        // TITLE
-        MessageBuilder builder1;
-
-        builder1.emplace<TextElement>(title, MessageElementFlag::Text);
-
-        builder1->flags.set(MessageFlag::Centered);
-        emoteChannel->addMessage(builder1.release());
-
-        // EMOTES
-        MessageBuilder builder2;
-        builder2->flags.set(MessageFlag::Centered);
-        builder2->flags.set(MessageFlag::DisableCompactEmotes);
-
-        for (auto emote : map) {
-            builder2
-                .emplace<EmoteElement>(emote.second,
-                                       MessageElementFlag::AlwaysShow)
-                ->setLink(Link(Link::InsertText, emote.first.string));
-        }
-
-        emoteChannel->addMessage(builder2.release());
+    auto addEmotes = [&](Channel &channel, const EmoteMap &map,
+                         const QString &title) {
+        channel.addMessage(makeTitleMessage(title));
+        channel.addMessage(makeEmoteMessage(map));
     };
 
-    auto app = getApp();
+    auto subChannel = std::make_shared<Channel>("", Channel::Type::None);
+    auto globalChannel = std::make_shared<Channel>("", Channel::Type::None);
+    auto channelChannel = std::make_shared<Channel>("", Channel::Type::None);
 
-    // fourtf: the entire emote manager needs to be refactored so there's no
-    // point in trying to fix this pile of garbage
-    for (const auto &set :
-         app->accounts->twitch.getCurrent()->accessEmotes()->emoteSets) {
-        // TITLE
-        MessageBuilder builder1;
+    // twitch
+    addEmoteSets(
+        getApp()->accounts->twitch.getCurrent()->accessEmotes()->emoteSets,
+        *globalChannel, *subChannel);
 
-        QString setText;
-        if (set->text.isEmpty()) {
-            if (set->channelName.isEmpty()) {
-                setText = "Twitch Account Emotes";
-            } else {
-                setText = "Twitch Account Emotes (" + set->channelName + ")";
-            }
-        } else {
-            setText = set->text;
-        }
+    // global
+    addEmotes(*globalChannel, *getApp()->emotes->bttv.global(), "BetterTTV");
+    addEmotes(*globalChannel, *getApp()->emotes->ffz.global(), "FrankerFaceZ");
 
-        builder1.emplace<TextElement>(setText, MessageElementFlag::Text);
+    // channel
+    // addEmotes(*channel->accessBttvEmotes(), "BetterTTV Channel Emotes",
+    //          "BetterTTV Channel Emote");
+    // addEmotes(*channel->accessFfzEmotes(), "FrankerFaceZ Channel Emotes",
+    //          "FrankerFaceZ Channel Emote");
 
-        builder1->flags.set(MessageFlag::Centered);
-        emoteChannel->addMessage(builder1.release());
-
-        // EMOTES
-        MessageBuilder builder2;
-        builder2->flags.set(MessageFlag::Centered);
-        builder2->flags.set(MessageFlag::DisableCompactEmotes);
-
-        for (const auto &emote : set->emotes) {
-            builder2
-                .emplace<EmoteElement>(
-                    app->emotes->twitch.getOrCreateEmote(emote.id, emote.name),
-                    MessageElementFlag::AlwaysShow)
-                ->setLink(Link(Link::InsertText, emote.name.string));
-        }
-
-        emoteChannel->addMessage(builder2.release());
-    }
-
-    addEmotes(*app->emotes->bttv.accessGlobalEmotes(),
-              "BetterTTV Global Emotes", "BetterTTV Global Emote");
-    addEmotes(*channel->accessBttvEmotes(), "BetterTTV Channel Emotes",
-              "BetterTTV Channel Emote");
-    //    addEmotes(*app->emotes->ffz.accessGlobalEmotes(), "FrankerFaceZ Global
-    //    Emotes",
-    //              "FrankerFaceZ Global Emote");
-    addEmotes(*channel->accessFfzEmotes(), "FrankerFaceZ Channel Emotes",
-              "FrankerFaceZ Channel Emote");
-
-    this->viewEmotes_->setChannel(emoteChannel);
+    this->globalEmotesView_->setChannel(globalChannel);
+    this->subEmotesView_->setChannel(subChannel);
+    this->channelEmotesView_->setChannel(channelChannel);
 }
 
 void EmotePopup::loadEmojis()
@@ -143,13 +144,6 @@ void EmotePopup::loadEmojis()
 
     ChannelPtr emojiChannel(new Channel("", Channel::Type::None));
 
-    // title
-    MessageBuilder builder1;
-
-    builder1.emplace<TextElement>("emojis", MessageElementFlag::Text);
-    builder1->flags.set(MessageFlag::Centered);
-    emojiChannel->addMessage(builder1.release());
-
     // emojis
     MessageBuilder builder;
     builder->flags.set(MessageFlag::Centered);
diff --git a/src/widgets/dialogs/EmotePopup.hpp b/src/widgets/dialogs/EmotePopup.hpp
index ad89a37d0..98331efa7 100644
--- a/src/widgets/dialogs/EmotePopup.hpp
+++ b/src/widgets/dialogs/EmotePopup.hpp
@@ -19,8 +19,10 @@ public:
     pajlada::Signals::Signal<Link> linkClicked;
 
 private:
-    ChannelView *viewEmotes_;
-    ChannelView *viewEmojis_;
+    ChannelView *globalEmotesView_{};
+    ChannelView *channelEmotesView_{};
+    ChannelView *subEmotesView_{};
+    ChannelView *viewEmojis_{};
 };
 
 }  // namespace chatterino
diff --git a/src/widgets/dialogs/QualityPopup.cpp b/src/widgets/dialogs/QualityPopup.cpp
index c4f9c4ceb..94bbf5594 100644
--- a/src/widgets/dialogs/QualityPopup.cpp
+++ b/src/widgets/dialogs/QualityPopup.cpp
@@ -47,7 +47,7 @@ void QualityPopup::okButtonClicked()
     try {
         openStreamlink(channelURL, this->ui_.selector.currentText());
     } catch (const Exception &ex) {
-        Log("Exception caught trying to open streamlink: {}", ex.what());
+        log("Exception caught trying to open streamlink: {}", ex.what());
     }
 
     this->close();
diff --git a/src/widgets/helper/ChannelView.cpp b/src/widgets/helper/ChannelView.cpp
index e8f90d0fc..3803f2a21 100644
--- a/src/widgets/helper/ChannelView.cpp
+++ b/src/widgets/helper/ChannelView.cpp
@@ -492,7 +492,7 @@ void ChannelView::setChannel(ChannelPtr newChannel)
             MessageLayoutPtr newItem(new MessageLayout(replacement));
             auto snapshot = this->messages.getSnapshot();
             if (index >= snapshot.getLength()) {
-                Log("Tried to replace out of bounds message. Index: {}. "
+                log("Tried to replace out of bounds message. Index: {}. "
                     "Length: {}",
                     index, snapshot.getLength());
                 return;
@@ -1169,19 +1169,18 @@ void ChannelView::handleLinkClick(QMouseEvent *event, const Link &link,
             userPopup->show();
 
             qDebug() << "Clicked " << user << "s message";
-            break;
-        }
+
+        } break;
 
         case Link::Url: {
             QDesktopServices::openUrl(QUrl(link.value));
-            break;
-        }
+        } break;
 
         case Link::UserAction: {
             QString value = link.value;
             value.replace("{user}", layout->getMessage()->loginName);
             this->channel_->sendMessage(value);
-        }
+        } break;
 
         default:;
     }
diff --git a/src/widgets/settingspages/AboutPage.cpp b/src/widgets/settingspages/AboutPage.cpp
index 758467391..1fa5dc40c 100644
--- a/src/widgets/settingspages/AboutPage.cpp
+++ b/src/widgets/settingspages/AboutPage.cpp
@@ -137,7 +137,7 @@ AboutPage::AboutPage()
                 QStringList contributorParts = line.split("|");
 
                 if (contributorParts.size() != 4) {
-                    Log("Missing parts in line '{}'", line);
+                    log("Missing parts in line '{}'", line);
                     continue;
                 }
 
diff --git a/src/widgets/splits/Split.cpp b/src/widgets/splits/Split.cpp
index f1f2a463f..38b390697 100644
--- a/src/widgets/splits/Split.cpp
+++ b/src/widgets/splits/Split.cpp
@@ -429,7 +429,7 @@ void Split::openInStreamlink()
     try {
         openStreamlinkForChannel(this->getChannel()->getName());
     } catch (const Exception &ex) {
-        Log("Error in doOpenStreamlink: {}", ex.what());
+        log("Error in doOpenStreamlink: {}", ex.what());
     }
 }
 

From c768bd9bd9d696c86a7525eabefffebf046d66c3 Mon Sep 17 00:00:00 2001
From: fourtf <tf.four@gmail.com>
Date: Sat, 11 Aug 2018 17:15:17 +0200
Subject: [PATCH 17/44] fixed image animations

---
 src/common/CompletionModel.cpp                |   4 +-
 src/messages/Emote.cpp                        |  18 +++
 src/messages/Emote.hpp                        |   4 +
 src/messages/Image.cpp                        |  39 +++++--
 src/messages/Image.hpp                        |   8 +-
 src/providers/bttv/BttvEmotes.cpp             |  64 +++++++++++
 src/providers/bttv/BttvEmotes.hpp             |   4 +
 src/providers/bttv/LoadBttvChannelEmote.cpp   |  74 ------------
 src/providers/bttv/LoadBttvChannelEmote.hpp   |   7 --
 src/providers/ffz/FfzEmotes.cpp               | 105 ++++++++----------
 src/providers/ffz/FfzEmotes.hpp               |   9 +-
 src/providers/twitch/TwitchChannel.cpp        |  53 ++++-----
 src/providers/twitch/TwitchChannel.hpp        |  22 ++--
 src/providers/twitch/TwitchMessageBuilder.cpp |   6 +-
 src/providers/twitch/TwitchServer.cpp         |   8 +-
 src/widgets/dialogs/EmotePopup.cpp            |  14 +--
 16 files changed, 229 insertions(+), 210 deletions(-)

diff --git a/src/common/CompletionModel.cpp b/src/common/CompletionModel.cpp
index f6dfd5b0c..9e2f4d024 100644
--- a/src/common/CompletionModel.cpp
+++ b/src/common/CompletionModel.cpp
@@ -137,7 +137,7 @@ void CompletionModel::refresh()
             getApp()
                 ->twitch2->getChannelOrEmptyByID(this->channelName_)
                 .get())) {
-        auto bttv = channel->accessBttvEmotes();
+        auto bttv = channel->bttvEmotes();
         //        auto it = bttv->begin();
         //        for (const auto &emote : *bttv) {
         //        }
@@ -148,7 +148,7 @@ void CompletionModel::refresh()
         //        }
 
         // Channel-specific: FFZ Channel Emotes
-        for (const auto &emote : *channel->accessFfzEmotes()) {
+        for (const auto &emote : *channel->ffzEmotes()) {
             this->addString(emote.second->name.string,
                             TaggedString::Type::FFZChannelEmote);
         }
diff --git a/src/messages/Emote.cpp b/src/messages/Emote.cpp
index c5ff83e12..318e2d300 100644
--- a/src/messages/Emote.cpp
+++ b/src/messages/Emote.cpp
@@ -24,4 +24,22 @@ EmotePtr cachedOrMakeEmotePtr(Emote &&emote, const EmoteMap &cache)
     return std::make_shared<Emote>(std::move(emote));
 }
 
+EmotePtr cachedOrMakeEmotePtr(
+    Emote &&emote,
+    std::unordered_map<EmoteId, std::weak_ptr<const Emote>> &cache,
+    std::mutex &mutex, const EmoteId &id)
+{
+    std::lock_guard<std::mutex> guard(mutex);
+
+    auto shared = cache[id].lock();
+    if (shared && *shared == emote) {
+        // reuse old shared_ptr if nothing changed
+        return shared;
+    } else {
+        shared = std::make_shared<Emote>(std::move(emote));
+        cache[id] = shared;
+        return shared;
+    }
+}
+
 }  // namespace chatterino
diff --git a/src/messages/Emote.hpp b/src/messages/Emote.hpp
index cfde58492..89cadc623 100644
--- a/src/messages/Emote.hpp
+++ b/src/messages/Emote.hpp
@@ -38,5 +38,9 @@ using WeakEmoteMap = std::unordered_map<EmoteName, std::weak_ptr<const Emote>>;
 using WeakEmoteIdMap = std::unordered_map<EmoteId, std::weak_ptr<const Emote>>;
 
 EmotePtr cachedOrMakeEmotePtr(Emote &&emote, const EmoteMap &cache);
+EmotePtr cachedOrMakeEmotePtr(
+    Emote &&emote,
+    std::unordered_map<EmoteId, std::weak_ptr<const Emote>> &cache,
+    std::mutex &mutex, const EmoteId &id);
 
 }  // namespace chatterino
diff --git a/src/messages/Image.cpp b/src/messages/Image.cpp
index 56286cdfe..572432cdd 100644
--- a/src/messages/Image.cpp
+++ b/src/messages/Image.cpp
@@ -30,14 +30,27 @@ Frames::Frames()
 Frames::Frames(const QVector<Frame<QPixmap>> &frames)
     : items_(frames)
 {
+    assertInGuiThread();
     DebugCount::increase("images");
-    if (this->animated()) DebugCount::increase("animated images");
+
+    if (this->animated()) {
+        DebugCount::increase("animated images");
+
+        this->gifTimerConnection_ = getApp()->emotes->gifTimer.signal.connect(
+            [this] { this->advance(); });
+    }
 }
 
 Frames::~Frames()
 {
+    assertInGuiThread();
     DebugCount::decrease("images");
-    if (this->animated()) DebugCount::decrease("animated images");
+
+    if (this->animated()) {
+        DebugCount::decrease("animated images");
+    }
+
+    this->gifTimerConnection_.disconnect();
 }
 
 void Frames::advance()
@@ -46,6 +59,11 @@ void Frames::advance()
 
     while (true) {
         this->index_ %= this->items_.size();
+
+        if (this->index_ >= this->items_.size()) {
+            this->index_ = this->index_;
+        }
+
         if (this->durationOffset_ > this->items_[this->index_].duration) {
             this->durationOffset_ -= this->items_[this->index_].duration;
             this->index_ = (this->index_ + 1) % this->items_.size();
@@ -195,12 +213,14 @@ Image::Image(const Url &url, qreal scale)
     : url_(url)
     , scale_(scale)
     , shouldLoad_(true)
+    , frames_(std::make_unique<Frames>())
 {
 }
 
 Image::Image(const QPixmap &pixmap, qreal scale)
     : scale_(scale)
-    , frames_(QVector<Frame<QPixmap>>{Frame<QPixmap>{pixmap, 1}})
+    , frames_(std::make_unique<Frames>(
+          QVector<Frame<QPixmap>>{Frame<QPixmap>{pixmap, 1}}))
 {
 }
 
@@ -218,7 +238,7 @@ boost::optional<QPixmap> Image::pixmap() const
         const_cast<Image *>(this)->load();
     }
 
-    return this->frames_.current();
+    return this->frames_->current();
 }
 
 qreal Image::scale() const
@@ -235,14 +255,14 @@ bool Image::animated() const
 {
     assertInGuiThread();
 
-    return this->frames_.animated();
+    return this->frames_->animated();
 }
 
 int Image::width() const
 {
     assertInGuiThread();
 
-    if (auto pixmap = this->frames_.first())
+    if (auto pixmap = this->frames_->first())
         return pixmap->width() * this->scale_;
     else
         return 16;
@@ -252,7 +272,7 @@ int Image::height() const
 {
     assertInGuiThread();
 
-    if (auto pixmap = this->frames_.first())
+    if (auto pixmap = this->frames_->first())
         return pixmap->height() * this->scale_;
     else
         return 16;
@@ -277,7 +297,8 @@ void Image::load()
         auto parsed = readFrames(reader, that->url());
 
         postToThread(makeConvertCallback(parsed, [weak](auto frames) {
-            if (auto shared = weak.lock()) shared->frames_ = frames;
+            if (auto shared = weak.lock())
+                shared->frames_ = std::make_unique<Frames>(frames);
         }));
 
         return Success;
@@ -290,7 +311,7 @@ bool Image::operator==(const Image &other) const
 {
     if (this->isEmpty() && other.isEmpty()) return true;
     if (!this->url_.string.isEmpty() && this->url_ == other.url_) return true;
-    if (this->frames_.first() == other.frames_.first()) return true;
+    if (this->frames_->first() == other.frames_->first()) return true;
 
     return false;
 }
diff --git a/src/messages/Image.hpp b/src/messages/Image.hpp
index 511ae9c48..3d869f798 100644
--- a/src/messages/Image.hpp
+++ b/src/messages/Image.hpp
@@ -11,6 +11,7 @@
 #include <boost/variant.hpp>
 #include <memory>
 #include <mutex>
+#include <pajlada/signals/signal.hpp>
 
 #include "common/NullablePtr.hpp"
 
@@ -21,14 +22,12 @@ struct Frame {
     Image image;
     int duration;
 };
-class Frames
+class Frames : boost::noncopyable
 {
 public:
     Frames();
     Frames(const QVector<Frame<QPixmap>> &frames);
     ~Frames();
-    Frames(Frames &&other) = default;
-    Frames &operator=(Frames &&other) = default;
 
     bool animated() const;
     void advance();
@@ -39,6 +38,7 @@ private:
     QVector<Frame<QPixmap>> items_;
     int index_{0};
     int durationOffset_{0};
+    pajlada::Signals::Connection gifTimerConnection_;
 };
 }  // namespace
 
@@ -74,7 +74,7 @@ private:
     qreal scale_{1};
     bool empty_{false};
     bool shouldLoad_{false};
-    Frames frames_{};
+    std::unique_ptr<Frames> frames_{};
     QObject object_{};
 };
 }  // namespace chatterino
diff --git a/src/providers/bttv/BttvEmotes.cpp b/src/providers/bttv/BttvEmotes.cpp
index 072212c21..1d9115c09 100644
--- a/src/providers/bttv/BttvEmotes.cpp
+++ b/src/providers/bttv/BttvEmotes.cpp
@@ -44,8 +44,45 @@ std::pair<Outcome, EmoteMap> parseGlobalEmotes(const QJsonObject &jsonRoot,
 
     return {Success, std::move(emotes)};
 }
+EmotePtr cachedOrMake(Emote &&emote, const EmoteId &id)
+{
+    static std::unordered_map<EmoteId, std::weak_ptr<const Emote>> cache;
+    static std::mutex mutex;
+
+    return cachedOrMakeEmotePtr(std::move(emote), cache, mutex, id);
+}
+std::pair<Outcome, EmoteMap> parseChannelEmotes(const QJsonObject &jsonRoot)
+{
+    auto emotes = EmoteMap();
+    auto jsonEmotes = jsonRoot.value("emotes").toArray();
+    auto urlTemplate = "https:" + jsonRoot.value("urlTemplate").toString();
+
+    for (auto jsonEmote_ : jsonEmotes) {
+        auto jsonEmote = jsonEmote_.toObject();
+
+        auto id = EmoteId{jsonEmote.value("id").toString()};
+        auto name = EmoteName{jsonEmote.value("code").toString()};
+        // emoteObject.value("imageType").toString();
+
+        auto emote = Emote(
+            {name,
+             ImageSet{
+                 Image::fromUrl(getEmoteLink(urlTemplate, id, "1x"), 1),
+                 Image::fromUrl(getEmoteLink(urlTemplate, id, "2x"), 0.5),
+                 Image::fromUrl(getEmoteLink(urlTemplate, id, "3x"), 0.25)},
+             Tooltip{name.string + "<br />Channel Bttv Emote"},
+             Url{"https://manage.betterttv.net/emotes/" + id.string}});
+
+        emotes[name] = cachedOrMake(std::move(emote), id);
+    }
+
+    return {Success, std::move(emotes)};
+}
 }  // namespace
 
+//
+// BttvEmotes
+//
 BttvEmotes::BttvEmotes()
     : global_(std::make_shared<EmoteMap>())
 {
@@ -84,4 +121,31 @@ void BttvEmotes::loadGlobal()
     request.execute();
 }
 
+void BttvEmotes::loadChannel(const QString &channelName,
+                             std::function<void(EmoteMap &&)> callback)
+{
+    auto request =
+        NetworkRequest(QString(bttvChannelEmoteApiUrl) + channelName);
+
+    request.setCaller(QThread::currentThread());
+    request.setTimeout(3000);
+
+    request.onSuccess([callback = std::move(callback)](auto result) -> Outcome {
+        auto pair = parseChannelEmotes(result.parseJson());
+        if (pair.first) callback(std::move(pair.second));
+        return pair.first;
+    });
+
+    request.execute();
+}
+
+static Url getEmoteLink(QString urlTemplate, const EmoteId &id,
+                        const QString &emoteScale)
+{
+    urlTemplate.detach();
+
+    return {urlTemplate.replace("{{id}}", id.string)
+                .replace("{{image}}", emoteScale)};
+}
+
 }  // namespace chatterino
diff --git a/src/providers/bttv/BttvEmotes.hpp b/src/providers/bttv/BttvEmotes.hpp
index 510f873fc..7392cd6bc 100644
--- a/src/providers/bttv/BttvEmotes.hpp
+++ b/src/providers/bttv/BttvEmotes.hpp
@@ -10,6 +10,8 @@ class BttvEmotes final
 {
     static constexpr const char *globalEmoteApiUrl =
         "https://api.betterttv.net/2/emotes";
+    static constexpr const char *bttvChannelEmoteApiUrl =
+        "https://api.betterttv.net/2/channels/";
 
 public:
     BttvEmotes();
@@ -17,6 +19,8 @@ public:
     std::shared_ptr<const EmoteMap> global() const;
     boost::optional<EmotePtr> global(const EmoteName &name) const;
     void loadGlobal();
+    static void loadChannel(const QString &channelName,
+                            std::function<void(EmoteMap &&)> callback);
 
 private:
     Atomic<std::shared_ptr<const EmoteMap>> global_;
diff --git a/src/providers/bttv/LoadBttvChannelEmote.cpp b/src/providers/bttv/LoadBttvChannelEmote.cpp
index ccc52a130..f5116cb02 100644
--- a/src/providers/bttv/LoadBttvChannelEmote.cpp
+++ b/src/providers/bttv/LoadBttvChannelEmote.cpp
@@ -11,78 +11,4 @@
 
 namespace chatterino {
 
-static Url getEmoteLink(QString urlTemplate, const EmoteId &id,
-                        const QString &emoteScale);
-static std::pair<Outcome, EmoteMap> bttvParseChannelEmotes(
-    const QJsonObject &jsonRoot);
-
-void loadBttvChannelEmotes(const QString &channelName,
-                           std::function<void(EmoteMap &&)> callback)
-{
-    auto request =
-        NetworkRequest(QString(bttvChannelEmoteApiUrl) + channelName);
-
-    request.setCaller(QThread::currentThread());
-    request.setTimeout(3000);
-    request.onSuccess([callback = std::move(callback)](auto result) -> Outcome {
-        auto pair = bttvParseChannelEmotes(result.parseJson());
-
-        if (pair.first == Success) callback(std::move(pair.second));
-
-        return pair.first;
-    });
-
-    request.execute();
-}
-
-static std::pair<Outcome, EmoteMap> bttvParseChannelEmotes(
-    const QJsonObject &jsonRoot)
-{
-    static UniqueAccess<std::unordered_map<EmoteId, std::weak_ptr<const Emote>>>
-        cache_;
-
-    auto cache = cache_.access();
-    auto emotes = EmoteMap();
-    auto jsonEmotes = jsonRoot.value("emotes").toArray();
-    auto urlTemplate =
-        QString("https:" + jsonRoot.value("urlTemplate").toString());
-
-    for (auto jsonEmote_ : jsonEmotes) {
-        auto jsonEmote = jsonEmote_.toObject();
-
-        auto id = EmoteId{jsonEmote.value("id").toString()};
-        auto name = EmoteName{jsonEmote.value("code").toString()};
-        // emoteObject.value("imageType").toString();
-
-        auto emote = Emote(
-            {name,
-             ImageSet{
-                 Image::fromUrl(getEmoteLink(urlTemplate, id, "1x"), 1),
-                 Image::fromUrl(getEmoteLink(urlTemplate, id, "2x"), 0.5),
-                 Image::fromUrl(getEmoteLink(urlTemplate, id, "3x"), 0.25)},
-             Tooltip{name.string + "<br />Channel Bttv Emote"},
-             Url{"https://manage.betterttv.net/emotes/" + id.string}});
-
-        auto shared = (*cache)[id].lock();
-        if (shared && *shared == emote) {
-            // reuse old shared_ptr if nothing changed
-            emotes[name] = shared;
-        } else {
-            (*cache)[id] = emotes[name] =
-                std::make_shared<Emote>(std::move(emote));
-        }
-    }
-
-    return {Success, std::move(emotes)};
-}
-
-static Url getEmoteLink(QString urlTemplate, const EmoteId &id,
-                        const QString &emoteScale)
-{
-    urlTemplate.detach();
-
-    return {urlTemplate.replace("{{id}}", id.string)
-                .replace("{{image}}", emoteScale)};
-}
-
 }  // namespace chatterino
diff --git a/src/providers/bttv/LoadBttvChannelEmote.hpp b/src/providers/bttv/LoadBttvChannelEmote.hpp
index ffbb50469..d0fa5cc32 100644
--- a/src/providers/bttv/LoadBttvChannelEmote.hpp
+++ b/src/providers/bttv/LoadBttvChannelEmote.hpp
@@ -6,11 +6,4 @@ class QString;
 
 namespace chatterino {
 
-class EmoteMap;
-constexpr const char *bttvChannelEmoteApiUrl =
-    "https://api.betterttv.net/2/channels/";
-
-void loadBttvChannelEmotes(const QString &channelName,
-                           std::function<void(EmoteMap &&)> callback);
-
 }  // namespace chatterino
diff --git a/src/providers/ffz/FfzEmotes.cpp b/src/providers/ffz/FfzEmotes.cpp
index be6d776c6..24341a817 100644
--- a/src/providers/ffz/FfzEmotes.cpp
+++ b/src/providers/ffz/FfzEmotes.cpp
@@ -33,6 +33,13 @@ void fillInEmoteData(const QJsonObject &urls, const EmoteName &name,
                  Image::fromUrl(url3x, 0.25)};
     emoteData.tooltip = {tooltip};
 }
+EmotePtr cachedOrMake(Emote &&emote, const EmoteId &id)
+{
+    static std::unordered_map<EmoteId, std::weak_ptr<const Emote>> cache;
+    static std::mutex mutex;
+
+    return cachedOrMakeEmotePtr(std::move(emote), cache, mutex, id);
+}
 std::pair<Outcome, EmoteMap> parseGlobalEmotes(const QJsonObject &jsonRoot,
                                                const EmoteMap &currentEmotes)
 {
@@ -64,6 +71,36 @@ std::pair<Outcome, EmoteMap> parseGlobalEmotes(const QJsonObject &jsonRoot,
 
     return {Success, std::move(emotes)};
 }
+std::pair<Outcome, EmoteMap> parseChannelEmotes(const QJsonObject &jsonRoot)
+{
+    auto jsonSets = jsonRoot.value("sets").toObject();
+    auto emotes = EmoteMap();
+
+    for (auto jsonSet : jsonSets) {
+        auto jsonEmotes = jsonSet.toObject().value("emoticons").toArray();
+
+        for (auto _jsonEmote : jsonEmotes) {
+            auto jsonEmote = _jsonEmote.toObject();
+
+            // margins
+            auto id = EmoteId{QString::number(jsonEmote.value("id").toInt())};
+            auto name = EmoteName{jsonEmote.value("name").toString()};
+            auto urls = jsonEmote.value("urls").toObject();
+
+            Emote emote;
+            fillInEmoteData(urls, name, name.string + "<br/>Channel FFZ Emote",
+                            emote);
+            emote.homePage =
+                Url{QString("https://www.frankerfacez.com/emoticon/%1-%2")
+                        .arg(id.string)
+                        .arg(name.string)};
+
+            emotes[name] = cachedOrMake(std::move(emote), id);
+        }
+    }
+
+    return {Success, std::move(emotes)};
+}
 }  // namespace
 
 FfzEmotes::FfzEmotes()
@@ -107,66 +144,20 @@ void FfzEmotes::loadGlobal()
 void FfzEmotes::loadChannel(const QString &channelName,
                             std::function<void(EmoteMap &&)> callback)
 {
-    // printf("[FFZEmotes] Reload FFZ Channel Emotes for channel %s\n",
-    // qPrintable(channelName));
+    log("[FFZEmotes] Reload FFZ Channel Emotes for channel %s\n", channelName);
 
-    // QString url("https://api.frankerfacez.com/v1/room/" + channelName);
+    NetworkRequest request("https://api.frankerfacez.com/v1/room/" +
+                           channelName);
+    request.setCaller(QThread::currentThread());
+    request.setTimeout(3000);
 
-    // NetworkRequest request(url);
-    // request.setCaller(QThread::currentThread());
-    // request.setTimeout(3000);
-    // request.onSuccess([this, channelName, _map](auto result) -> Outcome {
-    //    return this->parseChannelEmotes(result.parseJson());
-    //});
+    request.onSuccess([callback = std::move(callback)](auto result) -> Outcome {
+        auto pair = parseChannelEmotes(result.parseJson());
+        if (pair.first) callback(std::move(pair.second));
+        return pair.first;
+    });
 
-    // request.execute();
-}
-
-Outcome parseChannelEmotes(const QJsonObject &jsonRoot)
-{
-    // auto rootNode = result.parseJson();
-    // auto map = _map.lock();
-
-    // if (_map.expired()) {
-    //    return false;
-    //}
-
-    // map->clear();
-
-    // auto setsNode = rootNode.value("sets").toObject();
-
-    // std::vector<QString> codes;
-    // for (const QJsonValue &setNode : setsNode) {
-    //    auto emotesNode = setNode.toObject().value("emoticons").toArray();
-
-    //    for (const QJsonValue &emoteNode : emotesNode) {
-    //        QJsonObject emoteObject = emoteNode.toObject();
-
-    //        // margins
-    //        int id = emoteObject.value("id").toInt();
-    //        QString code = emoteObject.value("name").toString();
-
-    //        QJsonObject urls = emoteObject.value("urls").toObject();
-
-    //        auto emote = this->channelEmoteCache_.getOrAdd(id, [id, &code,
-    //        &urls] {
-    //            EmoteData emoteData;
-    //            fillInEmoteData(urls, code, code + "<br/>Channel FFZ Emote",
-    //            emoteData); emoteData.pageLink =
-    //                QString("https://www.frankerfacez.com/emoticon/%1-%2").arg(id).arg(code);
-
-    //            return emoteData;
-    //        });
-
-    //        this->channelEmotes.insert(code, emote);
-    //        map->insert(code, emote);
-    //        codes.push_back(code);
-    //    }
-
-    //    this->channelEmoteCodes[channelName] = codes;
-    //}
-
-    return Success;
+    request.execute();
 }
 
 }  // namespace chatterino
diff --git a/src/providers/ffz/FfzEmotes.hpp b/src/providers/ffz/FfzEmotes.hpp
index ccc850bff..cc75b09bd 100644
--- a/src/providers/ffz/FfzEmotes.hpp
+++ b/src/providers/ffz/FfzEmotes.hpp
@@ -1,14 +1,12 @@
 #pragma once
 
 #include <memory>
-
 #include "common/Atomic.hpp"
 #include "messages/Emote.hpp"
-#include "messages/EmoteCache.hpp"
 
 namespace chatterino {
 
-class FfzEmotes final : std::enable_shared_from_this<FfzEmotes>
+class FfzEmotes final
 {
     static constexpr const char *globalEmoteApiUrl =
         "https://api.frankerfacez.com/v1/set/global";
@@ -20,10 +18,9 @@ public:
 
     std::shared_ptr<const EmoteMap> global() const;
     boost::optional<EmotePtr> global(const EmoteName &name) const;
-
     void loadGlobal();
-    void loadChannel(const QString &channelName,
-                     std::function<void(EmoteMap &&)> callback);
+    static void loadChannel(const QString &channelName,
+                            std::function<void(EmoteMap &&)> callback);
 
 private:
     Atomic<std::shared_ptr<const EmoteMap>> global_;
diff --git a/src/providers/twitch/TwitchChannel.cpp b/src/providers/twitch/TwitchChannel.cpp
index 4d9445c75..7e0a1efc1 100644
--- a/src/providers/twitch/TwitchChannel.cpp
+++ b/src/providers/twitch/TwitchChannel.cpp
@@ -5,6 +5,7 @@
 #include "controllers/accounts/AccountController.hpp"
 #include "debug/Log.hpp"
 #include "messages/Message.hpp"
+#include "providers/bttv/BttvEmotes.hpp"
 #include "providers/bttv/LoadBttvChannelEmote.hpp"
 #include "providers/twitch/PubsubClient.hpp"
 #include "providers/twitch/TwitchCommon.hpp"
@@ -51,6 +52,8 @@ auto parseRecentMessages(const QJsonObject &jsonRoot, TwitchChannel &channel)
 
 TwitchChannel::TwitchChannel(const QString &name)
     : Channel(name, Channel::Type::Twitch)
+    , bttvEmotes_(std::make_shared<EmoteMap>())
+    , ffzEmotes_(std::make_shared<EmoteMap>())
     , subscriptionUrl_("https://www.twitch.tv/subs/" + name)
     , channelUrl_("https://twitch.tv/" + name)
     , popoutPlayerUrl_("https://player.twitch.tv/?channel=" + name)
@@ -111,15 +114,17 @@ bool TwitchChannel::canSendMessage() const
 
 void TwitchChannel::refreshChannelEmotes()
 {
-    loadBttvChannelEmotes(
-        this->getName(), [this, weak = weakOf<Channel>(this)](auto &&emoteMap) {
-            if (auto shared = weak.lock())  //
-                *this->bttvEmotes_.access() = emoteMap;
-        });
-    getApp()->emotes->ffz.loadChannel(
+    BttvEmotes::loadChannel(
         this->getName(), [this, weak = weakOf<Channel>(this)](auto &&emoteMap) {
             if (auto shared = weak.lock())
-                *this->ffzEmotes_.access() = emoteMap;
+                this->bttvEmotes_.set(
+                    std::make_shared<EmoteMap>(std::move(emoteMap)));
+        });
+    FfzEmotes::loadChannel(
+        this->getName(), [this, weak = weakOf<Channel>(this)](auto &&emoteMap) {
+            if (auto shared = weak.lock())
+                this->ffzEmotes_.set(
+                    std::make_shared<EmoteMap>(std::move(emoteMap)));
         });
 }
 
@@ -248,7 +253,7 @@ void TwitchChannel::addPartedUser(const QString &user)
     }
 }
 
-QString TwitchChannel::getRoomId() const
+QString TwitchChannel::roomId() const
 {
     return *this->roomID_.access();
 }
@@ -284,47 +289,45 @@ TwitchChannel::accessStreamStatus() const
     return this->streamStatus_.accessConst();
 }
 
-boost::optional<EmotePtr> TwitchChannel::getBttvEmote(
-    const EmoteName &name) const
+boost::optional<EmotePtr> TwitchChannel::bttvEmote(const EmoteName &name) const
 {
-    auto emotes = this->bttvEmotes_.access();
+    auto emotes = this->bttvEmotes_.get();
     auto it = emotes->find(name);
 
     if (it == emotes->end()) return boost::none;
     return it->second;
 }
 
-boost::optional<EmotePtr> TwitchChannel::getFfzEmote(
-    const EmoteName &name) const
+boost::optional<EmotePtr> TwitchChannel::ffzEmote(const EmoteName &name) const
 {
-    auto emotes = this->bttvEmotes_.access();
+    auto emotes = this->bttvEmotes_.get();
     auto it = emotes->find(name);
 
     if (it == emotes->end()) return boost::none;
     return it->second;
 }
 
-AccessGuard<const EmoteMap> TwitchChannel::accessBttvEmotes() const
+std::shared_ptr<const EmoteMap> TwitchChannel::bttvEmotes() const
 {
-    return this->bttvEmotes_.accessConst();
+    return this->bttvEmotes_.get();
 }
 
-AccessGuard<const EmoteMap> TwitchChannel::accessFfzEmotes() const
+std::shared_ptr<const EmoteMap> TwitchChannel::ffzEmotes() const
 {
-    return this->ffzEmotes_.accessConst();
+    return this->ffzEmotes_.get();
 }
 
-const QString &TwitchChannel::getSubscriptionUrl()
+const QString &TwitchChannel::subscriptionUrl()
 {
     return this->subscriptionUrl_;
 }
 
-const QString &TwitchChannel::getChannelUrl()
+const QString &TwitchChannel::channelUrl()
 {
     return this->channelUrl_;
 }
 
-const QString &TwitchChannel::getPopoutPlayerUrl()
+const QString &TwitchChannel::popoutPlayerUrl()
 {
     return this->popoutPlayerUrl_;
 }
@@ -347,7 +350,7 @@ void TwitchChannel::setLive(bool newLiveStatus)
 
 void TwitchChannel::refreshLiveStatus()
 {
-    auto roomID = this->getRoomId();
+    auto roomID = this->roomId();
 
     if (roomID.isEmpty()) {
         log("[TwitchChannel:{}] Refreshing live status (Missing ID)",
@@ -459,7 +462,7 @@ void TwitchChannel::loadRecentMessages()
         "https://tmi.twitch.tv/api/rooms/%1/recent_messages?client_id=" +
         getDefaultClientID();
 
-    NetworkRequest request(genericURL.arg(this->getRoomId()));
+    NetworkRequest request(genericURL.arg(this->roomId()));
     request.makeAuthorizedV5(getDefaultClientID());
     request.setCaller(QThread::currentThread());
     // can't be concurrent right now due to SignalVector
@@ -483,7 +486,7 @@ void TwitchChannel::refreshPubsub()
 {
     // listen to moderation actions
     if (!this->hasModRights()) return;
-    auto roomId = this->getRoomId();
+    auto roomId = this->roomId();
     if (roomId.isEmpty()) return;
 
     auto account = getApp()->accounts->twitch.getCurrent();
@@ -541,7 +544,7 @@ Outcome TwitchChannel::parseViewerList(const QJsonObject &jsonRoot)
 void TwitchChannel::loadBadges()
 {
     auto url = Url{"https://badges.twitch.tv/v1/badges/channels/" +
-                   this->getRoomId() + "/display?language=en"};
+                   this->roomId() + "/display?language=en"};
     NetworkRequest req(url.string);
     req.setCaller(QThread::currentThread());
 
diff --git a/src/providers/twitch/TwitchChannel.hpp b/src/providers/twitch/TwitchChannel.hpp
index e41120cda..8b2edeab4 100644
--- a/src/providers/twitch/TwitchChannel.hpp
+++ b/src/providers/twitch/TwitchChannel.hpp
@@ -2,9 +2,9 @@
 
 #include <IrcConnection>
 
+#include "common/Atomic.hpp"
 #include "common/Channel.hpp"
 #include "common/Common.hpp"
-#include "common/Atomic.hpp"
 #include "common/UniqueAccess.hpp"
 #include "messages/Emote.hpp"
 #include "singletons/Emotes.hpp"
@@ -64,19 +64,19 @@ public:
     void setMod(bool value);
     virtual bool isBroadcaster() const override;
 
-    QString getRoomId() const;
+    QString roomId() const;
     void setRoomId(const QString &id);
     AccessGuard<const RoomModes> accessRoomModes() const;
     void setRoomModes(const RoomModes &roomModes_);
     AccessGuard<const StreamStatus> accessStreamStatus() const;
 
-    boost::optional<EmotePtr> getBttvEmote(const EmoteName &name) const;
-    boost::optional<EmotePtr> getFfzEmote(const EmoteName &name) const;
-    AccessGuard<const EmoteMap> accessBttvEmotes() const;
-    AccessGuard<const EmoteMap> accessFfzEmotes() const;
-    const QString &getSubscriptionUrl();
-    const QString &getChannelUrl();
-    const QString &getPopoutPlayerUrl();
+    boost::optional<EmotePtr> bttvEmote(const EmoteName &name) const;
+    boost::optional<EmotePtr> ffzEmote(const EmoteName &name) const;
+    std::shared_ptr<const EmoteMap> bttvEmotes() const;
+    std::shared_ptr<const EmoteMap> ffzEmotes() const;
+    const QString &subscriptionUrl();
+    const QString &channelUrl();
+    const QString &popoutPlayerUrl();
 
     boost::optional<EmotePtr> getTwitchBadge(const QString &set,
                                              const QString &version) const;
@@ -127,8 +127,8 @@ private:
     UniqueAccess<UserState> userState_;
     UniqueAccess<RoomModes> roomModes_;
 
-    UniqueAccess<EmoteMap> bttvEmotes_;
-    UniqueAccess<EmoteMap> ffzEmotes_;
+    Atomic<std::shared_ptr<const EmoteMap>> bttvEmotes_;
+    Atomic<std::shared_ptr<const EmoteMap>> ffzEmotes_;
     const QString subscriptionUrl_;
     const QString channelUrl_;
     const QString popoutPlayerUrl_;
diff --git a/src/providers/twitch/TwitchMessageBuilder.cpp b/src/providers/twitch/TwitchMessageBuilder.cpp
index fef0e4a23..7bc5ce0f2 100644
--- a/src/providers/twitch/TwitchMessageBuilder.cpp
+++ b/src/providers/twitch/TwitchMessageBuilder.cpp
@@ -341,7 +341,7 @@ void TwitchMessageBuilder::parseRoomID()
     if (iterator != std::end(this->tags)) {
         this->roomID_ = iterator.value().toString();
 
-        if (this->twitchChannel->getRoomId().isEmpty()) {
+        if (this->twitchChannel->roomId().isEmpty()) {
             this->twitchChannel->setRoomId(this->roomID_);
         }
     }
@@ -641,12 +641,12 @@ Outcome TwitchMessageBuilder::tryAppendEmote(const EmoteName &name)
     if ((emote = getApp()->emotes->bttv.global(name))) {
         flags = MessageElementFlag::BttvEmote;
     } else if (twitchChannel &&
-               (emote = this->twitchChannel->getBttvEmote(name))) {
+               (emote = this->twitchChannel->bttvEmote(name))) {
         flags = MessageElementFlag::BttvEmote;
     } else if ((emote = getApp()->emotes->ffz.global(name))) {
         flags = MessageElementFlag::FfzEmote;
     } else if (twitchChannel &&
-               (emote = this->twitchChannel->getFfzEmote(name))) {
+               (emote = this->twitchChannel->ffzEmote(name))) {
         flags = MessageElementFlag::FfzEmote;
     }
 
diff --git a/src/providers/twitch/TwitchServer.cpp b/src/providers/twitch/TwitchServer.cpp
index 8a5e48cab..4e3bcddad 100644
--- a/src/providers/twitch/TwitchServer.cpp
+++ b/src/providers/twitch/TwitchServer.cpp
@@ -79,10 +79,12 @@ void TwitchServer::initializeConnection(IrcConnection *connection, bool isRead,
 
 std::shared_ptr<Channel> TwitchServer::createChannel(const QString &channelName)
 {
-    TwitchChannel *channel = new TwitchChannel(channelName);
+    auto channel =
+        std::shared_ptr<TwitchChannel>(new TwitchChannel(channelName));
+    channel->refreshChannelEmotes();
 
     channel->sendMessageSignal.connect(
-        [this, channel](auto &chan, auto &msg, bool &sent) {
+        [this, channel = channel.get()](auto &chan, auto &msg, bool &sent) {
             this->onMessageSendRequested(channel, msg, sent);
         });
 
@@ -175,7 +177,7 @@ std::shared_ptr<Channel> TwitchServer::getChannelOrEmptyByID(
         auto twitchChannel = std::dynamic_pointer_cast<TwitchChannel>(channel);
         if (!twitchChannel) continue;
 
-        if (twitchChannel->getRoomId() == channelId) {
+        if (twitchChannel->roomId() == channelId) {
             return twitchChannel;
         }
     }
diff --git a/src/widgets/dialogs/EmotePopup.cpp b/src/widgets/dialogs/EmotePopup.cpp
index b5dbb965b..8c3fc87e1 100644
--- a/src/widgets/dialogs/EmotePopup.cpp
+++ b/src/widgets/dialogs/EmotePopup.cpp
@@ -74,6 +74,8 @@ EmotePopup::EmotePopup()
     layout->addWidget(notebook);
     layout->setMargin(0);
 
+    auto clicked = [this](const Link &link) { this->linkClicked.invoke(link); };
+
     auto makeView = [&](QString tabTitle) {
         auto view = new ChannelView();
 
@@ -82,6 +84,7 @@ EmotePopup::EmotePopup()
             MessageElementFlag::EmoteImages});
         view->setEnableScrollingToBottom(false);
         notebook->addPage(view, tabTitle);
+        view->linkClicked.connect(clicked);
 
         return view;
     };
@@ -92,11 +95,6 @@ EmotePopup::EmotePopup()
     this->viewEmojis_ = makeView("Emojis");
 
     this->loadEmojis();
-
-    this->globalEmotesView_->linkClicked.connect(
-        [this](const Link &link) { this->linkClicked.invoke(link); });
-    this->viewEmojis_->linkClicked.connect(
-        [this](const Link &link) { this->linkClicked.invoke(link); });
 }
 
 void EmotePopup::loadChannel(ChannelPtr _channel)
@@ -128,10 +126,8 @@ void EmotePopup::loadChannel(ChannelPtr _channel)
     addEmotes(*globalChannel, *getApp()->emotes->ffz.global(), "FrankerFaceZ");
 
     // channel
-    // addEmotes(*channel->accessBttvEmotes(), "BetterTTV Channel Emotes",
-    //          "BetterTTV Channel Emote");
-    // addEmotes(*channel->accessFfzEmotes(), "FrankerFaceZ Channel Emotes",
-    //          "FrankerFaceZ Channel Emote");
+    addEmotes(*channelChannel, *twitchChannel->bttvEmotes(), "BetterTTV");
+    addEmotes(*channelChannel, *twitchChannel->ffzEmotes(), "FrankerFaceZ");
 
     this->globalEmotesView_->setChannel(globalChannel);
     this->subEmotesView_->setChannel(subChannel);

From 63eaf3b94cc747c752b0e9040c97820d109056db Mon Sep 17 00:00:00 2001
From: fourtf <tf.four@gmail.com>
Date: Sat, 11 Aug 2018 17:35:46 +0200
Subject: [PATCH 18/44] fixed not being able to select text backwards

---
 src/messages/Selection.hpp                    | 13 ++++---------
 src/providers/twitch/TwitchAccount.cpp        | 10 ++++++++++
 src/providers/twitch/TwitchAccount.hpp        |  8 +++++---
 src/providers/twitch/TwitchMessageBuilder.cpp |  7 +++----
 4 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/src/messages/Selection.hpp b/src/messages/Selection.hpp
index 8eefc3a33..7cffebbec 100644
--- a/src/messages/Selection.hpp
+++ b/src/messages/Selection.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <tuple>
 #include <utility>
 
 namespace chatterino {
@@ -23,19 +24,13 @@ struct SelectionItem {
 
     bool operator<(const SelectionItem &b) const
     {
-        if (this->messageIndex < b.messageIndex) {
-            return true;
-        }
-        if (this->messageIndex == b.messageIndex &&
-            this->charIndex < b.charIndex) {
-            return true;
-        }
-        return false;
+        return std::tie(this->messageIndex, this->charIndex) <
+               std::tie(b.messageIndex, b.charIndex);
     }
 
     bool operator>(const SelectionItem &b) const
     {
-        return this->operator!=(b) && b.operator<(*this);
+        return b.operator<(*this);
     }
 
     bool operator==(const SelectionItem &b) const
diff --git a/src/providers/twitch/TwitchAccount.cpp b/src/providers/twitch/TwitchAccount.cpp
index 95a8d37eb..0258c6e72 100644
--- a/src/providers/twitch/TwitchAccount.cpp
+++ b/src/providers/twitch/TwitchAccount.cpp
@@ -78,6 +78,16 @@ const QString &TwitchAccount::getUserId() const
     return this->userId_;
 }
 
+QColor TwitchAccount::color()
+{
+    return this->color_.get();
+}
+
+void TwitchAccount::setColor(QColor color)
+{
+    this->color_.set(color);
+}
+
 bool TwitchAccount::setOAuthClient(const QString &newClientID)
 {
     if (this->oauthClient_.compare(newClientID) == 0) {
diff --git a/src/providers/twitch/TwitchAccount.hpp b/src/providers/twitch/TwitchAccount.hpp
index 21dfbac63..c59ca9d38 100644
--- a/src/providers/twitch/TwitchAccount.hpp
+++ b/src/providers/twitch/TwitchAccount.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "common/Atomic.hpp"
 #include "common/UniqueAccess.hpp"
 #include "controllers/accounts/Account.hpp"
 #include "messages/Emote.hpp"
@@ -66,9 +67,11 @@ public:
     const QString &getUserName() const;
     const QString &getOAuthToken() const;
     const QString &getOAuthClient() const;
-
     const QString &getUserId() const;
 
+    QColor color();
+    void setColor(QColor color);
+
     // Attempts to update the users OAuth Client ID
     // Returns true if the value has changed, otherwise false
     bool setOAuthClient(const QString &newClientID);
@@ -104,8 +107,6 @@ public:
     void loadEmotes();
     AccessGuard<const TwitchAccountEmoteData> accessEmotes() const;
 
-    QColor color;
-
 private:
     void parseEmotes(const rapidjson::Document &document);
     void loadEmoteSetData(std::shared_ptr<EmoteSet> emoteSet);
@@ -115,6 +116,7 @@ private:
     QString userName_;
     QString userId_;
     const bool isAnon_;
+    Atomic<QColor> color_;
 
     mutable std::mutex ignoresMutex_;
     std::set<TwitchUser> ignores_;
diff --git a/src/providers/twitch/TwitchMessageBuilder.cpp b/src/providers/twitch/TwitchMessageBuilder.cpp
index 7bc5ce0f2..e475b724d 100644
--- a/src/providers/twitch/TwitchMessageBuilder.cpp
+++ b/src/providers/twitch/TwitchMessageBuilder.cpp
@@ -457,7 +457,7 @@ void TwitchMessageBuilder::appendUsername()
                                    app->themes->messages.textColors.system,
                                    FontStyle::ChatMedium);
 
-        QColor selfColor = currentUser->color;
+        QColor selfColor = currentUser->color();
         if (!selfColor.isValid()) {
             selfColor = app->themes->messages.textColors.system;
         }
@@ -490,7 +490,7 @@ void TwitchMessageBuilder::parseHighlights(bool isPastMsg)
     QString currentUsername = currentUser->getUserName();
 
     if (this->ircMessage->nick() == currentUsername) {
-        currentUser->color = this->usernameColor_;
+        currentUser->setColor(this->usernameColor_);
         // Do nothing. Highlights cannot be triggered by yourself
         return;
     }
@@ -645,8 +645,7 @@ Outcome TwitchMessageBuilder::tryAppendEmote(const EmoteName &name)
         flags = MessageElementFlag::BttvEmote;
     } else if ((emote = getApp()->emotes->ffz.global(name))) {
         flags = MessageElementFlag::FfzEmote;
-    } else if (twitchChannel &&
-               (emote = this->twitchChannel->ffzEmote(name))) {
+    } else if (twitchChannel && (emote = this->twitchChannel->ffzEmote(name))) {
         flags = MessageElementFlag::FfzEmote;
     }
 

From 44f5a15da3a7acbdb23fa7fccecfb4deb57106c7 Mon Sep 17 00:00:00 2001
From: fourtf <tf.four@gmail.com>
Date: Sat, 11 Aug 2018 22:23:06 +0200
Subject: [PATCH 19/44] turning a lot of includes into forward declares

---
 src/Application.cpp                           |   3 +
 src/Application.hpp                           |   3 +-
 src/common/Aliases.hpp                        |   2 +
 src/common/Channel.hpp                        |   4 +-
 src/common/Common.hpp                         |   4 +-
 src/common/CompletionModel.cpp                |   1 +
 src/common/CompletionModel.hpp                |   2 -
 src/common/NetworkCommon.hpp                  |   3 +-
 src/common/NetworkManager.hpp                 |   9 --
 src/common/NetworkRequest.cpp                 |   2 +
 src/common/NetworkRequest.hpp                 |   3 +-
 .../accounts/AccountController.cpp            |   2 +
 .../accounts/AccountController.hpp            |   5 +-
 src/controllers/accounts/AccountModel.cpp     |   1 +
 src/controllers/accounts/AccountModel.hpp     |   1 +
 .../commands/CommandController.cpp            |   3 +
 .../highlights/HighlightController.hpp        |   9 +-
 src/controllers/ignores/IgnoreController.hpp  |   5 +-
 .../moderationactions/ModerationAction.cpp    |   1 +
 .../moderationactions/ModerationAction.hpp    |   4 +-
 src/messages/Emote.hpp                        |   3 -
 src/messages/EmoteCache.hpp                   |  93 ----------------
 src/messages/Image.cpp                        |   1 +
 src/messages/Image.hpp                        |   4 +-
 src/messages/Link.hpp                         |   1 -
 src/messages/Message.hpp                      |   4 +-
 src/messages/MessageBuilder.cpp               |   9 +-
 src/messages/MessageBuilder.hpp               |   8 +-
 src/messages/MessageColor.cpp                 |   2 +
 src/messages/MessageColor.hpp                 |   3 +-
 src/messages/MessageElement.cpp               |   2 +
 src/messages/MessageElement.hpp               |  10 +-
 src/messages/layouts/MessageLayout.cpp        |  48 +++++----
 src/messages/layouts/MessageLayout.hpp        |  17 +--
 .../layouts/MessageLayoutContainer.cpp        |   6 +-
 .../layouts/MessageLayoutContainer.hpp        |  14 +--
 src/messages/layouts/MessageLayoutElement.cpp |   2 +
 src/messages/layouts/MessageLayoutElement.hpp |   6 +-
 src/providers/bttv/BttvEmotes.cpp             |   1 +
 src/providers/bttv/BttvEmotes.hpp             |   2 +
 src/providers/chatterino/ChatterinoBadges.cpp |  46 ++++----
 src/providers/chatterino/ChatterinoBadges.hpp |  12 +--
 src/providers/emoji/Emojis.cpp                |   1 +
 src/providers/emoji/Emojis.hpp                |   4 +-
 src/providers/ffz/FfzEmotes.cpp               |   1 +
 src/providers/irc/AbstractIrcServer.cpp       |   2 +
 src/providers/irc/AbstractIrcServer.hpp       |   4 +-
 src/providers/twitch/IrcMessageHandler.cpp    |   1 +
 src/providers/twitch/PartialTwitchUser.cpp    |   1 +
 src/providers/twitch/PubsubHelpers.cpp        |   1 +
 src/providers/twitch/PubsubHelpers.hpp        |   4 +-
 src/providers/twitch/TwitchAccount.cpp        |   1 +
 src/providers/twitch/TwitchAccount.hpp        |   1 +
 src/providers/twitch/TwitchAccountManager.cpp |   1 +
 src/providers/twitch/TwitchAccountManager.hpp |   1 +
 src/providers/twitch/TwitchApi.cpp            |   1 +
 src/providers/twitch/TwitchApi.hpp            |   1 +
 src/providers/twitch/TwitchBadges.cpp         |   2 +
 src/providers/twitch/TwitchBadges.hpp         |   4 +-
 src/providers/twitch/TwitchChannel.cpp        |   1 +
 src/providers/twitch/TwitchChannel.hpp        |  14 +--
 src/providers/twitch/TwitchEmotes.cpp         |   1 +
 src/providers/twitch/TwitchEmotes.hpp         |   8 +-
 src/providers/twitch/TwitchMessageBuilder.cpp |   2 +
 src/providers/twitch/TwitchMessageBuilder.hpp |   7 +-
 src/providers/twitch/TwitchServer.cpp         |   1 +
 src/providers/twitch/TwitchServer.hpp         |   4 +-
 src/singletons/Fonts.cpp                      |  41 +++----
 src/singletons/Fonts.hpp                      |  51 +++++----
 src/singletons/Settings.hpp                   |   1 -
 src/singletons/Updates.cpp                    |   1 +
 src/singletons/WindowManager.cpp              |  29 +++--
 src/singletons/WindowManager.hpp              |  17 ++-
 src/util/InitUpdateButton.cpp                 |   5 +-
 src/util/InitUpdateButton.hpp                 |   1 -
 src/widgets/AccountSwitchWidget.cpp           |   1 +
 src/widgets/AttachedWindow.hpp                |   8 +-
 src/widgets/BaseWindow.cpp                    |  19 ++--
 src/widgets/BaseWindow.hpp                    |   6 +-
 src/widgets/Notebook.cpp                      |  20 ++--
 src/widgets/Notebook.hpp                      |  13 +--
 src/widgets/Scrollbar.cpp                     |  12 +--
 src/widgets/Scrollbar.hpp                     |   1 -
 src/widgets/StreamView.cpp                    |   1 +
 src/widgets/TooltipWidget.cpp                 |   2 +-
 src/widgets/Window.cpp                        |  64 +++++------
 src/widgets/Window.hpp                        |  24 ++---
 src/widgets/dialogs/EmotePopup.cpp            |   3 +
 src/widgets/dialogs/EmotePopup.hpp            |   7 +-
 src/widgets/dialogs/LoginDialog.cpp           |   1 +
 src/widgets/dialogs/LogsPopup.cpp             |   2 +
 src/widgets/dialogs/LogsPopup.hpp             |   9 +-
 src/widgets/dialogs/NotificationPopup.cpp     |   2 +
 src/widgets/dialogs/NotificationPopup.hpp     |   8 +-
 src/widgets/dialogs/SelectChannelDialog.cpp   |   2 +
 src/widgets/dialogs/SelectChannelDialog.hpp   |   6 +-
 src/widgets/dialogs/UserInfoPopup.cpp         |   1 +
 src/widgets/dialogs/UserInfoPopup.hpp         |   3 +-
 src/widgets/helper/ChannelView.cpp            |  89 ++++++++-------
 src/widgets/helper/ChannelView.hpp            |  27 +++--
 src/widgets/helper/NotebookButton.cpp         |   1 +
 src/widgets/helper/NotebookTab.cpp            |   2 +
 src/widgets/helper/ScrollbarHighlight.hpp     |   2 -
 src/widgets/helper/SearchPopup.cpp            |   1 +
 src/widgets/helper/SearchPopup.hpp            |   4 +-
 src/widgets/helper/TitlebarButton.cpp         |  16 +--
 src/widgets/helper/TitlebarButton.hpp         |  26 ++---
 src/widgets/settingspages/IgnoresPage.cpp     |   1 +
 src/widgets/settingspages/LookPage.cpp        |   6 +-
 src/widgets/splits/Split.cpp                  | 102 +++++++++---------
 src/widgets/splits/Split.hpp                  |  21 ++--
 src/widgets/splits/SplitContainer.cpp         |   1 +
 src/widgets/splits/SplitContainer.hpp         |  11 +-
 src/widgets/splits/SplitHeader.cpp            |   3 +
 src/widgets/splits/SplitInput.cpp             |  14 ++-
 src/widgets/splits/SplitInput.hpp             |   8 +-
 src/widgets/splits/SplitOverlay.cpp           |   1 +
 117 files changed, 591 insertions(+), 536 deletions(-)
 delete mode 100644 src/messages/EmoteCache.hpp

diff --git a/src/Application.cpp b/src/Application.cpp
index 85b4f382c..22ae0c34b 100644
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -6,11 +6,13 @@
 #include "controllers/ignores/IgnoreController.hpp"
 #include "controllers/moderationactions/ModerationActions.hpp"
 #include "controllers/taggedusers/TaggedUsersController.hpp"
+#include "debug/Log.hpp"
 #include "messages/MessageBuilder.hpp"
 #include "providers/bttv/BttvEmotes.hpp"
 #include "providers/ffz/FfzEmotes.hpp"
 #include "providers/twitch/PubsubClient.hpp"
 #include "providers/twitch/TwitchServer.hpp"
+#include "singletons/Emotes.hpp"
 #include "singletons/Fonts.hpp"
 #include "singletons/Logging.hpp"
 #include "singletons/NativeMessaging.hpp"
@@ -21,6 +23,7 @@
 #include "singletons/WindowManager.hpp"
 #include "util/IsBigEndian.hpp"
 #include "util/PostToThread.hpp"
+#include "widgets/Window.hpp"
 
 #include <atomic>
 
diff --git a/src/Application.hpp b/src/Application.hpp
index 2a62503bf..e32f29bdd 100644
--- a/src/Application.hpp
+++ b/src/Application.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "common/Singleton.hpp"
-#include "singletons/Resources.hpp"
 
 #include <QApplication>
 #include <memory>
@@ -26,7 +25,7 @@ class AccountManager;
 class Emotes;
 class Settings;
 class Fonts;
-class Resources;
+class Resources2;
 
 class Application
 {
diff --git a/src/common/Aliases.hpp b/src/common/Aliases.hpp
index 8a61a9639..2dea876b7 100644
--- a/src/common/Aliases.hpp
+++ b/src/common/Aliases.hpp
@@ -32,3 +32,5 @@ QStringAlias(UserName);
 QStringAlias(UserId);
 QStringAlias(Url);
 QStringAlias(Tooltip);
+QStringAlias(EmoteId);
+QStringAlias(EmoteName);
diff --git a/src/common/Channel.hpp b/src/common/Channel.hpp
index cb93c1694..c1dd06651 100644
--- a/src/common/Channel.hpp
+++ b/src/common/Channel.hpp
@@ -1,9 +1,7 @@
 #pragma once
 
 #include "common/CompletionModel.hpp"
-#include "messages/Image.hpp"
 #include "messages/LimitedQueue.hpp"
-#include "messages/Message.hpp"
 
 #include <QString>
 #include <QTimer>
@@ -12,7 +10,9 @@
 #include <memory>
 
 namespace chatterino {
+
 struct Message;
+using MessagePtr = std::shared_ptr<const Message>;
 
 class Channel : public std::enable_shared_from_this<Channel>
 {
diff --git a/src/common/Common.hpp b/src/common/Common.hpp
index 251727c24..46de4a7cb 100644
--- a/src/common/Common.hpp
+++ b/src/common/Common.hpp
@@ -3,7 +3,6 @@
 #include "common/Aliases.hpp"
 #include "common/Outcome.hpp"
 #include "common/ProviderId.hpp"
-#include "debug/Log.hpp"
 
 #include <QString>
 #include <QWidget>
@@ -39,4 +38,7 @@ std::weak_ptr<T> weakOf(T *element)
     return element->shared_from_this();
 }
 
+struct Message;
+using MessagePtr = std::shared_ptr<const Message>;
+
 }  // namespace chatterino
diff --git a/src/common/CompletionModel.cpp b/src/common/CompletionModel.cpp
index 9e2f4d024..04425a624 100644
--- a/src/common/CompletionModel.cpp
+++ b/src/common/CompletionModel.cpp
@@ -5,6 +5,7 @@
 #include "controllers/accounts/AccountController.hpp"
 #include "controllers/commands/CommandController.hpp"
 #include "debug/Log.hpp"
+#include "providers/twitch/TwitchChannel.hpp"
 #include "providers/twitch/TwitchServer.hpp"
 #include "singletons/Emotes.hpp"
 
diff --git a/src/common/CompletionModel.hpp b/src/common/CompletionModel.hpp
index d9baac7b3..977768474 100644
--- a/src/common/CompletionModel.hpp
+++ b/src/common/CompletionModel.hpp
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "common/Common.hpp"
-
 #include <QAbstractListModel>
 
 #include <chrono>
diff --git a/src/common/NetworkCommon.hpp b/src/common/NetworkCommon.hpp
index 30d1e9267..b214f5472 100644
--- a/src/common/NetworkCommon.hpp
+++ b/src/common/NetworkCommon.hpp
@@ -2,12 +2,11 @@
 
 #include <functional>
 
-#include "Common.hpp"
-
 class QNetworkReply;
 
 namespace chatterino {
 
+class Outcome;
 class NetworkResult;
 
 using NetworkSuccessCallback = std::function<Outcome(NetworkResult)>;
diff --git a/src/common/NetworkManager.hpp b/src/common/NetworkManager.hpp
index 12c0c6a51..530aaae1f 100644
--- a/src/common/NetworkManager.hpp
+++ b/src/common/NetworkManager.hpp
@@ -1,16 +1,7 @@
 #pragma once
 
-#include "common/NetworkRequester.hpp"
-#include "common/NetworkWorker.hpp"
-#include "debug/Log.hpp"
-
-#include <QJsonDocument>
-#include <QJsonObject>
 #include <QNetworkAccessManager>
-#include <QNetworkReply>
 #include <QThread>
-#include <QTimer>
-#include <QUrl>
 
 namespace chatterino {
 
diff --git a/src/common/NetworkRequest.cpp b/src/common/NetworkRequest.cpp
index f54192190..0a2e45533 100644
--- a/src/common/NetworkRequest.cpp
+++ b/src/common/NetworkRequest.cpp
@@ -1,7 +1,9 @@
 #include "common/NetworkRequest.hpp"
 
 #include "Application.hpp"
+#include "common/NetworkData.hpp"
 #include "common/NetworkManager.hpp"
+#include "common/Outcome.hpp"
 #include "debug/Log.hpp"
 #include "providers/twitch/TwitchCommon.hpp"
 #include "singletons/Paths.hpp"
diff --git a/src/common/NetworkRequest.hpp b/src/common/NetworkRequest.hpp
index 09b2cccee..f1940621d 100644
--- a/src/common/NetworkRequest.hpp
+++ b/src/common/NetworkRequest.hpp
@@ -1,14 +1,13 @@
 #pragma once
 
-#include "Application.hpp"
 #include "common/NetworkCommon.hpp"
-#include "common/NetworkData.hpp"
 #include "common/NetworkRequester.hpp"
 #include "common/NetworkResult.hpp"
 #include "common/NetworkTimer.hpp"
 #include "common/NetworkWorker.hpp"
 
 namespace chatterino {
+class NetworkData;
 
 class NetworkRequest
 {
diff --git a/src/controllers/accounts/AccountController.cpp b/src/controllers/accounts/AccountController.cpp
index 6cd1f2558..7d2c84266 100644
--- a/src/controllers/accounts/AccountController.cpp
+++ b/src/controllers/accounts/AccountController.cpp
@@ -1,6 +1,8 @@
 #include "AccountController.hpp"
 
+#include "controllers/accounts/Account.hpp"
 #include "controllers/accounts/AccountModel.hpp"
+#include "providers/twitch/TwitchAccount.hpp"
 
 namespace chatterino {
 
diff --git a/src/controllers/accounts/AccountController.hpp b/src/controllers/accounts/AccountController.hpp
index 023ad9c9e..b47ec86be 100644
--- a/src/controllers/accounts/AccountController.hpp
+++ b/src/controllers/accounts/AccountController.hpp
@@ -1,16 +1,15 @@
 #pragma once
 
-#include "common/Singleton.hpp"
-
 #include <QObject>
 
 #include "common/SignalVector.hpp"
-#include "controllers/accounts/Account.hpp"
+#include "common/Singleton.hpp"
 #include "providers/twitch/TwitchAccountManager.hpp"
 #include "util/SharedPtrElementLess.hpp"
 
 namespace chatterino {
 
+class Account;
 class Settings;
 class Paths;
 
diff --git a/src/controllers/accounts/AccountModel.cpp b/src/controllers/accounts/AccountModel.cpp
index d63f2c288..23ded2881 100644
--- a/src/controllers/accounts/AccountModel.cpp
+++ b/src/controllers/accounts/AccountModel.cpp
@@ -1,5 +1,6 @@
 #include "AccountModel.hpp"
 
+#include "controllers/accounts/Account.hpp"
 #include "util/StandardItemHelper.hpp"
 
 namespace chatterino {
diff --git a/src/controllers/accounts/AccountModel.hpp b/src/controllers/accounts/AccountModel.hpp
index c0b4538d5..a8b020410 100644
--- a/src/controllers/accounts/AccountModel.hpp
+++ b/src/controllers/accounts/AccountModel.hpp
@@ -8,6 +8,7 @@
 
 namespace chatterino {
 
+class Account;
 class AccountController;
 
 class AccountModel : public SignalVectorModel<std::shared_ptr<Account>>
diff --git a/src/controllers/commands/CommandController.cpp b/src/controllers/commands/CommandController.cpp
index 3aaefca8b..f931aa073 100644
--- a/src/controllers/commands/CommandController.cpp
+++ b/src/controllers/commands/CommandController.cpp
@@ -5,7 +5,10 @@
 #include "controllers/accounts/AccountController.hpp"
 #include "controllers/commands/Command.hpp"
 #include "controllers/commands/CommandModel.hpp"
+#include "debug/Log.hpp"
+#include "messages/Message.hpp"
 #include "messages/MessageBuilder.hpp"
+#include "messages/MessageElement.hpp"
 #include "providers/twitch/TwitchApi.hpp"
 #include "providers/twitch/TwitchChannel.hpp"
 #include "providers/twitch/TwitchServer.hpp"
diff --git a/src/controllers/highlights/HighlightController.hpp b/src/controllers/highlights/HighlightController.hpp
index 09d686cb2..963f23aaa 100644
--- a/src/controllers/highlights/HighlightController.hpp
+++ b/src/controllers/highlights/HighlightController.hpp
@@ -1,15 +1,16 @@
 #pragma once
 
-#include "common/Singleton.hpp"
-
+#include "common/ChatterinoSetting.hpp"
 #include "common/SignalVector.hpp"
+#include "common/Singleton.hpp"
 #include "controllers/highlights/HighlightBlacklistUser.hpp"
 #include "controllers/highlights/HighlightPhrase.hpp"
-#include "messages/Message.hpp"
-#include "singletons/Settings.hpp"
 
 namespace chatterino {
 
+struct Message;
+using MessagePtr = std::shared_ptr<const Message>;
+
 class Settings;
 class Paths;
 
diff --git a/src/controllers/ignores/IgnoreController.hpp b/src/controllers/ignores/IgnoreController.hpp
index e7a0472e6..10c83ac10 100644
--- a/src/controllers/ignores/IgnoreController.hpp
+++ b/src/controllers/ignores/IgnoreController.hpp
@@ -1,10 +1,9 @@
 #pragma once
 
-#include "common/Singleton.hpp"
-
+#include "common/ChatterinoSetting.hpp"
 #include "common/SignalVector.hpp"
+#include "common/Singleton.hpp"
 #include "controllers/ignores/IgnorePhrase.hpp"
-#include "singletons/Settings.hpp"
 
 namespace chatterino {
 
diff --git a/src/controllers/moderationactions/ModerationAction.cpp b/src/controllers/moderationactions/ModerationAction.cpp
index 49d302b34..cc2b8463e 100644
--- a/src/controllers/moderationactions/ModerationAction.cpp
+++ b/src/controllers/moderationactions/ModerationAction.cpp
@@ -2,6 +2,7 @@
 
 #include <QRegularExpression>
 #include "Application.hpp"
+#include "messages/Image.hpp"
 #include "singletons/Resources.hpp"
 
 namespace chatterino {
diff --git a/src/controllers/moderationactions/ModerationAction.hpp b/src/controllers/moderationactions/ModerationAction.hpp
index f509f79c5..6a36157df 100644
--- a/src/controllers/moderationactions/ModerationAction.hpp
+++ b/src/controllers/moderationactions/ModerationAction.hpp
@@ -4,11 +4,13 @@
 #include <boost/optional.hpp>
 #include <pajlada/settings/serialize.hpp>
 
-#include "messages/Image.hpp"
 #include "util/RapidjsonHelpers.hpp"
 
 namespace chatterino {
 
+class Image;
+using ImagePtr = std::shared_ptr<Image>;
+
 class ModerationAction
 {
 public:
diff --git a/src/messages/Emote.hpp b/src/messages/Emote.hpp
index 89cadc623..143d3ea64 100644
--- a/src/messages/Emote.hpp
+++ b/src/messages/Emote.hpp
@@ -7,9 +7,6 @@
 #include <memory>
 #include <unordered_map>
 
-QStringAlias(EmoteId);
-QStringAlias(EmoteName);
-
 namespace chatterino {
 
 struct Emote {
diff --git a/src/messages/EmoteCache.hpp b/src/messages/EmoteCache.hpp
deleted file mode 100644
index 1bbb01fd4..000000000
--- a/src/messages/EmoteCache.hpp
+++ /dev/null
@@ -1,93 +0,0 @@
-#pragma once
-
-#include <QString>
-#include <boost/optional.hpp>
-#include <unordered_map>
-#include <util/QStringHash.hpp>
-
-#include "common/UniqueAccess.hpp"
-#include "messages/Emote.hpp"
-
-namespace chatterino {
-
-template <typename TKey>
-class MapReplacement
-{
-public:
-    MapReplacement(std::unordered_map<TKey, EmotePtr> &items)
-        : oldItems_(items)
-    {
-    }
-
-    void add(const TKey &key, const Emote &data)
-    {
-        this->add(key, Emote(data));
-    }
-
-    void add(const TKey &key, Emote &&data)
-    {
-        auto it = this->oldItems_.find(key);
-        if (it != this->oldItems_.end() && *it->second == data) {
-            this->newItems_[key] = it->second;
-        } else {
-            this->newItems_[key] = std::make_shared<Emote>(std::move(data));
-        }
-    }
-
-    void apply()
-    {
-        this->oldItems_ = std::move(this->newItems_);
-    }
-
-private:
-    std::unordered_map<TKey, EmotePtr> &oldItems_;
-    std::unordered_map<TKey, EmotePtr> newItems_;
-};
-
-template <typename TKey>
-class EmoteCache
-{
-public:
-    using Iterator = typename std::unordered_map<TKey, EmotePtr>::iterator;
-    using ConstIterator = typename std::unordered_map<TKey, EmotePtr>::iterator;
-
-    Iterator begin()
-    {
-        return this->items_.begin();
-    }
-
-    ConstIterator begin() const
-    {
-        return this->items_.begin();
-    }
-
-    Iterator end()
-    {
-        return this->items_.end();
-    }
-
-    ConstIterator end() const
-    {
-        return this->items_.end();
-    }
-
-    boost::optional<EmotePtr> get(const TKey &key) const
-    {
-        auto it = this->items_.find(key);
-
-        if (it == this->items_.end())
-            return boost::none;
-        else
-            return it->second;
-    }
-
-    MapReplacement<TKey> makeReplacment()
-    {
-        return MapReplacement<TKey>(this->items_);
-    }
-
-private:
-    std::unordered_map<TKey, EmotePtr> items_;
-};
-
-}  // namespace chatterino
diff --git a/src/messages/Image.cpp b/src/messages/Image.cpp
index 572432cdd..b48234536 100644
--- a/src/messages/Image.cpp
+++ b/src/messages/Image.cpp
@@ -1,6 +1,7 @@
 #include "messages/Image.hpp"
 
 #include "Application.hpp"
+#include "common/Common.hpp"
 #include "common/NetworkRequest.hpp"
 #include "debug/AssertInGuiThread.hpp"
 #include "debug/Benchmark.hpp"
diff --git a/src/messages/Image.hpp b/src/messages/Image.hpp
index 3d869f798..68b96392b 100644
--- a/src/messages/Image.hpp
+++ b/src/messages/Image.hpp
@@ -1,18 +1,18 @@
 #pragma once
 
-#include "common/Common.hpp"
-
 #include <QPixmap>
 #include <QString>
 #include <QThread>
 #include <QVector>
 #include <atomic>
 #include <boost/noncopyable.hpp>
+#include <boost/optional.hpp>
 #include <boost/variant.hpp>
 #include <memory>
 #include <mutex>
 #include <pajlada/signals/signal.hpp>
 
+#include "common/Aliases.hpp"
 #include "common/NullablePtr.hpp"
 
 namespace chatterino {
diff --git a/src/messages/Link.hpp b/src/messages/Link.hpp
index a6c503540..a07d21cf3 100644
--- a/src/messages/Link.hpp
+++ b/src/messages/Link.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <QString>
-#include <common/Common.hpp>
 
 namespace chatterino {
 
diff --git a/src/messages/Message.hpp b/src/messages/Message.hpp
index 76039ec41..7aacc47e5 100644
--- a/src/messages/Message.hpp
+++ b/src/messages/Message.hpp
@@ -1,16 +1,16 @@
 #pragma once
 
 #include "common/FlagsEnum.hpp"
-#include "messages/MessageElement.hpp"
-#include "providers/twitch/PubsubActions.hpp"
 #include "widgets/helper/ScrollbarHighlight.hpp"
 
 #include <QTime>
+#include <boost/noncopyable.hpp>
 #include <cinttypes>
 #include <memory>
 #include <vector>
 
 namespace chatterino {
+class MessageElement;
 
 enum class MessageFlag : uint16_t {
     None = 0,
diff --git a/src/messages/MessageBuilder.cpp b/src/messages/MessageBuilder.cpp
index f4ebd2301..49c96c946 100644
--- a/src/messages/MessageBuilder.cpp
+++ b/src/messages/MessageBuilder.cpp
@@ -1,6 +1,9 @@
 #include "MessageBuilder.hpp"
 
 #include "common/LinkParser.hpp"
+#include "messages/Message.hpp"
+#include "messages/MessageElement.hpp"
+#include "providers/twitch/PubsubActions.hpp"
 #include "singletons/Emotes.hpp"
 #include "singletons/Resources.hpp"
 #include "singletons/Theme.hpp"
@@ -17,7 +20,7 @@ MessagePtr makeSystemMessage(const QString &text)
 }
 
 MessageBuilder::MessageBuilder()
-    : message_(std::make_unique<Message>())
+    : message_(std::make_shared<Message>())
 {
 }
 
@@ -165,7 +168,9 @@ Message &MessageBuilder::message()
 
 MessagePtr MessageBuilder::release()
 {
-    return MessagePtr(this->message_.release());
+    std::shared_ptr<Message> ptr;
+    this->message_.swap(ptr);
+    return ptr;
 }
 
 void MessageBuilder::append(std::unique_ptr<MessageElement> element)
diff --git a/src/messages/MessageBuilder.hpp b/src/messages/MessageBuilder.hpp
index a2e78ec29..d3cbdb8d0 100644
--- a/src/messages/MessageBuilder.hpp
+++ b/src/messages/MessageBuilder.hpp
@@ -1,11 +1,15 @@
 #pragma once
 
-#include "messages/Message.hpp"
+#include "messages/MessageElement.hpp"
 
 #include <QRegularExpression>
 #include <ctime>
 
 namespace chatterino {
+struct BanAction;
+struct UnbanAction;
+struct Message;
+using MessagePtr = std::shared_ptr<const Message>;
 
 struct SystemMessageTag {
 };
@@ -56,7 +60,7 @@ public:
     }
 
 private:
-    std::unique_ptr<Message> message_;
+    std::shared_ptr<Message> message_;
 };
 
 }  // namespace chatterino
diff --git a/src/messages/MessageColor.cpp b/src/messages/MessageColor.cpp
index f22654b51..fe793b30e 100644
--- a/src/messages/MessageColor.cpp
+++ b/src/messages/MessageColor.cpp
@@ -1,5 +1,7 @@
 #include "MessageColor.hpp"
 
+#include "singletons/Theme.hpp"
+
 namespace chatterino {
 
 MessageColor::MessageColor(const QColor &color)
diff --git a/src/messages/MessageColor.hpp b/src/messages/MessageColor.hpp
index e7d828745..dd19692c9 100644
--- a/src/messages/MessageColor.hpp
+++ b/src/messages/MessageColor.hpp
@@ -1,10 +1,9 @@
 #pragma once
 
-#include "singletons/Theme.hpp"
-
 #include <QColor>
 
 namespace chatterino {
+class Theme;
 
 struct MessageColor {
     enum Type { Custom, Text, Link, System };
diff --git a/src/messages/MessageElement.cpp b/src/messages/MessageElement.cpp
index e31076107..24b526c29 100644
--- a/src/messages/MessageElement.cpp
+++ b/src/messages/MessageElement.cpp
@@ -3,9 +3,11 @@
 #include "Application.hpp"
 #include "controllers/moderationactions/ModerationActions.hpp"
 #include "debug/Benchmark.hpp"
+#include "messages/Emote.hpp"
 #include "messages/layouts/MessageLayoutContainer.hpp"
 #include "messages/layouts/MessageLayoutElement.hpp"
 #include "singletons/Settings.hpp"
+#include "singletons/Theme.hpp"
 #include "util/DebugCount.hpp"
 
 namespace chatterino {
diff --git a/src/messages/MessageElement.hpp b/src/messages/MessageElement.hpp
index 79f222789..8d96d1135 100644
--- a/src/messages/MessageElement.hpp
+++ b/src/messages/MessageElement.hpp
@@ -1,8 +1,6 @@
 #pragma once
 
 #include "common/FlagsEnum.hpp"
-#include "messages/Emote.hpp"
-#include "messages/Image.hpp"
 #include "messages/Link.hpp"
 #include "messages/MessageColor.hpp"
 #include "singletons/Fonts.hpp"
@@ -11,14 +9,20 @@
 #include <QString>
 #include <QTime>
 #include <boost/noncopyable.hpp>
-
 #include <cstdint>
 #include <memory>
+#include <vector>
 
 namespace chatterino {
 class Channel;
 struct MessageLayoutContainer;
 
+class Image;
+using ImagePtr = std::shared_ptr<Image>;
+
+struct Emote;
+using EmotePtr = std::shared_ptr<const Emote>;
+
 enum class MessageElementFlag {
     None = 0,
     Misc = (1 << 0),
diff --git a/src/messages/layouts/MessageLayout.cpp b/src/messages/layouts/MessageLayout.cpp
index 9847c1950..c077ac4fb 100644
--- a/src/messages/layouts/MessageLayout.cpp
+++ b/src/messages/layouts/MessageLayout.cpp
@@ -2,8 +2,12 @@
 
 #include "Application.hpp"
 #include "debug/Benchmark.hpp"
+#include "messages/Message.hpp"
+#include "messages/MessageElement.hpp"
+#include "messages/layouts/MessageLayoutContainer.hpp"
 #include "singletons/Emotes.hpp"
 #include "singletons/Settings.hpp"
+#include "singletons/Theme.hpp"
 #include "singletons/WindowManager.hpp"
 #include "util/DebugCount.hpp"
 
@@ -24,6 +28,7 @@ namespace chatterino {
 MessageLayout::MessageLayout(MessagePtr message)
     : message_(message)
     , buffer_(nullptr)
+    , container_(std::make_shared<MessageLayoutContainer>())
 {
     DebugCount::increase("message layout");
 }
@@ -41,7 +46,7 @@ const Message *MessageLayout::getMessage()
 // Height
 int MessageLayout::getHeight() const
 {
-    return container_.getHeight();
+    return container_->getHeight();
 }
 
 // Layout
@@ -82,9 +87,9 @@ bool MessageLayout::layout(int width, float scale, MessageElementFlags flags)
         return false;
     }
 
-    int oldHeight = this->container_.getHeight();
+    int oldHeight = this->container_->getHeight();
     this->actuallyLayout(width, flags);
-    if (widthChanged || this->container_.getHeight() != oldHeight) {
+    if (widthChanged || this->container_->getHeight() != oldHeight) {
         this->deleteBuffer();
     }
     this->invalidateBuffer();
@@ -103,22 +108,22 @@ void MessageLayout::actuallyLayout(int width, MessageElementFlags _flags)
         messageFlags.unset(MessageFlag::Collapsed);
     }
 
-    this->container_.begin(width, this->scale_, messageFlags);
+    this->container_->begin(width, this->scale_, messageFlags);
 
     for (const auto &element : this->message_->elements) {
-        element->addToContainer(this->container_, _flags);
+        element->addToContainer(*this->container_, _flags);
     }
 
-    if (this->height_ != this->container_.getHeight()) {
+    if (this->height_ != this->container_->getHeight()) {
         this->deleteBuffer();
     }
 
-    this->container_.end();
-    this->height_ = this->container_.getHeight();
+    this->container_->end();
+    this->height_ = this->container_->getHeight();
 
     // collapsed state
     this->flags.unset(MessageLayoutFlag::Collapsed);
-    if (this->container_.isCollapsed()) {
+    if (this->container_->isCollapsed()) {
         this->flags.set(MessageLayoutFlag::Collapsed);
     }
 }
@@ -135,11 +140,12 @@ void MessageLayout::paint(QPainter &painter, int width, int y, int messageIndex,
     if (!pixmap) {
 #ifdef Q_OS_MACOS
         pixmap = new QPixmap(int(width * painter.device()->devicePixelRatioF()),
-                             int(container_.getHeight() *
+                             int(container_->getHeight() *
                                  painter.device()->devicePixelRatioF()));
         pixmap->setDevicePixelRatio(painter.device()->devicePixelRatioF());
 #else
-        pixmap = new QPixmap(width, std::max(16, this->container_.getHeight()));
+        pixmap =
+            new QPixmap(width, std::max(16, this->container_->getHeight()));
 #endif
 
         this->buffer_ = std::shared_ptr<QPixmap>(pixmap);
@@ -157,7 +163,7 @@ void MessageLayout::paint(QPainter &painter, int width, int y, int messageIndex,
     //    this->container.getHeight(), *pixmap);
 
     // draw gif emotes
-    this->container_.paintAnimatedElements(painter, y);
+    this->container_->paintAnimatedElements(painter, y);
 
     // draw disabled
     if (this->message_->flags.has(MessageFlag::Disabled)) {
@@ -167,12 +173,12 @@ void MessageLayout::paint(QPainter &painter, int width, int y, int messageIndex,
 
     // draw selection
     if (!selection.isEmpty()) {
-        this->container_.paintSelection(painter, messageIndex, selection, y);
+        this->container_->paintSelection(painter, messageIndex, selection, y);
     }
 
     // draw message seperation line
     if (app->settings->separateMessages.getValue()) {
-        painter.fillRect(0, y, this->container_.getWidth(), 1,
+        painter.fillRect(0, y, this->container_->getWidth(), 1,
                          app->themes->splits.messageSeperator);
     }
 
@@ -186,7 +192,7 @@ void MessageLayout::paint(QPainter &painter, int width, int y, int messageIndex,
         QBrush brush(color, static_cast<Qt::BrushStyle>(
                                 app->settings->lastMessagePattern.getValue()));
 
-        painter.fillRect(0, y + this->container_.getHeight() - 1,
+        painter.fillRect(0, y + this->container_->getHeight() - 1,
                          pixmap->width(), 1, brush);
     }
 
@@ -217,7 +223,7 @@ void MessageLayout::updateBuffer(QPixmap *buffer, int /*messageIndex*/,
     painter.fillRect(buffer->rect(), backgroundColor);
 
     // draw message
-    this->container_.paintElements(painter);
+    this->container_->paintElements(painter);
 
 #ifdef FOURTF
     // debug
@@ -252,7 +258,7 @@ void MessageLayout::deleteCache()
     this->deleteBuffer();
 
 #ifdef XD
-    this->container_.clear();
+    this->container_->clear();
 #endif
 }
 
@@ -265,22 +271,22 @@ void MessageLayout::deleteCache()
 const MessageLayoutElement *MessageLayout::getElementAt(QPoint point)
 {
     // go through all words and return the first one that contains the point.
-    return this->container_.getElementAt(point);
+    return this->container_->getElementAt(point);
 }
 
 int MessageLayout::getLastCharacterIndex() const
 {
-    return this->container_.getLastCharacterIndex();
+    return this->container_->getLastCharacterIndex();
 }
 
 int MessageLayout::getSelectionIndex(QPoint position)
 {
-    return this->container_.getSelectionIndex(position);
+    return this->container_->getSelectionIndex(position);
 }
 
 void MessageLayout::addSelectionText(QString &str, int from, int to)
 {
-    this->container_.addSelectionText(str, from, to);
+    this->container_->addSelectionText(str, from, to);
 }
 
 }  // namespace chatterino
diff --git a/src/messages/layouts/MessageLayout.hpp b/src/messages/layouts/MessageLayout.hpp
index 0f0d5cab3..2ab015856 100644
--- a/src/messages/layouts/MessageLayout.hpp
+++ b/src/messages/layouts/MessageLayout.hpp
@@ -1,19 +1,24 @@
 #pragma once
 
 #include "common/FlagsEnum.hpp"
-#include "messages/Message.hpp"
-#include "messages/Selection.hpp"
-#include "messages/layouts/MessageLayoutContainer.hpp"
-#include "messages/layouts/MessageLayoutElement.hpp"
 
 #include <QPixmap>
-
 #include <boost/noncopyable.hpp>
 #include <cinttypes>
 #include <memory>
 
 namespace chatterino {
 
+struct Message;
+using MessagePtr = std::shared_ptr<const Message>;
+
+struct Selection;
+struct MessageLayoutContainer;
+class MessageLayoutElement;
+
+enum class MessageElementFlag;
+using MessageElementFlags = FlagsEnum<MessageElementFlag>;
+
 enum class MessageLayoutFlag : uint8_t {
     RequiresBufferUpdate = 1 << 1,
     RequiresLayout = 1 << 2,
@@ -57,7 +62,7 @@ public:
 private:
     // variables
     MessagePtr message_;
-    MessageLayoutContainer container_;
+    std::shared_ptr<MessageLayoutContainer> container_;
     std::shared_ptr<QPixmap> buffer_ = nullptr;
     bool bufferValid_ = false;
 
diff --git a/src/messages/layouts/MessageLayoutContainer.cpp b/src/messages/layouts/MessageLayoutContainer.cpp
index 699cfc604..2092524c9 100644
--- a/src/messages/layouts/MessageLayoutContainer.cpp
+++ b/src/messages/layouts/MessageLayoutContainer.cpp
@@ -1,9 +1,13 @@
 #include "MessageLayoutContainer.hpp"
 
 #include "Application.hpp"
-#include "MessageLayoutElement.hpp"
+#include "messages/Message.hpp"
+#include "messages/MessageElement.hpp"
 #include "messages/Selection.hpp"
+#include "messages/layouts/MessageLayoutElement.hpp"
+#include "singletons/Fonts.hpp"
 #include "singletons/Settings.hpp"
+#include "singletons/Theme.hpp"
 
 #include <QDebug>
 #include <QPainter>
diff --git a/src/messages/layouts/MessageLayoutContainer.hpp b/src/messages/layouts/MessageLayoutContainer.hpp
index f52f181e6..cab849ed0 100644
--- a/src/messages/layouts/MessageLayoutContainer.hpp
+++ b/src/messages/layouts/MessageLayoutContainer.hpp
@@ -1,18 +1,20 @@
 #pragma once
 
-#include <memory>
-#include <vector>
-
 #include <QPoint>
 #include <QRect>
+#include <memory>
+#include <vector>
 
-#include "messages/Message.hpp"
+#include "common/FlagsEnum.hpp"
 #include "messages/Selection.hpp"
+#include "messages/layouts/MessageLayoutElement.hpp"
 
 class QPainter;
 
 namespace chatterino {
-class MessageLayoutElement;
+
+enum class MessageFlag : uint16_t;
+using MessageFlags = FlagsEnum<MessageFlag>;
 
 struct Margin {
     int top;
@@ -92,7 +94,7 @@ private:
     // variables
     float scale_ = 1.f;
     int width_ = 0;
-    MessageFlags flags_ = MessageFlag::None;
+    MessageFlags flags_{};
     int line_ = 0;
     int height_ = 0;
     int currentX_ = 0;
diff --git a/src/messages/layouts/MessageLayoutElement.cpp b/src/messages/layouts/MessageLayoutElement.cpp
index e8d333e2b..385451141 100644
--- a/src/messages/layouts/MessageLayoutElement.cpp
+++ b/src/messages/layouts/MessageLayoutElement.cpp
@@ -1,7 +1,9 @@
 #include "messages/layouts/MessageLayoutElement.hpp"
 
 #include "Application.hpp"
+#include "messages/Image.hpp"
 #include "messages/MessageElement.hpp"
+#include "singletons/Theme.hpp"
 #include "util/DebugCount.hpp"
 
 #include <QDebug>
diff --git a/src/messages/layouts/MessageLayoutElement.hpp b/src/messages/layouts/MessageLayoutElement.hpp
index 44b4c9316..7167adaa9 100644
--- a/src/messages/layouts/MessageLayoutElement.hpp
+++ b/src/messages/layouts/MessageLayoutElement.hpp
@@ -3,19 +3,19 @@
 #include <QPoint>
 #include <QRect>
 #include <QString>
-
 #include <boost/noncopyable.hpp>
 #include <climits>
 
-#include "messages/Image.hpp"
 #include "messages/Link.hpp"
 #include "messages/MessageColor.hpp"
-#include "singletons/Fonts.hpp"
 
 class QPainter;
 
 namespace chatterino {
 class MessageElement;
+class Image;
+using ImagePtr = std::shared_ptr<Image>;
+enum class FontStyle : uint8_t;
 
 class MessageLayoutElement : boost::noncopyable
 {
diff --git a/src/providers/bttv/BttvEmotes.cpp b/src/providers/bttv/BttvEmotes.cpp
index 1d9115c09..70c7cdbdb 100644
--- a/src/providers/bttv/BttvEmotes.cpp
+++ b/src/providers/bttv/BttvEmotes.cpp
@@ -1,5 +1,6 @@
 #include "providers/bttv/BttvEmotes.hpp"
 
+#include "common/Common.hpp"
 #include "common/NetworkRequest.hpp"
 #include "debug/Log.hpp"
 #include "messages/Image.hpp"
diff --git a/src/providers/bttv/BttvEmotes.hpp b/src/providers/bttv/BttvEmotes.hpp
index 7392cd6bc..ff4809411 100644
--- a/src/providers/bttv/BttvEmotes.hpp
+++ b/src/providers/bttv/BttvEmotes.hpp
@@ -1,6 +1,8 @@
 #pragma once
 
+#include <boost/optional.hpp>
 #include <memory>
+
 #include "common/Atomic.hpp"
 #include "messages/Emote.hpp"
 
diff --git a/src/providers/chatterino/ChatterinoBadges.cpp b/src/providers/chatterino/ChatterinoBadges.cpp
index 98b1841d4..37dc8f6f0 100644
--- a/src/providers/chatterino/ChatterinoBadges.cpp
+++ b/src/providers/chatterino/ChatterinoBadges.cpp
@@ -14,39 +14,41 @@ ChatterinoBadges::ChatterinoBadges()
 
 boost::optional<EmotePtr> ChatterinoBadges::getBadge(const UserName &username)
 {
-    return this->badges.access()->get(username);
+    return boost::none;
+    // return this->badges.access()->get(username);
 }
 
 void ChatterinoBadges::loadChatterinoBadges()
 {
-    static QString url("https://fourtf.com/chatterino/badges.json");
+    // static QString url("https://fourtf.com/chatterino/badges.json");
 
-    NetworkRequest req(url);
-    req.setCaller(QThread::currentThread());
+    // NetworkRequest req(url);
+    // req.setCaller(QThread::currentThread());
 
-    req.onSuccess([this](auto result) {
-        auto jsonRoot = result.parseJson();
-        auto badges = this->badges.access();
-        auto replacement = badges->makeReplacment();
+    // req.onSuccess([this](auto result) {
+    //    auto jsonRoot = result.parseJson();
+    //    auto badges = this->badges.access();
+    //    auto replacement = badges->makeReplacment();
 
-        for (auto jsonBadge_ : jsonRoot.value("badges").toArray()) {
-            auto jsonBadge = jsonBadge_.toObject();
+    //    for (auto jsonBadge_ : jsonRoot.value("badges").toArray()) {
+    //        auto jsonBadge = jsonBadge_.toObject();
 
-            auto emote = Emote{
-                EmoteName{}, ImageSet{Url{jsonBadge.value("image").toString()}},
-                Tooltip{jsonBadge.value("tooltip").toString()}, Url{}};
+    //        auto emote = Emote{
+    //            EmoteName{},
+    //            ImageSet{Url{jsonBadge.value("image").toString()}},
+    //            Tooltip{jsonBadge.value("tooltip").toString()}, Url{}};
 
-            for (auto jsonUser : jsonBadge.value("users").toArray()) {
-                replacement.add(UserName{jsonUser.toString()},
-                                std::move(emote));
-            }
-        }
+    //        for (auto jsonUser : jsonBadge.value("users").toArray()) {
+    //            replacement.add(UserName{jsonUser.toString()},
+    //                            std::move(emote));
+    //        }
+    //    }
 
-        replacement.apply();
-        return Success;
-    });
+    //    replacement.apply();
+    //    return Success;
+    //});
 
-    req.execute();
+    // req.execute();
 }
 
 }  // namespace chatterino
diff --git a/src/providers/chatterino/ChatterinoBadges.hpp b/src/providers/chatterino/ChatterinoBadges.hpp
index 3162c75b1..89870fd16 100644
--- a/src/providers/chatterino/ChatterinoBadges.hpp
+++ b/src/providers/chatterino/ChatterinoBadges.hpp
@@ -1,14 +1,14 @@
 #pragma once
 
 #include <boost/optional.hpp>
-#include <unordered_map>
-#include "common/Common.hpp"
-#include "common/UniqueAccess.hpp"
-#include "messages/Emote.hpp"
-#include "messages/EmoteCache.hpp"
+
+#include "common/Aliases.hpp"
 
 namespace chatterino {
 
+struct Emote;
+using EmotePtr = std::shared_ptr<const Emote>;
+
 class ChatterinoBadges
 {
 public:
@@ -19,7 +19,7 @@ public:
 private:
     void loadChatterinoBadges();
 
-    UniqueAccess<EmoteCache<UserName>> badges;
+    // UniqueAccess<EmoteCache<UserName>> badges;
 };
 
 }  // namespace chatterino
diff --git a/src/providers/emoji/Emojis.cpp b/src/providers/emoji/Emojis.cpp
index 06d4e798b..d0403e75c 100644
--- a/src/providers/emoji/Emojis.cpp
+++ b/src/providers/emoji/Emojis.cpp
@@ -2,6 +2,7 @@
 
 #include "Application.hpp"
 #include "debug/Log.hpp"
+#include "messages/Emote.hpp"
 #include "singletons/Settings.hpp"
 
 #include <rapidjson/error/en.h>
diff --git a/src/providers/emoji/Emojis.hpp b/src/providers/emoji/Emojis.hpp
index 18bd33522..62443b9aa 100644
--- a/src/providers/emoji/Emojis.hpp
+++ b/src/providers/emoji/Emojis.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "messages/Emote.hpp"
 #include "util/ConcurrentMap.hpp"
 
 #include <QMap>
@@ -12,6 +11,9 @@
 
 namespace chatterino {
 
+struct Emote;
+using EmotePtr = std::shared_ptr<const Emote>;
+
 struct EmojiData {
     // actual byte-representation of the emoji (i.e. \154075\156150 which is
     // :male:)
diff --git a/src/providers/ffz/FfzEmotes.cpp b/src/providers/ffz/FfzEmotes.cpp
index 24341a817..c22fe91fe 100644
--- a/src/providers/ffz/FfzEmotes.cpp
+++ b/src/providers/ffz/FfzEmotes.cpp
@@ -3,6 +3,7 @@
 #include <QJsonArray>
 
 #include "common/NetworkRequest.hpp"
+#include "common/Outcome.hpp"
 #include "debug/Log.hpp"
 #include "messages/Image.hpp"
 
diff --git a/src/providers/irc/AbstractIrcServer.cpp b/src/providers/irc/AbstractIrcServer.cpp
index b7995282f..25c810a4d 100644
--- a/src/providers/irc/AbstractIrcServer.cpp
+++ b/src/providers/irc/AbstractIrcServer.cpp
@@ -1,6 +1,8 @@
 #include "AbstractIrcServer.hpp"
 
+#include "common/Channel.hpp"
 #include "common/Common.hpp"
+#include "debug/Log.hpp"
 #include "messages/LimitedQueueSnapshot.hpp"
 #include "messages/Message.hpp"
 #include "messages/MessageBuilder.hpp"
diff --git a/src/providers/irc/AbstractIrcServer.hpp b/src/providers/irc/AbstractIrcServer.hpp
index 580cdd0fe..109f869ef 100644
--- a/src/providers/irc/AbstractIrcServer.hpp
+++ b/src/providers/irc/AbstractIrcServer.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "common/Channel.hpp"
 #include "providers/irc/IrcConnection2.hpp"
 
 #include <IrcMessage>
@@ -11,6 +10,9 @@
 
 namespace chatterino {
 
+class Channel;
+using ChannelPtr = std::shared_ptr<Channel>;
+
 class AbstractIrcServer
 {
 public:
diff --git a/src/providers/twitch/IrcMessageHandler.cpp b/src/providers/twitch/IrcMessageHandler.cpp
index 35c7c51d9..1679884b8 100644
--- a/src/providers/twitch/IrcMessageHandler.cpp
+++ b/src/providers/twitch/IrcMessageHandler.cpp
@@ -10,6 +10,7 @@
 #include "providers/twitch/TwitchMessageBuilder.hpp"
 #include "providers/twitch/TwitchServer.hpp"
 #include "singletons/Resources.hpp"
+#include "singletons/Settings.hpp"
 #include "singletons/WindowManager.hpp"
 #include "util/IrcHelpers.hpp"
 
diff --git a/src/providers/twitch/PartialTwitchUser.cpp b/src/providers/twitch/PartialTwitchUser.cpp
index c3d9e5102..6aca624b1 100644
--- a/src/providers/twitch/PartialTwitchUser.cpp
+++ b/src/providers/twitch/PartialTwitchUser.cpp
@@ -1,5 +1,6 @@
 #include "providers/twitch/PartialTwitchUser.hpp"
 
+#include "common/Common.hpp"
 #include "common/NetworkRequest.hpp"
 #include "debug/Log.hpp"
 #include "providers/twitch/TwitchCommon.hpp"
diff --git a/src/providers/twitch/PubsubHelpers.cpp b/src/providers/twitch/PubsubHelpers.cpp
index cf4560f6b..f9b4e784a 100644
--- a/src/providers/twitch/PubsubHelpers.cpp
+++ b/src/providers/twitch/PubsubHelpers.cpp
@@ -1,6 +1,7 @@
 #include "providers/twitch/PubsubHelpers.hpp"
 
 #include "providers/twitch/PubsubActions.hpp"
+#include "providers/twitch/TwitchAccount.hpp"
 #include "util/RapidjsonHelpers.hpp"
 
 namespace chatterino {
diff --git a/src/providers/twitch/PubsubHelpers.hpp b/src/providers/twitch/PubsubHelpers.hpp
index 8b9b3f322..3e92e332c 100644
--- a/src/providers/twitch/PubsubHelpers.hpp
+++ b/src/providers/twitch/PubsubHelpers.hpp
@@ -1,16 +1,14 @@
 #pragma once
 
-#include "debug/Log.hpp"
-#include "providers/twitch/TwitchAccount.hpp"
 #include "util/RapidjsonHelpers.hpp"
 
 #include <boost/asio.hpp>
 #include <boost/asio/steady_timer.hpp>
-
 #include <memory>
 
 namespace chatterino {
 
+class TwitchAccount;
 struct ActionUser;
 
 const rapidjson::Value &getArgs(const rapidjson::Value &data);
diff --git a/src/providers/twitch/TwitchAccount.cpp b/src/providers/twitch/TwitchAccount.cpp
index 0258c6e72..238d9a6be 100644
--- a/src/providers/twitch/TwitchAccount.cpp
+++ b/src/providers/twitch/TwitchAccount.cpp
@@ -4,6 +4,7 @@
 
 #include "Application.hpp"
 #include "common/NetworkRequest.hpp"
+#include "common/Outcome.hpp"
 #include "debug/Log.hpp"
 #include "providers/twitch/PartialTwitchUser.hpp"
 #include "providers/twitch/TwitchCommon.hpp"
diff --git a/src/providers/twitch/TwitchAccount.hpp b/src/providers/twitch/TwitchAccount.hpp
index c59ca9d38..1ea718b73 100644
--- a/src/providers/twitch/TwitchAccount.hpp
+++ b/src/providers/twitch/TwitchAccount.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "common/Aliases.hpp"
 #include "common/Atomic.hpp"
 #include "common/UniqueAccess.hpp"
 #include "controllers/accounts/Account.hpp"
diff --git a/src/providers/twitch/TwitchAccountManager.cpp b/src/providers/twitch/TwitchAccountManager.cpp
index 18210c2fd..097aa89ea 100644
--- a/src/providers/twitch/TwitchAccountManager.cpp
+++ b/src/providers/twitch/TwitchAccountManager.cpp
@@ -2,6 +2,7 @@
 
 #include "common/Common.hpp"
 #include "debug/Log.hpp"
+#include "providers/twitch/TwitchAccount.hpp"
 #include "providers/twitch/TwitchCommon.hpp"
 
 namespace chatterino {
diff --git a/src/providers/twitch/TwitchAccountManager.hpp b/src/providers/twitch/TwitchAccountManager.hpp
index 32961f092..7c79ea249 100644
--- a/src/providers/twitch/TwitchAccountManager.hpp
+++ b/src/providers/twitch/TwitchAccountManager.hpp
@@ -17,6 +17,7 @@
 
 namespace chatterino {
 
+class TwitchAccount;
 class AccountController;
 
 class TwitchAccountManager
diff --git a/src/providers/twitch/TwitchApi.cpp b/src/providers/twitch/TwitchApi.cpp
index dc0329b69..33e982191 100644
--- a/src/providers/twitch/TwitchApi.cpp
+++ b/src/providers/twitch/TwitchApi.cpp
@@ -1,5 +1,6 @@
 #include "providers/twitch/TwitchApi.hpp"
 
+#include "common/Common.hpp"
 #include "common/NetworkRequest.hpp"
 #include "debug/Log.hpp"
 #include "providers/twitch/TwitchCommon.hpp"
diff --git a/src/providers/twitch/TwitchApi.hpp b/src/providers/twitch/TwitchApi.hpp
index 67b26c1ca..fd7ad599c 100644
--- a/src/providers/twitch/TwitchApi.hpp
+++ b/src/providers/twitch/TwitchApi.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <QString>
+#include <functional>
 
 namespace chatterino {
 
diff --git a/src/providers/twitch/TwitchBadges.cpp b/src/providers/twitch/TwitchBadges.cpp
index fd9fe7461..8853f1add 100644
--- a/src/providers/twitch/TwitchBadges.cpp
+++ b/src/providers/twitch/TwitchBadges.cpp
@@ -5,6 +5,8 @@
 #include <QJsonValue>
 #include <QThread>
 #include "common/NetworkRequest.hpp"
+#include "common/Outcome.hpp"
+#include "messages/Emote.hpp"
 
 namespace chatterino {
 
diff --git a/src/providers/twitch/TwitchBadges.hpp b/src/providers/twitch/TwitchBadges.hpp
index a228365da..62196f8d8 100644
--- a/src/providers/twitch/TwitchBadges.hpp
+++ b/src/providers/twitch/TwitchBadges.hpp
@@ -1,12 +1,14 @@
 #pragma once
 
 #include <QString>
-#include <messages/Emote.hpp>
 #include <unordered_map>
 #include "util/QStringHash.hpp"
 
 namespace chatterino {
 
+struct Emote;
+using EmotePtr = std::shared_ptr<const Emote>;
+
 class Settings;
 class Paths;
 
diff --git a/src/providers/twitch/TwitchChannel.cpp b/src/providers/twitch/TwitchChannel.cpp
index 7e0a1efc1..0bb7ffe9c 100644
--- a/src/providers/twitch/TwitchChannel.cpp
+++ b/src/providers/twitch/TwitchChannel.cpp
@@ -1,5 +1,6 @@
 #include "providers/twitch/TwitchChannel.hpp"
 
+#include "Application.hpp"
 #include "common/Common.hpp"
 #include "common/NetworkRequest.hpp"
 #include "controllers/accounts/AccountController.hpp"
diff --git a/src/providers/twitch/TwitchChannel.hpp b/src/providers/twitch/TwitchChannel.hpp
index 8b2edeab4..940da72bf 100644
--- a/src/providers/twitch/TwitchChannel.hpp
+++ b/src/providers/twitch/TwitchChannel.hpp
@@ -2,21 +2,23 @@
 
 #include <IrcConnection>
 
+#include "common/Aliases.hpp"
 #include "common/Atomic.hpp"
 #include "common/Channel.hpp"
-#include "common/Common.hpp"
+#include "common/Outcome.hpp"
 #include "common/UniqueAccess.hpp"
-#include "messages/Emote.hpp"
-#include "singletons/Emotes.hpp"
-#include "util/ConcurrentMap.hpp"
-
-#include <pajlada/signals/signalholder.hpp>
 
+#include <boost/optional.hpp>
 #include <mutex>
+#include <pajlada/signals/signalholder.hpp>
 #include <unordered_map>
 
 namespace chatterino {
 
+struct Emote;
+using EmotePtr = std::shared_ptr<const Emote>;
+class EmoteMap;
+
 class TwitchServer;
 
 class TwitchChannel final : public Channel, pajlada::Signals::SignalHolder
diff --git a/src/providers/twitch/TwitchEmotes.cpp b/src/providers/twitch/TwitchEmotes.cpp
index 08c28286f..ce63d6864 100644
--- a/src/providers/twitch/TwitchEmotes.cpp
+++ b/src/providers/twitch/TwitchEmotes.cpp
@@ -3,6 +3,7 @@
 #include "common/NetworkRequest.hpp"
 #include "debug/Benchmark.hpp"
 #include "debug/Log.hpp"
+#include "messages/Emote.hpp"
 #include "messages/Image.hpp"
 #include "util/RapidjsonHelpers.hpp"
 
diff --git a/src/providers/twitch/TwitchEmotes.hpp b/src/providers/twitch/TwitchEmotes.hpp
index 69cf65e5e..90cafe440 100644
--- a/src/providers/twitch/TwitchEmotes.hpp
+++ b/src/providers/twitch/TwitchEmotes.hpp
@@ -3,18 +3,18 @@
 #include <QString>
 #include <unordered_map>
 
+#include "common/Aliases.hpp"
 #include "common/UniqueAccess.hpp"
-#include "messages/Emote.hpp"
-#include "providers/twitch/EmoteValue.hpp"
-#include "providers/twitch/TwitchAccount.hpp"
 #include "providers/twitch/TwitchEmotes.hpp"
-#include "util/ConcurrentMap.hpp"
 
 #define TWITCH_EMOTE_TEMPLATE \
     "https://static-cdn.jtvnw.net/emoticons/v1/{id}/{scale}"
 
 namespace chatterino {
 
+struct Emote;
+using EmotePtr = std::shared_ptr<const Emote>;
+
 class TwitchEmotes
 {
 public:
diff --git a/src/providers/twitch/TwitchMessageBuilder.cpp b/src/providers/twitch/TwitchMessageBuilder.cpp
index e475b724d..67cd2998d 100644
--- a/src/providers/twitch/TwitchMessageBuilder.cpp
+++ b/src/providers/twitch/TwitchMessageBuilder.cpp
@@ -5,6 +5,7 @@
 #include "controllers/highlights/HighlightController.hpp"
 #include "controllers/ignores/IgnoreController.hpp"
 #include "debug/Log.hpp"
+#include "messages/Message.hpp"
 #include "providers/twitch/TwitchChannel.hpp"
 #include "singletons/Emotes.hpp"
 #include "singletons/Resources.hpp"
@@ -12,6 +13,7 @@
 #include "singletons/Theme.hpp"
 #include "singletons/WindowManager.hpp"
 #include "util/IrcHelpers.hpp"
+#include "widgets/Window.hpp"
 
 #include <QApplication>
 #include <QDebug>
diff --git a/src/providers/twitch/TwitchMessageBuilder.hpp b/src/providers/twitch/TwitchMessageBuilder.hpp
index 385fed932..30b476f97 100644
--- a/src/providers/twitch/TwitchMessageBuilder.hpp
+++ b/src/providers/twitch/TwitchMessageBuilder.hpp
@@ -1,15 +1,18 @@
 #pragma once
 
+#include "common/Aliases.hpp"
+#include "common/Outcome.hpp"
 #include "messages/MessageBuilder.hpp"
-#include "singletons/Emotes.hpp"
 
 #include <IrcMessage>
-
 #include <QString>
 #include <QVariant>
 
 namespace chatterino {
 
+struct Emote;
+using EmotePtr = std::shared_ptr<const Emote>;
+
 class Channel;
 class TwitchChannel;
 
diff --git a/src/providers/twitch/TwitchServer.cpp b/src/providers/twitch/TwitchServer.cpp
index 4e3bcddad..e9325443c 100644
--- a/src/providers/twitch/TwitchServer.cpp
+++ b/src/providers/twitch/TwitchServer.cpp
@@ -7,6 +7,7 @@
 #include "providers/twitch/IrcMessageHandler.hpp"
 #include "providers/twitch/PubsubClient.hpp"
 #include "providers/twitch/TwitchAccount.hpp"
+#include "providers/twitch/TwitchChannel.hpp"
 #include "providers/twitch/TwitchHelpers.hpp"
 #include "providers/twitch/TwitchMessageBuilder.hpp"
 #include "util/PostToThread.hpp"
diff --git a/src/providers/twitch/TwitchServer.hpp b/src/providers/twitch/TwitchServer.hpp
index 7e204173f..72c4078bc 100644
--- a/src/providers/twitch/TwitchServer.hpp
+++ b/src/providers/twitch/TwitchServer.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
 #include "common/Atomic.hpp"
+#include "common/Channel.hpp"
 #include "common/Singleton.hpp"
+#include "pajlada/signals/signalholder.hpp"
 #include "providers/irc/AbstractIrcServer.hpp"
-#include "providers/twitch/TwitchAccount.hpp"
-#include "providers/twitch/TwitchChannel.hpp"
 
 #include <chrono>
 #include <memory>
diff --git a/src/singletons/Fonts.cpp b/src/singletons/Fonts.cpp
index 69f327285..3c9efa79e 100644
--- a/src/singletons/Fonts.cpp
+++ b/src/singletons/Fonts.cpp
@@ -2,6 +2,7 @@
 
 #include "Application.hpp"
 #include "debug/AssertInGuiThread.hpp"
+#include "singletons/Settings.hpp"
 #include "singletons/WindowManager.hpp"
 
 #include <QDebug>
@@ -26,7 +27,7 @@ Fonts::Fonts()
     : chatFontFamily("/appearance/currentFontFamily", DEFAULT_FONT_FAMILY)
     , chatFontSize("/appearance/currentFontSize", DEFAULT_FONT_SIZE)
 {
-    this->fontsByType_.resize(size_t(EndType));
+    this->fontsByType_.resize(size_t(FontStyle::EndType));
 }
 
 void Fonts::initialize(Settings &, Paths &)
@@ -61,21 +62,21 @@ void Fonts::initialize(Settings &, Paths &)
     });
 }
 
-QFont Fonts::getFont(Fonts::Type type, float scale)
+QFont Fonts::getFont(FontStyle type, float scale)
 {
     return this->getOrCreateFontData(type, scale).font;
 }
 
-QFontMetrics Fonts::getFontMetrics(Fonts::Type type, float scale)
+QFontMetrics Fonts::getFontMetrics(FontStyle type, float scale)
 {
     return this->getOrCreateFontData(type, scale).metrics;
 }
 
-Fonts::FontData &Fonts::getOrCreateFontData(Type type, float scale)
+Fonts::FontData &Fonts::getOrCreateFontData(FontStyle type, float scale)
 {
     assertInGuiThread();
 
-    assert(type >= 0 && type < EndType);
+    assert(type < FontStyle::EndType);
 
     auto &map = this->fontsByType_[size_t(type)];
 
@@ -94,22 +95,22 @@ Fonts::FontData &Fonts::getOrCreateFontData(Type type, float scale)
     return result.first->second;
 }
 
-Fonts::FontData Fonts::createFontData(Type type, float scale)
+Fonts::FontData Fonts::createFontData(FontStyle type, float scale)
 {
     // check if it's a chat (scale the setting)
-    if (type >= ChatStart && type <= ChatEnd) {
-        static std::unordered_map<Type, ChatFontData> sizeScale{
-            {ChatSmall, {0.6f, false, QFont::Normal}},
-            {ChatMediumSmall, {0.8f, false, QFont::Normal}},
-            {ChatMedium, {1, false, QFont::Normal}},
-            {ChatMediumBold,
+    if (type >= FontStyle::ChatStart && type <= FontStyle::ChatEnd) {
+        static std::unordered_map<FontStyle, ChatFontData> sizeScale{
+            {FontStyle::ChatSmall, {0.6f, false, QFont::Normal}},
+            {FontStyle::ChatMediumSmall, {0.8f, false, QFont::Normal}},
+            {FontStyle::ChatMedium, {1, false, QFont::Normal}},
+            {FontStyle::ChatMediumBold,
              {1, false,
               QFont::Weight(getApp()->settings->boldScale.getValue())}},
-            {ChatMediumItalic, {1, true, QFont::Normal}},
-            {ChatLarge, {1.2f, false, QFont::Normal}},
-            {ChatVeryLarge, {1.4f, false, QFont::Normal}},
+            {FontStyle::ChatMediumItalic, {1, true, QFont::Normal}},
+            {FontStyle::ChatLarge, {1.2f, false, QFont::Normal}},
+            {FontStyle::ChatVeryLarge, {1.4f, false, QFont::Normal}},
         };
-        sizeScale[ChatMediumBold] = {
+        sizeScale[FontStyle::ChatMediumBold] = {
             1, false, QFont::Weight(getApp()->settings->boldScale.getValue())};
         auto data = sizeScale[type];
         return FontData(
@@ -126,11 +127,11 @@ Fonts::FontData Fonts::createFontData(Type type, float scale)
         constexpr float multiplier = 1.f;
 #endif
 
-        static std::unordered_map<Type, UiFontData> defaultSize{
-            {Tiny, {8, "Monospace", false, QFont::Normal}},
-            {UiMedium,
+        static std::unordered_map<FontStyle, UiFontData> defaultSize{
+            {FontStyle::Tiny, {8, "Monospace", false, QFont::Normal}},
+            {FontStyle::UiMedium,
              {int(9 * multiplier), DEFAULT_FONT_FAMILY, false, QFont::Normal}},
-            {UiTabs,
+            {FontStyle::UiTabs,
              {int(9 * multiplier), DEFAULT_FONT_FAMILY, false, QFont::Normal}},
         };
 
diff --git a/src/singletons/Fonts.hpp b/src/singletons/Fonts.hpp
index 59c6550c3..61ba393d6 100644
--- a/src/singletons/Fonts.hpp
+++ b/src/singletons/Fonts.hpp
@@ -16,6 +16,27 @@ namespace chatterino {
 class Settings;
 class Paths;
 
+enum class FontStyle : uint8_t {
+    Tiny,
+    ChatSmall,
+    ChatMediumSmall,
+    ChatMedium,
+    ChatMediumBold,
+    ChatMediumItalic,
+    ChatLarge,
+    ChatVeryLarge,
+
+    UiMedium,
+    UiTabs,
+
+    // don't remove this value
+    EndType,
+
+    // make sure to update these values accordingly!
+    ChatStart = ChatSmall,
+    ChatEnd = ChatVeryLarge,
+};
+
 class Fonts final : public Singleton
 {
 public:
@@ -24,29 +45,9 @@ public:
     virtual void initialize(Settings &settings, Paths &paths) override;
 
     // font data gets set in createFontData(...)
-    enum Type : uint8_t {
-        Tiny,
-        ChatSmall,
-        ChatMediumSmall,
-        ChatMedium,
-        ChatMediumBold,
-        ChatMediumItalic,
-        ChatLarge,
-        ChatVeryLarge,
 
-        UiMedium,
-        UiTabs,
-
-        // don't remove this value
-        EndType,
-
-        // make sure to update these values accordingly!
-        ChatStart = ChatSmall,
-        ChatEnd = ChatVeryLarge,
-    };
-
-    QFont getFont(Type type, float scale);
-    QFontMetrics getFontMetrics(Type type, float scale);
+    QFont getFont(FontStyle type, float scale);
+    QFontMetrics getFontMetrics(FontStyle type, float scale);
 
     pajlada::Settings::Setting<std::string> chatFontFamily;
     pajlada::Settings::Setting<int> chatFontSize;
@@ -78,12 +79,10 @@ private:
         QFont::Weight weight;
     };
 
-    FontData &getOrCreateFontData(Type type, float scale);
-    FontData createFontData(Type type, float scale);
+    FontData &getOrCreateFontData(FontStyle type, float scale);
+    FontData createFontData(FontStyle type, float scale);
 
     std::vector<std::unordered_map<float, FontData>> fontsByType_;
 };
 
-using FontStyle = Fonts::Type;
-
 }  // namespace chatterino
diff --git a/src/singletons/Settings.hpp b/src/singletons/Settings.hpp
index fbc813b4a..28d0e43d3 100644
--- a/src/singletons/Settings.hpp
+++ b/src/singletons/Settings.hpp
@@ -5,7 +5,6 @@
 #include "common/ChatterinoSetting.hpp"
 #include "controllers/highlights/HighlightPhrase.hpp"
 #include "controllers/moderationactions/ModerationAction.hpp"
-#include "messages/MessageElement.hpp"
 
 #include <pajlada/settings/setting.hpp>
 #include <pajlada/settings/settinglistener.hpp>
diff --git a/src/singletons/Updates.cpp b/src/singletons/Updates.cpp
index d56a8f510..5782b4bea 100644
--- a/src/singletons/Updates.cpp
+++ b/src/singletons/Updates.cpp
@@ -1,6 +1,7 @@
 #include "Updates.hpp"
 
 #include "common/NetworkRequest.hpp"
+#include "common/Outcome.hpp"
 #include "common/Version.hpp"
 #include "singletons/Paths.hpp"
 #include "util/CombinePath.hpp"
diff --git a/src/singletons/WindowManager.cpp b/src/singletons/WindowManager.cpp
index 8ff34c7bf..17bf1ea83 100644
--- a/src/singletons/WindowManager.cpp
+++ b/src/singletons/WindowManager.cpp
@@ -3,13 +3,20 @@
 #include "Application.hpp"
 #include "debug/AssertInGuiThread.hpp"
 #include "debug/Log.hpp"
+#include "messages/MessageElement.hpp"
 #include "providers/twitch/TwitchServer.hpp"
 #include "singletons/Fonts.hpp"
 #include "singletons/Paths.hpp"
+#include "singletons/Settings.hpp"
 #include "singletons/Theme.hpp"
 #include "util/Clamp.hpp"
 #include "widgets/AccountSwitchPopupWidget.hpp"
+#include "widgets/Notebook.hpp"
+#include "widgets/Window.hpp"
 #include "widgets/dialogs/SettingsDialog.hpp"
+#include "widgets/helper/NotebookTab.hpp"
+#include "widgets/splits/Split.hpp"
+#include "widgets/splits/SplitContainer.hpp"
 
 #include <QDebug>
 #include <QJsonArray>
@@ -174,7 +181,7 @@ Window &WindowManager::getSelectedWindow()
     return *this->selectedWindow_;
 }
 
-Window &WindowManager::createWindow(Window::Type type)
+Window &WindowManager::createWindow(WindowType type)
 {
     assertInGuiThread();
 
@@ -182,7 +189,7 @@ Window &WindowManager::createWindow(Window::Type type)
     this->windows_.push_back(window);
     window->show();
 
-    if (type != Window::Type::Main) {
+    if (type != WindowType::Main) {
         window->setAttribute(Qt::WA_DeleteOnClose);
 
         QObject::connect(window, &QWidget::destroyed, [this, window] {
@@ -239,16 +246,16 @@ void WindowManager::initialize(Settings &settings, Paths &paths)
 
         // get type
         QString type_val = window_obj.value("type").toString();
-        Window::Type type =
-            type_val == "main" ? Window::Type::Main : Window::Type::Popup;
+        WindowType type =
+            type_val == "main" ? WindowType::Main : WindowType::Popup;
 
-        if (type == Window::Type::Main && mainWindow_ != nullptr) {
-            type = Window::Type::Popup;
+        if (type == WindowType::Main && mainWindow_ != nullptr) {
+            type = WindowType::Popup;
         }
 
         Window &window = createWindow(type);
 
-        if (type == Window::Type::Main) {
+        if (type == WindowType::Main) {
             mainWindow_ = &window;
         }
 
@@ -308,7 +315,7 @@ void WindowManager::initialize(Settings &settings, Paths &paths)
     }
 
     if (mainWindow_ == nullptr) {
-        mainWindow_ = &createWindow(Window::Type::Main);
+        mainWindow_ = &createWindow(WindowType::Main);
         mainWindow_->getNotebook().addPage(true);
     }
 
@@ -344,15 +351,15 @@ void WindowManager::save()
 
         // window type
         switch (window->getType()) {
-            case Window::Type::Main:
+            case WindowType::Main:
                 window_obj.insert("type", "main");
                 break;
 
-            case Window::Type::Popup:
+            case WindowType::Popup:
                 window_obj.insert("type", "popup");
                 break;
 
-            case Window::Type::Attached:;
+            case WindowType::Attached:;
         }
 
         // window geometry
diff --git a/src/singletons/WindowManager.hpp b/src/singletons/WindowManager.hpp
index eef2be2f1..74149876e 100644
--- a/src/singletons/WindowManager.hpp
+++ b/src/singletons/WindowManager.hpp
@@ -1,13 +1,20 @@
 #pragma once
 
+#include "common/Channel.hpp"
+#include "common/FlagsEnum.hpp"
 #include "common/Singleton.hpp"
-#include "widgets/Window.hpp"
 #include "widgets/splits/SplitContainer.hpp"
 
 namespace chatterino {
 
 class Settings;
 class Paths;
+class Window;
+class SplitContainer;
+
+enum class MessageElementFlag;
+using MessageElementFlags = FlagsEnum<MessageElementFlag>;
+enum class WindowType;
 
 class WindowManager final : public Singleton
 {
@@ -34,7 +41,7 @@ public:
 
     Window &getMainWindow();
     Window &getSelectedWindow();
-    Window &createWindow(Window::Type type);
+    Window &createWindow(WindowType type);
 
     int windowCount();
     Window *windowAt(int index);
@@ -63,10 +70,10 @@ private:
 
     std::vector<Window *> windows_;
 
-    Window *mainWindow_ = nullptr;
-    Window *selectedWindow_ = nullptr;
+    Window *mainWindow_{};
+    Window *selectedWindow_{};
 
-    MessageElementFlags wordFlags_ = MessageElementFlag::Default;
+    MessageElementFlags wordFlags_{};
     pajlada::Settings::SettingListener wordFlagsListener_;
 };
 
diff --git a/src/util/InitUpdateButton.cpp b/src/util/InitUpdateButton.cpp
index 25d131635..54f06976d 100644
--- a/src/util/InitUpdateButton.cpp
+++ b/src/util/InitUpdateButton.cpp
@@ -6,15 +6,12 @@
 namespace chatterino {
 
 void initUpdateButton(Button &button,
-                      std::unique_ptr<UpdateDialog> &handle,
                       pajlada::Signals::SignalHolder &signalHolder)
 {
     button.hide();
 
     // show update prompt when clicking the button
-    QObject::connect(&button, &Button::clicked, [&button, &handle] {
-        (void)(handle);
-
+    QObject::connect(&button, &Button::clicked, [&button] {
         auto dialog = new UpdateDialog();
         dialog->setActionOnFocusLoss(BaseWindow::Delete);
         dialog->move(button.mapToGlobal(
diff --git a/src/util/InitUpdateButton.hpp b/src/util/InitUpdateButton.hpp
index e95fcd7bd..9a88382a2 100644
--- a/src/util/InitUpdateButton.hpp
+++ b/src/util/InitUpdateButton.hpp
@@ -14,7 +14,6 @@ class Button;
 class UpdateDialog;
 
 void initUpdateButton(Button &button,
-                      std::unique_ptr<UpdateDialog> &handle,
                       pajlada::Signals::SignalHolder &signalHolder);
 
 }  // namespace chatterino
diff --git a/src/widgets/AccountSwitchWidget.cpp b/src/widgets/AccountSwitchWidget.cpp
index 9c307ba73..3e201ded3 100644
--- a/src/widgets/AccountSwitchWidget.cpp
+++ b/src/widgets/AccountSwitchWidget.cpp
@@ -3,6 +3,7 @@
 #include "Application.hpp"
 #include "common/Common.hpp"
 #include "controllers/accounts/AccountController.hpp"
+#include "providers/twitch/TwitchAccount.hpp"
 #include "providers/twitch/TwitchCommon.hpp"
 
 namespace chatterino {
diff --git a/src/widgets/AttachedWindow.hpp b/src/widgets/AttachedWindow.hpp
index 80b030fca..64da52f6a 100644
--- a/src/widgets/AttachedWindow.hpp
+++ b/src/widgets/AttachedWindow.hpp
@@ -1,12 +1,14 @@
 #pragma once
 
+#include <QTimer>
 #include <QWidget>
 
-#include "common/Channel.hpp"
-#include "widgets/splits/Split.hpp"
-
 namespace chatterino {
 
+class Split;
+class Channel;
+using ChannelPtr = std::shared_ptr<Channel>;
+
 class AttachedWindow : public QWidget
 {
     AttachedWindow(void *_target, int _yOffset);
diff --git a/src/widgets/BaseWindow.cpp b/src/widgets/BaseWindow.cpp
index eccde0f97..5c80bc9a7 100644
--- a/src/widgets/BaseWindow.cpp
+++ b/src/widgets/BaseWindow.cpp
@@ -4,6 +4,7 @@
 #include "boost/algorithm/algorithm.hpp"
 #include "debug/Log.hpp"
 #include "singletons/Settings.hpp"
+#include "singletons/Theme.hpp"
 #include "singletons/WindowManager.hpp"
 #include "util/PostToThread.hpp"
 #include "util/WindowsHelper.hpp"
@@ -110,11 +111,11 @@ void BaseWindow::init()
 
                 // buttons
                 TitleBarButton *_minButton = new TitleBarButton;
-                _minButton->setButtonStyle(TitleBarButton::Minimize);
+                _minButton->setButtonStyle(TitleBarButtonStyle::Minimize);
                 TitleBarButton *_maxButton = new TitleBarButton;
-                _maxButton->setButtonStyle(TitleBarButton::Maximize);
+                _maxButton->setButtonStyle(TitleBarButtonStyle::Maximize);
                 TitleBarButton *_exitButton = new TitleBarButton;
-                _exitButton->setButtonStyle(TitleBarButton::Close);
+                _exitButton->setButtonStyle(TitleBarButtonStyle::Close);
 
                 QObject::connect(_minButton, &TitleBarButton::clicked, this,
                                  [this] {
@@ -353,8 +354,8 @@ void BaseWindow::mouseMoveEvent(QMouseEvent *event)
     BaseWidget::mouseMoveEvent(event);
 }
 
-TitleBarButton *BaseWindow::addTitleBarButton(
-    const TitleBarButton::Style &style, std::function<void()> onClicked)
+TitleBarButton *BaseWindow::addTitleBarButton(const TitleBarButtonStyle &style,
+                                              std::function<void()> onClicked)
 {
     TitleBarButton *button = new TitleBarButton;
     button->setScaleIndependantSize(30, 30);
@@ -389,10 +390,10 @@ void BaseWindow::changeEvent(QEvent *)
 
 #ifdef USEWINSDK
     if (this->ui_.maxButton) {
-        this->ui_.maxButton->setButtonStyle(this->windowState() &
-                                                    Qt::WindowMaximized
-                                                ? TitleBarButton::Unmaximize
-                                                : TitleBarButton::Maximize);
+        this->ui_.maxButton->setButtonStyle(
+            this->windowState() & Qt::WindowMaximized
+                ? TitleBarButtonStyle::Unmaximize
+                : TitleBarButtonStyle::Maximize);
     }
 #endif
 
diff --git a/src/widgets/BaseWindow.hpp b/src/widgets/BaseWindow.hpp
index eac2ee55e..088c07c86 100644
--- a/src/widgets/BaseWindow.hpp
+++ b/src/widgets/BaseWindow.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "BaseWidget.hpp"
-#include "widgets/helper/TitlebarButton.hpp"
 
 #include <functional>
 #include <pajlada/signals/signalholder.hpp>
@@ -15,6 +14,7 @@ namespace chatterino {
 class Button;
 class EffectLabel;
 class TitleBarButton;
+enum class TitleBarButtonStyle;
 
 class BaseWindow : public BaseWidget
 {
@@ -36,7 +36,7 @@ public:
 
     QWidget *getLayoutContainer();
     bool hasCustomWindowFrame();
-    TitleBarButton *addTitleBarButton(const TitleBarButton::Style &style,
+    TitleBarButton *addTitleBarButton(const TitleBarButtonStyle &style,
                                       std::function<void()> onClicked);
     EffectLabel *addTitleBarLabel(std::function<void()> onClicked);
 
@@ -114,6 +114,6 @@ private:
 
     pajlada::Signals::SignalHolder connections_;
     std::vector<pajlada::Signals::ScopedConnection> managedConnections_;
-};
+};  // namespace chatterino
 
 }  // namespace chatterino
diff --git a/src/widgets/Notebook.cpp b/src/widgets/Notebook.cpp
index d99d1f021..8cd5a6075 100644
--- a/src/widgets/Notebook.cpp
+++ b/src/widgets/Notebook.cpp
@@ -2,6 +2,7 @@
 
 #include "Application.hpp"
 #include "debug/Log.hpp"
+#include "singletons/Settings.hpp"
 #include "singletons/Theme.hpp"
 #include "singletons/WindowManager.hpp"
 #include "util/InitUpdateButton.hpp"
@@ -27,11 +28,11 @@ namespace chatterino {
 
 Notebook::Notebook(QWidget *parent)
     : BaseWidget(parent)
-    , addButton_(this)
+    , addButton_(new NotebookButton(this))
 {
-    this->addButton_.setIcon(NotebookButton::Icon::Plus);
+    this->addButton_->setIcon(NotebookButton::Icon::Plus);
 
-    this->addButton_.setHidden(true);
+    this->addButton_->setHidden(true);
 
     auto *shortcut_next = new QShortcut(QKeySequence("Ctrl+Tab"), this);
     QObject::connect(shortcut_next, &QShortcut::activated,
@@ -290,14 +291,14 @@ void Notebook::setShowAddButton(bool value)
 {
     this->showAddButton_ = value;
 
-    this->addButton_.setHidden(!value);
+    this->addButton_->setHidden(!value);
 }
 
 void Notebook::scaleChangedEvent(float scale)
 {
     float h = NOTEBOOK_TAB_HEIGHT * this->getScale();
 
-    this->addButton_.setFixedSize(h, h);
+    this->addButton_->setFixedSize(h, h);
 
     for (auto &i : this->items_) {
         i.tab->updateSize();
@@ -353,7 +354,7 @@ void Notebook::performLayout(bool animated)
     }
 
     if (this->showAddButton_) {
-        this->addButton_.move(x, y);
+        this->addButton_->move(x, y);
     }
 
     if (this->lineY_ != y + tabHeight) {
@@ -368,7 +369,7 @@ void Notebook::performLayout(bool animated)
     }
 
     if (this->showAddButton_) {
-        this->addButton_.raise();
+        this->addButton_->raise();
     }
 
     if (this->selectedPage_ != nullptr) {
@@ -389,7 +390,7 @@ void Notebook::paintEvent(QPaintEvent *event)
 
 NotebookButton *Notebook::getAddButton()
 {
-    return &this->addButton_;
+    return this->addButton_;
 }
 
 NotebookButton *Notebook::addCustomButton()
@@ -460,8 +461,7 @@ void SplitNotebook::addCustomButtons()
     // updates
     auto updateBtn = this->addCustomButton();
 
-    initUpdateButton(*updateBtn, this->updateDialogHandle_,
-                     this->signalHolder_);
+    initUpdateButton(*updateBtn, this->signalHolder_);
 }
 
 SplitContainer *SplitNotebook::addPage(bool select)
diff --git a/src/widgets/Notebook.hpp b/src/widgets/Notebook.hpp
index 749d12594..022c075a2 100644
--- a/src/widgets/Notebook.hpp
+++ b/src/widgets/Notebook.hpp
@@ -2,10 +2,6 @@
 
 #include "pajlada/signals/signal.hpp"
 #include "widgets/BaseWidget.hpp"
-#include "widgets/dialogs/UpdateDialog.hpp"
-#include "widgets/helper/NotebookButton.hpp"
-#include "widgets/helper/NotebookTab.hpp"
-#include "widgets/splits/SplitContainer.hpp"
 
 #include <QList>
 #include <QMessageBox>
@@ -15,6 +11,10 @@
 namespace chatterino {
 
 class Window;
+class UpdateDialog;
+class NotebookButton;
+class NotebookTab;
+class SplitContainer;
 
 class Notebook : public BaseWidget
 {
@@ -22,6 +22,7 @@ class Notebook : public BaseWidget
 
 public:
     explicit Notebook(QWidget *parent);
+    ~Notebook() override = default;
 
     NotebookTab *addPage(QWidget *page, QString title = QString(),
                          bool select = false);
@@ -74,7 +75,7 @@ private:
     QList<Item> items_;
     QWidget *selectedPage_ = nullptr;
 
-    NotebookButton addButton_;
+    NotebookButton *addButton_;
     std::vector<NotebookButton *> customButtons_;
 
     bool allowUserTabManagement_ = false;
@@ -94,7 +95,7 @@ private:
     void addCustomButtons();
 
     pajlada::Signals::SignalHolder signalHolder_;
-    std::unique_ptr<UpdateDialog> updateDialogHandle_;
+    std::shared_ptr<UpdateDialog> updateDialogHandle_;
 
     std::vector<pajlada::Signals::ScopedConnection> connections_;
 };
diff --git a/src/widgets/Scrollbar.cpp b/src/widgets/Scrollbar.cpp
index 9c46cff80..879aa9af2 100644
--- a/src/widgets/Scrollbar.cpp
+++ b/src/widgets/Scrollbar.cpp
@@ -1,6 +1,7 @@
 #include "widgets/Scrollbar.hpp"
 
 #include "Application.hpp"
+#include "singletons/Settings.hpp"
 #include "singletons/Theme.hpp"
 #include "widgets/helper/ChannelView.hpp"
 
@@ -103,8 +104,7 @@ void Scrollbar::setSmallChange(qreal value)
 
 void Scrollbar::setDesiredValue(qreal value, bool animated)
 {
-    auto app = getApp();
-    animated &= app->settings->enableSmoothScrolling.getValue();
+    animated &= getSettings()->enableSmoothScrolling.getValue();
     value = std::max(this->minimum_,
                      std::min(this->maximum_ - this->largeChange_, value));
 
@@ -221,8 +221,6 @@ void Scrollbar::printCurrentState(const QString &prefix) const
 
 void Scrollbar::paintEvent(QPaintEvent *)
 {
-    auto *app = getApp();
-
     bool mouseOver = this->mouseOverIndex_ != -1;
     int xOffset = mouseOver ? 0 : width() - int(4 * this->getScale());
 
@@ -267,9 +265,11 @@ void Scrollbar::paintEvent(QPaintEvent *)
             QColor color = [&] {
                 switch (highlight.getColor()) {
                     case ScrollbarHighlight::Highlight:
-                        return app->themes->scrollbars.highlights.highlight;
+                        return getApp()
+                            ->themes->scrollbars.highlights.highlight;
                     case ScrollbarHighlight::Subscription:
-                        return app->themes->scrollbars.highlights.subscription;
+                        return getApp()
+                            ->themes->scrollbars.highlights.subscription;
                 }
                 return QColor();
             }();
diff --git a/src/widgets/Scrollbar.hpp b/src/widgets/Scrollbar.hpp
index fe72477c3..114a1dfe6 100644
--- a/src/widgets/Scrollbar.hpp
+++ b/src/widgets/Scrollbar.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "messages/LimitedQueue.hpp"
-#include "singletons/Settings.hpp"
 #include "widgets/BaseWidget.hpp"
 #include "widgets/helper/ScrollbarHighlight.hpp"
 
diff --git a/src/widgets/StreamView.cpp b/src/widgets/StreamView.cpp
index ad3f1966c..9277ba825 100644
--- a/src/widgets/StreamView.cpp
+++ b/src/widgets/StreamView.cpp
@@ -3,6 +3,7 @@
 #include "common/Channel.hpp"
 #include "util/Helpers.hpp"
 #include "util/LayoutCreator.hpp"
+#include "widgets/helper/ChannelView.hpp"
 #include "widgets/splits/Split.hpp"
 
 #ifdef USEWEBENGINE
diff --git a/src/widgets/TooltipWidget.cpp b/src/widgets/TooltipWidget.cpp
index 0b3b83639..3479826b8 100644
--- a/src/widgets/TooltipWidget.cpp
+++ b/src/widgets/TooltipWidget.cpp
@@ -79,7 +79,7 @@ void TooltipWidget::updateFont()
     auto app = getApp();
 
     this->setFont(
-        app->fonts->getFont(Fonts::Type::ChatMediumSmall, this->getScale()));
+        app->fonts->getFont(FontStyle::ChatMediumSmall, this->getScale()));
 }
 
 void TooltipWidget::setText(QString text)
diff --git a/src/widgets/Window.cpp b/src/widgets/Window.cpp
index 7088e5cb6..876f2a078 100644
--- a/src/widgets/Window.cpp
+++ b/src/widgets/Window.cpp
@@ -14,8 +14,11 @@
 #include "widgets/dialogs/SettingsDialog.hpp"
 #include "widgets/dialogs/UpdateDialog.hpp"
 #include "widgets/dialogs/WelcomeDialog.hpp"
+#include "widgets/helper/EffectLabel.hpp"
 #include "widgets/helper/Shortcut.hpp"
+#include "widgets/helper/TitlebarButton.hpp"
 #include "widgets/splits/Split.hpp"
+#include "widgets/splits/SplitContainer.hpp"
 
 #include <QApplication>
 #include <QDesktopServices>
@@ -28,10 +31,10 @@
 
 namespace chatterino {
 
-Window::Window(Type type)
+Window::Window(WindowType type)
     : BaseWindow(nullptr, BaseWindow::EnableCustomFrame)
     , type_(type)
-    , notebook_(this)
+    , notebook_(new SplitNotebook(this))
 {
     this->addCustomTitlebarButtons();
     this->addDebugStuff();
@@ -42,26 +45,26 @@ Window::Window(Type type)
         [this] { this->onAccountSelected(); });
     this->onAccountSelected();
 
-    if (type == Type::Main) {
+    if (type == WindowType::Main) {
         this->resize(int(600 * this->getScale()), int(500 * this->getScale()));
     } else {
         this->resize(int(300 * this->getScale()), int(500 * this->getScale()));
     }
 }
 
-Window::Type Window::getType()
+WindowType Window::getType()
 {
     return this->type_;
 }
 
 SplitNotebook &Window::getNotebook()
 {
-    return this->notebook_;
+    return *this->notebook_;
 }
 
 void Window::repaintVisibleChatWidgets(Channel *channel)
 {
-    auto page = this->notebook_.getOrAddSelectedPage();
+    auto page = this->notebook_->getOrAddSelectedPage();
 
     for (const auto &split : page->getSplits()) {
         if (channel == nullptr || channel == split->getChannel().get()) {
@@ -77,7 +80,7 @@ bool Window::event(QEvent *event)
             break;
 
         case QEvent::WindowDeactivate: {
-            auto page = this->notebook_.getOrAddSelectedPage();
+            auto page = this->notebook_->getOrAddSelectedPage();
 
             if (page != nullptr) {
                 std::vector<Split *> splits = page->getSplits();
@@ -135,7 +138,7 @@ void Window::showEvent(QShowEvent *event)
 
 void Window::closeEvent(QCloseEvent *)
 {
-    if (this->type_ == Type::Main) {
+    if (this->type_ == WindowType::Main) {
         auto app = getApp();
         app->windows->save();
         app->windows->closeAll();
@@ -143,7 +146,7 @@ void Window::closeEvent(QCloseEvent *)
 
     this->closed.invoke();
 
-    if (this->type_ == Type::Main) {
+    if (this->type_ == WindowType::Main) {
         QApplication::exit();
     }
 }
@@ -152,35 +155,34 @@ void Window::addLayout()
 {
     QVBoxLayout *layout = new QVBoxLayout(this);
 
-    layout->addWidget(&this->notebook_);
+    layout->addWidget(this->notebook_);
     this->getLayoutContainer()->setLayout(layout);
 
     // set margin
     layout->setMargin(0);
 
-    this->notebook_.setAllowUserTabManagement(true);
-    this->notebook_.setShowAddButton(true);
+    this->notebook_->setAllowUserTabManagement(true);
+    this->notebook_->setShowAddButton(true);
 }
 
 void Window::addCustomTitlebarButtons()
 {
     if (!this->hasCustomWindowFrame()) return;
-    if (this->type_ != Type::Main) return;
+    if (this->type_ != WindowType::Main) return;
 
     // settings
-    this->addTitleBarButton(TitleBarButton::Settings, [] {
-        getApp()->windows->showSettingsDialog();  //
-    });
+    this->addTitleBarButton(TitleBarButtonStyle::Settings,
+                            [] { getApp()->windows->showSettingsDialog(); });
 
     // updates
-    auto update = this->addTitleBarButton(TitleBarButton::None, [] {});
+    auto update = this->addTitleBarButton(TitleBarButtonStyle::None, [] {});
 
-    initUpdateButton(*update, this->updateDialogHandle_, this->signalHolder_);
+    initUpdateButton(*update, this->signalHolder_);
 
     // account
     this->userLabel_ = this->addTitleBarLabel([this] {
         getApp()->windows->showAccountSelectPopup(this->userLabel_->mapToGlobal(
-            this->userLabel_->rect().bottomLeft()));  //
+            this->userLabel_->rect().bottomLeft()));
     });
     this->userLabel_->setMinimumWidth(20 * getScale());
 }
@@ -252,27 +254,27 @@ void Window::addShortcuts()
 
     // Switch tab
     createWindowShortcut(this, "CTRL+T", [this] {
-        this->notebook_.getOrAddSelectedPage()->appendNewSplit(true);
+        this->notebook_->getOrAddSelectedPage()->appendNewSplit(true);
     });
 
     createWindowShortcut(this, "CTRL+1",
-                         [this] { this->notebook_.selectIndex(0); });
+                         [this] { this->notebook_->selectIndex(0); });
     createWindowShortcut(this, "CTRL+2",
-                         [this] { this->notebook_.selectIndex(1); });
+                         [this] { this->notebook_->selectIndex(1); });
     createWindowShortcut(this, "CTRL+3",
-                         [this] { this->notebook_.selectIndex(2); });
+                         [this] { this->notebook_->selectIndex(2); });
     createWindowShortcut(this, "CTRL+4",
-                         [this] { this->notebook_.selectIndex(3); });
+                         [this] { this->notebook_->selectIndex(3); });
     createWindowShortcut(this, "CTRL+5",
-                         [this] { this->notebook_.selectIndex(4); });
+                         [this] { this->notebook_->selectIndex(4); });
     createWindowShortcut(this, "CTRL+6",
-                         [this] { this->notebook_.selectIndex(5); });
+                         [this] { this->notebook_->selectIndex(5); });
     createWindowShortcut(this, "CTRL+7",
-                         [this] { this->notebook_.selectIndex(6); });
+                         [this] { this->notebook_->selectIndex(6); });
     createWindowShortcut(this, "CTRL+8",
-                         [this] { this->notebook_.selectIndex(7); });
+                         [this] { this->notebook_->selectIndex(7); });
     createWindowShortcut(this, "CTRL+9",
-                         [this] { this->notebook_.selectIndex(8); });
+                         [this] { this->notebook_->selectIndex(8); });
 
     // Zoom in
     {
@@ -296,11 +298,11 @@ void Window::addShortcuts()
 
     // New tab
     createWindowShortcut(this, "CTRL+SHIFT+T",
-                         [this] { this->notebook_.addPage(true); });
+                         [this] { this->notebook_->addPage(true); });
 
     // Close tab
     createWindowShortcut(this, "CTRL+SHIFT+W",
-                         [this] { this->notebook_.removeCurrentPage(); });
+                         [this] { this->notebook_->removeCurrentPage(); });
 }
 
 void Window::onAccountSelected()
diff --git a/src/widgets/Window.hpp b/src/widgets/Window.hpp
index 438f6b3e2..f9267a81f 100644
--- a/src/widgets/Window.hpp
+++ b/src/widgets/Window.hpp
@@ -1,13 +1,6 @@
 #pragma once
 
-#include "util/Helpers.hpp"
 #include "widgets/BaseWindow.hpp"
-#include "widgets/Notebook.hpp"
-#include "widgets/dialogs/UpdateDialog.hpp"
-
-//#ifdef USEWINSDK
-//#include <platform/borderless/qwinwidget.h>
-//#endif
 
 #include <pajlada/settings/setting.hpp>
 #include <pajlada/signals/signal.hpp>
@@ -16,17 +9,20 @@
 namespace chatterino {
 
 class Theme;
+class UpdateDialog;
+class SplitNotebook;
+class Channel;
+
+enum class WindowType { Main, Popup, Attached };
 
 class Window : public BaseWindow
 {
     Q_OBJECT
 
 public:
-    enum class Type { Main, Popup, Attached };
+    explicit Window(WindowType type);
 
-    explicit Window(Window::Type type);
-
-    Type getType();
+    WindowType getType();
     SplitNotebook &getNotebook();
 
     void repaintVisibleChatWidgets(Channel *channel = nullptr);
@@ -45,11 +41,11 @@ private:
     void addLayout();
     void onAccountSelected();
 
-    Type type_;
+    WindowType type_;
 
-    SplitNotebook notebook_;
+    SplitNotebook *notebook_;
     EffectLabel *userLabel_ = nullptr;
-    std::unique_ptr<UpdateDialog> updateDialogHandle_;
+    std::shared_ptr<UpdateDialog> updateDialogHandle_;
 
     pajlada::Signals::SignalHolder signalHolder_;
 
diff --git a/src/widgets/dialogs/EmotePopup.cpp b/src/widgets/dialogs/EmotePopup.cpp
index 8c3fc87e1..92435065d 100644
--- a/src/widgets/dialogs/EmotePopup.cpp
+++ b/src/widgets/dialogs/EmotePopup.cpp
@@ -3,9 +3,12 @@
 #include "Application.hpp"
 #include "controllers/accounts/AccountController.hpp"
 #include "debug/Benchmark.hpp"
+#include "messages/Message.hpp"
 #include "messages/MessageBuilder.hpp"
 #include "providers/twitch/TwitchChannel.hpp"
+#include "singletons/Emotes.hpp"
 #include "widgets/Notebook.hpp"
+#include "widgets/helper/ChannelView.hpp"
 
 #include <QHBoxLayout>
 #include <QShortcut>
diff --git a/src/widgets/dialogs/EmotePopup.hpp b/src/widgets/dialogs/EmotePopup.hpp
index 98331efa7..b8ea9ebf9 100644
--- a/src/widgets/dialogs/EmotePopup.hpp
+++ b/src/widgets/dialogs/EmotePopup.hpp
@@ -1,13 +1,16 @@
 #pragma once
 
-#include "common/Channel.hpp"
 #include "widgets/BaseWindow.hpp"
-#include "widgets/helper/ChannelView.hpp"
 
 #include <pajlada/signals/signal.hpp>
 
 namespace chatterino {
 
+class Link;
+class ChannelView;
+class Channel;
+using ChannelPtr = std::shared_ptr<Channel>;
+
 class EmotePopup : public BaseWindow
 {
 public:
diff --git a/src/widgets/dialogs/LoginDialog.cpp b/src/widgets/dialogs/LoginDialog.cpp
index 1b73f143f..daf3c201e 100644
--- a/src/widgets/dialogs/LoginDialog.cpp
+++ b/src/widgets/dialogs/LoginDialog.cpp
@@ -1,5 +1,6 @@
 #include "widgets/dialogs/LoginDialog.hpp"
 
+#include "Application.hpp"
 #include "common/Common.hpp"
 #include "common/NetworkRequest.hpp"
 #include "controllers/accounts/AccountController.hpp"
diff --git a/src/widgets/dialogs/LogsPopup.cpp b/src/widgets/dialogs/LogsPopup.cpp
index 04aa78fb4..be799be53 100644
--- a/src/widgets/dialogs/LogsPopup.cpp
+++ b/src/widgets/dialogs/LogsPopup.cpp
@@ -1,6 +1,7 @@
 #include "LogsPopup.hpp"
 
 #include "IrcMessage"
+#include "common/Channel.hpp"
 #include "common/NetworkRequest.hpp"
 #include "providers/twitch/TwitchChannel.hpp"
 #include "providers/twitch/TwitchMessageBuilder.hpp"
@@ -14,6 +15,7 @@
 namespace chatterino {
 
 LogsPopup::LogsPopup()
+    : channel_(Channel::getEmpty())
 {
     this->initLayout();
     this->resize(400, 600);
diff --git a/src/widgets/dialogs/LogsPopup.hpp b/src/widgets/dialogs/LogsPopup.hpp
index 5ec39102e..395e1a384 100644
--- a/src/widgets/dialogs/LogsPopup.hpp
+++ b/src/widgets/dialogs/LogsPopup.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "common/Channel.hpp"
 #include "widgets/BaseWindow.hpp"
 
 namespace chatterino {
@@ -8,6 +7,12 @@ namespace chatterino {
 class Channel;
 class ChannelView;
 
+class Channel;
+using ChannelPtr = std::shared_ptr<Channel>;
+
+struct Message;
+using MessagePtr = std::shared_ptr<const Message>;
+
 class LogsPopup : public BaseWindow
 {
 public:
@@ -17,7 +22,7 @@ public:
 
 private:
     ChannelView *channelView_ = nullptr;
-    ChannelPtr channel_ = Channel::getEmpty();
+    ChannelPtr channel_;
 
     QString userName_;
     int roomID_;
diff --git a/src/widgets/dialogs/NotificationPopup.cpp b/src/widgets/dialogs/NotificationPopup.cpp
index 46ff7e8af..fb1822f40 100644
--- a/src/widgets/dialogs/NotificationPopup.cpp
+++ b/src/widgets/dialogs/NotificationPopup.cpp
@@ -1,5 +1,7 @@
 #include "NotificationPopup.hpp"
 
+#include "common/Channel.hpp"
+#include "messages/Message.hpp"
 #include "widgets/helper/ChannelView.hpp"
 
 #include <QApplication>
diff --git a/src/widgets/dialogs/NotificationPopup.hpp b/src/widgets/dialogs/NotificationPopup.hpp
index 04a35b3a7..0f98a81bd 100644
--- a/src/widgets/dialogs/NotificationPopup.hpp
+++ b/src/widgets/dialogs/NotificationPopup.hpp
@@ -1,13 +1,17 @@
 #pragma once
 
-#include "common/Channel.hpp"
-#include "messages/Message.hpp"
 #include "widgets/BaseWindow.hpp"
 
 namespace chatterino {
 
 class ChannelView;
 
+class Channel;
+using ChannelPtr = std::shared_ptr<Channel>;
+
+struct Message;
+using MessagePtr = std::shared_ptr<const Message>;
+
 class NotificationPopup : public BaseWindow
 {
 public:
diff --git a/src/widgets/dialogs/SelectChannelDialog.cpp b/src/widgets/dialogs/SelectChannelDialog.cpp
index 367b626b2..e760a823e 100644
--- a/src/widgets/dialogs/SelectChannelDialog.cpp
+++ b/src/widgets/dialogs/SelectChannelDialog.cpp
@@ -2,8 +2,10 @@
 
 #include "Application.hpp"
 #include "providers/twitch/TwitchServer.hpp"
+#include "singletons/Theme.hpp"
 #include "util/LayoutCreator.hpp"
 #include "widgets/Notebook.hpp"
+#include "widgets/helper/NotebookTab.hpp"
 
 #include <QDialogButtonBox>
 #include <QGroupBox>
diff --git a/src/widgets/dialogs/SelectChannelDialog.hpp b/src/widgets/dialogs/SelectChannelDialog.hpp
index 94f21595c..5d5890d9a 100644
--- a/src/widgets/dialogs/SelectChannelDialog.hpp
+++ b/src/widgets/dialogs/SelectChannelDialog.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
+#include "Application.hpp"
 #include "common/Channel.hpp"
 #include "widgets/BaseWindow.hpp"
-#include "widgets/Notebook.hpp"
 
 #include <pajlada/signals/signal.hpp>
 
@@ -11,7 +11,9 @@
 
 namespace chatterino {
 
-class SelectChannelDialog : public BaseWindow
+class Notebook;
+
+class SelectChannelDialog final : public BaseWindow
 {
 public:
     SelectChannelDialog(QWidget *parent = nullptr);
diff --git a/src/widgets/dialogs/UserInfoPopup.cpp b/src/widgets/dialogs/UserInfoPopup.cpp
index e822da8b7..e7d3681ea 100644
--- a/src/widgets/dialogs/UserInfoPopup.cpp
+++ b/src/widgets/dialogs/UserInfoPopup.cpp
@@ -1,6 +1,7 @@
 #include "UserInfoPopup.hpp"
 
 #include "Application.hpp"
+#include "common/Channel.hpp"
 #include "common/NetworkRequest.hpp"
 #include "controllers/accounts/AccountController.hpp"
 #include "controllers/highlights/HighlightController.hpp"
diff --git a/src/widgets/dialogs/UserInfoPopup.hpp b/src/widgets/dialogs/UserInfoPopup.hpp
index 3dd13a464..59437d3da 100644
--- a/src/widgets/dialogs/UserInfoPopup.hpp
+++ b/src/widgets/dialogs/UserInfoPopup.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "common/Channel.hpp"
 #include "widgets/BaseWindow.hpp"
 
 #include <pajlada/signals/signal.hpp>
@@ -9,6 +8,8 @@ class QCheckBox;
 
 namespace chatterino {
 
+class Channel;
+using ChannelPtr = std::shared_ptr<Channel>;
 class Label;
 
 class UserInfoPopup final : public BaseWindow
diff --git a/src/widgets/helper/ChannelView.cpp b/src/widgets/helper/ChannelView.cpp
index 3803f2a21..45bc7b677 100644
--- a/src/widgets/helper/ChannelView.cpp
+++ b/src/widgets/helper/ChannelView.cpp
@@ -1,18 +1,24 @@
 #include "ChannelView.hpp"
 
 #include "Application.hpp"
+#include "common/Common.hpp"
 #include "debug/Benchmark.hpp"
 #include "debug/Log.hpp"
+#include "messages/Emote.hpp"
 #include "messages/LimitedQueueSnapshot.hpp"
 #include "messages/Message.hpp"
+#include "messages/MessageElement.hpp"
 #include "messages/layouts/MessageLayout.hpp"
+#include "messages/layouts/MessageLayoutElement.hpp"
 #include "providers/twitch/TwitchServer.hpp"
 #include "singletons/Settings.hpp"
 #include "singletons/Theme.hpp"
 #include "singletons/WindowManager.hpp"
 #include "util/DistanceBetweenPoints.hpp"
+#include "widgets/Scrollbar.hpp"
 #include "widgets/TooltipWidget.hpp"
 #include "widgets/dialogs/UserInfoPopup.hpp"
+#include "widgets/helper/EffectLabel.hpp"
 #include "widgets/splits/Split.hpp"
 
 #include <QClipboard>
@@ -93,7 +99,7 @@ void addEmoteContextMenuItems(const Emote &emote,
 
 ChannelView::ChannelView(BaseWidget *parent)
     : BaseWidget(parent)
-    , scrollBar_(this)
+    , scrollBar_(new Scrollbar(this))
 {
     this->setMouseTracking(true);
 
@@ -124,7 +130,7 @@ void ChannelView::initializeLayout()
 
     QObject::connect(this->goToBottom_, &EffectLabel::clicked, this, [=] {
         QTimer::singleShot(180, [=] {
-            this->scrollBar_.scrollToBottom(
+            this->scrollBar_->scrollToBottom(
                 getApp()
                     ->settings->enableSmoothScrollingNewMessages.getValue());
         });
@@ -133,18 +139,18 @@ void ChannelView::initializeLayout()
 
 void ChannelView::initializeScrollbar()
 {
-    this->scrollBar_.getCurrentValueChanged().connect([this] {
+    this->scrollBar_->getCurrentValueChanged().connect([this] {
         this->actuallyLayoutMessages(true);
 
         this->goToBottom_->setVisible(this->enableScrollingToBottom_ &&
-                                      this->scrollBar_.isVisible() &&
-                                      !this->scrollBar_.isAtBottom());
+                                      this->scrollBar_->isVisible() &&
+                                      !this->scrollBar_->isAtBottom());
 
         this->queueUpdate();
     });
 
-    this->scrollBar_.getDesiredValueChanged().connect([this] {
-        this->pausedByScrollingUp_ = !this->scrollBar_.isAtBottom();
+    this->scrollBar_->getDesiredValueChanged().connect([this] {
+        this->pausedByScrollingUp_ = !this->scrollBar_->isAtBottom();
     });
 }
 
@@ -212,7 +218,7 @@ void ChannelView::actuallyLayoutMessages(bool causedByScrollbar)
     auto messagesSnapshot = this->getMessagesSnapshot();
 
     if (messagesSnapshot.getLength() == 0) {
-        this->scrollBar_.setVisible(false);
+        this->scrollBar_->setVisible(false);
 
         return;
     }
@@ -225,9 +231,9 @@ void ChannelView::actuallyLayoutMessages(bool causedByScrollbar)
     // The scrollbar was not visible
     // The scrollbar was visible and at the bottom
     this->showingLatestMessages_ =
-        this->scrollBar_.isAtBottom() || !this->scrollBar_.isVisible();
+        this->scrollBar_->isAtBottom() || !this->scrollBar_->isVisible();
 
-    size_t start = size_t(this->scrollBar_.getCurrentValue());
+    size_t start = size_t(this->scrollBar_->getCurrentValue());
     int layoutWidth = this->getLayoutWidth();
 
     MessageElementFlags flags = this->getFlags();
@@ -235,7 +241,7 @@ void ChannelView::actuallyLayoutMessages(bool causedByScrollbar)
     // layout the visible messages in the view
     if (messagesSnapshot.getLength() > start) {
         int y = int(-(messagesSnapshot[start]->getHeight() *
-                      (fmod(this->scrollBar_.getCurrentValue(), 1))));
+                      (fmod(this->scrollBar_->getCurrentValue(), 1))));
 
         for (size_t i = start; i < messagesSnapshot.getLength(); ++i) {
             auto message = messagesSnapshot[i];
@@ -262,8 +268,9 @@ void ChannelView::actuallyLayoutMessages(bool causedByScrollbar)
         h -= message->getHeight();
 
         if (h < 0) {
-            this->scrollBar_.setLargeChange((messagesSnapshot.getLength() - i) +
-                                            qreal(h) / message->getHeight());
+            this->scrollBar_->setLargeChange(
+                (messagesSnapshot.getLength() - i) +
+                qreal(h) / message->getHeight());
             //            this->scrollBar.setDesiredValue(this->scrollBar.getDesiredValue());
 
             showScrollbar = true;
@@ -271,20 +278,20 @@ void ChannelView::actuallyLayoutMessages(bool causedByScrollbar)
         }
     }
 
-    this->scrollBar_.setVisible(showScrollbar);
+    this->scrollBar_->setVisible(showScrollbar);
 
     if (!showScrollbar && !causedByScrollbar) {
-        this->scrollBar_.setDesiredValue(0);
+        this->scrollBar_->setDesiredValue(0);
     }
 
-    this->scrollBar_.setMaximum(messagesSnapshot.getLength());
+    this->scrollBar_->setMaximum(messagesSnapshot.getLength());
 
     // If we were showing the latest messages and the scrollbar now wants to be
     // rendered, scroll to bottom
     if (this->enableScrollingToBottom_ && this->showingLatestMessages_ &&
         showScrollbar) {
         if (!this->isPaused()) {
-            this->scrollBar_.scrollToBottom(
+            this->scrollBar_->scrollToBottom(
                 //                this->messageWasAdded &&
                 app->settings->enableSmoothScrollingNewMessages.getValue());
         }
@@ -309,7 +316,7 @@ void ChannelView::clearMessages()
 
 Scrollbar &ChannelView::getScrollBar()
 {
-    return this->scrollBar_;
+    return *this->scrollBar_;
 }
 
 QString ChannelView::getSelectedText()
@@ -378,7 +385,7 @@ const boost::optional<MessageElementFlags> &ChannelView::getOverrideFlags()
 
 LimitedQueueSnapshot<MessageLayoutPtr> ChannelView::getMessagesSnapshot()
 {
-    if (!this->isPaused() /*|| this->scrollBar_.isVisible()*/) {
+    if (!this->isPaused() /*|| this->scrollBar_->isVisible()*/) {
         this->snapshot_ = this->messages.getSnapshot();
     }
 
@@ -413,10 +420,10 @@ void ChannelView::setChannel(ChannelPtr newChannel)
             if (this->messages.pushBack(MessageLayoutPtr(messageRef),
                                         deleted)) {
                 //                if (!this->isPaused()) {
-                if (this->scrollBar_.isAtBottom()) {
-                    this->scrollBar_.scrollToBottom();
+                if (this->scrollBar_->isAtBottom()) {
+                    this->scrollBar_->scrollToBottom();
                 } else {
-                    this->scrollBar_.offset(-1);
+                    this->scrollBar_->offset(-1);
                 }
                 //                }
             }
@@ -431,7 +438,7 @@ void ChannelView::setChannel(ChannelPtr newChannel)
                 }
             }
 
-            this->scrollBar_.addHighlight(message->getScrollBarHighlight());
+            this->scrollBar_->addHighlight(message->getScrollBarHighlight());
 
             this->messageWasAdded_ = true;
             this->layoutMessages();
@@ -449,10 +456,10 @@ void ChannelView::setChannel(ChannelPtr newChannel)
 
                 if (!this->isPaused()) {
                     if (this->messages.pushFront(messageRefs).size() > 0) {
-                        if (this->scrollBar_.isAtBottom()) {
-                            this->scrollBar_.scrollToBottom();
+                        if (this->scrollBar_->isAtBottom()) {
+                            this->scrollBar_->scrollToBottom();
                         } else {
-                            this->scrollBar_.offset(qreal(messages.size()));
+                            this->scrollBar_->offset(qreal(messages.size()));
                         }
                     }
                 }
@@ -464,7 +471,7 @@ void ChannelView::setChannel(ChannelPtr newChannel)
                         messages.at(i)->getScrollBarHighlight());
                 }
 
-                this->scrollBar_.addHighlightsAtStart(highlights);
+                this->scrollBar_->addHighlightsAtStart(highlights);
 
                 this->messageWasAdded_ = true;
                 this->layoutMessages();
@@ -503,7 +510,7 @@ void ChannelView::setChannel(ChannelPtr newChannel)
                 newItem->flags.set(MessageLayoutFlag::AlternateBackground);
             }
 
-            this->scrollBar_.replaceHighlight(
+            this->scrollBar_->replaceHighlight(
                 index, replacement->getScrollBarHighlight());
 
             this->messages.replaceItem(message, newItem);
@@ -563,12 +570,12 @@ void ChannelView::updateLastReadMessage()
 
 void ChannelView::resizeEvent(QResizeEvent *)
 {
-    this->scrollBar_.setGeometry(this->width() - this->scrollBar_.width(), 0,
-                                 this->scrollBar_.width(), this->height());
+    this->scrollBar_->setGeometry(this->width() - this->scrollBar_->width(), 0,
+                                  this->scrollBar_->width(), this->height());
 
     this->goToBottom_->setGeometry(0, this->height() - 32, this->width(), 32);
 
-    this->scrollBar_.raise();
+    this->scrollBar_->raise();
 
     this->layoutMessages();
 
@@ -625,9 +632,9 @@ bool ChannelView::isPaused()
 void ChannelView::updatePauseStatus()
 {
     if (this->isPaused()) {
-        this->scrollBar_.pauseHighlights();
+        this->scrollBar_->pauseHighlights();
     } else {
-        this->scrollBar_.unpauseHighlights();
+        this->scrollBar_->unpauseHighlights();
     }
 }
 
@@ -651,14 +658,14 @@ void ChannelView::drawMessages(QPainter &painter)
 
     auto messagesSnapshot = this->getMessagesSnapshot();
 
-    size_t start = size_t(this->scrollBar_.getCurrentValue());
+    size_t start = size_t(this->scrollBar_->getCurrentValue());
 
     if (start >= messagesSnapshot.getLength()) {
         return;
     }
 
     int y = int(-(messagesSnapshot[start].get()->getHeight() *
-                  (fmod(this->scrollBar_.getCurrentValue(), 1))));
+                  (fmod(this->scrollBar_->getCurrentValue(), 1))));
 
     MessageLayout *end = nullptr;
     bool windowFocused = this->window() == QApplication::activeWindow();
@@ -729,12 +736,12 @@ void ChannelView::wheelEvent(QWheelEvent *event)
         return;
     }
 
-    if (this->scrollBar_.isVisible()) {
+    if (this->scrollBar_->isVisible()) {
         auto app = getApp();
 
         float mouseMultiplier = app->settings->mouseScrollMultiplier;
 
-        qreal desired = this->scrollBar_.getDesiredValue();
+        qreal desired = this->scrollBar_->getDesiredValue();
         qreal delta = event->delta() * qreal(1.5) * mouseMultiplier;
 
         auto snapshot = this->getMessagesSnapshot();
@@ -792,7 +799,7 @@ void ChannelView::wheelEvent(QWheelEvent *event)
             }
         }
 
-        this->scrollBar_.setDesiredValue(desired, true);
+        this->scrollBar_->setDesiredValue(desired, true);
     }
 }
 
@@ -1192,14 +1199,14 @@ bool ChannelView::tryGetMessageAt(QPoint p,
 {
     auto messagesSnapshot = this->getMessagesSnapshot();
 
-    size_t start = this->scrollBar_.getCurrentValue();
+    size_t start = this->scrollBar_->getCurrentValue();
 
     if (start >= messagesSnapshot.getLength()) {
         return false;
     }
 
     int y = -(messagesSnapshot[start]->getHeight() *
-              (fmod(this->scrollBar_.getCurrentValue(), 1)));
+              (fmod(this->scrollBar_->getCurrentValue(), 1)));
 
     for (size_t i = start; i < messagesSnapshot.getLength(); ++i) {
         auto message = messagesSnapshot[i];
@@ -1219,7 +1226,7 @@ bool ChannelView::tryGetMessageAt(QPoint p,
 
 int ChannelView::getLayoutWidth() const
 {
-    if (this->scrollBar_.isVisible())
+    if (this->scrollBar_->isVisible())
         return int(this->width() - 8 * this->getScale());
 
     return this->width();
diff --git a/src/widgets/helper/ChannelView.hpp b/src/widgets/helper/ChannelView.hpp
index cb8ad990f..46e51bebe 100644
--- a/src/widgets/helper/ChannelView.hpp
+++ b/src/widgets/helper/ChannelView.hpp
@@ -1,14 +1,10 @@
 #pragma once
 
-#include "common/Channel.hpp"
-#include "messages/Image.hpp"
+#include "common/FlagsEnum.hpp"
+#include "messages/LimitedQueue.hpp"
 #include "messages/LimitedQueueSnapshot.hpp"
-#include "messages/MessageElement.hpp"
 #include "messages/Selection.hpp"
-#include "messages/layouts/MessageLayout.hpp"
 #include "widgets/BaseWidget.hpp"
-#include "widgets/Scrollbar.hpp"
-#include "widgets/helper/EffectLabel.hpp"
 
 #include <QPaintEvent>
 #include <QScroller>
@@ -20,8 +16,23 @@
 #include <unordered_set>
 
 namespace chatterino {
+enum class HighlightState;
 
-class ChannelView : public BaseWidget
+class Channel;
+using ChannelPtr = std::shared_ptr<Channel>;
+
+class MessageLayout;
+using MessageLayoutPtr = std::shared_ptr<MessageLayout>;
+
+enum class MessageElementFlag;
+using MessageElementFlags = FlagsEnum<MessageElementFlag>;
+
+class Scrollbar;
+class EffectLabel;
+struct Link;
+class MessageLayoutElement;
+
+class ChannelView final : public BaseWidget
 {
     Q_OBJECT
 
@@ -121,7 +132,7 @@ private:
 
     ChannelPtr channel_;
 
-    Scrollbar scrollBar_;
+    Scrollbar *scrollBar_;
     EffectLabel *goToBottom_;
 
     // This variable can be used to decide whether or not we should render the
diff --git a/src/widgets/helper/NotebookButton.cpp b/src/widgets/helper/NotebookButton.cpp
index 926c42c24..c7ef9e1db 100644
--- a/src/widgets/helper/NotebookButton.cpp
+++ b/src/widgets/helper/NotebookButton.cpp
@@ -2,6 +2,7 @@
 #include "singletons/Theme.hpp"
 #include "widgets/Notebook.hpp"
 #include "widgets/helper/Button.hpp"
+#include "widgets/splits/Split.hpp"
 #include "widgets/splits/SplitContainer.hpp"
 
 #include <QMouseEvent>
diff --git a/src/widgets/helper/NotebookTab.cpp b/src/widgets/helper/NotebookTab.cpp
index 5581f5e50..865eb6048 100644
--- a/src/widgets/helper/NotebookTab.cpp
+++ b/src/widgets/helper/NotebookTab.cpp
@@ -3,6 +3,7 @@
 #include "Application.hpp"
 #include "common/Common.hpp"
 #include "debug/Log.hpp"
+#include "singletons/Fonts.hpp"
 #include "singletons/Settings.hpp"
 #include "singletons/Theme.hpp"
 #include "util/Clamp.hpp"
@@ -10,6 +11,7 @@
 #include "widgets/Notebook.hpp"
 #include "widgets/dialogs/SettingsDialog.hpp"
 #include "widgets/dialogs/TextInputDialog.hpp"
+#include "widgets/splits/SplitContainer.hpp"
 
 #include <QApplication>
 #include <QDebug>
diff --git a/src/widgets/helper/ScrollbarHighlight.hpp b/src/widgets/helper/ScrollbarHighlight.hpp
index b88cdae09..e34cf913b 100644
--- a/src/widgets/helper/ScrollbarHighlight.hpp
+++ b/src/widgets/helper/ScrollbarHighlight.hpp
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <QString>
-
 namespace chatterino {
 
 class ScrollbarHighlight
diff --git a/src/widgets/helper/SearchPopup.cpp b/src/widgets/helper/SearchPopup.cpp
index b67addb18..81439407a 100644
--- a/src/widgets/helper/SearchPopup.cpp
+++ b/src/widgets/helper/SearchPopup.cpp
@@ -6,6 +6,7 @@
 #include <QVBoxLayout>
 
 #include "common/Channel.hpp"
+#include "messages/Message.hpp"
 #include "widgets/helper/ChannelView.hpp"
 
 namespace chatterino {
diff --git a/src/widgets/helper/SearchPopup.hpp b/src/widgets/helper/SearchPopup.hpp
index 0a7065c55..1f2837fbe 100644
--- a/src/widgets/helper/SearchPopup.hpp
+++ b/src/widgets/helper/SearchPopup.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "messages/LimitedQueueSnapshot.hpp"
-#include "messages/Message.hpp"
 #include "widgets/BaseWindow.hpp"
 
 #include <memory>
@@ -13,6 +12,9 @@ namespace chatterino {
 class Channel;
 class ChannelView;
 
+struct Message;
+using MessagePtr = std::shared_ptr<const Message>;
+
 class SearchPopup : public BaseWindow
 {
 public:
diff --git a/src/widgets/helper/TitlebarButton.cpp b/src/widgets/helper/TitlebarButton.cpp
index c92e94ba6..d5ab4cc4a 100644
--- a/src/widgets/helper/TitlebarButton.cpp
+++ b/src/widgets/helper/TitlebarButton.cpp
@@ -9,12 +9,12 @@ TitleBarButton::TitleBarButton()
 {
 }
 
-TitleBarButton::Style TitleBarButton::getButtonStyle() const
+TitleBarButtonStyle TitleBarButton::getButtonStyle() const
 {
     return this->style_;
 }
 
-void TitleBarButton::setButtonStyle(Style _style)
+void TitleBarButton::setButtonStyle(TitleBarButtonStyle _style)
 {
     this->style_ = _style;
     this->update();
@@ -35,16 +35,16 @@ void TitleBarButton::paintEvent(QPaintEvent *event)
     painter.setRenderHint(QPainter::Antialiasing, false);
 
     switch (this->style_) {
-        case Minimize: {
+        case TitleBarButtonStyle::Minimize: {
             painter.fillRect(centerX - xD / 2, xD * 3 / 2, xD, 1, color);
             break;
         }
-        case Maximize: {
+        case TitleBarButtonStyle::Maximize: {
             painter.setPen(color);
             painter.drawRect(centerX - xD / 2, xD, xD - 1, xD - 1);
             break;
         }
-        case Unmaximize: {
+        case TitleBarButtonStyle::Unmaximize: {
             int xD2 = xD * 1 / 5;
             int xD3 = xD * 4 / 5;
 
@@ -54,7 +54,7 @@ void TitleBarButton::paintEvent(QPaintEvent *event)
             painter.drawRect(centerX - xD / 2, xD + xD2, xD3, xD3);
             break;
         }
-        case Close: {
+        case TitleBarButtonStyle::Close: {
             QRect rect(centerX - xD / 2, xD, xD - 1, xD - 1);
             painter.setPen(QPen(color, 1));
 
@@ -62,7 +62,7 @@ void TitleBarButton::paintEvent(QPaintEvent *event)
             painter.drawLine(rect.topRight(), rect.bottomLeft());
             break;
         }
-        case User: {
+        case TitleBarButtonStyle::User: {
             color = "#999";
 
             painter.setRenderHint(QPainter::Antialiasing);
@@ -88,7 +88,7 @@ void TitleBarButton::paintEvent(QPaintEvent *event)
 
             break;
         }
-        case Settings: {
+        case TitleBarButtonStyle::Settings: {
             color = "#999";
             painter.setRenderHint(QPainter::Antialiasing);
             painter.setRenderHint(QPainter::HighQualityAntialiasing);
diff --git a/src/widgets/helper/TitlebarButton.hpp b/src/widgets/helper/TitlebarButton.hpp
index 33777660f..ed1261e9e 100644
--- a/src/widgets/helper/TitlebarButton.hpp
+++ b/src/widgets/helper/TitlebarButton.hpp
@@ -4,29 +4,29 @@
 
 namespace chatterino {
 
+enum class TitleBarButtonStyle {
+    None = 0,
+    Minimize = 1,
+    Maximize = 2,
+    Unmaximize = 4,
+    Close = 8,
+    User = 16,
+    Settings = 32
+};
+
 class TitleBarButton : public Button
 {
 public:
-    enum Style {
-        None = 0,
-        Minimize = 1,
-        Maximize = 2,
-        Unmaximize = 4,
-        Close = 8,
-        User = 16,
-        Settings = 32
-    };
-
     TitleBarButton();
 
-    Style getButtonStyle() const;
-    void setButtonStyle(Style style_);
+    TitleBarButtonStyle getButtonStyle() const;
+    void setButtonStyle(TitleBarButtonStyle style_);
 
 protected:
     void paintEvent(QPaintEvent *) override;
 
 private:
-    Style style_;
+    TitleBarButtonStyle style_;
 };
 
 }  // namespace chatterino
diff --git a/src/widgets/settingspages/IgnoresPage.cpp b/src/widgets/settingspages/IgnoresPage.cpp
index 51d7cda71..b23ecbb89 100644
--- a/src/widgets/settingspages/IgnoresPage.cpp
+++ b/src/widgets/settingspages/IgnoresPage.cpp
@@ -4,6 +4,7 @@
 #include "controllers/accounts/AccountController.hpp"
 #include "controllers/ignores/IgnoreController.hpp"
 #include "controllers/ignores/IgnoreModel.hpp"
+#include "providers/twitch/TwitchAccount.hpp"
 #include "singletons/Settings.hpp"
 #include "util/LayoutCreator.hpp"
 #include "widgets/helper/EditableModelView.hpp"
diff --git a/src/widgets/settingspages/LookPage.cpp b/src/widgets/settingspages/LookPage.cpp
index 8cdcfd5f9..08a6ec77a 100644
--- a/src/widgets/settingspages/LookPage.cpp
+++ b/src/widgets/settingspages/LookPage.cpp
@@ -1,10 +1,14 @@
 #include "LookPage.hpp"
 
 #include "Application.hpp"
+#include "messages/Image.hpp"
 #include "messages/MessageBuilder.hpp"
+#include "singletons/Resources.hpp"
+#include "singletons/Theme.hpp"
 #include "singletons/WindowManager.hpp"
 #include "util/LayoutCreator.hpp"
 #include "util/RemoveScrollAreaBackground.hpp"
+#include "widgets/helper/ChannelView.hpp"
 #include "widgets/helper/Line.hpp"
 
 #include <QFontDialog>
@@ -416,7 +420,7 @@ QLayout *LookPage::createFontChanger()
     button->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Policy::Fixed);
 
     QObject::connect(button, &QPushButton::clicked, [=]() {
-        QFontDialog dialog(app->fonts->getFont(Fonts::ChatMedium, 1.));
+        QFontDialog dialog(app->fonts->getFont(FontStyle::ChatMedium, 1.));
 
         dialog.setWindowFlag(Qt::WindowStaysOnTopHint);
 
diff --git a/src/widgets/splits/Split.cpp b/src/widgets/splits/Split.cpp
index 38b390697..01a2faaad 100644
--- a/src/widgets/splits/Split.cpp
+++ b/src/widgets/splits/Split.cpp
@@ -1,8 +1,8 @@
 #include "widgets/splits/Split.hpp"
 
-#include "Application.hpp"
 #include "common/Common.hpp"
 #include "common/NetworkRequest.hpp"
+#include "debug/Log.hpp"
 #include "providers/twitch/EmoteValue.hpp"
 #include "providers/twitch/TwitchChannel.hpp"
 #include "providers/twitch/TwitchMessageBuilder.hpp"
@@ -11,15 +11,20 @@
 #include "singletons/Theme.hpp"
 #include "singletons/WindowManager.hpp"
 #include "util/StreamLink.hpp"
+#include "widgets/Notebook.hpp"
 #include "widgets/Window.hpp"
 #include "widgets/dialogs/QualityPopup.hpp"
 #include "widgets/dialogs/SelectChannelDialog.hpp"
 #include "widgets/dialogs/TextInputDialog.hpp"
 #include "widgets/dialogs/UserInfoPopup.hpp"
+#include "widgets/helper/ChannelView.hpp"
 #include "widgets/helper/DebugPopup.hpp"
+#include "widgets/helper/ResizingTextEdit.hpp"
 #include "widgets/helper/SearchPopup.hpp"
 #include "widgets/helper/Shortcut.hpp"
 #include "widgets/splits/SplitContainer.hpp"
+#include "widgets/splits/SplitHeader.hpp"
+#include "widgets/splits/SplitInput.hpp"
 #include "widgets/splits/SplitOverlay.hpp"
 
 #include <QApplication>
@@ -37,7 +42,6 @@
 #include <random>
 
 namespace chatterino {
-
 pajlada::Signals::Signal<Qt::KeyboardModifiers> Split::modifierStatusChanged;
 Qt::KeyboardModifiers Split::modifierStatus = Qt::NoModifier;
 
@@ -51,20 +55,20 @@ Split::Split(QWidget *parent)
     : BaseWidget(parent)
     , container_(nullptr)
     , channel_(Channel::getEmpty())
-    , vbox_(this)
-    , header_(this)
-    , view_(this)
-    , input_(this)
+    , vbox_(new QVBoxLayout(this))
+    , header_(new SplitHeader(this))
+    , view_(new ChannelView(this))
+    , input_(new SplitInput(this))
     , overlay_(new SplitOverlay(this))
 {
     this->setMouseTracking(true);
 
-    this->vbox_.setSpacing(0);
-    this->vbox_.setMargin(1);
+    this->vbox_->setSpacing(0);
+    this->vbox_->setMargin(1);
 
-    this->vbox_.addWidget(&this->header_);
-    this->vbox_.addWidget(&this->view_, 1);
-    this->vbox_.addWidget(&this->input_);
+    this->vbox_->addWidget(this->header_);
+    this->vbox_->addWidget(this->view_, 1);
+    this->vbox_->addWidget(this->input_);
 
     // Initialize chat widget-wide hotkeys
     // CTRL+W: Close Split
@@ -89,41 +93,41 @@ Split::Split(QWidget *parent)
     // CreateShortcut(this, "ALT+SHIFT+UP", &Split::doIncFlexY);
     // CreateShortcut(this, "ALT+SHIFT+DOWN", &Split::doDecFlexY);
 
-    this->input_.ui_.textEdit->installEventFilter(parent);
+    this->input_->ui_.textEdit->installEventFilter(parent);
 
-    this->view_.mouseDown.connect([this](QMouseEvent *) {
+    this->view_->mouseDown.connect([this](QMouseEvent *) {
         //
         this->giveFocus(Qt::MouseFocusReason);
     });
-    this->view_.selectionChanged.connect([this]() {
-        if (view_.hasSelection()) {
-            this->input_.clearSelection();
+    this->view_->selectionChanged.connect([this]() {
+        if (view_->hasSelection()) {
+            this->input_->clearSelection();
         }
     });
 
-    this->input_.textChanged.connect([=](const QString &newText) {
+    this->input_->textChanged.connect([=](const QString &newText) {
         if (getSettings()->showEmptyInput) {
             return;
         }
 
         if (newText.length() == 0) {
-            this->input_.hide();
-        } else if (this->input_.isHidden()) {
-            this->input_.show();
+            this->input_->hide();
+        } else if (this->input_->isHidden()) {
+            this->input_->show();
         }
     });
 
     getSettings()->showEmptyInput.connect(
         [this](const bool &showEmptyInput, auto) {
-            if (!showEmptyInput && this->input_.getInputText().length() == 0) {
-                this->input_.hide();
+            if (!showEmptyInput && this->input_->getInputText().length() == 0) {
+                this->input_->hide();
             } else {
-                this->input_.show();
+                this->input_->show();
             }
         },
         this->managedConnections_);
 
-    this->header_.updateModerationModeIcon();
+    this->header_->updateModerationModeIcon();
     this->overlay_->hide();
 
     this->setSizePolicy(QSizePolicy::MinimumExpanding,
@@ -139,9 +143,9 @@ Split::Split(QWidget *parent)
                              }
                          });
 
-    this->input_.ui_.textEdit->focused.connect(
+    this->input_->ui_.textEdit->focused.connect(
         [this] { this->focused.invoke(); });
-    this->input_.ui_.textEdit->focusLost.connect(
+    this->input_->ui_.textEdit->focusLost.connect(
         [this] { this->focusLost.invoke(); });
 }
 
@@ -155,7 +159,7 @@ Split::~Split()
 
 ChannelView &Split::getChannelView()
 {
-    return this->view_;
+    return *this->view_;
 }
 
 SplitContainer *Split::getContainer()
@@ -187,7 +191,7 @@ void Split::setChannel(IndirectChannel newChannel)
 {
     this->channel_ = newChannel;
 
-    this->view_.setChannel(newChannel.get());
+    this->view_->setChannel(newChannel.get());
 
     this->usermodeChangedConnection_.disconnect();
     this->roomModeChangedConnection_.disconnect();
@@ -197,12 +201,12 @@ void Split::setChannel(IndirectChannel newChannel)
 
     if (tc != nullptr) {
         this->usermodeChangedConnection_ = tc->userStateChanged.connect([this] {
-            this->header_.updateModerationModeIcon();
-            this->header_.updateRoomModes();
+            this->header_->updateModerationModeIcon();
+            this->header_->updateRoomModes();
         });
 
         this->roomModeChangedConnection_ = tc->roomModesChanged.connect(
-            [this] { this->header_.updateRoomModes(); });
+            [this] { this->header_->updateRoomModes(); });
     }
 
     this->indirectChannelChangedConnection_ =
@@ -210,9 +214,9 @@ void Split::setChannel(IndirectChannel newChannel)
             QTimer::singleShot(0, [this] { this->setChannel(this->channel_); });
         });
 
-    this->header_.updateModerationModeIcon();
-    this->header_.updateChannelText();
-    this->header_.updateRoomModes();
+    this->header_->updateModerationModeIcon();
+    this->header_->updateChannelText();
+    this->header_->updateRoomModes();
 
     this->channelChanged.invoke();
 }
@@ -221,8 +225,8 @@ void Split::setModerationMode(bool value)
 {
     if (value != this->moderationMode_) {
         this->moderationMode_ = value;
-        this->header_.updateModerationModeIcon();
-        this->view_.layoutMessages();
+        this->header_->updateModerationModeIcon();
+        this->view_->layoutMessages();
     }
 }
 
@@ -233,7 +237,7 @@ bool Split::getModerationMode() const
 
 void Split::insertTextToInput(const QString &text)
 {
-    this->input_.insertText(text);
+    this->input_->insertText(text);
 }
 
 void Split::showChangeChannelPopup(const char *dialogTitle, bool empty,
@@ -267,27 +271,27 @@ void Split::showChangeChannelPopup(const char *dialogTitle, bool empty,
 
 void Split::layoutMessages()
 {
-    this->view_.layoutMessages();
+    this->view_->layoutMessages();
 }
 
 void Split::updateGifEmotes()
 {
-    this->view_.queueUpdate();
+    this->view_->queueUpdate();
 }
 
 void Split::updateLastReadMessage()
 {
-    this->view_.updateLastReadMessage();
+    this->view_->updateLastReadMessage();
 }
 
 void Split::giveFocus(Qt::FocusReason reason)
 {
-    this->input_.ui_.textEdit->setFocus(reason);
+    this->input_->ui_.textEdit->setFocus(reason);
 }
 
 bool Split::hasFocus() const
 {
-    return this->input_.ui_.textEdit->hasFocus();
+    return this->input_->ui_.textEdit->hasFocus();
 }
 
 void Split::paintEvent(QPaintEvent *)
@@ -305,13 +309,13 @@ void Split::mouseMoveEvent(QMouseEvent *event)
 
 void Split::keyPressEvent(QKeyEvent *event)
 {
-    this->view_.unsetCursor();
+    this->view_->unsetCursor();
     this->handleModifiers(QGuiApplication::queryKeyboardModifiers());
 }
 
 void Split::keyReleaseEvent(QKeyEvent *event)
 {
-    this->view_.unsetCursor();
+    this->view_->unsetCursor();
     this->handleModifiers(QGuiApplication::queryKeyboardModifiers());
 }
 
@@ -389,7 +393,7 @@ void Split::changeChannel()
 void Split::popup()
 {
     auto app = getApp();
-    Window &window = app->windows->createWindow(Window::Type::Popup);
+    Window &window = app->windows->createWindow(WindowType::Popup);
 
     Split *split = new Split(static_cast<SplitContainer *>(
         window.getNotebook().getOrAddSelectedPage()));
@@ -402,7 +406,7 @@ void Split::popup()
 
 void Split::clear()
 {
-    this->view_.clearMessages();
+    this->view_->clearMessages();
 }
 
 void Split::openInBrowser()
@@ -442,8 +446,8 @@ void Split::showViewerList()
                             QDockWidget::DockWidgetFloatable);
     viewerDock->resize(
         0.5 * this->width(),
-        this->height() - this->header_.height() - this->input_.height());
-    viewerDock->move(0, this->header_.height());
+        this->height() - this->header_->height() - this->input_->height());
+    viewerDock->move(0, this->header_->height());
 
     auto multiWidget = new QWidget(viewerDock);
     auto dockVbox = new QVBoxLayout(viewerDock);
@@ -543,7 +547,7 @@ void Split::showUserInfoPopup(const UserName &user)
 
 void Split::copyToClipboard()
 {
-    QApplication::clipboard()->setText(this->view_.getSelectedText());
+    QApplication::clipboard()->setText(this->view_->getSelectedText());
 }
 
 void Split::showSearch()
diff --git a/src/widgets/splits/Split.hpp b/src/widgets/splits/Split.hpp
index ca185dbdb..8c4ebf84a 100644
--- a/src/widgets/splits/Split.hpp
+++ b/src/widgets/splits/Split.hpp
@@ -1,17 +1,9 @@
 #pragma once
 
+#include "common/Aliases.hpp"
 #include "common/Channel.hpp"
 #include "common/NullablePtr.hpp"
-#include "messages/LimitedQueueSnapshot.hpp"
-#include "messages/MessageElement.hpp"
-#include "messages/layouts/MessageLayout.hpp"
-#include "messages/layouts/MessageLayoutElement.hpp"
-#include "util/RapidJsonSerializeQString.hpp"
 #include "widgets/BaseWidget.hpp"
-#include "widgets/helper/ChannelView.hpp"
-#include "widgets/helper/EffectLabel.hpp"
-#include "widgets/splits/SplitHeader.hpp"
-#include "widgets/splits/SplitInput.hpp"
 
 #include <QFont>
 #include <QShortcut>
@@ -20,6 +12,9 @@
 
 namespace chatterino {
 
+class ChannelView;
+class SplitHeader;
+class SplitInput;
 class SplitContainer;
 class SplitOverlay;
 class SelectChannelDialog;
@@ -103,10 +98,10 @@ private:
     SplitContainer *container_;
     IndirectChannel channel_;
 
-    QVBoxLayout vbox_;
-    SplitHeader header_;
-    ChannelView view_;
-    SplitInput input_;
+    QVBoxLayout *vbox_;
+    SplitHeader *header_;
+    ChannelView *view_;
+    SplitInput *input_;
     SplitOverlay *overlay_;
 
     NullablePtr<SelectChannelDialog> selectChannelDialog_;
diff --git a/src/widgets/splits/SplitContainer.cpp b/src/widgets/splits/SplitContainer.cpp
index ecbadc21d..cac6f2dfb 100644
--- a/src/widgets/splits/SplitContainer.cpp
+++ b/src/widgets/splits/SplitContainer.cpp
@@ -7,6 +7,7 @@
 #include "util/Helpers.hpp"
 #include "util/LayoutCreator.hpp"
 #include "widgets/Notebook.hpp"
+#include "widgets/helper/ChannelView.hpp"
 #include "widgets/helper/NotebookTab.hpp"
 #include "widgets/splits/Split.hpp"
 
diff --git a/src/widgets/splits/SplitContainer.hpp b/src/widgets/splits/SplitContainer.hpp
index 7bd2ced1a..1f0a2e701 100644
--- a/src/widgets/splits/SplitContainer.hpp
+++ b/src/widgets/splits/SplitContainer.hpp
@@ -1,8 +1,6 @@
 #pragma once
 
 #include "widgets/BaseWidget.hpp"
-#include "widgets/helper/NotebookTab.hpp"
-#include "widgets/splits/Split.hpp"
 
 #include <QDragEnterEvent>
 #include <QHBoxLayout>
@@ -13,21 +11,24 @@
 
 #include <algorithm>
 #include <functional>
-#include <vector>
-
 #include <pajlada/signals/signal.hpp>
 #include <pajlada/signals/signalholder.hpp>
+#include <vector>
 
 class QJsonObject;
 
 namespace chatterino {
 
+class Split;
+class NotebookTab;
+class Notebook;
+
 //
 // Note: This class is a spaghetti container. There is a lot of spaghetti code
 // inside but it doesn't expose any of it publicly.
 //
 
-class SplitContainer : public BaseWidget, pajlada::Signals::SignalHolder
+class SplitContainer final : public BaseWidget, pajlada::Signals::SignalHolder
 {
     Q_OBJECT
 
diff --git a/src/widgets/splits/SplitHeader.cpp b/src/widgets/splits/SplitHeader.cpp
index 882f0b9eb..d99448221 100644
--- a/src/widgets/splits/SplitHeader.cpp
+++ b/src/widgets/splits/SplitHeader.cpp
@@ -5,17 +5,20 @@
 #include "providers/twitch/TwitchChannel.hpp"
 #include "providers/twitch/TwitchServer.hpp"
 #include "singletons/Resources.hpp"
+#include "singletons/Settings.hpp"
 #include "singletons/Theme.hpp"
 #include "util/LayoutCreator.hpp"
 #include "util/LayoutHelper.hpp"
 #include "widgets/Label.hpp"
 #include "widgets/TooltipWidget.hpp"
+#include "widgets/helper/EffectLabel.hpp"
 #include "widgets/splits/Split.hpp"
 #include "widgets/splits/SplitContainer.hpp"
 
 #include <QByteArray>
 #include <QDesktopWidget>
 #include <QDrag>
+#include <QHBoxLayout>
 #include <QInputDialog>
 #include <QMenu>
 #include <QMimeData>
diff --git a/src/widgets/splits/SplitInput.cpp b/src/widgets/splits/SplitInput.cpp
index 65bc37e5c..8fbc62f02 100644
--- a/src/widgets/splits/SplitInput.cpp
+++ b/src/widgets/splits/SplitInput.cpp
@@ -2,14 +2,20 @@
 
 #include "Application.hpp"
 #include "controllers/commands/CommandController.hpp"
+#include "messages/Link.hpp"
 #include "providers/twitch/TwitchChannel.hpp"
 #include "providers/twitch/TwitchServer.hpp"
 #include "singletons/Settings.hpp"
 #include "singletons/Theme.hpp"
 #include "util/LayoutCreator.hpp"
 #include "widgets/Notebook.hpp"
+#include "widgets/dialogs/EmotePopup.hpp"
+#include "widgets/helper/ChannelView.hpp"
+#include "widgets/helper/EffectLabel.hpp"
+#include "widgets/helper/ResizingTextEdit.hpp"
 #include "widgets/splits/Split.hpp"
 #include "widgets/splits/SplitContainer.hpp"
+#include "widgets/splits/SplitInput.hpp"
 
 #include <QCompleter>
 #include <QPainter>
@@ -70,11 +76,11 @@ void SplitInput::initLayout()
 
     // set edit font
     this->ui_.textEdit->setFont(
-        app->fonts->getFont(Fonts::Type::ChatMedium, this->getScale()));
+        app->fonts->getFont(FontStyle::ChatMedium, this->getScale()));
 
     this->managedConnections_.push_back(app->fonts->fontChanged.connect([=]() {
         this->ui_.textEdit->setFont(
-            app->fonts->getFont(Fonts::Type::ChatMedium, this->getScale()));
+            app->fonts->getFont(FontStyle::ChatMedium, this->getScale()));
     }));
 
     // open emote popup
@@ -98,7 +104,7 @@ void SplitInput::initLayout()
     QObject::connect(this->ui_.textEdit, &QTextEdit::copyAvailable,
                      [this](bool available) {
                          if (available) {
-                             this->split_->view_.clearSelection();
+                             this->split_->view_->clearSelection();
                          }
                      });
 
@@ -273,7 +279,7 @@ void SplitInput::installKeyPressedEvent()
             }
         } else if (event->key() == Qt::Key_C &&
                    event->modifiers() == Qt::ControlModifier) {
-            if (this->split_->view_.hasSelection()) {
+            if (this->split_->view_->hasSelection()) {
                 this->split_->copyToClipboard();
                 event->accept();
             }
diff --git a/src/widgets/splits/SplitInput.hpp b/src/widgets/splits/SplitInput.hpp
index ddcf2c97d..6ad6f4f83 100644
--- a/src/widgets/splits/SplitInput.hpp
+++ b/src/widgets/splits/SplitInput.hpp
@@ -1,9 +1,6 @@
 #pragma once
 
 #include "widgets/BaseWidget.hpp"
-#include "widgets/dialogs/EmotePopup.hpp"
-#include "widgets/helper/ResizingTextEdit.hpp"
-#include "widgets/helper/EffectLabel.hpp"
 
 #include <QHBoxLayout>
 #include <QLabel>
@@ -16,6 +13,9 @@
 namespace chatterino {
 
 class Split;
+class EmotePopup;
+class EffectLabel;
+class ResizingTextEdit;
 
 class SplitInput : public BaseWidget
 {
@@ -45,7 +45,7 @@ private:
     void updateEmoteButton();
 
     Split *const split_;
-    std::unique_ptr<EmotePopup> emotePopup_;
+    std::shared_ptr<EmotePopup> emotePopup_;
 
     struct {
         ResizingTextEdit *textEdit;
diff --git a/src/widgets/splits/SplitOverlay.cpp b/src/widgets/splits/SplitOverlay.cpp
index 268811b20..1b38c0ca2 100644
--- a/src/widgets/splits/SplitOverlay.cpp
+++ b/src/widgets/splits/SplitOverlay.cpp
@@ -10,6 +10,7 @@
 
 #include "Application.hpp"
 #include "singletons/Resources.hpp"
+#include "singletons/Theme.hpp"
 #include "widgets/splits/Split.hpp"
 #include "widgets/splits/SplitContainer.hpp"
 

From b3fd278c3cbd091dd21c0ae4e1a9f16566c659ce Mon Sep 17 00:00:00 2001
From: Touhou-fan <30899927+Touhou-fan@users.noreply.github.com>
Date: Sat, 11 Aug 2018 23:53:20 +0200
Subject: [PATCH 20/44] Fix selecting incorrect image (#659)

---
 src/messages/ImageSet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/messages/ImageSet.cpp b/src/messages/ImageSet.cpp
index 0e500816f..1019d27e9 100644
--- a/src/messages/ImageSet.cpp
+++ b/src/messages/ImageSet.cpp
@@ -76,7 +76,7 @@ const ImagePtr &ImageSet::getImage(float scale) const
     }
 
     if (!this->imageX2_->isEmpty() && quality == 2) {
-        return this->imageX3_;
+        return this->imageX2_;
     }
 
     return this->imageX1_;

From 1ec1ecd52b67c750d8d9765db2bcf5420784eb3b Mon Sep 17 00:00:00 2001
From: fourtf <tf.four@gmail.com>
Date: Sun, 12 Aug 2018 00:01:37 +0200
Subject: [PATCH 21/44] fixed crash when moderation buttons are enabled

---
 .../moderationactions/ModerationActions.cpp   |  8 ++++--
 .../moderationactions/ModerationActions.hpp   |  3 +-
 src/providers/bttv/BttvEmotes.cpp             |  7 +++--
 src/providers/bttv/BttvEmotes.hpp             | 15 ++++++----
 src/providers/emoji/Emojis.cpp                | 25 +++--------------
 src/providers/ffz/FfzEmotes.cpp               |  9 +++---
 src/providers/ffz/FfzEmotes.hpp               | 15 ++++++----
 src/providers/twitch/TwitchChannel.cpp        | 19 +++++++++++--
 src/providers/twitch/TwitchChannel.hpp        | 28 +++++++++++++------
 src/providers/twitch/TwitchMessageBuilder.cpp |  7 ++---
 src/providers/twitch/TwitchServer.cpp         |  7 +++--
 src/providers/twitch/TwitchServer.hpp         |  4 +++
 src/singletons/Emotes.cpp                     |  2 --
 src/singletons/Emotes.hpp                     |  2 --
 src/widgets/dialogs/EmotePopup.cpp            |  6 ++--
 15 files changed, 89 insertions(+), 68 deletions(-)

diff --git a/src/controllers/moderationactions/ModerationActions.cpp b/src/controllers/moderationactions/ModerationActions.cpp
index 68070f6b2..27cd5de30 100644
--- a/src/controllers/moderationactions/ModerationActions.cpp
+++ b/src/controllers/moderationactions/ModerationActions.cpp
@@ -17,12 +17,16 @@ void ModerationActions::initialize(Settings &settings, Paths &paths)
     assert(!this->initialized_);
     this->initialized_ = true;
 
-    for (auto &val : this->setting_.getValue()) {
+    this->setting_ =
+        std::make_unique<ChatterinoSetting<std::vector<ModerationAction>>>(
+            "/moderation/actions");
+
+    for (auto &val : this->setting_->getValue()) {
         this->items.insertItem(val);
     }
 
     this->items.delayedItemsChanged.connect([this] {  //
-        this->setting_.setValue(this->items.getVector());
+        this->setting_->setValue(this->items.getVector());
     });
 }
 
diff --git a/src/controllers/moderationactions/ModerationActions.hpp b/src/controllers/moderationactions/ModerationActions.hpp
index d5e510f1c..08314eb22 100644
--- a/src/controllers/moderationactions/ModerationActions.hpp
+++ b/src/controllers/moderationactions/ModerationActions.hpp
@@ -25,8 +25,7 @@ public:
     ModerationActionModel *createModel(QObject *parent);
 
 private:
-    ChatterinoSetting<std::vector<ModerationAction>> setting_ = {
-        "/moderation/actions"};
+    std::unique_ptr<ChatterinoSetting<std::vector<ModerationAction>>> setting_;
     bool initialized_ = false;
 };
 
diff --git a/src/providers/bttv/BttvEmotes.cpp b/src/providers/bttv/BttvEmotes.cpp
index 70c7cdbdb..cf32bd414 100644
--- a/src/providers/bttv/BttvEmotes.cpp
+++ b/src/providers/bttv/BttvEmotes.cpp
@@ -3,6 +3,7 @@
 #include "common/Common.hpp"
 #include "common/NetworkRequest.hpp"
 #include "debug/Log.hpp"
+#include "messages/Emote.hpp"
 #include "messages/Image.hpp"
 #include "messages/ImageSet.hpp"
 #include "providers/twitch/TwitchChannel.hpp"
@@ -89,12 +90,12 @@ BttvEmotes::BttvEmotes()
 {
 }
 
-std::shared_ptr<const EmoteMap> BttvEmotes::global() const
+std::shared_ptr<const EmoteMap> BttvEmotes::emotes() const
 {
     return this->global_.get();
 }
 
-boost::optional<EmotePtr> BttvEmotes::global(const EmoteName &name) const
+boost::optional<EmotePtr> BttvEmotes::emote(const EmoteName &name) const
 {
     auto emotes = this->global_.get();
     auto it = emotes->find(name);
@@ -103,7 +104,7 @@ boost::optional<EmotePtr> BttvEmotes::global(const EmoteName &name) const
     return it->second;
 }
 
-void BttvEmotes::loadGlobal()
+void BttvEmotes::loadEmotes()
 {
     auto request = NetworkRequest(QString(globalEmoteApiUrl));
 
diff --git a/src/providers/bttv/BttvEmotes.hpp b/src/providers/bttv/BttvEmotes.hpp
index ff4809411..c82cb67a4 100644
--- a/src/providers/bttv/BttvEmotes.hpp
+++ b/src/providers/bttv/BttvEmotes.hpp
@@ -1,13 +1,16 @@
 #pragma once
 
-#include <boost/optional.hpp>
 #include <memory>
-
+#include "boost/optional.hpp"
+#include "common/Aliases.hpp"
 #include "common/Atomic.hpp"
-#include "messages/Emote.hpp"
 
 namespace chatterino {
 
+struct Emote;
+using EmotePtr = std::shared_ptr<const Emote>;
+class EmoteMap;
+
 class BttvEmotes final
 {
     static constexpr const char *globalEmoteApiUrl =
@@ -18,9 +21,9 @@ class BttvEmotes final
 public:
     BttvEmotes();
 
-    std::shared_ptr<const EmoteMap> global() const;
-    boost::optional<EmotePtr> global(const EmoteName &name) const;
-    void loadGlobal();
+    std::shared_ptr<const EmoteMap> emotes() const;
+    boost::optional<EmotePtr> emote(const EmoteName &name) const;
+    void loadEmotes();
     static void loadChannel(const QString &channelName,
                             std::function<void(EmoteMap &&)> callback);
 
diff --git a/src/providers/emoji/Emojis.cpp b/src/providers/emoji/Emojis.cpp
index d0403e75c..18ce18139 100644
--- a/src/providers/emoji/Emojis.cpp
+++ b/src/providers/emoji/Emojis.cpp
@@ -104,12 +104,10 @@ void Emojis::load()
 
 void Emojis::loadEmojis()
 {
-    std::map<std::string, QString> toneNames;
-    toneNames["1F3FB"] = "tone1";
-    toneNames["1F3FC"] = "tone2";
-    toneNames["1F3FD"] = "tone3";
-    toneNames["1F3FE"] = "tone4";
-    toneNames["1F3FF"] = "tone5";
+    auto toneNames = std::map<std::string, QString>{
+        {"1F3FB", "tone1"}, {"1F3FC", "tone2"}, {"1F3FD", "tone3"},
+        {"1F3FE", "tone4"}, {"1F3FF", "tone5"},
+    };
 
     QFile file(":/emoji.json");
     file.open(QFile::ReadOnly);
@@ -234,27 +232,12 @@ void Emojis::loadEmojiSet()
                 // {"Google", "https://cdn.jsdelivr.net/npm/emoji-datasource-google@4.0.4/img/google/64/"},
                 // {"Messenger", "https://cdn.jsdelivr.net/npm/emoji-datasource-messenger@4.0.4/img/messenger/64/"},
 
-                // {"EmojiOne 2", "https://cdnjs.cloudflare.com/ajax/libs/emojione/2.2.6/assets/png/"},
-                // {"EmojiOne 3", "https://braize.pajlada.com/emoji/img/emojione/64/"},
-                // {"Twitter", "https://braize.pajlada.com/emoji/img/twitter/64/"},
-                // {"Facebook", "https://braize.pajlada.com/emoji/img/facebook/64/"},
-                // {"Apple", "https://braize.pajlada.com/emoji/img/apple/64/"},
-                // {"Google", "https://braize.pajlada.com/emoji/img/google/64/"},
-                // {"Messenger", "https://braize.pajlada.com/emoji/img/messenger/64/"},
-
                 {"EmojiOne 3", "https://pajbot.com/static/emoji/img/emojione/64/"},
                 {"Twitter", "https://pajbot.com/static/emoji/img/twitter/64/"},
                 {"Facebook", "https://pajbot.com/static/emoji/img/facebook/64/"},
                 {"Apple", "https://pajbot.com/static/emoji/img/apple/64/"},
                 {"Google", "https://pajbot.com/static/emoji/img/google/64/"},
                 {"Messenger", "https://pajbot.com/static/emoji/img/messenger/64/"},
-
-//                {"EmojiOne 3", "https://cdn.fourtf.com/emoji/emojione/64/"},
-//                {"Twitter", "https://cdn.fourtf.com/emoji/twitter/64/"},
-//                {"Facebook", "https://cdn.fourtf.com/emoji/facebook/64/"},
-//                {"Apple", "https://cdn.fourtf.com/emoji/apple/64/"},
-//                {"Google", "https://cdn.fourtf.com/emoji/google/64/"},
-//                {"Messenger", "https://cdn.fourtf.com/emoji/messenger/64/"},
             };
             // clang-format on
 
diff --git a/src/providers/ffz/FfzEmotes.cpp b/src/providers/ffz/FfzEmotes.cpp
index c22fe91fe..f8be4baa0 100644
--- a/src/providers/ffz/FfzEmotes.cpp
+++ b/src/providers/ffz/FfzEmotes.cpp
@@ -5,6 +5,7 @@
 #include "common/NetworkRequest.hpp"
 #include "common/Outcome.hpp"
 #include "debug/Log.hpp"
+#include "messages/Emote.hpp"
 #include "messages/Image.hpp"
 
 namespace chatterino {
@@ -109,12 +110,12 @@ FfzEmotes::FfzEmotes()
 {
 }
 
-std::shared_ptr<const EmoteMap> FfzEmotes::global() const
+std::shared_ptr<const EmoteMap> FfzEmotes::emotes() const
 {
     return this->global_.get();
 }
 
-boost::optional<EmotePtr> FfzEmotes::global(const EmoteName &name) const
+boost::optional<EmotePtr> FfzEmotes::emote(const EmoteName &name) const
 {
     auto emotes = this->global_.get();
     auto it = emotes->find(name);
@@ -122,7 +123,7 @@ boost::optional<EmotePtr> FfzEmotes::global(const EmoteName &name) const
     return boost::none;
 }
 
-void FfzEmotes::loadGlobal()
+void FfzEmotes::loadEmotes()
 {
     QString url("https://api.frankerfacez.com/v1/set/global");
 
@@ -131,7 +132,7 @@ void FfzEmotes::loadGlobal()
     request.setTimeout(30000);
 
     request.onSuccess([this](auto result) -> Outcome {
-        auto emotes = this->global();
+        auto emotes = this->emotes();
         auto pair = parseGlobalEmotes(result.parseJson(), *emotes);
         if (pair.first)
             this->global_.set(
diff --git a/src/providers/ffz/FfzEmotes.hpp b/src/providers/ffz/FfzEmotes.hpp
index cc75b09bd..8214cbf80 100644
--- a/src/providers/ffz/FfzEmotes.hpp
+++ b/src/providers/ffz/FfzEmotes.hpp
@@ -1,24 +1,27 @@
 #pragma once
 
 #include <memory>
+#include "boost/optional.hpp"
+#include "common/Aliases.hpp"
 #include "common/Atomic.hpp"
-#include "messages/Emote.hpp"
 
 namespace chatterino {
 
+struct Emote;
+using EmotePtr = std::shared_ptr<const Emote>;
+class EmoteMap;
+
 class FfzEmotes final
 {
     static constexpr const char *globalEmoteApiUrl =
         "https://api.frankerfacez.com/v1/set/global";
-    static constexpr const char *channelEmoteApiUrl =
-        "https://api.betterttv.net/2/channels/";
 
 public:
     FfzEmotes();
 
-    std::shared_ptr<const EmoteMap> global() const;
-    boost::optional<EmotePtr> global(const EmoteName &name) const;
-    void loadGlobal();
+    std::shared_ptr<const EmoteMap> emotes() const;
+    boost::optional<EmotePtr> emote(const EmoteName &name) const;
+    void loadEmotes();
     static void loadChannel(const QString &channelName,
                             std::function<void(EmoteMap &&)> callback);
 
diff --git a/src/providers/twitch/TwitchChannel.cpp b/src/providers/twitch/TwitchChannel.cpp
index 0bb7ffe9c..6413629f6 100644
--- a/src/providers/twitch/TwitchChannel.cpp
+++ b/src/providers/twitch/TwitchChannel.cpp
@@ -51,13 +51,16 @@ auto parseRecentMessages(const QJsonObject &jsonRoot, TwitchChannel &channel)
 }
 }  // namespace
 
-TwitchChannel::TwitchChannel(const QString &name)
+TwitchChannel::TwitchChannel(const QString &name, BttvEmotes &bttv,
+                             FfzEmotes &ffz)
     : Channel(name, Channel::Type::Twitch)
-    , bttvEmotes_(std::make_shared<EmoteMap>())
-    , ffzEmotes_(std::make_shared<EmoteMap>())
     , subscriptionUrl_("https://www.twitch.tv/subs/" + name)
     , channelUrl_("https://twitch.tv/" + name)
     , popoutPlayerUrl_("https://player.twitch.tv/?channel=" + name)
+    , globalBttv_(bttv)
+    , globalFfz_(ffz)
+    , bttvEmotes_(std::make_shared<EmoteMap>())
+    , ffzEmotes_(std::make_shared<EmoteMap>())
     , mod_(false)
 {
     log("[TwitchChannel:{}] Opened", name);
@@ -290,6 +293,16 @@ TwitchChannel::accessStreamStatus() const
     return this->streamStatus_.accessConst();
 }
 
+const BttvEmotes &TwitchChannel::globalBttv() const
+{
+    return this->globalBttv_;
+}
+
+const FfzEmotes &TwitchChannel::globalFfz() const
+{
+    return this->globalFfz_;
+}
+
 boost::optional<EmotePtr> TwitchChannel::bttvEmote(const EmoteName &name) const
 {
     auto emotes = this->bttvEmotes_.get();
diff --git a/src/providers/twitch/TwitchChannel.hpp b/src/providers/twitch/TwitchChannel.hpp
index 940da72bf..a444d26e2 100644
--- a/src/providers/twitch/TwitchChannel.hpp
+++ b/src/providers/twitch/TwitchChannel.hpp
@@ -19,6 +19,9 @@ struct Emote;
 using EmotePtr = std::shared_ptr<const Emote>;
 class EmoteMap;
 
+class FfzEmotes;
+class BttvEmotes;
+
 class TwitchServer;
 
 class TwitchChannel final : public Channel, pajlada::Signals::SignalHolder
@@ -60,25 +63,28 @@ public:
     void addJoinedUser(const QString &user);
     void addPartedUser(const QString &user);
 
-    // Twitch data
     bool isLive() const;
     virtual bool isMod() const override;
     void setMod(bool value);
     virtual bool isBroadcaster() const override;
 
+    // Data
+    const QString &subscriptionUrl();
+    const QString &channelUrl();
+    const QString &popoutPlayerUrl();
     QString roomId() const;
     void setRoomId(const QString &id);
     AccessGuard<const RoomModes> accessRoomModes() const;
     void setRoomModes(const RoomModes &roomModes_);
     AccessGuard<const StreamStatus> accessStreamStatus() const;
 
+    // Emotes
+    const BttvEmotes &globalBttv() const;
+    const FfzEmotes &globalFfz() const;
     boost::optional<EmotePtr> bttvEmote(const EmoteName &name) const;
     boost::optional<EmotePtr> ffzEmote(const EmoteName &name) const;
     std::shared_ptr<const EmoteMap> bttvEmotes() const;
     std::shared_ptr<const EmoteMap> ffzEmotes() const;
-    const QString &subscriptionUrl();
-    const QString &channelUrl();
-    const QString &popoutPlayerUrl();
 
     boost::optional<EmotePtr> getTwitchBadge(const QString &set,
                                              const QString &version) const;
@@ -109,7 +115,8 @@ private:
         std::vector<CheerEmote> cheerEmotes;
     };
 
-    explicit TwitchChannel(const QString &channelName);
+    explicit TwitchChannel(const QString &channelName, BttvEmotes &bttv,
+                           FfzEmotes &ffz);
 
     // Methods
     void refreshLiveStatus();
@@ -124,16 +131,19 @@ private:
     void loadBadges();
     void loadCheerEmotes();
 
-    // Twitch data
+    // Data
+    const QString subscriptionUrl_;
+    const QString channelUrl_;
+    const QString popoutPlayerUrl_;
     UniqueAccess<StreamStatus> streamStatus_;
     UniqueAccess<UserState> userState_;
     UniqueAccess<RoomModes> roomModes_;
 
+    // Emotes
+    BttvEmotes &globalBttv_;
+    FfzEmotes &globalFfz_;
     Atomic<std::shared_ptr<const EmoteMap>> bttvEmotes_;
     Atomic<std::shared_ptr<const EmoteMap>> ffzEmotes_;
-    const QString subscriptionUrl_;
-    const QString channelUrl_;
-    const QString popoutPlayerUrl_;
 
     bool mod_ = false;
     UniqueAccess<QString> roomID_;
diff --git a/src/providers/twitch/TwitchMessageBuilder.cpp b/src/providers/twitch/TwitchMessageBuilder.cpp
index 67cd2998d..5b4cef199 100644
--- a/src/providers/twitch/TwitchMessageBuilder.cpp
+++ b/src/providers/twitch/TwitchMessageBuilder.cpp
@@ -640,12 +640,11 @@ Outcome TwitchMessageBuilder::tryAppendEmote(const EmoteName &name)
     auto flags = MessageElementFlags();
     auto emote = boost::optional<EmotePtr>{};
 
-    if ((emote = getApp()->emotes->bttv.global(name))) {
+    if ((emote = this->twitchChannel->globalBttv().emote(name))) {
         flags = MessageElementFlag::BttvEmote;
-    } else if (twitchChannel &&
-               (emote = this->twitchChannel->bttvEmote(name))) {
+    } else if ((emote = this->twitchChannel->bttvEmote(name))) {
         flags = MessageElementFlag::BttvEmote;
-    } else if ((emote = getApp()->emotes->ffz.global(name))) {
+    } else if ((emote = this->twitchChannel->globalFfz().emote(name))) {
         flags = MessageElementFlag::FfzEmote;
     } else if (twitchChannel && (emote = this->twitchChannel->ffzEmote(name))) {
         flags = MessageElementFlag::FfzEmote;
diff --git a/src/providers/twitch/TwitchServer.cpp b/src/providers/twitch/TwitchServer.cpp
index e9325443c..bb7b16fd9 100644
--- a/src/providers/twitch/TwitchServer.cpp
+++ b/src/providers/twitch/TwitchServer.cpp
@@ -40,6 +40,9 @@ void TwitchServer::initialize(Settings &settings, Paths &paths)
 {
     getApp()->accounts->twitch.currentUserChanged.connect(
         [this]() { postToThread([this] { this->connect(); }); });
+
+    this->bttv.loadEmotes();
+    this->ffz.loadEmotes();
 }
 
 void TwitchServer::initializeConnection(IrcConnection *connection, bool isRead,
@@ -80,8 +83,8 @@ void TwitchServer::initializeConnection(IrcConnection *connection, bool isRead,
 
 std::shared_ptr<Channel> TwitchServer::createChannel(const QString &channelName)
 {
-    auto channel =
-        std::shared_ptr<TwitchChannel>(new TwitchChannel(channelName));
+    auto channel = std::shared_ptr<TwitchChannel>(
+        new TwitchChannel(channelName, this->bttv, this->ffz));
     channel->refreshChannelEmotes();
 
     channel->sendMessageSignal.connect(
diff --git a/src/providers/twitch/TwitchServer.hpp b/src/providers/twitch/TwitchServer.hpp
index 72c4078bc..127c2f62b 100644
--- a/src/providers/twitch/TwitchServer.hpp
+++ b/src/providers/twitch/TwitchServer.hpp
@@ -4,6 +4,8 @@
 #include "common/Channel.hpp"
 #include "common/Singleton.hpp"
 #include "pajlada/signals/signalholder.hpp"
+#include "providers/bttv/BttvEmotes.hpp"
+#include "providers/ffz/FfzEmotes.hpp"
 #include "providers/irc/AbstractIrcServer.hpp"
 
 #include <chrono>
@@ -66,6 +68,8 @@ private:
     std::chrono::steady_clock::time_point lastErrorTimeAmount_;
 
     bool singleConnection_ = false;
+    BttvEmotes bttv;
+    FfzEmotes ffz;
 
     pajlada::Signals::SignalHolder signalHolder_;
 };
diff --git a/src/singletons/Emotes.cpp b/src/singletons/Emotes.cpp
index cfc23f6d4..9916d2046 100644
--- a/src/singletons/Emotes.cpp
+++ b/src/singletons/Emotes.cpp
@@ -15,8 +15,6 @@ void Emotes::initialize(Settings &settings, Paths &paths)
         [] { getApp()->accounts->twitch.getCurrent()->loadEmotes(); });
 
     this->emojis.load();
-    this->bttv.loadGlobal();
-    this->ffz.loadGlobal();
 
     this->gifTimer.initialize();
 }
diff --git a/src/singletons/Emotes.hpp b/src/singletons/Emotes.hpp
index e991fe674..fc475d752 100644
--- a/src/singletons/Emotes.hpp
+++ b/src/singletons/Emotes.hpp
@@ -25,8 +25,6 @@ public:
     bool isIgnoredEmote(const QString &emote);
 
     TwitchEmotes twitch;
-    BttvEmotes bttv;
-    FfzEmotes ffz;
     Emojis emojis;
 
     GIFTimer gifTimer;
diff --git a/src/widgets/dialogs/EmotePopup.cpp b/src/widgets/dialogs/EmotePopup.cpp
index 92435065d..ade2a88a5 100644
--- a/src/widgets/dialogs/EmotePopup.cpp
+++ b/src/widgets/dialogs/EmotePopup.cpp
@@ -125,8 +125,10 @@ void EmotePopup::loadChannel(ChannelPtr _channel)
         *globalChannel, *subChannel);
 
     // global
-    addEmotes(*globalChannel, *getApp()->emotes->bttv.global(), "BetterTTV");
-    addEmotes(*globalChannel, *getApp()->emotes->ffz.global(), "FrankerFaceZ");
+    addEmotes(*globalChannel, *twitchChannel->globalBttv().emotes(),
+              "BetterTTV");
+    addEmotes(*globalChannel, *twitchChannel->globalBttv().emotes(),
+              "FrankerFaceZ");
 
     // channel
     addEmotes(*channelChannel, *twitchChannel->bttvEmotes(), "BetterTTV");

From 7ff4f12257dc28eda587c4a0c889cb2b4c2c9aaa Mon Sep 17 00:00:00 2001
From: Lajamerr Mittesdine <danieljmerritt4394@gmail.com>
Date: Sat, 11 Aug 2018 19:12:03 -0400
Subject: [PATCH 22/44] Fix Global FFZ emotes in Emote Popup (#663)

There was two instances of Global BTTV emotes.
Changed the second instance to Global FFZ emotes.
---
 src/widgets/dialogs/EmotePopup.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/widgets/dialogs/EmotePopup.cpp b/src/widgets/dialogs/EmotePopup.cpp
index ade2a88a5..735d68f63 100644
--- a/src/widgets/dialogs/EmotePopup.cpp
+++ b/src/widgets/dialogs/EmotePopup.cpp
@@ -127,7 +127,7 @@ void EmotePopup::loadChannel(ChannelPtr _channel)
     // global
     addEmotes(*globalChannel, *twitchChannel->globalBttv().emotes(),
               "BetterTTV");
-    addEmotes(*globalChannel, *twitchChannel->globalBttv().emotes(),
+    addEmotes(*globalChannel, *twitchChannel->globalFfz().emotes(),
               "FrankerFaceZ");
 
     // channel

From f6414c9d7e90fb17f10dad1fe112210889b142be Mon Sep 17 00:00:00 2001
From: fourtf <tf.four@gmail.com>
Date: Sun, 12 Aug 2018 12:56:28 +0200
Subject: [PATCH 23/44] remove settings and paths from Application

---
 src/Application.cpp                           |  4 +--
 src/Application.hpp                           |  2 --
 src/RunGui.cpp                                |  2 +-
 src/common/NetworkData.cpp                    |  2 +-
 src/common/NetworkRequest.cpp                 |  2 +-
 src/controllers/highlights/HighlightModel.cpp | 21 ++++++-------
 .../taggedusers/TaggedUsersModel.cpp          | 12 +++----
 src/messages/MessageElement.cpp               |  6 ++--
 src/messages/layouts/MessageLayout.cpp        |  8 ++---
 .../layouts/MessageLayoutContainer.cpp        |  4 +--
 src/providers/emoji/Emojis.cpp                |  2 +-
 src/providers/twitch/IrcMessageHandler.cpp    |  2 +-
 src/providers/twitch/TwitchMessageBuilder.cpp | 16 +++++-----
 src/singletons/Fonts.cpp                      |  4 +--
 src/singletons/Paths.hpp                      |  2 +-
 src/singletons/WindowManager.cpp              |  4 +--
 src/singletons/helper/GifTimer.cpp            |  2 +-
 src/singletons/helper/LoggingChannel.cpp      |  4 +--
 src/util/StreamLink.cpp                       | 12 +++----
 src/widgets/BaseWindow.cpp                    | 16 +++++-----
 src/widgets/Notebook.cpp                      |  8 ++---
 src/widgets/Window.cpp                        | 18 +++++------
 src/widgets/dialogs/SettingsDialog.cpp        |  4 +--
 src/widgets/helper/ChannelView.cpp            | 31 ++++++-------------
 src/widgets/helper/NotebookTab.cpp            |  8 ++---
 src/widgets/settingspages/CommandPage.cpp     |  2 +-
 .../settingspages/ExternalToolsPage.cpp       | 10 +++---
 src/widgets/settingspages/FeelPage.cpp        | 20 ++++++------
 .../settingspages/HighlightingPage.cpp        |  8 ++---
 src/widgets/settingspages/IgnoresPage.cpp     |  2 +-
 src/widgets/settingspages/LogsPage.cpp        |  4 +--
 src/widgets/settingspages/LookPage.cpp        | 10 +++---
 src/widgets/settingspages/ModerationPage.cpp  | 21 ++++++-------
 .../settingspages/SpecialChannelsPage.cpp     |  2 --
 src/widgets/splits/SplitInput.cpp             |  2 +-
 35 files changed, 125 insertions(+), 152 deletions(-)

diff --git a/src/Application.cpp b/src/Application.cpp
index 22ae0c34b..b53940702 100644
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -38,9 +38,7 @@ Application *Application::instance = nullptr;
 // to each other
 
 Application::Application(Settings &_settings, Paths &_paths)
-    : settings(&_settings)
-    , paths(&_paths)
-    , resources(&this->emplace<Resources2>())
+    : resources(&this->emplace<Resources2>())
 
     , themes(&this->emplace<Theme>())
     , fonts(&this->emplace<Fonts>())
diff --git a/src/Application.hpp b/src/Application.hpp
index e32f29bdd..6089aef43 100644
--- a/src/Application.hpp
+++ b/src/Application.hpp
@@ -46,8 +46,6 @@ public:
 
     friend void test();
 
-    Settings *const settings{};
-    Paths *const paths{};
     Resources2 *const resources;
 
     Theme *const themes{};
diff --git a/src/RunGui.cpp b/src/RunGui.cpp
index 9fdcdb20c..7ed61be87 100644
--- a/src/RunGui.cpp
+++ b/src/RunGui.cpp
@@ -107,7 +107,7 @@ void runGui(QApplication &a, Paths &paths, Settings &settings)
     chatterino::Updates::getInstance().checkForUpdates();
 
 #ifdef C_USE_BREAKPAD
-    QBreakpadInstance.setDumpPath(app->paths->settingsFolderPath + "/Crashes");
+    QBreakpadInstance.setDumpPath(getPaths()->settingsFolderPath + "/Crashes");
 #endif
 
     // Running file
diff --git a/src/common/NetworkData.cpp b/src/common/NetworkData.cpp
index ad8fe40b2..d3434576e 100644
--- a/src/common/NetworkData.cpp
+++ b/src/common/NetworkData.cpp
@@ -44,7 +44,7 @@ void NetworkData::writeToCache(const QByteArray &bytes)
     if (this->useQuickLoadCache_) {
         auto app = getApp();
 
-        QFile cachedFile(app->paths->cacheDirectory + "/" + this->getHash());
+        QFile cachedFile(getPaths()->cacheDirectory + "/" + this->getHash());
 
         if (cachedFile.open(QIODevice::WriteOnly)) {
             cachedFile.write(bytes);
diff --git a/src/common/NetworkRequest.cpp b/src/common/NetworkRequest.cpp
index 0a2e45533..af27394de 100644
--- a/src/common/NetworkRequest.cpp
+++ b/src/common/NetworkRequest.cpp
@@ -147,7 +147,7 @@ Outcome NetworkRequest::tryLoadCachedFile()
 {
     auto app = getApp();
 
-    QFile cachedFile(app->paths->cacheDirectory + "/" + this->data->getHash());
+    QFile cachedFile(getPaths()->cacheDirectory + "/" + this->data->getHash());
 
     if (!cachedFile.exists()) {
         // File didn't exist
diff --git a/src/controllers/highlights/HighlightModel.cpp b/src/controllers/highlights/HighlightModel.cpp
index cad2fd006..827e23a4a 100644
--- a/src/controllers/highlights/HighlightModel.cpp
+++ b/src/controllers/highlights/HighlightModel.cpp
@@ -37,13 +37,13 @@ void HighlightModel::getRowFromItem(const HighlightPhrase &item,
 void HighlightModel::afterInit()
 {
     std::vector<QStandardItem *> row = this->createRow();
-    setBoolItem(row[0], getApp()->settings->enableHighlightsSelf.getValue(),
-                true, false);
+    setBoolItem(row[0], getSettings()->enableHighlightsSelf.getValue(), true,
+                false);
     row[0]->setData("Your username (automatic)", Qt::DisplayRole);
-    setBoolItem(row[1], getApp()->settings->enableHighlightTaskbar.getValue(),
-                true, false);
-    setBoolItem(row[2], getApp()->settings->enableHighlightSound.getValue(),
-                true, false);
+    setBoolItem(row[1], getSettings()->enableHighlightTaskbar.getValue(), true,
+                false);
+    setBoolItem(row[2], getSettings()->enableHighlightSound.getValue(), true,
+                false);
     row[3]->setFlags(0);
     this->insertCustomRow(row, 0);
 }
@@ -55,20 +55,17 @@ void HighlightModel::customRowSetData(const std::vector<QStandardItem *> &row,
     switch (column) {
         case 0: {
             if (role == Qt::CheckStateRole) {
-                getApp()->settings->enableHighlightsSelf.setValue(
-                    value.toBool());
+                getSettings()->enableHighlightsSelf.setValue(value.toBool());
             }
         } break;
         case 1: {
             if (role == Qt::CheckStateRole) {
-                getApp()->settings->enableHighlightTaskbar.setValue(
-                    value.toBool());
+                getSettings()->enableHighlightTaskbar.setValue(value.toBool());
             }
         } break;
         case 2: {
             if (role == Qt::CheckStateRole) {
-                getApp()->settings->enableHighlightSound.setValue(
-                    value.toBool());
+                getSettings()->enableHighlightSound.setValue(value.toBool());
             }
         } break;
         case 3: {
diff --git a/src/controllers/taggedusers/TaggedUsersModel.cpp b/src/controllers/taggedusers/TaggedUsersModel.cpp
index e3225888c..037b4ae63 100644
--- a/src/controllers/taggedusers/TaggedUsersModel.cpp
+++ b/src/controllers/taggedusers/TaggedUsersModel.cpp
@@ -29,12 +29,12 @@ void TaggedUsersModel::afterInit()
 {
     //    std::vector<QStandardItem *> row = this->createRow();
     //    setBoolItem(row[0],
-    //    getApp()->settings->enableHighlightsSelf.getValue(), true, false);
+    //    getSettings()->enableHighlightsSelf.getValue(), true, false);
     //    row[0]->setData("Your username (automatic)", Qt::DisplayRole);
     //    setBoolItem(row[1],
-    //    getApp()->settings->enableHighlightTaskbar.getValue(), true, false);
+    //    getSettings()->enableHighlightTaskbar.getValue(), true, false);
     //    setBoolItem(row[2],
-    //    getApp()->settings->enableHighlightSound.getValue(), true, false);
+    //    getSettings()->enableHighlightSound.getValue(), true, false);
     //    row[3]->setFlags(0); this->insertCustomRow(row, 0);
 }
 
@@ -45,17 +45,17 @@ void TaggedUsersModel::afterInit()
 //    switch (column) {
 //        case 0: {
 //            if (role == Qt::CheckStateRole) {
-//                getApp()->settings->enableHighlightsSelf.setValue(value.toBool());
+//                getSettings()->enableHighlightsSelf.setValue(value.toBool());
 //            }
 //        } break;
 //        case 1: {
 //            if (role == Qt::CheckStateRole) {
-//                getApp()->settings->enableHighlightTaskbar.setValue(value.toBool());
+//                getSettings()->enableHighlightTaskbar.setValue(value.toBool());
 //            }
 //        } break;
 //        case 2: {
 //            if (role == Qt::CheckStateRole) {
-//                getApp()->settings->enableHighlightSound.setValue(value.toBool());
+//                getSettings()->enableHighlightSound.setValue(value.toBool());
 //            }
 //        } break;
 //        case 3: {
diff --git a/src/messages/MessageElement.cpp b/src/messages/MessageElement.cpp
index 24b526c29..b9271d2ed 100644
--- a/src/messages/MessageElement.cpp
+++ b/src/messages/MessageElement.cpp
@@ -225,8 +225,8 @@ void TimestampElement::addToContainer(MessageLayoutContainer &container,
 {
     if (flags.hasAny(this->getFlags())) {
         auto app = getApp();
-        if (app->settings->timestampFormat != this->format_) {
-            this->format_ = app->settings->timestampFormat.getValue();
+        if (getSettings()->timestampFormat != this->format_) {
+            this->format_ = getSettings()->timestampFormat.getValue();
             this->element_.reset(this->formatTime(this->time_));
         }
 
@@ -238,7 +238,7 @@ TextElement *TimestampElement::formatTime(const QTime &time)
 {
     static QLocale locale("en_US");
 
-    QString format = locale.toString(time, getApp()->settings->timestampFormat);
+    QString format = locale.toString(time, getSettings()->timestampFormat);
 
     return new TextElement(format, MessageElementFlag::Timestamp,
                            MessageColor::System, FontStyle::ChatMedium);
diff --git a/src/messages/layouts/MessageLayout.cpp b/src/messages/layouts/MessageLayout.cpp
index c077ac4fb..c7ff02af9 100644
--- a/src/messages/layouts/MessageLayout.cpp
+++ b/src/messages/layouts/MessageLayout.cpp
@@ -73,7 +73,7 @@ bool MessageLayout::layout(int width, float scale, MessageElementFlags flags)
 
     // check if work mask changed
     layoutRequired |= this->currentWordFlags_ != flags;
-    this->currentWordFlags_ = flags;  // app->settings->getWordTypeMask();
+    this->currentWordFlags_ = flags;  // getSettings()->getWordTypeMask();
 
     // check if layout was requested manually
     layoutRequired |= this->flags.has(MessageLayoutFlag::RequiresLayout);
@@ -177,7 +177,7 @@ void MessageLayout::paint(QPainter &painter, int width, int y, int messageIndex,
     }
 
     // draw message seperation line
-    if (app->settings->separateMessages.getValue()) {
+    if (getSettings()->separateMessages.getValue()) {
         painter.fillRect(0, y, this->container_->getWidth(), 1,
                          app->themes->splits.messageSeperator);
     }
@@ -190,7 +190,7 @@ void MessageLayout::paint(QPainter &painter, int width, int y, int messageIndex,
                 : app->themes->tabs.selected.backgrounds.unfocused.color();
 
         QBrush brush(color, static_cast<Qt::BrushStyle>(
-                                app->settings->lastMessagePattern.getValue()));
+                                getSettings()->lastMessagePattern.getValue()));
 
         painter.fillRect(0, y + this->container_->getHeight() - 1,
                          pixmap->width(), 1, brush);
@@ -214,7 +214,7 @@ void MessageLayout::updateBuffer(QPixmap *buffer, int /*messageIndex*/,
         backgroundColor = app->themes->messages.backgrounds.highlighted;
     } else if (this->message_->flags.has(MessageFlag::Subscription)) {
         backgroundColor = app->themes->messages.backgrounds.subscription;
-    } else if (app->settings->alternateMessageBackground.getValue() &&
+    } else if (getSettings()->alternateMessageBackground.getValue() &&
                this->flags.has(MessageLayoutFlag::AlternateBackground)) {
         backgroundColor = app->themes->messages.backgrounds.alternate;
     } else {
diff --git a/src/messages/layouts/MessageLayoutContainer.cpp b/src/messages/layouts/MessageLayoutContainer.cpp
index 2092524c9..008a02d05 100644
--- a/src/messages/layouts/MessageLayoutContainer.cpp
+++ b/src/messages/layouts/MessageLayoutContainer.cpp
@@ -14,7 +14,7 @@
 
 #define COMPACT_EMOTES_OFFSET 6
 #define MAX_UNCOLLAPSED_LINES \
-    (getApp()->settings->collpseMessagesMinLines.getValue())
+    (getSettings()->collpseMessagesMinLines.getValue())
 
 namespace chatterino {
 
@@ -235,7 +235,7 @@ void MessageLayoutContainer::end()
 
 bool MessageLayoutContainer::canCollapse()
 {
-    return getApp()->settings->collpseMessagesMinLines.getValue() > 0 &&
+    return getSettings()->collpseMessagesMinLines.getValue() > 0 &&
            this->flags_.has(MessageFlag::Collapsed);
 }
 
diff --git a/src/providers/emoji/Emojis.cpp b/src/providers/emoji/Emojis.cpp
index 18ce18139..5140d2fe1 100644
--- a/src/providers/emoji/Emojis.cpp
+++ b/src/providers/emoji/Emojis.cpp
@@ -217,7 +217,7 @@ void Emojis::loadEmojiSet()
 {
     auto app = getApp();
 
-    app->settings->emojiSet.connect([=](const auto &emojiSet, auto) {
+    getSettings()->emojiSet.connect([=](const auto &emojiSet, auto) {
         log("Using emoji set {}", emojiSet);
         this->emojis.each([=](const auto &name,
                               std::shared_ptr<EmojiData> &emoji) {
diff --git a/src/providers/twitch/IrcMessageHandler.cpp b/src/providers/twitch/IrcMessageHandler.cpp
index 1679884b8..9aabbc91d 100644
--- a/src/providers/twitch/IrcMessageHandler.cpp
+++ b/src/providers/twitch/IrcMessageHandler.cpp
@@ -231,7 +231,7 @@ void IrcMessageHandler::handleWhisperMessage(Communi::IrcMessage *message)
 
         c->addMessage(_message);
 
-        if (app->settings->inlineWhispers) {
+        if (getSettings()->inlineWhispers) {
             app->twitch.server->forEachChannel([_message](ChannelPtr channel) {
                 channel->addMessage(_message);  //
             });
diff --git a/src/providers/twitch/TwitchMessageBuilder.cpp b/src/providers/twitch/TwitchMessageBuilder.cpp
index 5b4cef199..7f8c2aa3d 100644
--- a/src/providers/twitch/TwitchMessageBuilder.cpp
+++ b/src/providers/twitch/TwitchMessageBuilder.cpp
@@ -63,7 +63,7 @@ bool TwitchMessageBuilder::isIgnored() const
         }
     }
 
-    if (app->settings->enableTwitchIgnoredUsers &&
+    if (getSettings()->enableTwitchIgnoredUsers &&
         this->tags.contains("user-id")) {
         auto sourceUserID = this->tags.value("user-id").toString();
 
@@ -289,7 +289,7 @@ void TwitchMessageBuilder::addTextOrEmoji(const QString &string_)
     }
 
     // if (!linkString.isEmpty()) {
-    //    if (getApp()->settings->lowercaseLink) {
+    //    if (getSettings()->lowercaseLink) {
     //        QRegularExpression httpRegex("\\bhttps?://",
     //        QRegularExpression::CaseInsensitiveOption); QRegularExpression
     //        ftpRegex("\\bftps?://",
@@ -499,9 +499,9 @@ void TwitchMessageBuilder::parseHighlights(bool isPastMsg)
 
     // update the media player url if necessary
     QUrl highlightSoundUrl;
-    if (app->settings->customHighlightSound) {
+    if (getSettings()->customHighlightSound) {
         highlightSoundUrl =
-            QUrl::fromLocalFile(app->settings->pathHighlightSound.getValue());
+            QUrl::fromLocalFile(getSettings()->pathHighlightSound.getValue());
     } else {
         highlightSoundUrl = QUrl("qrc:/sounds/ping2.wav");
     }
@@ -519,10 +519,10 @@ void TwitchMessageBuilder::parseHighlights(bool isPastMsg)
     std::vector<HighlightPhrase> userHighlights =
         app->highlights->highlightedUsers.getVector();
 
-    if (app->settings->enableHighlightsSelf && currentUsername.size() > 0) {
+    if (getSettings()->enableHighlightsSelf && currentUsername.size() > 0) {
         HighlightPhrase selfHighlight(
-            currentUsername, app->settings->enableHighlightTaskbar,
-            app->settings->enableHighlightSound, false);
+            currentUsername, getSettings()->enableHighlightTaskbar,
+            getSettings()->enableHighlightSound, false);
         activeHighlights.emplace_back(std::move(selfHighlight));
     }
 
@@ -581,7 +581,7 @@ void TwitchMessageBuilder::parseHighlights(bool isPastMsg)
 
         if (!isPastMsg) {
             if (playSound &&
-                (!hasFocus || app->settings->highlightAlwaysPlaySound)) {
+                (!hasFocus || getSettings()->highlightAlwaysPlaySound)) {
                 player->play();
             }
 
diff --git a/src/singletons/Fonts.cpp b/src/singletons/Fonts.cpp
index 3c9efa79e..cc2f00727 100644
--- a/src/singletons/Fonts.cpp
+++ b/src/singletons/Fonts.cpp
@@ -105,13 +105,13 @@ Fonts::FontData Fonts::createFontData(FontStyle type, float scale)
             {FontStyle::ChatMedium, {1, false, QFont::Normal}},
             {FontStyle::ChatMediumBold,
              {1, false,
-              QFont::Weight(getApp()->settings->boldScale.getValue())}},
+              QFont::Weight(getSettings()->boldScale.getValue())}},
             {FontStyle::ChatMediumItalic, {1, true, QFont::Normal}},
             {FontStyle::ChatLarge, {1.2f, false, QFont::Normal}},
             {FontStyle::ChatVeryLarge, {1.4f, false, QFont::Normal}},
         };
         sizeScale[FontStyle::ChatMediumBold] = {
-            1, false, QFont::Weight(getApp()->settings->boldScale.getValue())};
+            1, false, QFont::Weight(getSettings()->boldScale.getValue())};
         auto data = sizeScale[type];
         return FontData(
             QFont(QString::fromStdString(this->chatFontFamily.getValue()),
diff --git a/src/singletons/Paths.hpp b/src/singletons/Paths.hpp
index 071feb737..70ab2642f 100644
--- a/src/singletons/Paths.hpp
+++ b/src/singletons/Paths.hpp
@@ -43,6 +43,6 @@ private:
     boost::optional<bool> portable_;
 };
 
-[[deprecated]] Paths *getPaths();
+Paths *getPaths();
 
 }  // namespace chatterino
diff --git a/src/singletons/WindowManager.cpp b/src/singletons/WindowManager.cpp
index 17bf1ea83..02b711f7b 100644
--- a/src/singletons/WindowManager.cpp
+++ b/src/singletons/WindowManager.cpp
@@ -406,7 +406,7 @@ void WindowManager::save()
     document.setObject(obj);
 
     // save file
-    QString settingsPath = app->paths->settingsDirectory + SETTINGS_FILENAME;
+    QString settingsPath = getPaths()->settingsDirectory + SETTINGS_FILENAME;
     QFile file(settingsPath);
     file.open(QIODevice::WriteOnly | QIODevice::Truncate);
 
@@ -518,7 +518,7 @@ int WindowManager::clampUiScale(int scale)
 
 float WindowManager::getUiScaleValue()
 {
-    return getUiScaleValue(getApp()->settings->uiScale.getValue());
+    return getUiScaleValue(getSettings()->uiScale.getValue());
 }
 
 float WindowManager::getUiScaleValue(int scale)
diff --git a/src/singletons/helper/GifTimer.cpp b/src/singletons/helper/GifTimer.cpp
index 49fbd98bf..8ef657e7a 100644
--- a/src/singletons/helper/GifTimer.cpp
+++ b/src/singletons/helper/GifTimer.cpp
@@ -10,7 +10,7 @@ void GIFTimer::initialize()
 {
     this->timer.setInterval(30);
 
-    getApp()->settings->enableGifAnimations.connect([this](bool enabled, auto) {
+    getSettings()->enableGifAnimations.connect([this](bool enabled, auto) {
         if (enabled) {
             this->timer.start();
         } else {
diff --git a/src/singletons/helper/LoggingChannel.cpp b/src/singletons/helper/LoggingChannel.cpp
index d70344448..c9081d2a6 100644
--- a/src/singletons/helper/LoggingChannel.cpp
+++ b/src/singletons/helper/LoggingChannel.cpp
@@ -30,11 +30,11 @@ LoggingChannel::LoggingChannel(const QString &_channelName)
 
     auto app = getApp();
 
-    app->settings->logPath.connect([this](const QString &logPath, auto) {
+    getSettings()->logPath.connect([this](const QString &logPath, auto) {
         auto app = getApp();
 
         if (logPath.isEmpty()) {
-            this->baseDirectory = app->paths->messageLogDirectory;
+            this->baseDirectory = getPaths()->messageLogDirectory;
         } else {
             this->baseDirectory = logPath;
         }
diff --git a/src/util/StreamLink.cpp b/src/util/StreamLink.cpp
index 2fd2ef0a3..aa2db55c0 100644
--- a/src/util/StreamLink.cpp
+++ b/src/util/StreamLink.cpp
@@ -37,8 +37,8 @@ QString getStreamlinkProgram()
 {
     auto app = getApp();
 
-    if (app->settings->streamlinkUseCustomPath) {
-        return app->settings->streamlinkPath + "/" + getBinaryName();
+    if (getSettings()->streamlinkUseCustomPath) {
+        return getSettings()->streamlinkPath + "/" + getBinaryName();
     } else {
         return getBinaryName();
     }
@@ -62,7 +62,7 @@ void showStreamlinkNotFoundError()
     static QErrorMessage *msg = new QErrorMessage;
 
     auto app = getApp();
-    if (app->settings->streamlinkUseCustomPath) {
+    if (getSettings()->streamlinkUseCustomPath) {
         msg->showMessage(
             "Unable to find Streamlink executable\nMake sure your custom path "
             "is pointing "
@@ -146,9 +146,9 @@ void openStreamlink(const QString &channelURL, const QString &quality,
 
     QStringList arguments;
 
-    QString additionalOptions = app->settings->streamlinkOpts.getValue();
+    QString additionalOptions = getSettings()->streamlinkOpts.getValue();
     if (!additionalOptions.isEmpty()) {
-        arguments << app->settings->streamlinkOpts;
+        arguments << getSettings()->streamlinkOpts;
     }
 
     arguments.append(extraArguments);
@@ -173,7 +173,7 @@ void openStreamlinkForChannel(const QString &channel)
 
     QString channelURL = "twitch.tv/" + channel;
 
-    QString preferredQuality = app->settings->preferredQuality;
+    QString preferredQuality = getSettings()->preferredQuality;
     preferredQuality = preferredQuality.toLower();
 
     if (preferredQuality == "choose") {
diff --git a/src/widgets/BaseWindow.cpp b/src/widgets/BaseWindow.cpp
index 5c80bc9a7..32d470805 100644
--- a/src/widgets/BaseWindow.cpp
+++ b/src/widgets/BaseWindow.cpp
@@ -56,13 +56,13 @@ BaseWindow::BaseWindow(QWidget *parent, Flags _flags)
     this->init();
 
     this->connections_.managedConnect(
-        getApp()->settings->uiScale.getValueChangedSignal(),
+        getSettings()->uiScale.getValueChangedSignal(),
         [this](auto, auto) { postToThread([this] { this->updateScale(); }); });
 
     this->updateScale();
 
     createWindowShortcut(this, "CTRL+0",
-                         [] { getApp()->settings->uiScale.setValue(0); });
+                         [] { getSettings()->uiScale.setValue(0); });
 
     //    QTimer::this->scaleChangedEvent(this->getScale());
 }
@@ -163,7 +163,7 @@ void BaseWindow::init()
     // fourtf: don't ask me why we need to delay this
     if (!(this->flags_ & Flags::TopMost)) {
         QTimer::singleShot(1, this, [this] {
-            getApp()->settings->windowTopMost.connect(
+            getSettings()->windowTopMost.connect(
                 [this](bool topMost, auto) {
                     ::SetWindowPos(HWND(this->winId()),
                                    topMost ? HWND_TOPMOST : HWND_NOTOPMOST, 0,
@@ -174,7 +174,7 @@ void BaseWindow::init()
         });
     }
 #else
-//    if (getApp()->settings->windowTopMost.getValue()) {
+//    if (getSettings()->windowTopMost.getValue()) {
 //        this->setWindowFlag(Qt::WindowStaysOnTopHint);
 //    }
 #endif
@@ -267,11 +267,11 @@ void BaseWindow::wheelEvent(QWheelEvent *event)
 
     if (event->modifiers() & Qt::ControlModifier) {
         if (event->delta() > 0) {
-            getApp()->settings->uiScale.setValue(WindowManager::clampUiScale(
-                getApp()->settings->uiScale.getValue() + 1));
+            getSettings()->uiScale.setValue(WindowManager::clampUiScale(
+                getSettings()->uiScale.getValue() + 1));
         } else {
-            getApp()->settings->uiScale.setValue(WindowManager::clampUiScale(
-                getApp()->settings->uiScale.getValue() - 1));
+            getSettings()->uiScale.setValue(WindowManager::clampUiScale(
+                getSettings()->uiScale.getValue() - 1));
         }
     }
 }
diff --git a/src/widgets/Notebook.cpp b/src/widgets/Notebook.cpp
index 8cd5a6075..04ecd0840 100644
--- a/src/widgets/Notebook.cpp
+++ b/src/widgets/Notebook.cpp
@@ -434,9 +434,9 @@ void SplitNotebook::addCustomButtons()
     auto settingsBtn = this->addCustomButton();
 
     settingsBtn->setVisible(
-        !getApp()->settings->hidePreferencesButton.getValue());
+        !getSettings()->hidePreferencesButton.getValue());
 
-    getApp()->settings->hidePreferencesButton.connect(
+    getSettings()->hidePreferencesButton.connect(
         [settingsBtn](bool hide, auto) { settingsBtn->setVisible(!hide); },
         this->connections_);
 
@@ -447,8 +447,8 @@ void SplitNotebook::addCustomButtons()
 
     // account
     auto userBtn = this->addCustomButton();
-    userBtn->setVisible(!getApp()->settings->hideUserButton.getValue());
-    getApp()->settings->hideUserButton.connect(
+    userBtn->setVisible(!getSettings()->hideUserButton.getValue());
+    getSettings()->hideUserButton.connect(
         [userBtn](bool hide, auto) { userBtn->setVisible(!hide); },
         this->connections_);
 
diff --git a/src/widgets/Window.cpp b/src/widgets/Window.cpp
index 876f2a078..6df88b402 100644
--- a/src/widgets/Window.cpp
+++ b/src/widgets/Window.cpp
@@ -105,8 +105,8 @@ bool Window::event(QEvent *event)
 void Window::showEvent(QShowEvent *event)
 {
     // Startup notification
-    if (getApp()->settings->startUpNotification.getValue() < 1) {
-        getApp()->settings->startUpNotification = 1;
+    if (getSettings()->startUpNotification.getValue() < 1) {
+        getSettings()->startUpNotification = 1;
 
         auto box = new QMessageBox(
             QMessageBox::Information, "Chatterino 2 Beta",
@@ -118,8 +118,8 @@ void Window::showEvent(QShowEvent *event)
     }
 
     // Show changelog
-    if (getApp()->settings->currentVersion.getValue() != "" &&
-        getApp()->settings->currentVersion.getValue() != CHATTERINO_VERSION) {
+    if (getSettings()->currentVersion.getValue() != "" &&
+        getSettings()->currentVersion.getValue() != CHATTERINO_VERSION) {
         auto box = new QMessageBox(QMessageBox::Information,
                                    "Chatterino 2 Beta", "Show changelog?",
                                    QMessageBox::Yes | QMessageBox::No);
@@ -130,7 +130,7 @@ void Window::showEvent(QShowEvent *event)
         }
     }
 
-    getApp()->settings->currentVersion.setValue(CHATTERINO_VERSION);
+    getSettings()->currentVersion.setValue(CHATTERINO_VERSION);
 
     // --
     BaseWindow::showEvent(event);
@@ -281,8 +281,8 @@ void Window::addShortcuts()
         auto s = new QShortcut(QKeySequence::ZoomIn, this);
         s->setContext(Qt::WindowShortcut);
         QObject::connect(s, &QShortcut::activated, this, [] {
-            getApp()->settings->uiScale.setValue(WindowManager::clampUiScale(
-                getApp()->settings->uiScale.getValue() + 1));
+            getSettings()->uiScale.setValue(WindowManager::clampUiScale(
+                getSettings()->uiScale.getValue() + 1));
         });
     }
 
@@ -291,8 +291,8 @@ void Window::addShortcuts()
         auto s = new QShortcut(QKeySequence::ZoomOut, this);
         s->setContext(Qt::WindowShortcut);
         QObject::connect(s, &QShortcut::activated, this, [] {
-            getApp()->settings->uiScale.setValue(WindowManager::clampUiScale(
-                getApp()->settings->uiScale.getValue() - 1));
+            getSettings()->uiScale.setValue(WindowManager::clampUiScale(
+                getSettings()->uiScale.getValue() - 1));
         });
     }
 
diff --git a/src/widgets/dialogs/SettingsDialog.cpp b/src/widgets/dialogs/SettingsDialog.cpp
index 8f0746ccb..1c89344f4 100644
--- a/src/widgets/dialogs/SettingsDialog.cpp
+++ b/src/widgets/dialogs/SettingsDialog.cpp
@@ -154,7 +154,7 @@ void SettingsDialog::showDialog(PreferredTab preferredTab)
 
 void SettingsDialog::refresh()
 {
-    getApp()->settings->saveSnapshot();
+    getSettings()->saveSnapshot();
 
     for (auto *tab : this->tabs_) {
         tab->getSettingsPage()->onShow();
@@ -199,7 +199,7 @@ void SettingsDialog::onCancelClicked()
         tab->getSettingsPage()->cancel();
     }
 
-    getApp()->settings->restoreSnapshot();
+    getSettings()->restoreSnapshot();
 
     this->close();
 }
diff --git a/src/widgets/helper/ChannelView.cpp b/src/widgets/helper/ChannelView.cpp
index 45bc7b677..467d34630 100644
--- a/src/widgets/helper/ChannelView.cpp
+++ b/src/widgets/helper/ChannelView.cpp
@@ -131,8 +131,7 @@ void ChannelView::initializeLayout()
     QObject::connect(this->goToBottom_, &EffectLabel::clicked, this, [=] {
         QTimer::singleShot(180, [=] {
             this->scrollBar_->scrollToBottom(
-                getApp()
-                    ->settings->enableSmoothScrollingNewMessages.getValue());
+                getSettings()->enableSmoothScrollingNewMessages.getValue());
         });
     });
 }
@@ -162,7 +161,7 @@ void ChannelView::initializeSignals()
             this->update();
         }));
 
-    getApp()->settings->showLastMessageIndicator.connect(
+    getSettings()->showLastMessageIndicator.connect(
         [this](auto, auto) { this->update(); }, this->connections_);
 
     connections_.push_back(
@@ -213,8 +212,6 @@ void ChannelView::actuallyLayoutMessages(bool causedByScrollbar)
 {
     //    BenchmarkGuard benchmark("layout");
 
-    auto app = getApp();
-
     auto messagesSnapshot = this->getMessagesSnapshot();
 
     if (messagesSnapshot.getLength() == 0) {
@@ -293,7 +290,7 @@ void ChannelView::actuallyLayoutMessages(bool causedByScrollbar)
         if (!this->isPaused()) {
             this->scrollBar_->scrollToBottom(
                 //                this->messageWasAdded &&
-                app->settings->enableSmoothScrollingNewMessages.getValue());
+                getSettings()->enableSmoothScrollingNewMessages.getValue());
         }
         this->messageWasAdded_ = false;
     }
@@ -654,8 +651,6 @@ void ChannelView::paintEvent(QPaintEvent * /*event*/)
 // such as the grey overlay when a message is disabled
 void ChannelView::drawMessages(QPainter &painter)
 {
-    auto app = getApp();
-
     auto messagesSnapshot = this->getMessagesSnapshot();
 
     size_t start = size_t(this->scrollBar_->getCurrentValue());
@@ -674,7 +669,7 @@ void ChannelView::drawMessages(QPainter &painter)
         MessageLayout *layout = messagesSnapshot[i].get();
 
         bool isLastMessage = false;
-        if (app->settings->showLastMessageIndicator) {
+        if (getSettings()->showLastMessageIndicator) {
             isLastMessage = this->lastReadMessage_.get() == layout;
         }
 
@@ -737,9 +732,7 @@ void ChannelView::wheelEvent(QWheelEvent *event)
     }
 
     if (this->scrollBar_->isVisible()) {
-        auto app = getApp();
-
-        float mouseMultiplier = app->settings->mouseScrollMultiplier;
+        float mouseMultiplier = getSettings()->mouseScrollMultiplier;
 
         qreal desired = this->scrollBar_->getDesiredValue();
         qreal delta = event->delta() * qreal(1.5) * mouseMultiplier;
@@ -824,9 +817,7 @@ void ChannelView::mouseMoveEvent(QMouseEvent *event)
         return;
     }
 
-    auto app = getApp();
-
-    if (app->settings->pauseChatHover.getValue()) {
+    if (getSettings()->pauseChatHover.getValue()) {
         this->pause(CHAT_HOVER_PAUSE_DURATION);
     }
 
@@ -891,8 +882,6 @@ void ChannelView::mouseMoveEvent(QMouseEvent *event)
 
 void ChannelView::mousePressEvent(QMouseEvent *event)
 {
-    auto app = getApp();
-
     this->mouseDown.invoke(event);
 
     std::shared_ptr<MessageLayout> layout;
@@ -929,7 +918,7 @@ void ChannelView::mousePressEvent(QMouseEvent *event)
                 return;
             }
 
-            if (app->settings->linksDoubleClickOnly.getValue()) {
+            if (getSettings()->linksDoubleClickOnly.getValue()) {
                 this->pause(200);
             }
 
@@ -1034,7 +1023,7 @@ void ChannelView::handleMouseClick(QMouseEvent *event,
             }
 
             auto &link = hoveredElement->getLink();
-            if (!getApp()->settings->linksDoubleClickOnly) {
+            if (!getSettings()->linksDoubleClickOnly) {
                 this->handleLinkClick(event, link, layout);
 
                 this->linkClicked.invoke(link);
@@ -1119,9 +1108,7 @@ void ChannelView::addContextMenuItems(
 
 void ChannelView::mouseDoubleClickEvent(QMouseEvent *event)
 {
-    auto app = getApp();
-
-    if (app->settings->linksDoubleClickOnly) {
+    if (getSettings()->linksDoubleClickOnly) {
         std::shared_ptr<MessageLayout> layout;
         QPoint relativePos;
         int messageIndex;
diff --git a/src/widgets/helper/NotebookTab.cpp b/src/widgets/helper/NotebookTab.cpp
index 865eb6048..15388e34c 100644
--- a/src/widgets/helper/NotebookTab.cpp
+++ b/src/widgets/helper/NotebookTab.cpp
@@ -35,7 +35,7 @@ NotebookTab::NotebookTab(Notebook *notebook)
     this->positionChangedAnimation_.setEasingCurve(
         QEasingCurve(QEasingCurve::InCubic));
 
-    app->settings->showTabCloseButton.connect(
+    getSettings()->showTabCloseButton.connect(
         boost::bind(&NotebookTab::hideTabXChanged, this, _1),
         this->managedConnections_);
 
@@ -286,7 +286,7 @@ void NotebookTab::paintEvent(QPaintEvent *)
     painter.setPen(colors.text);
 
     // set area for text
-    int rectW = (!app->settings->showTabCloseButton ? 0 : int(16 * scale));
+    int rectW = (!getSettings()->showTabCloseButton ? 0 : int(16 * scale));
     QRect rect(0, 0, this->width() - rectW, height);
 
     // draw text
@@ -341,7 +341,7 @@ void NotebookTab::paintEvent(QPaintEvent *)
 
 bool NotebookTab::hasXButton()
 {
-    return getApp()->settings->showTabCloseButton &&
+    return getSettings()->showTabCloseButton &&
            this->notebook_->getAllowUserTabManagement();
 }
 
@@ -434,7 +434,7 @@ void NotebookTab::mouseMoveEvent(QMouseEvent *event)
 {
     auto app = getApp();
 
-    if (app->settings->showTabCloseButton &&
+    if (getSettings()->showTabCloseButton &&
         this->notebook_->getAllowUserTabManagement())  //
     {
         bool overX = this->getXRect().contains(event->pos());
diff --git a/src/widgets/settingspages/CommandPage.cpp b/src/widgets/settingspages/CommandPage.cpp
index bb3a60c59..b06988a57 100644
--- a/src/widgets/settingspages/CommandPage.cpp
+++ b/src/widgets/settingspages/CommandPage.cpp
@@ -47,7 +47,7 @@ CommandPage::CommandPage()
 
     layout.append(
         this->createCheckBox("Also match the trigger at the end of the message",
-                             app->settings->allowCommandsAtEnd));
+                             getSettings()->allowCommandsAtEnd));
 
     QLabel *text = layout.emplace<QLabel>(TEXT).getElement();
     text->setWordWrap(true);
diff --git a/src/widgets/settingspages/ExternalToolsPage.cpp b/src/widgets/settingspages/ExternalToolsPage.cpp
index 0f47e37a1..bdb164e36 100644
--- a/src/widgets/settingspages/ExternalToolsPage.cpp
+++ b/src/widgets/settingspages/ExternalToolsPage.cpp
@@ -57,22 +57,22 @@ ExternalToolsPage::ExternalToolsPage()
         auto customPathCb =
             this->createCheckBox("Use custom path (Enable if using "
                                  "non-standard streamlink installation path)",
-                                 app->settings->streamlinkUseCustomPath);
+                                 getSettings()->streamlinkUseCustomPath);
         groupLayout->setWidget(2, QFormLayout::SpanningRole, customPathCb);
 
-        auto customPath = this->createLineEdit(app->settings->streamlinkPath);
+        auto customPath = this->createLineEdit(getSettings()->streamlinkPath);
         customPath->setPlaceholderText(
             "Path to folder where Streamlink executable can be found");
         groupLayout->addRow("Custom streamlink path:", customPath);
         groupLayout->addRow(
             "Preferred quality:",
             this->createComboBox({STREAMLINK_QUALITY},
-                                 app->settings->preferredQuality));
+                                 getSettings()->preferredQuality));
         groupLayout->addRow(
             "Additional options:",
-            this->createLineEdit(app->settings->streamlinkOpts));
+            this->createLineEdit(getSettings()->streamlinkOpts));
 
-        app->settings->streamlinkUseCustomPath.connect(
+        getSettings()->streamlinkUseCustomPath.connect(
             [=](const auto &value, auto) {
                 customPath->setEnabled(value);  //
             },
diff --git a/src/widgets/settingspages/FeelPage.cpp b/src/widgets/settingspages/FeelPage.cpp
index d20c859c7..78b41c45d 100644
--- a/src/widgets/settingspages/FeelPage.cpp
+++ b/src/widgets/settingspages/FeelPage.cpp
@@ -20,7 +20,6 @@ namespace chatterino {
 FeelPage::FeelPage()
     : SettingsPage("Feel", ":/settings/behave.svg")
 {
-    auto app = getApp();
     LayoutCreator<FeelPage> layoutCreator(this);
 
     auto layout = layoutCreator.setLayoutType<QVBoxLayout>();
@@ -37,20 +36,20 @@ FeelPage::FeelPage()
         form->addRow(
             "", this->createCheckBox(
                     "Show which users joined the channel (up to 1000 chatters)",
-                    app->settings->showJoins));
+                    getSettings()->showJoins));
         form->addRow(
             "", this->createCheckBox(
                     "Show which users parted the channel (up to 1000 chatters)",
-                    app->settings->showParts));
+                    getSettings()->showParts));
 
         form->addRow("Pause chat:",
                      this->createCheckBox(PAUSE_HOVERING,
-                                          app->settings->pauseChatHover));
+                                          getSettings()->pauseChatHover));
 
         form->addRow("Mouse scroll speed:", this->createMouseScrollSlider());
         form->addRow("Links:",
                      this->createCheckBox("Open links only on double click",
-                                          app->settings->linksDoubleClickOnly));
+                                          getSettings()->linksDoubleClickOnly));
     }
 
     layout->addSpacing(16);
@@ -61,11 +60,11 @@ FeelPage::FeelPage()
         groupLayout->addRow(
             LIMIT_CHATTERS_FOR_SMALLER_STREAMERS,
             this->createCheckBox(
-                "", app->settings->onlyFetchChattersForSmallerStreamers));
+                "", getSettings()->onlyFetchChattersForSmallerStreamers));
 
         groupLayout->addRow(
             "What viewer count counts as a \"smaller streamer\"",
-            this->createSpinBox(app->settings->smallStreamerLimit, 10, 50000));
+            this->createSpinBox(getSettings()->smallStreamerLimit, 10, 50000));
     }
 
     {
@@ -73,7 +72,7 @@ FeelPage::FeelPage()
         auto groupLayout = group.setLayoutType<QVBoxLayout>();
 
         groupLayout.append(this->createCheckBox("Show whispers inline",
-                                                app->settings->inlineWhispers));
+                                                getSettings()->inlineWhispers));
     }
 
     layout->addStretch(1);
@@ -81,17 +80,16 @@ FeelPage::FeelPage()
 
 QSlider *FeelPage::createMouseScrollSlider()
 {
-    auto app = getApp();
     auto slider = new QSlider(Qt::Horizontal);
 
-    float currentValue = app->settings->mouseScrollMultiplier;
+    float currentValue = getSettings()->mouseScrollMultiplier;
     int sliderValue = int(((currentValue - 0.1f) / 2.f) * 99.f);
     slider->setValue(sliderValue);
 
     QObject::connect(slider, &QSlider::valueChanged, [=](int newValue) {
         float mul = static_cast<float>(newValue) / 99.f;
         float newSliderValue = (mul * 2.1f) + 0.1f;
-        app->settings->mouseScrollMultiplier = newSliderValue;
+        getSettings()->mouseScrollMultiplier = newSliderValue;
     });
 
     return slider;
diff --git a/src/widgets/settingspages/HighlightingPage.cpp b/src/widgets/settingspages/HighlightingPage.cpp
index 455c0d377..be394b3c2 100644
--- a/src/widgets/settingspages/HighlightingPage.cpp
+++ b/src/widgets/settingspages/HighlightingPage.cpp
@@ -39,7 +39,7 @@ HighlightingPage::HighlightingPage()
     {
         // GENERAL
         // layout.append(this->createCheckBox(ENABLE_HIGHLIGHTS,
-        // app->settings->enableHighlights));
+        // getSettings()->enableHighlights));
 
         // TABS
         auto tabs = layout.emplace<QTabWidget>();
@@ -135,7 +135,7 @@ HighlightingPage::HighlightingPage()
         auto customSound = layout.emplace<QHBoxLayout>().withoutMargin();
         {
             customSound.append(this->createCheckBox(
-                "Custom sound", app->settings->customHighlightSound));
+                "Custom sound", getSettings()->customHighlightSound));
             auto selectFile =
                 customSound.emplace<QPushButton>("Select custom sound file");
             QObject::connect(selectFile.getElement(), &QPushButton::clicked,
@@ -143,12 +143,12 @@ HighlightingPage::HighlightingPage()
                                  auto fileName = QFileDialog::getOpenFileName(
                                      this, tr("Open Sound"), "",
                                      tr("Audio Files (*.mp3 *.wav)"));
-                                 app->settings->pathHighlightSound = fileName;
+                                 getSettings()->pathHighlightSound = fileName;
                              });
         }
 
         layout.append(createCheckBox(ALWAYS_PLAY,
-                                     app->settings->highlightAlwaysPlaySound));
+                                     getSettings()->highlightAlwaysPlaySound));
     }
 
     // ---- misc
diff --git a/src/widgets/settingspages/IgnoresPage.cpp b/src/widgets/settingspages/IgnoresPage.cpp
index b23ecbb89..8aa6c5c4a 100644
--- a/src/widgets/settingspages/IgnoresPage.cpp
+++ b/src/widgets/settingspages/IgnoresPage.cpp
@@ -71,7 +71,7 @@ void addUsersTab(IgnoresPage &page, LayoutCreator<QVBoxLayout> users,
 {
     users.append(
         page.createCheckBox("Enable twitch ignored users",
-                            getApp()->settings->enableTwitchIgnoredUsers));
+                            getSettings()->enableTwitchIgnoredUsers));
 
     auto anyways = users.emplace<QHBoxLayout>().withoutMargin();
     {
diff --git a/src/widgets/settingspages/LogsPage.cpp b/src/widgets/settingspages/LogsPage.cpp
index 8cf1fbcc1..2be6c2144 100644
--- a/src/widgets/settingspages/LogsPage.cpp
+++ b/src/widgets/settingspages/LogsPage.cpp
@@ -33,7 +33,7 @@
 //    LayoutCreator<LogsPage> layoutCreator(this);
 //    auto layout = layoutCreator.emplace<QVBoxLayout>().withoutMargin();
 
-//    auto logPath = app->paths->logsFolderPath;
+//    auto logPath = getPaths()->logsFolderPath;
 
 //    auto created = layout.emplace<QLabel>();
 //    created->setText("Logs are saved to " + CreateLink(logPath, true));
@@ -43,7 +43,7 @@
 //                                     Qt::LinksAccessibleByKeyboard);
 //    created->setOpenExternalLinks(true);
 //    layout.append(this->createCheckBox("Enable logging",
-//    app->settings->enableLogging));
+//    getSettings()->enableLogging));
 
 //    layout->addStretch(1);
 //}
diff --git a/src/widgets/settingspages/LookPage.cpp b/src/widgets/settingspages/LookPage.cpp
index 08a6ec77a..5daec0464 100644
--- a/src/widgets/settingspages/LookPage.cpp
+++ b/src/widgets/settingspages/LookPage.cpp
@@ -208,13 +208,13 @@ void LookPage::addEmoteTab(LayoutCreator<QVBoxLayout> layout)
     /*
     emotes.append(
         this->createCheckBox("Enable Twitch emotes",
-    app->settings->enableTwitchEmotes));
+    getSettings()->enableTwitchEmotes));
     emotes.append(this->createCheckBox("Enable BetterTTV emotes for Twitch",
-                                       app->settings->enableBttvEmotes));
+                                       getSettings()->enableBttvEmotes));
     emotes.append(this->createCheckBox("Enable FrankerFaceZ emotes for Twitch",
-                                       app->settings->enableFfzEmotes));
+                                       getSettings()->enableFfzEmotes));
     emotes.append(this->createCheckBox("Enable emojis",
-    app->settings->enableEmojis));
+    getSettings()->enableEmojis));
     */
     layout.append(
         this->createCheckBox("Animations", getSettings()->enableGifAnimations));
@@ -285,7 +285,7 @@ void LookPage::addLastReadMessageIndicatorPatternSelector(
     combo->addItems({"Dotted line", "Solid line"});
 
     const auto currentIndex = []() -> int {
-        switch (getApp()->settings->lastMessagePattern.getValue()) {
+        switch (getSettings()->lastMessagePattern.getValue()) {
             case Qt::SolidLine:
                 return 1;
             case Qt::VerPattern:
diff --git a/src/widgets/settingspages/ModerationPage.cpp b/src/widgets/settingspages/ModerationPage.cpp
index fdb6df89f..28e0f7419 100644
--- a/src/widgets/settingspages/ModerationPage.cpp
+++ b/src/widgets/settingspages/ModerationPage.cpp
@@ -69,12 +69,11 @@ QString formatSize(qint64 size)
 
 QString fetchLogDirectorySize()
 {
-    auto app = getApp();
     QString logPathDirectory;
-    if (app->settings->logPath == "") {
-        logPathDirectory = app->paths->messageLogDirectory;
+    if (getSettings()->logPath == "") {
+        logPathDirectory = getPaths()->messageLogDirectory;
     } else {
-        logPathDirectory = app->settings->logPath;
+        logPathDirectory = getSettings()->logPath;
     }
     qint64 logsSize = dirSize(logPathDirectory);
     QString logsSizeLabel = "Your logs currently take up ";
@@ -101,12 +100,12 @@ ModerationPage::ModerationPage()
             QtConcurrent::run([] { return fetchLogDirectorySize(); }));
 
         // Logs (copied from LoggingMananger)
-        app->settings->logPath.connect(
+        getSettings()->logPath.connect(
             [app, logsPathLabel](const QString &logPath, auto) mutable {
                 QString pathOriginal;
 
                 if (logPath == "") {
-                    pathOriginal = app->paths->messageLogDirectory;
+                    pathOriginal = getPaths()->messageLogDirectory;
                 } else {
                     pathOriginal = logPath;
                 }
@@ -136,7 +135,7 @@ ModerationPage::ModerationPage()
                                                Qt::LinksAccessibleByKeyboard);
         logsPathLabel->setOpenExternalLinks(true);
         logs.append(this->createCheckBox("Enable logging",
-                                         app->settings->enableLogging));
+                                         getSettings()->enableLogging));
 
         logs->addStretch(1);
         auto selectDir = logs.emplace<QPushButton>("Set custom logpath");
@@ -145,10 +144,9 @@ ModerationPage::ModerationPage()
         QObject::connect(
             selectDir.getElement(), &QPushButton::clicked, this,
             [this, logsPathSizeLabel]() mutable {
-                auto app = getApp();
                 auto dirName = QFileDialog::getExistingDirectory(this);
 
-                app->settings->logPath = dirName;
+                getSettings()->logPath = dirName;
 
                 // Refresh: Show how big (size-wise) the logs are
                 logsPathSizeLabel->setText(
@@ -159,8 +157,7 @@ ModerationPage::ModerationPage()
         auto resetDir = logs.emplace<QPushButton>("Reset logpath");
         QObject::connect(resetDir.getElement(), &QPushButton::clicked, this,
                          [logsPathSizeLabel]() mutable {
-                             auto app = getApp();
-                             app->settings->logPath = "";
+                             getSettings()->logPath = "";
 
                              // Refresh: Show how big (size-wise) the logs are
                              logsPathSizeLabel->setText(QtConcurrent::run(
@@ -183,7 +180,7 @@ ModerationPage::ModerationPage()
         //            form->addRow("Action on timed out messages
         //            (unimplemented):",
         //                         this->createComboBox({"Disable", "Hide"},
-        //                         app->settings->timeoutAction));
+        //                         getSettings()->timeoutAction));
         //        }
 
         EditableModelView *view =
diff --git a/src/widgets/settingspages/SpecialChannelsPage.cpp b/src/widgets/settingspages/SpecialChannelsPage.cpp
index cdd016dea..5ccb904c0 100644
--- a/src/widgets/settingspages/SpecialChannelsPage.cpp
+++ b/src/widgets/settingspages/SpecialChannelsPage.cpp
@@ -13,8 +13,6 @@ namespace chatterino {
 SpecialChannelsPage::SpecialChannelsPage()
     : SettingsPage("Special channels", "")
 {
-    auto app = getApp();
-
     LayoutCreator<SpecialChannelsPage> layoutCreator(this);
     auto layout = layoutCreator.setLayoutType<QVBoxLayout>();
 
diff --git a/src/widgets/splits/SplitInput.cpp b/src/widgets/splits/SplitInput.cpp
index 8fbc62f02..f6a66e7f4 100644
--- a/src/widgets/splits/SplitInput.cpp
+++ b/src/widgets/splits/SplitInput.cpp
@@ -109,7 +109,7 @@ void SplitInput::initLayout()
                      });
 
     // textEditLength visibility
-    app->settings->showMessageLength.connect(
+    getSettings()->showMessageLength.connect(
         [this](const bool &value, auto) {
             this->ui_.textEditLength->setHidden(!value);
         },

From f6e110b7fb8f8d9e75d4146772c19d3fd094f983 Mon Sep 17 00:00:00 2001
From: fourtf <tf.four@gmail.com>
Date: Mon, 13 Aug 2018 13:54:39 +0200
Subject: [PATCH 24/44] fixed and optimized the autocompletion

---
 chatterino.pro                                |   6 +-
 src/common/Channel.hpp                        |   2 +-
 src/common/CompletionModel.cpp                | 152 +++++++++---------
 src/common/CompletionModel.hpp                |   2 +-
 src/common/UsernameSet.cpp                    | 110 +++++++++++++
 src/common/UsernameSet.hpp                    |  73 +++++++++
 src/providers/twitch/TwitchChannel.cpp        |  74 +++++----
 src/providers/twitch/TwitchChannel.hpp        |  83 +++++-----
 src/providers/twitch/TwitchEmotes.hpp         |  16 +-
 src/providers/twitch/TwitchMessageBuilder.cpp |   4 +-
 src/providers/twitch/TwitchServer.cpp         |   2 +-
 src/widgets/helper/ResizingTextEdit.cpp       |   2 +-
 12 files changed, 362 insertions(+), 164 deletions(-)
 create mode 100644 src/common/UsernameSet.cpp
 create mode 100644 src/common/UsernameSet.hpp

diff --git a/chatterino.pro b/chatterino.pro
index 7ddf1fd34..522dea930 100644
--- a/chatterino.pro
+++ b/chatterino.pro
@@ -250,7 +250,8 @@ SOURCES += \
     src/widgets/helper/EffectLabel.cpp \
     src/widgets/helper/Button.cpp \
     src/messages/MessageContainer.cpp \
-    src/debug/Benchmark.cpp
+    src/debug/Benchmark.cpp \
+    src/common/UsernameSet.cpp
 
 HEADERS  += \
     src/Application.hpp \
@@ -445,7 +446,8 @@ HEADERS  += \
     src/widgets/helper/EffectLabel.hpp \
     src/util/LayoutHelper.hpp \
     src/widgets/helper/Button.hpp \
-    src/messages/MessageContainer.hpp
+    src/messages/MessageContainer.hpp \
+    src/common/UsernameSet.hpp
 
 RESOURCES += \ 
     resources/resources.qrc \
diff --git a/src/common/Channel.hpp b/src/common/Channel.hpp
index c1dd06651..f265f4b70 100644
--- a/src/common/Channel.hpp
+++ b/src/common/Channel.hpp
@@ -51,7 +51,6 @@ public:
     void addOrReplaceTimeout(MessagePtr message);
     void disableAllMessages();
     void replaceMessage(MessagePtr message, MessagePtr replacement);
-    virtual void addRecentChatter(const MessagePtr &message);
 
     QStringList modList;
 
@@ -67,6 +66,7 @@ public:
 
 protected:
     virtual void onConnected();
+    virtual void addRecentChatter(const MessagePtr &message);
 
 private:
     const QString name_;
diff --git a/src/common/CompletionModel.cpp b/src/common/CompletionModel.cpp
index 04425a624..69e7ffe70 100644
--- a/src/common/CompletionModel.cpp
+++ b/src/common/CompletionModel.cpp
@@ -2,8 +2,10 @@
 
 #include "Application.hpp"
 #include "common/Common.hpp"
+#include "common/UsernameSet.hpp"
 #include "controllers/accounts/AccountController.hpp"
 #include "controllers/commands/CommandController.hpp"
+#include "debug/Benchmark.hpp"
 #include "debug/Log.hpp"
 #include "providers/twitch/TwitchChannel.hpp"
 #include "providers/twitch/TwitchServer.hpp"
@@ -103,88 +105,81 @@ int CompletionModel::rowCount(const QModelIndex &) const
     return this->emotes_.size();
 }
 
-void CompletionModel::refresh()
+void CompletionModel::refresh(const QString &prefix)
 {
-    log("[CompletionModel:{}] Refreshing...]", this->channelName_);
+    {
+        std::lock_guard<std::mutex> guard(this->emotesMutex_);
+        this->emotes_.clear();
+    }
 
-    auto app = getApp();
+    if (prefix.length() < 2) return;
 
-    // User-specific: Twitch Emotes
-    if (auto account = app->accounts->twitch.getCurrent()) {
-        for (const auto &emote : account->accessEmotes()->allEmoteNames) {
-            // XXX: No way to discern between a twitch global emote and sub
-            // emote right now
-            this->addString(emote.string,
-                            TaggedString::Type::TwitchGlobalEmote);
+    BenchmarkGuard guard("CompletionModel::refresh");
+
+    auto addString = [&](const QString &str, TaggedString::Type type) {
+        if (str.startsWith(prefix)) this->emotes_.emplace(str + " ", type);
+    };
+
+    auto _channel = getApp()->twitch2->getChannelOrEmpty(this->channelName_);
+
+    if (auto channel = dynamic_cast<TwitchChannel *>(_channel.get())) {
+        // account emotes
+        if (auto account = getApp()->accounts->twitch.getCurrent()) {
+            for (const auto &emote : account->accessEmotes()->allEmoteNames) {
+                // XXX: No way to discern between a twitch global emote and sub
+                // emote right now
+                addString(emote.string, TaggedString::Type::TwitchGlobalEmote);
+            }
+        }
+
+        // Usernames
+        if (prefix.length() >= UsernameSet::PrefixLength) {
+            auto usernames = channel->accessChatters();
+
+            for (const auto &name : usernames->subrange(Prefix(prefix))) {
+                addString(name, TaggedString::Type::Username);
+                addString("@" + name, TaggedString::Type::Username);
+            }
+        }
+
+        // Bttv Global
+        for (auto &emote : *channel->globalBttv().emotes()) {
+            addString(emote.first.string, TaggedString::Type::BTTVChannelEmote);
+        }
+
+        // Ffz Global
+        for (auto &emote : *channel->globalFfz().emotes()) {
+            addString(emote.first.string, TaggedString::Type::FFZChannelEmote);
+        }
+
+        // Bttv Channel
+        for (auto &emote : *channel->bttvEmotes()) {
+            addString(emote.first.string, TaggedString::Type::BTTVGlobalEmote);
+        }
+
+        // Ffz Channel
+        for (auto &emote : *channel->ffzEmotes()) {
+            addString(emote.first.string, TaggedString::Type::BTTVGlobalEmote);
+        }
+
+        // Emojis
+        if (prefix.startsWith(":")) {
+            const auto &emojiShortCodes = getApp()->emotes->emojis.shortCodes;
+            for (auto &m : emojiShortCodes) {
+                addString(":" + m + ":", TaggedString::Type::Emoji);
+            }
+        }
+
+        // Commands
+        for (auto &command : getApp()->commands->items.getVector()) {
+            addString(command.name, TaggedString::Command);
+        }
+
+        for (auto &command :
+             getApp()->commands->getDefaultTwitchCommandList()) {
+            addString(command, TaggedString::Command);
         }
     }
-
-    //    // Global: BTTV Global Emotes
-    //    std::vector<QString> &bttvGlobalEmoteCodes =
-    //    app->emotes->bttv.globalEmoteNames_; for (const auto &m :
-    //    bttvGlobalEmoteCodes) {
-    //        this->addString(m, TaggedString::Type::BTTVGlobalEmote);
-    //    }
-
-    //    // Global: FFZ Global Emotes
-    //    std::vector<QString> &ffzGlobalEmoteCodes =
-    //    app->emotes->ffz.globalEmoteCodes; for (const auto &m :
-    //    ffzGlobalEmoteCodes) {
-    //        this->addString(m, TaggedString::Type::FFZGlobalEmote);
-    //    }
-
-    // Channel emotes
-    if (auto channel = dynamic_cast<TwitchChannel *>(
-            getApp()
-                ->twitch2->getChannelOrEmptyByID(this->channelName_)
-                .get())) {
-        auto bttv = channel->bttvEmotes();
-        //        auto it = bttv->begin();
-        //        for (const auto &emote : *bttv) {
-        //        }
-        //            std::vector<QString> &bttvChannelEmoteCodes =
-        //                app->emotes->bttv.channelEmoteName_[this->channelName_];
-        //        for (const auto &m : bttvChannelEmoteCodes) {
-        //            this->addString(m, TaggedString::Type::BTTVChannelEmote);
-        //        }
-
-        // Channel-specific: FFZ Channel Emotes
-        for (const auto &emote : *channel->ffzEmotes()) {
-            this->addString(emote.second->name.string,
-                            TaggedString::Type::FFZChannelEmote);
-        }
-    }
-
-    // Emojis
-    const auto &emojiShortCodes = app->emotes->emojis.shortCodes;
-    for (const auto &m : emojiShortCodes) {
-        this->addString(":" + m + ":", TaggedString::Type::Emoji);
-    }
-
-    // Commands
-    for (auto &command : app->commands->items.getVector()) {
-        this->addString(command.name, TaggedString::Command);
-    }
-
-    for (auto &command : app->commands->getDefaultTwitchCommandList()) {
-        this->addString(command, TaggedString::Command);
-    }
-
-    // Channel-specific: Usernames
-    // fourtf: only works with twitch chat
-    //    auto c =
-    //    ChannelManager::getInstance().getTwitchChannel(this->channelName);
-    //    auto usernames = c->getUsernamesForCompletions();
-    //    for (const auto &name : usernames) {
-    //        assert(!name.displayName.isEmpty());
-    //        this->addString(name.displayName);
-    //        this->addString('@' + name.displayName);
-
-    //        if (!name.localizedName.isEmpty()) {
-    //            this->addString(name.localizedName);
-    //            this->addString('@' + name.localizedName);
-    //        }
-    //    }
 }
 
 void CompletionModel::addString(const QString &str, TaggedString::Type type)
@@ -200,8 +195,7 @@ void CompletionModel::addUser(const QString &username)
     auto add = [this](const QString &str) {
         auto ts = this->createUser(str + " ");
         // Always add a space at the end of completions
-        std::pair<std::set<TaggedString>::iterator, bool> p =
-            this->emotes_.insert(ts);
+        auto p = this->emotes_.insert(ts);
         if (!p.second) {
             // No inseration was made, figure out if we need to replace the
             // username.
diff --git a/src/common/CompletionModel.hpp b/src/common/CompletionModel.hpp
index 977768474..d0a5e3a06 100644
--- a/src/common/CompletionModel.hpp
+++ b/src/common/CompletionModel.hpp
@@ -51,7 +51,7 @@ public:
     virtual QVariant data(const QModelIndex &index, int) const override;
     virtual int rowCount(const QModelIndex &) const override;
 
-    void refresh();
+    void refresh(const QString &prefix);
     void addString(const QString &str, TaggedString::Type type);
     void addUser(const QString &str);
 
diff --git a/src/common/UsernameSet.cpp b/src/common/UsernameSet.cpp
new file mode 100644
index 000000000..4356772a9
--- /dev/null
+++ b/src/common/UsernameSet.cpp
@@ -0,0 +1,110 @@
+#include "UsernameSet.hpp"
+
+#include <tuple>
+
+namespace chatterino {
+
+//
+// UsernameSet
+//
+
+UsernameSet::ConstIterator UsernameSet::begin() const
+{
+    return this->items.begin();
+}
+
+UsernameSet::ConstIterator UsernameSet::end() const
+{
+    return this->items.end();
+}
+
+UsernameSet::Range UsernameSet::subrange(const Prefix &prefix) const
+{
+    auto it = this->firstKeyForPrefix.find(prefix);
+    if (it != this->firstKeyForPrefix.end()) {
+        auto start = this->items.find(it->second);
+        auto end = start;
+
+        while (end != this->items.end() && prefix.isStartOf(*end)) {
+            end++;
+        }
+        return {start, end};
+    }
+
+    return {this->items.end(), this->items.end()};
+}
+
+std::set<QString>::size_type UsernameSet::size() const
+{
+    return this->items.size();
+}
+
+std::pair<UsernameSet::Iterator, bool> UsernameSet::insert(const QString &value)
+{
+    this->insertPrefix(value);
+
+    return this->items.insert(value);
+}
+
+std::pair<UsernameSet::Iterator, bool> UsernameSet::insert(QString &&value)
+{
+    this->insertPrefix(value);
+
+    return this->items.insert(std::move(value));
+}
+
+void UsernameSet::insertPrefix(const QString &value)
+{
+    auto &string = this->firstKeyForPrefix[Prefix(value)];
+
+    if (string.isNull() || value < string) string = value;
+}
+
+//
+// Range
+//
+
+UsernameSet::Range::Range(ConstIterator start, ConstIterator end)
+    : start_(start)
+    , end_(end)
+{
+}
+
+UsernameSet::ConstIterator UsernameSet::Range::begin()
+{
+    return this->start_;
+}
+
+UsernameSet::ConstIterator UsernameSet::Range::end()
+{
+    return this->end_;
+}
+
+//
+// Prefix
+//
+
+Prefix::Prefix(const QString &string)
+    : first(string.size() >= 1 ? string[0] : '\0')
+    , second(string.size() >= 2 ? string[1] : '\0')
+{
+}
+
+bool Prefix::operator==(const Prefix &other) const
+{
+    return std::tie(this->first, this->second) ==
+           std::tie(other.first, other.second);
+}
+
+bool Prefix::isStartOf(const QString &string) const
+{
+    if (string.size() == 0) {
+        return this->first == QChar('\0') && this->second == QChar('\0');
+    } else if (string.size() == 1) {
+        return this->first == string[0] && this->second == QChar('\0');
+    } else {
+        return this->first == string[0] && this->second == string[1];
+    }
+}
+
+}  // namespace chatterino
diff --git a/src/common/UsernameSet.hpp b/src/common/UsernameSet.hpp
new file mode 100644
index 000000000..d71bcdaf6
--- /dev/null
+++ b/src/common/UsernameSet.hpp
@@ -0,0 +1,73 @@
+#pragma once
+
+#include <QString>
+#include <functional>
+#include <set>
+#include <unordered_map>
+
+namespace chatterino {
+class Prefix
+{
+public:
+    Prefix(const QString &string);
+    bool operator==(const Prefix &other) const;
+    bool isStartOf(const QString &string) const;
+
+private:
+    QChar first;
+    QChar second;
+
+    friend struct std::hash<Prefix>;
+};
+}  // namespace chatterino
+
+namespace std {
+template <>
+struct hash<chatterino::Prefix> {
+    size_t operator()(const chatterino::Prefix &prefix) const
+    {
+        return (size_t(prefix.first.unicode()) << 16) |
+               size_t(prefix.second.unicode());
+    }
+};
+}  // namespace std
+
+namespace chatterino {
+class UsernameSet
+{
+public:
+    static constexpr int PrefixLength = 2;
+
+    using Iterator = std::set<QString>::iterator;
+    using ConstIterator = std::set<QString>::const_iterator;
+
+    class Range
+    {
+    public:
+        Range(ConstIterator start, ConstIterator end);
+
+        ConstIterator begin();
+        ConstIterator end();
+
+    private:
+        ConstIterator start_;
+        ConstIterator end_;
+    };
+
+    ConstIterator begin() const;
+    ConstIterator end() const;
+    Range subrange(const Prefix &prefix) const;
+
+    std::set<QString>::size_type size() const;
+
+    std::pair<Iterator, bool> insert(const QString &value);
+    std::pair<Iterator, bool> insert(QString &&value);
+
+private:
+    void insertPrefix(const QString &string);
+
+    std::set<QString> items;
+    std::unordered_map<Prefix, QString> firstKeyForPrefix;
+};
+
+}  // namespace chatterino
diff --git a/src/providers/twitch/TwitchChannel.cpp b/src/providers/twitch/TwitchChannel.cpp
index 6413629f6..ad3cdc94a 100644
--- a/src/providers/twitch/TwitchChannel.cpp
+++ b/src/providers/twitch/TwitchChannel.cpp
@@ -49,6 +49,24 @@ auto parseRecentMessages(const QJsonObject &jsonRoot, TwitchChannel &channel)
 
     return messages;
 }
+std::pair<Outcome, UsernameSet> parseChatters(const QJsonObject &jsonRoot)
+{
+    static QStringList categories = {"moderators", "staff", "admins",
+                                     "global_mods", "viewers"};
+
+    auto usernames = UsernameSet();
+
+    // parse json
+    QJsonObject jsonCategories = jsonRoot.value("chatters").toObject();
+
+    for (const auto &category : categories) {
+        for (auto jsonCategory : jsonCategories.value(category).toArray()) {
+            usernames.insert(jsonCategory.toString());
+        }
+    }
+
+    return {Success, std::move(usernames)};
+}
 }  // namespace
 
 TwitchChannel::TwitchChannel(const QString &name, BttvEmotes &bttv,
@@ -72,22 +90,22 @@ TwitchChannel::TwitchChannel(const QString &name, BttvEmotes &bttv,
                          [=] { this->setMod(false); });
 
     // pubsub
-    this->userStateChanged.connect([=] { this->refreshPubsub(); });
     this->managedConnect(getApp()->accounts->twitch.currentUserChanged,
                          [=] { this->refreshPubsub(); });
     this->refreshPubsub();
+    this->userStateChanged.connect([this] { this->refreshPubsub(); });
 
     // room id loaded -> refresh live status
     this->roomIdChanged.connect([this]() {
         this->refreshPubsub();
         this->refreshLiveStatus();
-        this->loadBadges();
-        this->loadCheerEmotes();
+        this->refreshBadges();
+        this->refreshCheerEmotes();
     });
 
     // timers
     QObject::connect(&this->chattersListTimer_, &QTimer::timeout,
-                     [=] { this->refreshViewerList(); });
+                     [=] { this->refreshChatters(); });
     this->chattersListTimer_.start(5 * 60 * 1000);
 
     QObject::connect(&this->liveStatusTimer_, &QTimer::timeout,
@@ -101,11 +119,17 @@ TwitchChannel::TwitchChannel(const QString &name, BttvEmotes &bttv,
     // debugging
 #if 0
     for (int i = 0; i < 1000; i++) {
-        this->addMessage(makeSystemMessage("asdf"));
+        this->addMessage(makeSystemMessage("asef"));
     }
 #endif
 }
 
+void TwitchChannel::initialize()
+{
+    this->refreshChatters();
+    this->refreshChannelEmotes();
+}
+
 bool TwitchChannel::isEmpty() const
 {
     return this->getName().isEmpty();
@@ -293,6 +317,11 @@ TwitchChannel::accessStreamStatus() const
     return this->streamStatus_.accessConst();
 }
 
+AccessGuard<const UsernameSet> TwitchChannel::accessChatters() const
+{
+    return this->chatters_.accessConst();
+}
+
 const BttvEmotes &TwitchChannel::globalBttv() const
 {
     return this->globalBttv_;
@@ -314,7 +343,7 @@ boost::optional<EmotePtr> TwitchChannel::bttvEmote(const EmoteName &name) const
 
 boost::optional<EmotePtr> TwitchChannel::ffzEmote(const EmoteName &name) const
 {
-    auto emotes = this->bttvEmotes_.get();
+    auto emotes = this->ffzEmotes_.get();
     auto it = emotes->find(name);
 
     if (it == emotes->end()) return boost::none;
@@ -508,7 +537,7 @@ void TwitchChannel::refreshPubsub()
                                                                 account);
 }
 
-void TwitchChannel::refreshViewerList()
+void TwitchChannel::refreshChatters()
 {
     // setting?
     const auto streamStatus = this->accessStreamStatus();
@@ -531,31 +560,18 @@ void TwitchChannel::refreshViewerList()
             auto shared = weak.lock();
             if (!shared) return Failure;
 
-            return this->parseViewerList(result.parseJson());
+            auto pair = parseChatters(result.parseJson());
+            if (pair.first) {
+                *this->chatters_.access() = std::move(pair.second);
+            }
+
+            return pair.first;
         });
 
     request.execute();
 }
 
-Outcome TwitchChannel::parseViewerList(const QJsonObject &jsonRoot)
-{
-    static QStringList categories = {"moderators", "staff", "admins",
-                                     "global_mods", "viewers"};
-
-    // parse json
-    QJsonObject jsonCategories = jsonRoot.value("chatters").toObject();
-
-    for (const auto &category : categories) {
-        for (const auto jsonCategory :
-             jsonCategories.value(category).toArray()) {
-            this->completionModel.addUser(jsonCategory.toString());
-        }
-    }
-
-    return Success;
-}
-
-void TwitchChannel::loadBadges()
+void TwitchChannel::refreshBadges()
 {
     auto url = Url{"https://badges.twitch.tv/v1/badges/channels/" +
                    this->roomId() + "/display?language=en"};
@@ -600,7 +616,7 @@ void TwitchChannel::loadBadges()
     req.execute();
 }
 
-void TwitchChannel::loadCheerEmotes()
+void TwitchChannel::refreshCheerEmotes()
 {
     /*auto url = Url{"https://api.twitch.tv/kraken/bits/actions?channel_id=" +
                    this->getRoomId()};
@@ -664,7 +680,7 @@ void TwitchChannel::loadCheerEmotes()
     */
 }
 
-boost::optional<EmotePtr> TwitchChannel::getTwitchBadge(
+boost::optional<EmotePtr> TwitchChannel::twitchBadge(
     const QString &set, const QString &version) const
 {
     auto badgeSets = this->badgeSets_.access();
diff --git a/src/providers/twitch/TwitchChannel.hpp b/src/providers/twitch/TwitchChannel.hpp
index a444d26e2..ea95c0df3 100644
--- a/src/providers/twitch/TwitchChannel.hpp
+++ b/src/providers/twitch/TwitchChannel.hpp
@@ -1,13 +1,17 @@
 #pragma once
 
-#include <IrcConnection>
-
 #include "common/Aliases.hpp"
 #include "common/Atomic.hpp"
 #include "common/Channel.hpp"
 #include "common/Outcome.hpp"
 #include "common/UniqueAccess.hpp"
+#include "common/UsernameSet.hpp"
+#include "providers/twitch/TwitchEmotes.hpp"
 
+#include <rapidjson/document.h>
+#include <IrcConnection>
+#include <QColor>
+#include <QRegularExpression>
 #include <boost/optional.hpp>
 #include <mutex>
 #include <pajlada/signals/signalholder.hpp>
@@ -37,11 +41,6 @@ public:
         QString streamType;
     };
 
-    struct UserState {
-        bool mod;
-        bool broadcaster;
-    };
-
     struct RoomModes {
         bool submode = false;
         bool r9k = false;
@@ -51,32 +50,24 @@ public:
         QString broadcasterLang;
     };
 
-    void refreshChannelEmotes();
+    void initialize();
 
     // Channel methods
     virtual bool isEmpty() const override;
     virtual bool canSendMessage() const override;
     virtual void sendMessage(const QString &message) override;
-
-    // Auto completion
-    void addRecentChatter(const MessagePtr &message) final;
-    void addJoinedUser(const QString &user);
-    void addPartedUser(const QString &user);
-
-    bool isLive() const;
     virtual bool isMod() const override;
-    void setMod(bool value);
     virtual bool isBroadcaster() const override;
 
     // Data
     const QString &subscriptionUrl();
     const QString &channelUrl();
     const QString &popoutPlayerUrl();
+    bool isLive() const;
     QString roomId() const;
-    void setRoomId(const QString &id);
     AccessGuard<const RoomModes> accessRoomModes() const;
-    void setRoomModes(const RoomModes &roomModes_);
     AccessGuard<const StreamStatus> accessStreamStatus() const;
+    AccessGuard<const UsernameSet> accessChatters() const;
 
     // Emotes
     const BttvEmotes &globalBttv() const;
@@ -86,58 +77,53 @@ public:
     std::shared_ptr<const EmoteMap> bttvEmotes() const;
     std::shared_ptr<const EmoteMap> ffzEmotes() const;
 
-    boost::optional<EmotePtr> getTwitchBadge(const QString &set,
-                                             const QString &version) const;
+    void refreshChannelEmotes();
+
+    // Badges
+    boost::optional<EmotePtr> twitchBadge(const QString &set,
+                                          const QString &version) const;
 
     // Signals
     pajlada::Signals::NoArgSignal roomIdChanged;
-    pajlada::Signals::NoArgSignal liveStatusChanged;
     pajlada::Signals::NoArgSignal userStateChanged;
+    pajlada::Signals::NoArgSignal liveStatusChanged;
     pajlada::Signals::NoArgSignal roomModesChanged;
 
+protected:
+    void addRecentChatter(const MessagePtr &message) override;
+
 private:
     struct NameOptions {
         QString displayName;
         QString localizedName;
     };
 
-    struct CheerEmote {
-        // a Cheermote indicates one tier
-        QColor color;
-        int minBits;
-
-        EmotePtr animatedEmote;
-        EmotePtr staticEmote;
-    };
-
-    struct CheerEmoteSet {
-        QRegularExpression regex;
-        std::vector<CheerEmote> cheerEmotes;
-    };
-
-    explicit TwitchChannel(const QString &channelName, BttvEmotes &bttv,
-                           FfzEmotes &ffz);
+    explicit TwitchChannel(const QString &channelName, BttvEmotes &globalBttv,
+                           FfzEmotes &globalFfz);
 
     // Methods
     void refreshLiveStatus();
     Outcome parseLiveStatus(const rapidjson::Document &document);
     void refreshPubsub();
-    void refreshViewerList();
-    Outcome parseViewerList(const QJsonObject &jsonRoot);
+    void refreshChatters();
+    void refreshBadges();
+    void refreshCheerEmotes();
     void loadRecentMessages();
 
+    void addJoinedUser(const QString &user);
+    void addPartedUser(const QString &user);
     void setLive(bool newLiveStatus);
-
-    void loadBadges();
-    void loadCheerEmotes();
+    void setMod(bool value);
+    void setRoomId(const QString &id);
+    void setRoomModes(const RoomModes &roomModes_);
 
     // Data
     const QString subscriptionUrl_;
     const QString channelUrl_;
     const QString popoutPlayerUrl_;
     UniqueAccess<StreamStatus> streamStatus_;
-    UniqueAccess<UserState> userState_;
     UniqueAccess<RoomModes> roomModes_;
+    UniqueAccess<UsernameSet> chatters_;  // maps 2 char prefix to set of names
 
     // Emotes
     BttvEmotes &globalBttv_;
@@ -145,6 +131,11 @@ private:
     Atomic<std::shared_ptr<const EmoteMap>> bttvEmotes_;
     Atomic<std::shared_ptr<const EmoteMap>> ffzEmotes_;
 
+    // Badges
+    UniqueAccess<std::map<QString, std::map<QString, EmotePtr>>>
+        badgeSets_;  // "subscribers": { "0": ... "3": ... "6": ...
+    UniqueAccess<std::vector<CheerEmoteSet>> cheerEmoteSets_;
+
     bool mod_ = false;
     UniqueAccess<QString> roomID_;
 
@@ -153,10 +144,6 @@ private:
     UniqueAccess<QStringList> partedUsers_;
     bool partedUsersMergeQueued_ = false;
 
-    // "subscribers": { "0": ... "3": ... "6": ...
-    UniqueAccess<std::map<QString, std::map<QString, EmotePtr>>> badgeSets_;
-    UniqueAccess<std::vector<CheerEmoteSet>> cheerEmoteSets_;
-
     // --
     QByteArray messageSuffix_;
     QString lastSentMessage_;
@@ -165,6 +152,8 @@ private:
     QTimer chattersListTimer_;
 
     friend class TwitchServer;
+    friend class TwitchMessageBuilder;
+    friend class IrcMessageHandler;
 };
 
 }  // namespace chatterino
diff --git a/src/providers/twitch/TwitchEmotes.hpp b/src/providers/twitch/TwitchEmotes.hpp
index 90cafe440..1c1b0b216 100644
--- a/src/providers/twitch/TwitchEmotes.hpp
+++ b/src/providers/twitch/TwitchEmotes.hpp
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <QColor>
+#include <QRegularExpression>
 #include <QString>
 #include <unordered_map>
 
@@ -11,10 +13,22 @@
     "https://static-cdn.jtvnw.net/emoticons/v1/{id}/{scale}"
 
 namespace chatterino {
-
 struct Emote;
 using EmotePtr = std::shared_ptr<const Emote>;
 
+struct CheerEmote {
+    QColor color;
+    int minBits;
+
+    EmotePtr animatedEmote;
+    EmotePtr staticEmote;
+};
+
+struct CheerEmoteSet {
+    QRegularExpression regex;
+    std::vector<CheerEmote> cheerEmotes;
+};
+
 class TwitchEmotes
 {
 public:
diff --git a/src/providers/twitch/TwitchMessageBuilder.cpp b/src/providers/twitch/TwitchMessageBuilder.cpp
index 7f8c2aa3d..97b41561a 100644
--- a/src/providers/twitch/TwitchMessageBuilder.cpp
+++ b/src/providers/twitch/TwitchMessageBuilder.cpp
@@ -646,7 +646,7 @@ Outcome TwitchMessageBuilder::tryAppendEmote(const EmoteName &name)
         flags = MessageElementFlag::BttvEmote;
     } else if ((emote = this->twitchChannel->globalFfz().emote(name))) {
         flags = MessageElementFlag::FfzEmote;
-    } else if (twitchChannel && (emote = this->twitchChannel->ffzEmote(name))) {
+    } else if ((emote = this->twitchChannel->ffzEmote(name))) {
         flags = MessageElementFlag::FfzEmote;
     }
 
@@ -691,7 +691,7 @@ void TwitchMessageBuilder::appendTwitchBadges()
             // Try to fetch channel-specific bit badge
             try {
                 if (twitchChannel)
-                    if (const auto &badge = this->twitchChannel->getTwitchBadge(
+                    if (const auto &badge = this->twitchChannel->twitchBadge(
                             "bits", cheerAmount)) {
                         this->emplace<EmoteElement>(
                                 badge.get(), MessageElementFlag::BadgeVanity)
diff --git a/src/providers/twitch/TwitchServer.cpp b/src/providers/twitch/TwitchServer.cpp
index bb7b16fd9..465fe3315 100644
--- a/src/providers/twitch/TwitchServer.cpp
+++ b/src/providers/twitch/TwitchServer.cpp
@@ -85,7 +85,7 @@ std::shared_ptr<Channel> TwitchServer::createChannel(const QString &channelName)
 {
     auto channel = std::shared_ptr<TwitchChannel>(
         new TwitchChannel(channelName, this->bttv, this->ffz));
-    channel->refreshChannelEmotes();
+    channel->initialize();
 
     channel->sendMessageSignal.connect(
         [this, channel = channel.get()](auto &chan, auto &msg, bool &sent) {
diff --git a/src/widgets/helper/ResizingTextEdit.cpp b/src/widgets/helper/ResizingTextEdit.cpp
index 731bed53b..1a06b1868 100644
--- a/src/widgets/helper/ResizingTextEdit.cpp
+++ b/src/widgets/helper/ResizingTextEdit.cpp
@@ -102,7 +102,7 @@ void ResizingTextEdit::keyPressEvent(QKeyEvent *event)
             // First type pressing tab after modifying a message, we refresh our
             // completion model
             this->completer_->setModel(completionModel);
-            completionModel->refresh();
+            completionModel->refresh(currentCompletionPrefix);
             this->completionInProgress_ = true;
             this->completer_->setCompletionPrefix(currentCompletionPrefix);
             this->completer_->complete();

From 2448f6f5384eb50dc882aef01985e8006a15022e Mon Sep 17 00:00:00 2001
From: fourtf <tf.four@gmail.com>
Date: Mon, 13 Aug 2018 14:38:03 +0200
Subject: [PATCH 25/44] cleaned up CompletionModel

---
 src/common/Channel.cpp                 |   7 +-
 src/common/CompletionModel.cpp         | 143 +++++--------------------
 src/common/CompletionModel.hpp         |  23 ++--
 src/providers/twitch/TwitchChannel.cpp |   7 +-
 src/providers/twitch/TwitchServer.hpp  |   2 +-
 5 files changed, 35 insertions(+), 147 deletions(-)

diff --git a/src/common/Channel.cpp b/src/common/Channel.cpp
index d7f1659f4..9c1967f60 100644
--- a/src/common/Channel.cpp
+++ b/src/common/Channel.cpp
@@ -22,15 +22,10 @@ namespace chatterino {
 // Channel
 //
 Channel::Channel(const QString &name, Type type)
-    : completionModel(name)
+    : completionModel(*this)
     , name_(name)
     , type_(type)
 {
-    QObject::connect(&this->clearCompletionModelTimer_, &QTimer::timeout,
-                     [this]() {
-                         this->completionModel.clearExpiredStrings();  //
-                     });
-    this->clearCompletionModelTimer_.start(60 * 1000);
 }
 
 Channel::~Channel()
diff --git a/src/common/CompletionModel.cpp b/src/common/CompletionModel.cpp
index 69e7ffe70..ce07b25f6 100644
--- a/src/common/CompletionModel.cpp
+++ b/src/common/CompletionModel.cpp
@@ -12,38 +12,20 @@
 #include "singletons/Emotes.hpp"
 
 #include <QtAlgorithms>
-
 #include <utility>
 
 namespace chatterino {
 
-// -- TaggedString
+//
+// TaggedString
+//
 
-CompletionModel::TaggedString::TaggedString(const QString &_str, Type _type)
-    : str(_str)
+CompletionModel::TaggedString::TaggedString(const QString &_string, Type _type)
+    : string(_string)
     , type(_type)
-    , timeAdded(std::chrono::steady_clock::now())
 {
 }
 
-bool CompletionModel::TaggedString::isExpired(
-    const std::chrono::steady_clock::time_point &now) const
-{
-    switch (this->type) {
-        case Type::Username: {
-            static std::chrono::minutes expirationTimer(10);
-
-            return (this->timeAdded + expirationTimer < now);
-        } break;
-
-        default: {
-            return false;
-        } break;
-    }
-
-    return false;
-}
-
 bool CompletionModel::TaggedString::isEmote() const
 {
     return this->type > Type::EmoteStart && this->type < Type::EmoteEnd;
@@ -51,35 +33,23 @@ bool CompletionModel::TaggedString::isEmote() const
 
 bool CompletionModel::TaggedString::operator<(const TaggedString &that) const
 {
-    if (this->isEmote()) {
-        if (that.isEmote()) {
-            int k = QString::compare(this->str, that.str, Qt::CaseInsensitive);
-            if (k == 0) {
-                return this->str > that.str;
-            }
-
-            return k < 0;
-        }
-
-        return true;
+    if (this->isEmote() != that.isEmote()) {
+        return this->isEmote();
     }
 
-    if (that.isEmote()) {
-        return false;
-    }
-
-    int k = QString::compare(this->str, that.str, Qt::CaseInsensitive);
-    if (k == 0) {
-        return false;
-    }
+    // try comparing insensitively, if they are the same then senstively
+    // (fixes order of LuL and LUL)
+    int k = QString::compare(this->string, that.string, Qt::CaseInsensitive);
+    if (k == 0) return this->string > that.string;
 
     return k < 0;
 }
 
-// -- CompletionModel
-
-CompletionModel::CompletionModel(const QString &channelName)
-    : channelName_(channelName)
+//
+// CompletionModel
+//
+CompletionModel::CompletionModel(Channel &channel)
+    : channel_(channel)
 {
 }
 
@@ -90,39 +60,32 @@ int CompletionModel::columnCount(const QModelIndex &) const
 
 QVariant CompletionModel::data(const QModelIndex &index, int) const
 {
-    std::lock_guard<std::mutex> lock(this->emotesMutex_);
+    std::lock_guard<std::mutex> lock(this->itemsMutex_);
 
-    // TODO: Implement more safely
-    auto it = this->emotes_.begin();
+    auto it = this->items_.begin();
     std::advance(it, index.row());
-    return QVariant(it->str);
+    return QVariant(it->string);
 }
 
 int CompletionModel::rowCount(const QModelIndex &) const
 {
-    std::lock_guard<std::mutex> lock(this->emotesMutex_);
+    std::lock_guard<std::mutex> lock(this->itemsMutex_);
 
-    return this->emotes_.size();
+    return this->items_.size();
 }
 
 void CompletionModel::refresh(const QString &prefix)
 {
-    {
-        std::lock_guard<std::mutex> guard(this->emotesMutex_);
-        this->emotes_.clear();
-    }
+    std::lock_guard<std::mutex> guard(this->itemsMutex_);
+    this->items_.clear();
 
     if (prefix.length() < 2) return;
 
-    BenchmarkGuard guard("CompletionModel::refresh");
-
     auto addString = [&](const QString &str, TaggedString::Type type) {
-        if (str.startsWith(prefix)) this->emotes_.emplace(str + " ", type);
+        if (str.startsWith(prefix)) this->items_.emplace(str + " ", type);
     };
 
-    auto _channel = getApp()->twitch2->getChannelOrEmpty(this->channelName_);
-
-    if (auto channel = dynamic_cast<TwitchChannel *>(_channel.get())) {
+    if (auto channel = dynamic_cast<TwitchChannel *>(&this->channel_)) {
         // account emotes
         if (auto account = getApp()->accounts->twitch.getCurrent()) {
             for (const auto &emote : account->accessEmotes()->allEmoteNames) {
@@ -182,60 +145,4 @@ void CompletionModel::refresh(const QString &prefix)
     }
 }
 
-void CompletionModel::addString(const QString &str, TaggedString::Type type)
-{
-    std::lock_guard<std::mutex> lock(this->emotesMutex_);
-
-    // Always add a space at the end of completions
-    this->emotes_.insert({str + " ", type});
-}
-
-void CompletionModel::addUser(const QString &username)
-{
-    auto add = [this](const QString &str) {
-        auto ts = this->createUser(str + " ");
-        // Always add a space at the end of completions
-        auto p = this->emotes_.insert(ts);
-        if (!p.second) {
-            // No inseration was made, figure out if we need to replace the
-            // username.
-
-            if (p.first->str > ts.str) {
-                // Replace lowercase version of name with mixed-case version
-                this->emotes_.erase(p.first);
-                auto result2 = this->emotes_.insert(ts);
-                assert(result2.second);
-            } else {
-                p.first->timeAdded = std::chrono::steady_clock::now();
-            }
-        }
-    };
-
-    add(username);
-    add("@" + username);
-}
-
-void CompletionModel::clearExpiredStrings()
-{
-    std::lock_guard<std::mutex> lock(this->emotesMutex_);
-
-    auto now = std::chrono::steady_clock::now();
-
-    for (auto it = this->emotes_.begin(); it != this->emotes_.end();) {
-        const auto &taggedString = *it;
-
-        if (taggedString.isExpired(now)) {
-            // Log("String {} expired", taggedString.str);
-            it = this->emotes_.erase(it);
-        } else {
-            ++it;
-        }
-    }
-}
-
-CompletionModel::TaggedString CompletionModel::createUser(const QString &str)
-{
-    return TaggedString{str, TaggedString::Type::Username};
-}
-
 }  // namespace chatterino
diff --git a/src/common/CompletionModel.hpp b/src/common/CompletionModel.hpp
index d0a5e3a06..f4f216cd1 100644
--- a/src/common/CompletionModel.hpp
+++ b/src/common/CompletionModel.hpp
@@ -8,7 +8,7 @@
 
 namespace chatterino {
 
-class TwitchChannel;
+class Channel;
 
 class CompletionModel : public QAbstractListModel
 {
@@ -31,39 +31,30 @@ class CompletionModel : public QAbstractListModel
             Command,
         };
 
-        TaggedString(const QString &_str, Type _type);
+        TaggedString(const QString &string, Type type);
 
-        bool isExpired(const std::chrono::steady_clock::time_point &now) const;
         bool isEmote() const;
         bool operator<(const TaggedString &that) const;
 
-        QString str;
-        // Type will help decide the lifetime of the tagged strings
+        QString string;
         Type type;
-
-        mutable std::chrono::steady_clock::time_point timeAdded;
     };
 
 public:
-    CompletionModel(const QString &channelName);
+    CompletionModel(Channel &channel);
 
     virtual int columnCount(const QModelIndex &) const override;
     virtual QVariant data(const QModelIndex &index, int) const override;
     virtual int rowCount(const QModelIndex &) const override;
 
     void refresh(const QString &prefix);
-    void addString(const QString &str, TaggedString::Type type);
-    void addUser(const QString &str);
-
-    void clearExpiredStrings();
 
 private:
     TaggedString createUser(const QString &str);
 
-    mutable std::mutex emotesMutex_;
-    std::set<TaggedString> emotes_;
-
-    QString channelName_;
+    std::set<TaggedString> items_;
+    mutable std::mutex itemsMutex_;
+    Channel &channel_;
 };
 
 }  // namespace chatterino
diff --git a/src/providers/twitch/TwitchChannel.cpp b/src/providers/twitch/TwitchChannel.cpp
index ad3cdc94a..da7a508d9 100644
--- a/src/providers/twitch/TwitchChannel.cpp
+++ b/src/providers/twitch/TwitchChannel.cpp
@@ -83,9 +83,6 @@ TwitchChannel::TwitchChannel(const QString &name, BttvEmotes &bttv,
 {
     log("[TwitchChannel:{}] Opened", name);
 
-    // this->refreshChannelEmotes();
-    // this->refreshViewerList();
-
     this->managedConnect(getApp()->accounts->twitch.currentUserChanged,
                          [=] { this->setMod(false); });
 
@@ -220,9 +217,7 @@ bool TwitchChannel::isBroadcaster() const
 
 void TwitchChannel::addRecentChatter(const MessagePtr &message)
 {
-    assert(!message->loginName.isEmpty());
-
-    this->completionModel.addUser(message->displayName);
+    this->chatters_.access()->insert(message->displayName);
 }
 
 void TwitchChannel::addJoinedUser(const QString &user)
diff --git a/src/providers/twitch/TwitchServer.hpp b/src/providers/twitch/TwitchServer.hpp
index 127c2f62b..e097cc365 100644
--- a/src/providers/twitch/TwitchServer.hpp
+++ b/src/providers/twitch/TwitchServer.hpp
@@ -16,8 +16,8 @@ namespace chatterino {
 
 class Settings;
 class Paths;
-
 class PubSub;
+class TwitchChannel;
 
 class TwitchServer final : public AbstractIrcServer, public Singleton
 {

From c4e3bf1a8c058d3407d03634303485ea9806dd1e Mon Sep 17 00:00:00 2001
From: Daniel Pasch <daniel.pasch.s@gmail.com>
Date: Mon, 13 Aug 2018 20:10:32 +0200
Subject: [PATCH 26/44] Fix compiling on macOS High Sierra  (#665)

* mac docs update relating to qt

give a little more detailed installation guide for the qt installation

* Fix compiling on clang, now compiles on macOS High Sierra
---
 chatterino.pro                         | 4 +++-
 src/providers/twitch/PubsubHelpers.hpp | 2 +-
 src/providers/twitch/TwitchChannel.cpp | 4 ++--
 src/widgets/BaseWindow.cpp             | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/chatterino.pro b/chatterino.pro
index 522dea930..dd97cb271 100644
--- a/chatterino.pro
+++ b/chatterino.pro
@@ -33,7 +33,7 @@ equals(QMAKE_CXX, "clang++")|equals(QMAKE_CXX, "g++") {
 }
 
 # Icons
-macx:ICON = resources/images/chatterino2.icns
+#macx:ICON = resources/images/chatterino2.icns
 win32:RC_FILE = resources/windows.rc
 
 
@@ -71,6 +71,8 @@ win32 {
 # OSX include directory
 macx {
     INCLUDEPATH += /usr/local/include
+    INCLUDEPATH += /usr/local/opt/openssl/include
+    LIBS += -L/usr/local/opt/openssl/lib
 }
 
 # Optional dependency on Windows SDK 7
diff --git a/src/providers/twitch/PubsubHelpers.hpp b/src/providers/twitch/PubsubHelpers.hpp
index 3e92e332c..f9bc28a05 100644
--- a/src/providers/twitch/PubsubHelpers.hpp
+++ b/src/providers/twitch/PubsubHelpers.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "util/RapidjsonHelpers.hpp"
-
+#include "debug/Log.hpp"
 #include <boost/asio.hpp>
 #include <boost/asio/steady_timer.hpp>
 #include <memory>
diff --git a/src/providers/twitch/TwitchChannel.cpp b/src/providers/twitch/TwitchChannel.cpp
index da7a508d9..346ed1476 100644
--- a/src/providers/twitch/TwitchChannel.cpp
+++ b/src/providers/twitch/TwitchChannel.cpp
@@ -409,7 +409,7 @@ void TwitchChannel::refreshLiveStatus()
     //>>>>>>> 9bfbdefd2f0972a738230d5b95a009f73b1dd933
 
     request.onSuccess(
-        [this, weak = this->weak_from_this()](auto result) -> Outcome {
+        [this, weak = weakOf<Channel>(this)](auto result) -> Outcome {
             ChannelPtr shared = weak.lock();
             if (!shared) return Failure;
 
@@ -550,7 +550,7 @@ void TwitchChannel::refreshChatters()
 
     request.setCaller(QThread::currentThread());
     request.onSuccess(
-        [this, weak = this->weak_from_this()](auto result) -> Outcome {
+        [this, weak = weakOf<Channel>(this)](auto result) -> Outcome {
             // channel still exists?
             auto shared = weak.lock();
             if (!shared) return Failure;
diff --git a/src/widgets/BaseWindow.cpp b/src/widgets/BaseWindow.cpp
index 32d470805..af97b224b 100644
--- a/src/widgets/BaseWindow.cpp
+++ b/src/widgets/BaseWindow.cpp
@@ -316,7 +316,7 @@ void BaseWindow::mousePressEvent(QMouseEvent *event)
             };
 
             if (!recursiveCheckMouseTracking(widget)) {
-                Log("Start moving");
+                log("Start moving");
                 this->moving = true;
             }
         }
@@ -331,7 +331,7 @@ void BaseWindow::mouseReleaseEvent(QMouseEvent *event)
 #ifndef Q_OS_WIN
     if (this->flags_ & FramelessDraggable) {
         if (this->moving) {
-            Log("Stop moving");
+            log("Stop moving");
             this->moving = false;
         }
     }

From 902fe684c0a8a19bccbc19813b0a436fc8554f05 Mon Sep 17 00:00:00 2001
From: fourtf <tf.four@gmail.com>
Date: Tue, 14 Aug 2018 17:34:45 +0200
Subject: [PATCH 27/44] Fixes #666

---
 src/common/CompletionModel.cpp |  3 ++-
 src/common/UsernameSet.cpp     | 10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/common/CompletionModel.cpp b/src/common/CompletionModel.cpp
index ce07b25f6..8ccafb8e5 100644
--- a/src/common/CompletionModel.cpp
+++ b/src/common/CompletionModel.cpp
@@ -82,7 +82,8 @@ void CompletionModel::refresh(const QString &prefix)
     if (prefix.length() < 2) return;
 
     auto addString = [&](const QString &str, TaggedString::Type type) {
-        if (str.startsWith(prefix)) this->items_.emplace(str + " ", type);
+        if (str.startsWith(prefix, Qt::CaseInsensitive))
+            this->items_.emplace(str + " ", type);
     };
 
     if (auto channel = dynamic_cast<TwitchChannel *>(&this->channel_)) {
diff --git a/src/common/UsernameSet.cpp b/src/common/UsernameSet.cpp
index 4356772a9..064b6cf54 100644
--- a/src/common/UsernameSet.cpp
+++ b/src/common/UsernameSet.cpp
@@ -85,8 +85,8 @@ UsernameSet::ConstIterator UsernameSet::Range::end()
 //
 
 Prefix::Prefix(const QString &string)
-    : first(string.size() >= 1 ? string[0] : '\0')
-    , second(string.size() >= 2 ? string[1] : '\0')
+    : first(string.size() >= 1 ? string[0].toLower() : '\0')
+    , second(string.size() >= 2 ? string[1].toLower() : '\0')
 {
 }
 
@@ -101,9 +101,11 @@ bool Prefix::isStartOf(const QString &string) const
     if (string.size() == 0) {
         return this->first == QChar('\0') && this->second == QChar('\0');
     } else if (string.size() == 1) {
-        return this->first == string[0] && this->second == QChar('\0');
+        return this->first == string[0].toLower() &&
+               this->second == QChar('\0');
     } else {
-        return this->first == string[0] && this->second == string[1];
+        return this->first == string[0].toLower() &&
+               this->second == string[1].toLower();
     }
 }
 

From d7566665d88bdc46df532d9ca4dffe5f6173be69 Mon Sep 17 00:00:00 2001
From: Confuseh <confuseh@gmail.com>
Date: Tue, 14 Aug 2018 16:36:20 +0100
Subject: [PATCH 28/44] minor streamlink quality option fix (#664)

---
 src/util/StreamLink.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/util/StreamLink.cpp b/src/util/StreamLink.cpp
index aa2db55c0..3cf639b6c 100644
--- a/src/util/StreamLink.cpp
+++ b/src/util/StreamLink.cpp
@@ -4,6 +4,7 @@
 #include "Helpers.hpp"
 #include "singletons/Settings.hpp"
 #include "widgets/dialogs/QualityPopup.hpp"
+#include "debug/Log.hpp"
 
 #include <QErrorMessage>
 #include <QFileInfo>
@@ -83,7 +84,7 @@ QProcess *createStreamlinkProcess()
         if (err == QProcess::FailedToStart) {
             showStreamlinkNotFoundError();
         } else {
-            qDebug() << "Error occured: " << err;  //
+            log("Error occured {}", err);
         }
 
         p->deleteLater();
@@ -109,7 +110,7 @@ void getStreamQualities(const QString &channelURL,
         p, static_cast<void (QProcess::*)(int)>(&QProcess::finished),
         [=](int res) {
             if (res != 0) {
-                qDebug() << "Got error code" << res;
+                log("Got error code {}", res);
                 // return;
             }
             QString lastLine = QString(p->readAllStandardOutput());
@@ -121,7 +122,15 @@ void getStreamQualities(const QString &channelURL,
 
                 for (int i = split.length() - 1; i >= 0; i--) {
                     QString option = split.at(i);
-                    if (option.endsWith(" (worst)")) {
+                    if (option == "best)") {
+                        // As it turns out, sometimes, one quality option can
+                        // be the best and worst quality at the same time.
+                        // Since we start loop from the end, we can check
+                        // that and act accordingly
+                        option = split.at(--i);
+                        // "900p60 (worst"
+                        options << option.left(option.length() - 7);
+                    } else if (option.endsWith(" (worst)")) {
                         options << option.left(option.length() - 8);
                     } else if (option.endsWith(" (best)")) {
                         options << option.left(option.length() - 7);

From 44c16f1b3a5a514df1bb8e3a2a8ddcdce721e615 Mon Sep 17 00:00:00 2001
From: fourtf <tf.four@gmail.com>
Date: Tue, 14 Aug 2018 17:45:17 +0200
Subject: [PATCH 29/44] badges

---
 src/common/Channel.cpp                        |   7 +-
 src/providers/twitch/PubsubHelpers.hpp        |   1 +
 src/providers/twitch/TwitchBadges.cpp         |  57 ++++---
 src/providers/twitch/TwitchBadges.hpp         |  16 +-
 src/providers/twitch/TwitchChannel.cpp        |   9 +-
 src/providers/twitch/TwitchChannel.hpp        |   8 +-
 src/providers/twitch/TwitchMessageBuilder.cpp | 143 ++++--------------
 src/providers/twitch/TwitchServer.cpp         |   6 +-
 src/providers/twitch/TwitchServer.hpp         |   2 +
 src/widgets/splits/SplitHeader.cpp            |   4 +-
 10 files changed, 100 insertions(+), 153 deletions(-)

diff --git a/src/common/Channel.cpp b/src/common/Channel.cpp
index 9c1967f60..f9ac3ac50 100644
--- a/src/common/Channel.cpp
+++ b/src/common/Channel.cpp
@@ -160,13 +160,14 @@ void Channel::disableAllMessages()
     LimitedQueueSnapshot<MessagePtr> snapshot = this->getMessageSnapshot();
     int snapshotLength = snapshot.getLength();
     for (int i = 0; i < snapshotLength; i++) {
-        auto &s = snapshot[i];
-        if (s->flags.hasAny({MessageFlag::System, MessageFlag::Timeout})) {
+        auto &message = snapshot[i];
+        if (message->flags.hasAny(
+                {MessageFlag::System, MessageFlag::Timeout})) {
             continue;
         }
 
         // FOURTF: disabled for now
-        // s->flags.EnableFlag(MessageFlag::Disabled);
+        const_cast<Message *>(message.get())->flags.set(MessageFlag::Disabled);
     }
 }
 
diff --git a/src/providers/twitch/PubsubHelpers.hpp b/src/providers/twitch/PubsubHelpers.hpp
index f9bc28a05..fe7056dc8 100644
--- a/src/providers/twitch/PubsubHelpers.hpp
+++ b/src/providers/twitch/PubsubHelpers.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "debug/Log.hpp"
 #include "util/RapidjsonHelpers.hpp"
 #include "debug/Log.hpp"
 #include <boost/asio.hpp>
diff --git a/src/providers/twitch/TwitchBadges.cpp b/src/providers/twitch/TwitchBadges.cpp
index 8853f1add..0e515d627 100644
--- a/src/providers/twitch/TwitchBadges.cpp
+++ b/src/providers/twitch/TwitchBadges.cpp
@@ -4,21 +4,14 @@
 #include <QJsonObject>
 #include <QJsonValue>
 #include <QThread>
+
 #include "common/NetworkRequest.hpp"
 #include "common/Outcome.hpp"
+#include "debug/Log.hpp"
 #include "messages/Emote.hpp"
 
 namespace chatterino {
 
-TwitchBadges::TwitchBadges()
-{
-}
-
-void TwitchBadges::initialize(Settings &settings, Paths &paths)
-{
-    this->loadTwitchBadges();
-}
-
 void TwitchBadges::loadTwitchBadges()
 {
     static QString url(
@@ -28,32 +21,34 @@ void TwitchBadges::loadTwitchBadges()
     req.setCaller(QThread::currentThread());
     req.onSuccess([this](auto result) -> Outcome {
         auto root = result.parseJson();
-        QJsonObject sets = root.value("badge_sets").toObject();
+        auto badgeSets = this->badgeSets_.access();
 
-        for (QJsonObject::iterator it = sets.begin(); it != sets.end(); ++it) {
-            QJsonObject versions =
-                it.value().toObject().value("versions").toObject();
+        auto jsonSets = root.value("badge_sets").toObject();
+        for (auto sIt = jsonSets.begin(); sIt != jsonSets.end(); ++sIt) {
+            auto key = sIt.key();
+            auto versions = sIt.value().toObject().value("versions").toObject();
+
+            for (auto vIt = versions.begin(); vIt != versions.end(); ++vIt) {
+                auto versionObj = vIt.value().toObject();
 
-            for (auto versionIt = std::begin(versions);
-                 versionIt != std::end(versions); ++versionIt) {
                 auto emote = Emote{
                     {""},
                     ImageSet{
-                        Image::fromUrl({root.value("image_url_1x").toString()},
-                                       1),
-                        Image::fromUrl({root.value("image_url_2x").toString()},
-                                       0.5),
-                        Image::fromUrl({root.value("image_url_4x").toString()},
-                                       0.25),
+                        Image::fromUrl(
+                            {versionObj.value("image_url_1x").toString()}, 1),
+                        Image::fromUrl(
+                            {versionObj.value("image_url_2x").toString()}, .5),
+                        Image::fromUrl(
+                            {versionObj.value("image_url_4x").toString()}, .25),
                     },
                     Tooltip{root.value("description").toString()},
                     Url{root.value("clickURL").toString()}};
                 // "title"
                 // "clickAction"
 
-                QJsonObject versionObj = versionIt.value().toObject();
-                this->badges.emplace(versionIt.key(),
-                                     std::make_shared<Emote>(emote));
+                log("{} {}", key, vIt.key());
+
+                (*badgeSets)[key][vIt.key()] = std::make_shared<Emote>(emote);
             }
         }
 
@@ -63,4 +58,18 @@ void TwitchBadges::loadTwitchBadges()
     req.execute();
 }
 
+boost::optional<EmotePtr> TwitchBadges::badge(const QString &set,
+                                              const QString &version) const
+{
+    auto badgeSets = this->badgeSets_.access();
+    auto it = badgeSets->find(set);
+    if (it != badgeSets->end()) {
+        auto it2 = it->second.find(version);
+        if (it2 != it->second.end()) {
+            return it2->second;
+        }
+    }
+    return boost::none;
+}
+
 }  // namespace chatterino
diff --git a/src/providers/twitch/TwitchBadges.hpp b/src/providers/twitch/TwitchBadges.hpp
index 62196f8d8..d9023855d 100644
--- a/src/providers/twitch/TwitchBadges.hpp
+++ b/src/providers/twitch/TwitchBadges.hpp
@@ -1,7 +1,10 @@
 #pragma once
 
 #include <QString>
+#include <boost/optional.hpp>
 #include <unordered_map>
+
+#include "common/UniqueAccess.hpp"
 #include "util/QStringHash.hpp"
 
 namespace chatterino {
@@ -15,14 +18,15 @@ class Paths;
 class TwitchBadges
 {
 public:
-    TwitchBadges();
-
-    void initialize(Settings &settings, Paths &paths);
-
-private:
     void loadTwitchBadges();
 
-    std::unordered_map<QString, EmotePtr> badges;
+    boost::optional<EmotePtr> badge(const QString &set,
+                                    const QString &version) const;
+
+private:
+    UniqueAccess<
+        std::unordered_map<QString, std::unordered_map<QString, EmotePtr>>>
+        badgeSets_;  // "bits": { "100": ... "500": ...
 };
 
 }  // namespace chatterino
diff --git a/src/providers/twitch/TwitchChannel.cpp b/src/providers/twitch/TwitchChannel.cpp
index 346ed1476..06ed13739 100644
--- a/src/providers/twitch/TwitchChannel.cpp
+++ b/src/providers/twitch/TwitchChannel.cpp
@@ -69,12 +69,14 @@ std::pair<Outcome, UsernameSet> parseChatters(const QJsonObject &jsonRoot)
 }
 }  // namespace
 
-TwitchChannel::TwitchChannel(const QString &name, BttvEmotes &bttv,
+TwitchChannel::TwitchChannel(const QString &name,
+                             TwitchBadges &globalTwitchBadges, BttvEmotes &bttv,
                              FfzEmotes &ffz)
     : Channel(name, Channel::Type::Twitch)
     , subscriptionUrl_("https://www.twitch.tv/subs/" + name)
     , channelUrl_("https://twitch.tv/" + name)
     , popoutPlayerUrl_("https://player.twitch.tv/?channel=" + name)
+    , globalTwitchBadges_(globalTwitchBadges)
     , globalBttv_(bttv)
     , globalFfz_(ffz)
     , bttvEmotes_(std::make_shared<EmoteMap>())
@@ -317,6 +319,11 @@ AccessGuard<const UsernameSet> TwitchChannel::accessChatters() const
     return this->chatters_.accessConst();
 }
 
+const TwitchBadges &TwitchChannel::globalTwitchBadges() const
+{
+    return this->globalTwitchBadges_;
+}
+
 const BttvEmotes &TwitchChannel::globalBttv() const
 {
     return this->globalBttv_;
diff --git a/src/providers/twitch/TwitchChannel.hpp b/src/providers/twitch/TwitchChannel.hpp
index ea95c0df3..82ae58d40 100644
--- a/src/providers/twitch/TwitchChannel.hpp
+++ b/src/providers/twitch/TwitchChannel.hpp
@@ -23,6 +23,7 @@ struct Emote;
 using EmotePtr = std::shared_ptr<const Emote>;
 class EmoteMap;
 
+class TwitchBadges;
 class FfzEmotes;
 class BttvEmotes;
 
@@ -70,6 +71,7 @@ public:
     AccessGuard<const UsernameSet> accessChatters() const;
 
     // Emotes
+    const TwitchBadges &globalTwitchBadges() const;
     const BttvEmotes &globalBttv() const;
     const FfzEmotes &globalFfz() const;
     boost::optional<EmotePtr> bttvEmote(const EmoteName &name) const;
@@ -98,8 +100,9 @@ private:
         QString localizedName;
     };
 
-    explicit TwitchChannel(const QString &channelName, BttvEmotes &globalBttv,
-                           FfzEmotes &globalFfz);
+    explicit TwitchChannel(const QString &channelName,
+                           TwitchBadges &globalTwitchBadges,
+                           BttvEmotes &globalBttv, FfzEmotes &globalFfz);
 
     // Methods
     void refreshLiveStatus();
@@ -126,6 +129,7 @@ private:
     UniqueAccess<UsernameSet> chatters_;  // maps 2 char prefix to set of names
 
     // Emotes
+    TwitchBadges &globalTwitchBadges_;
     BttvEmotes &globalBttv_;
     FfzEmotes &globalFfz_;
     Atomic<std::shared_ptr<const EmoteMap>> bttvEmotes_;
diff --git a/src/providers/twitch/TwitchMessageBuilder.cpp b/src/providers/twitch/TwitchMessageBuilder.cpp
index 97b41561a..26ea07dec 100644
--- a/src/providers/twitch/TwitchMessageBuilder.cpp
+++ b/src/providers/twitch/TwitchMessageBuilder.cpp
@@ -6,6 +6,7 @@
 #include "controllers/ignores/IgnoreController.hpp"
 #include "debug/Log.hpp"
 #include "messages/Message.hpp"
+#include "providers/twitch/TwitchBadges.hpp"
 #include "providers/twitch/TwitchChannel.hpp"
 #include "singletons/Emotes.hpp"
 #include "singletons/Resources.hpp"
@@ -91,13 +92,6 @@ MessagePtr TwitchMessageBuilder::build()
         this->senderIsBroadcaster = true;
     }
 
-    //#ifdef XD
-    //    if (this->originalMessage.length() > 100) {
-    //        this->message->flags.has(MessageFlag::Collapsed);
-    //        this->emplace<EmoteElement>(getApp()->resources->badgeCollapsed,
-    //        MessageElementFlag::Collapsed);
-    //    }
-    //#endif
     this->message().flags.has(MessageFlag::Collapsed);
 
     // PARSING
@@ -203,11 +197,7 @@ void TwitchMessageBuilder::addWords(
 
         // split words
         for (auto &variant : getApp()->emotes->emojis.parse(word)) {
-            boost::apply_visitor(/*overloaded{[&](EmotePtr arg) {
-                                    this->addTextOrEmoji(arg); },
-                                    [&](const QString &arg) {
-                                    this->addTextOrEmoji(arg); }}*/
-                                 [&](auto &&arg) { this->addTextOrEmoji(arg); },
+            boost::apply_visitor([&](auto &&arg) { this->addTextOrEmoji(arg); },
                                  variant);
         }
 
@@ -659,32 +649,15 @@ Outcome TwitchMessageBuilder::tryAppendEmote(const EmoteName &name)
 }
 
 // fourtf: this is ugly
-//		   maybe put the individual badges into a map instead of this
-// mess
 void TwitchMessageBuilder::appendTwitchBadges()
 {
     auto app = getApp();
 
     auto iterator = this->tags.find("badges");
+    if (iterator == this->tags.end()) return;
 
-    if (iterator == this->tags.end()) {
-        // No badges in this message
-        return;
-    }
-
-    QStringList badges = iterator.value().toString().split(',');
-
-    for (QString badge : badges) {
-        if (badge.isEmpty()) {
-            continue;
-        }
-
+    for (QString badge : iterator.value().toString().split(',')) {
         if (badge.startsWith("bits/")) {
-            // if (!app->resources->dynamicBadgesLoaded) {
-            //     // Do nothing
-            //     continue;
-            // }
-
             QString cheerAmount = badge.mid(5);
             QString tooltip = QString("Twitch cheer ") + cheerAmount;
 
@@ -703,16 +676,12 @@ void TwitchMessageBuilder::appendTwitchBadges()
             }
 
             // Use default bit badge
-            // try {
-            //    const auto &badge =
-            //    app->resources->badgeSets.at("bits").versions.at(cheerAmount);
-            //    this->emplace<ImageElement>(badge.badgeImage1x,
-            //    MessageElementFlag::BadgeVanity)
-            //        ->setTooltip(tooltip);
-            //} catch (const std::out_of_range &) {
-            //    Log("No default bit badge for version {} found", cheerAmount);
-            //    continue;
-            //}
+            if (auto badge = this->twitchChannel->globalTwitchBadges().badge(
+                    "bits", cheerAmount)) {
+                this->emplace<EmoteElement>(badge.get(),
+                                            MessageElementFlag::BadgeVanity)
+                    ->setTooltip(tooltip);
+            }
         } else if (badge == "staff/1") {
             this->emplace<ImageElement>(
                     Image::fromPixmap(app->resources->twitch.staff),
@@ -766,80 +735,30 @@ void TwitchMessageBuilder::appendTwitchBadges()
                 } break;
             }
         } else if (badge.startsWith("subscriber/")) {
-            //            if (channelResources.loaded == false) {
-            //                // qDebug() << "Channel resources are not loaded,
-            //                can't add the subscriber
-            //                // badge";
-            //                continue;
-            //            }
+            if (auto badgeEmote = this->twitchChannel->twitchBadge(
+                    "subscriber", badge.mid(11))) {
+                this->emplace<EmoteElement>(
+                        badgeEmote.get(), MessageElementFlag::BadgeSubscription)
+                    ->setTooltip((*badgeEmote)->tooltip.string);
+                continue;
+            }
 
-            // auto badgeSetIt = channelResources.badgeSets.find("subscriber");
-            // if (badgeSetIt == channelResources.badgeSets.end()) {
-            //    // Fall back to default badge
-            //    this->emplace<ImageElement>(app->resources->badgeSubscriber,
-            //                                MessageElementFlag::BadgeSubscription)
-            //        ->setTooltip("Twitch Subscriber");
-            //    continue;
-            //}
-
-            // const auto &badgeSet = badgeSetIt->second;
-
-            // std::string versionKey = badge.mid(11).toStdString();
-
-            // auto badgeVersionIt = badgeSet.versions.find(versionKey);
-
-            // if (badgeVersionIt == badgeSet.versions.end()) {
-            //    // Fall back to default badge
-            //    this->emplace<ImageElement>(app->resources->badgeSubscriber,
-            //                                MessageElementFlag::BadgeSubscription)
-            //        ->setTooltip("Twitch Subscriber");
-            //    continue;
-            //}
-
-            // auto &badgeVersion = badgeVersionIt->second;
-
-            // this->emplace<ImageElement>(badgeVersion.badgeImage1x,
-            //                            MessageElementFlag::BadgeSubscription)
-            //    ->setTooltip("Twitch " +
-            //    QString::fromStdString(badgeVersion.title));
+            // use default subscriber badge if custom one not found
+            this->emplace<ImageElement>(
+                    Image::fromPixmap(app->resources->twitch.subscriber, 0.25),
+                    MessageElementFlag::BadgeSubscription)
+                ->setTooltip("Twitch Subscriber");
         } else {
-            // if (!app->resources->dynamicBadgesLoaded) {
-            //    // Do nothing
-            //    continue;
-            //}
+            auto splits = badge.split('/');
+            if (splits.size() != 2) continue;
 
-            // QStringList parts = badge.split('/');
-
-            // if (parts.length() != 2) {
-            //    qDebug() << "Bad number of parts: " << parts.length() << " in
-            //    " << parts; continue;
-            //}
-
-            // MessageElementFlags badgeType =
-            // MessageElementFlag::BadgeVanity;
-
-            // std::string badgeSetKey = parts[0].toStdString();
-            // std::string versionKey = parts[1].toStdString();
-
-            // try {
-            //    auto &badgeSet = app->resources->badgeSets.at(badgeSetKey);
-
-            //    try {
-            //        auto &badgeVersion = badgeSet.versions.at(versionKey);
-
-            //        this->emplace<ImageElement>(badgeVersion.badgeImage1x,
-            //        badgeType)
-            //            ->setTooltip("Twitch " +
-            //            QString::fromStdString(badgeVersion.title));
-            //    } catch (const std::exception &e) {
-            //        qDebug() << "Exception caught:" << e.what()
-            //                 << "when trying to fetch badge version " <<
-            //                 versionKey.c_str();
-            //    }
-            //} catch (const std::exception &e) {
-            //    qDebug() << "No badge set with key" << badgeSetKey.c_str()
-            //             << ". Exception: " << e.what();
-            //}
+            if (auto badgeEmote =
+                    this->twitchChannel->twitchBadge(splits[0], splits[1])) {
+                this->emplace<EmoteElement>(badgeEmote.get(),
+                                            MessageElementFlag::BadgeVanity)
+                    ->setTooltip((*badgeEmote)->tooltip.string);
+                continue;
+            }
         }
     }
 }
diff --git a/src/providers/twitch/TwitchServer.cpp b/src/providers/twitch/TwitchServer.cpp
index 465fe3315..d1e03b63b 100644
--- a/src/providers/twitch/TwitchServer.cpp
+++ b/src/providers/twitch/TwitchServer.cpp
@@ -13,7 +13,6 @@
 #include "util/PostToThread.hpp"
 
 #include <IrcCommand>
-
 #include <cassert>
 
 // using namespace Communi;
@@ -41,6 +40,7 @@ void TwitchServer::initialize(Settings &settings, Paths &paths)
     getApp()->accounts->twitch.currentUserChanged.connect(
         [this]() { postToThread([this] { this->connect(); }); });
 
+    this->twitchBadges.loadTwitchBadges();
     this->bttv.loadEmotes();
     this->ffz.loadEmotes();
 }
@@ -83,8 +83,8 @@ void TwitchServer::initializeConnection(IrcConnection *connection, bool isRead,
 
 std::shared_ptr<Channel> TwitchServer::createChannel(const QString &channelName)
 {
-    auto channel = std::shared_ptr<TwitchChannel>(
-        new TwitchChannel(channelName, this->bttv, this->ffz));
+    auto channel = std::shared_ptr<TwitchChannel>(new TwitchChannel(
+        channelName, this->twitchBadges, this->bttv, this->ffz));
     channel->initialize();
 
     channel->sendMessageSignal.connect(
diff --git a/src/providers/twitch/TwitchServer.hpp b/src/providers/twitch/TwitchServer.hpp
index e097cc365..60026a142 100644
--- a/src/providers/twitch/TwitchServer.hpp
+++ b/src/providers/twitch/TwitchServer.hpp
@@ -7,6 +7,7 @@
 #include "providers/bttv/BttvEmotes.hpp"
 #include "providers/ffz/FfzEmotes.hpp"
 #include "providers/irc/AbstractIrcServer.hpp"
+#include "providers/twitch/TwitchBadges.hpp"
 
 #include <chrono>
 #include <memory>
@@ -68,6 +69,7 @@ private:
     std::chrono::steady_clock::time_point lastErrorTimeAmount_;
 
     bool singleConnection_ = false;
+    TwitchBadges twitchBadges;
     BttvEmotes bttv;
     FfzEmotes ffz;
 
diff --git a/src/widgets/splits/SplitHeader.cpp b/src/widgets/splits/SplitHeader.cpp
index d99448221..0c713c996 100644
--- a/src/widgets/splits/SplitHeader.cpp
+++ b/src/widgets/splits/SplitHeader.cpp
@@ -92,10 +92,10 @@ auto formatTitle(const TwitchChannel::StreamStatus &s, Settings &settings)
 
     // description
     if (settings.showViewerCount)
-        title += " - " + QString::number(s.viewerCount) + " viewers";
+        title += " - " + QString::number(s.viewerCount);
     if (settings.showTitle) title += " - " + s.title;
     if (settings.showGame) title += " - " + s.game;
-    if (settings.showUptime) title += "  - uptime: " + s.uptime;
+    if (settings.showUptime) title += " - " + s.uptime;
 
     return title;
 }

From af7b742a234efa0c34ca352ad0d56c001d5ec96b Mon Sep 17 00:00:00 2001
From: fourtf <tf.four@gmail.com>
Date: Wed, 15 Aug 2018 22:46:20 +0200
Subject: [PATCH 30/44] changed .clang-format

---
 .clang-format                                 |   3 +
 src/Application.cpp                           |  10 +-
 src/BrowserExtension.cpp                      |  42 +--
 src/PrecompiledHeader.hpp                     | 326 ++++++++--------
 src/RunGui.cpp                                | 138 +++----
 src/common/Version.hpp                        |   6 +-
 .../highlights/HighlightBlacklistUser.hpp     |  52 +--
 .../highlights/HighlightPhrase.hpp            |  64 ++--
 src/controllers/ignores/IgnorePhrase.hpp      |  50 +--
 .../moderationactions/ModerationAction.hpp    |  44 +--
 src/messages/Image.cpp                        | 272 +++++++-------
 src/messages/Image.hpp                        |  42 +--
 src/messages/MessageParseArgs.hpp             |   1 -
 src/providers/bttv/BttvEmotes.cpp             | 121 +++---
 src/providers/emoji/Emojis.cpp                | 133 ++++---
 src/providers/ffz/FfzEmotes.cpp               | 167 +++++----
 src/providers/twitch/PubsubClient.cpp         | 254 ++++++-------
 src/providers/twitch/PubsubClient.hpp         |  53 +--
 src/providers/twitch/PubsubHelpers.hpp        |   5 +-
 src/providers/twitch/TwitchAccount.cpp        |  46 +--
 src/providers/twitch/TwitchChannel.cpp        |  67 ++--
 .../twitch/TwitchParseCheerEmotes.cpp         | 354 +++++++++---------
 src/providers/twitch/TwitchUser.hpp           |  66 ++--
 src/singletons/Fonts.cpp                      |  21 +-
 src/singletons/NativeMessaging.cpp            |   8 +-
 src/singletons/Theme.cpp                      |  24 +-
 src/util/FormatTime.cpp                       |  10 +-
 src/util/InitUpdateButton.hpp                 |   2 +-
 src/util/RapidJsonSerializeQString.hpp        |  58 +--
 src/util/RapidjsonHelpers.cpp                 |  36 +-
 src/util/RapidjsonHelpers.hpp                 | 150 ++++----
 src/util/StreamLink.cpp                       | 137 +++----
 src/util/WindowsHelper.hpp                    |   4 +-
 src/widgets/AttachedWindow.cpp                |   8 +-
 src/widgets/BaseWindow.cpp                    |  26 +-
 src/widgets/Notebook.cpp                      |   3 +-
 src/widgets/StreamView.cpp                    |   2 +-
 src/widgets/TooltipWidget.cpp                 |   2 +-
 src/widgets/dialogs/EmotePopup.cpp            |  82 ++--
 src/widgets/dialogs/LoginDialog.cpp           |  94 ++---
 src/widgets/helper/ChannelView.cpp            |  98 ++---
 .../settingspages/ExternalToolsPage.cpp       |  18 +-
 src/widgets/settingspages/IgnoresPage.cpp     |   5 +-
 src/widgets/settingspages/LookPage.cpp        |   4 +-
 src/widgets/settingspages/ModerationPage.cpp  |   2 +-
 src/widgets/splits/SplitHeader.cpp            | 137 +++----
 46 files changed, 1636 insertions(+), 1611 deletions(-)

diff --git a/.clang-format b/.clang-format
index bd3f2c430..eeb9eb929 100644
--- a/.clang-format
+++ b/.clang-format
@@ -25,6 +25,9 @@ DerivePointerBinding: false
 FixNamespaceComments: true
 IndentCaseLabels: true
 IndentWidth: 4
+IndentWrappedFunctionNames: true
+IndentPPDirectives: AfterHash
+NamespaceIndentation: Inner
 PointerBindsToType: false
 SpacesBeforeTrailingComments: 2
 Standard: Auto
diff --git a/src/Application.cpp b/src/Application.cpp
index b53940702..68ccc78f8 100644
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -99,15 +99,15 @@ void Application::save()
 void Application::initNm()
 {
 #ifdef Q_OS_WIN
-#ifdef QT_DEBUG
-#ifdef C_DEBUG_NM
+#    ifdef QT_DEBUG
+#        ifdef C_DEBUG_NM
     this->nativeMessaging->registerHost();
     this->nativeMessaging->openGuiMessageQueue();
-#endif
-#else
+#        endif
+#    else
     this->nativeMessaging->registerHost();
     this->nativeMessaging->openGuiMessageQueue();
-#endif
+#    endif
 #endif
 }
 
diff --git a/src/BrowserExtension.cpp b/src/BrowserExtension.cpp
index 5275e0648..f12d19b5e 100644
--- a/src/BrowserExtension.cpp
+++ b/src/BrowserExtension.cpp
@@ -9,31 +9,31 @@
 #include <memory>
 
 #ifdef Q_OS_WIN
-#include <fcntl.h>
-#include <io.h>
-#include <stdio.h>
+#    include <fcntl.h>
+#    include <io.h>
+#    include <stdio.h>
 #endif
 
 namespace chatterino {
 
 namespace {
-void initFileMode()
-{
+    void initFileMode()
+    {
 #ifdef Q_OS_WIN
-    _setmode(_fileno(stdin), _O_BINARY);
-    _setmode(_fileno(stdout), _O_BINARY);
+        _setmode(_fileno(stdin), _O_BINARY);
+        _setmode(_fileno(stdout), _O_BINARY);
 #endif
-}
+    }
 
-void runLoop(NativeMessagingClient &client)
-{
-    while (true) {
-        char size_c[4];
-        std::cin.read(size_c, 4);
+    void runLoop(NativeMessagingClient &client)
+    {
+        while (true) {
+            char size_c[4];
+            std::cin.read(size_c, 4);
 
-        if (std::cin.eof()) break;
+            if (std::cin.eof()) break;
 
-        auto size = *reinterpret_cast<uint32_t *>(size_c);
+            auto size = *reinterpret_cast<uint32_t *>(size_c);
 
 #if 0
     bool bigEndian = isBigEndian();
@@ -48,14 +48,14 @@ void runLoop(NativeMessagingClient &client)
         }
 #endif
 
-        std::unique_ptr<char[]> buffer(new char[size + 1]);
-        std::cin.read(buffer.get(), size);
-        *(buffer.get() + size) = '\0';
+            std::unique_ptr<char[]> buffer(new char[size + 1]);
+            std::cin.read(buffer.get(), size);
+            *(buffer.get() + size) = '\0';
 
-        client.sendMessage(
-            QByteArray::fromRawData(buffer.get(), static_cast<int32_t>(size)));
+            client.sendMessage(QByteArray::fromRawData(
+                buffer.get(), static_cast<int32_t>(size)));
+        }
     }
-}
 }  // namespace
 
 bool shouldRunBrowserExtensionHost(const QStringList &args)
diff --git a/src/PrecompiledHeader.hpp b/src/PrecompiledHeader.hpp
index 6eec78c8e..10dfcd418 100644
--- a/src/PrecompiledHeader.hpp
+++ b/src/PrecompiledHeader.hpp
@@ -1,168 +1,168 @@
 #ifdef __cplusplus
-#include <fmt/format.h>
-#include <irccommand.h>
-#include <ircconnection.h>
-#include <rapidjson/document.h>
-#include <rapidjson/error/en.h>
-#include <rapidjson/error/error.h>
-#include <IrcMessage>
-#include <QAbstractListModel>
-#include <QAbstractNativeEventFilter>
-#include <QAction>
-#include <QApplication>
-#include <QBrush>
-#include <QBuffer>
-#include <QButtonGroup>
-#include <QByteArray>
-#include <QCheckBox>
-#include <QClipboard>
-#include <QColor>
-#include <QComboBox>
-#include <QCompleter>
-#include <QCoreApplication>
-#include <QDateTime>
-#include <QDebug>
-#include <QDesktopServices>
-#include <QDialog>
-#include <QDialogButtonBox>
-#include <QDir>
-#include <QDockWidget>
-#include <QDrag>
-#include <QDragEnterEvent>
-#include <QElapsedTimer>
-#include <QEventLoop>
-#include <QFile>
-#include <QFileDialog>
-#include <QFileInfo>
-#include <QFlags>
-#include <QFont>
-#include <QFontDatabase>
-#include <QFontDialog>
-#include <QFontMetrics>
-#include <QFormLayout>
-#include <QGraphicsBlurEffect>
-#include <QGroupBox>
-#include <QHBoxLayout>
-#include <QHeaderView>
-#include <QIcon>
-#include <QImageReader>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonValue>
-#include <QKeyEvent>
-#include <QLabel>
-#include <QLayout>
-#include <QLibrary>
-#include <QLineEdit>
-#include <QList>
-#include <QListView>
-#include <QListWidget>
-#include <QMap>
-#include <QMediaPlayer>
-#include <QMenu>
-#include <QMessageBox>
-#include <QMimeData>
-#include <QMouseEvent>
-#include <QMutex>
-#include <QMutexLocker>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
-#include <QNetworkRequest>
-#include <QObject>
-#include <QPaintEvent>
-#include <QPainter>
-#include <QPainterPath>
-#include <QPalette>
-#include <QPixmap>
-#include <QPoint>
-#include <QProcess>
-#include <QPropertyAnimation>
-#include <QPushButton>
-#include <QRadialGradient>
-#include <QRect>
-#include <QRegularExpression>
-#include <QRunnable>
-#include <QScroller>
-#include <QShortcut>
-#include <QSizePolicy>
-#include <QSlider>
-#include <QStackedLayout>
-#include <QStandardPaths>
-#include <QString>
-#include <QStyle>
-#include <QStyleOption>
-#include <QTabWidget>
-#include <QTextEdit>
-#include <QThread>
-#include <QThreadPool>
-#include <QTime>
-#include <QTimer>
-#include <QUrl>
-#include <QUuid>
-#include <QVBoxLayout>
-#include <QVariant>
-#include <QVector>
-#include <QWheelEvent>
-#include <QWidget>
-#include <QtCore/QVariant>
-#include <QtGlobal>
-#include <QtWidgets/QAction>
-#include <QtWidgets/QApplication>
-#include <QtWidgets/QButtonGroup>
-#include <QtWidgets/QDialog>
-#include <QtWidgets/QDialogButtonBox>
-#include <QtWidgets/QFormLayout>
-#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QHeaderView>
-#include <QtWidgets/QLabel>
-#include <QtWidgets/QLineEdit>
-#include <QtWidgets/QPushButton>
-#include <QtWidgets/QTabWidget>
-#include <QtWidgets/QVBoxLayout>
-#include <algorithm>
-#include <boost/current_function.hpp>
-#include <boost/foreach.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/optional.hpp>
-#include <cassert>
-#include <chrono>
-#include <cinttypes>
-#include <climits>
-#include <cmath>
-#include <cstdint>
-#include <ctime>
-#include <functional>
-#include <future>
-#include <list>
-#include <map>
-#include <memory>
-#include <mutex>
-#include <pajlada/settings/serialize.hpp>
-#include <pajlada/settings/setting.hpp>
-#include <pajlada/settings/settinglistener.hpp>
-#include <pajlada/signals/connection.hpp>
-#include <pajlada/signals/signal.hpp>
-#include <random>
-#include <set>
-#include <string>
-#include <thread>
-#include <tuple>
-#include <type_traits>
-#include <unordered_map>
-#include <unordered_set>
-#include <vector>
+#    include <fmt/format.h>
+#    include <irccommand.h>
+#    include <ircconnection.h>
+#    include <rapidjson/document.h>
+#    include <rapidjson/error/en.h>
+#    include <rapidjson/error/error.h>
+#    include <IrcMessage>
+#    include <QAbstractListModel>
+#    include <QAbstractNativeEventFilter>
+#    include <QAction>
+#    include <QApplication>
+#    include <QBrush>
+#    include <QBuffer>
+#    include <QButtonGroup>
+#    include <QByteArray>
+#    include <QCheckBox>
+#    include <QClipboard>
+#    include <QColor>
+#    include <QComboBox>
+#    include <QCompleter>
+#    include <QCoreApplication>
+#    include <QDateTime>
+#    include <QDebug>
+#    include <QDesktopServices>
+#    include <QDialog>
+#    include <QDialogButtonBox>
+#    include <QDir>
+#    include <QDockWidget>
+#    include <QDrag>
+#    include <QDragEnterEvent>
+#    include <QElapsedTimer>
+#    include <QEventLoop>
+#    include <QFile>
+#    include <QFileDialog>
+#    include <QFileInfo>
+#    include <QFlags>
+#    include <QFont>
+#    include <QFontDatabase>
+#    include <QFontDialog>
+#    include <QFontMetrics>
+#    include <QFormLayout>
+#    include <QGraphicsBlurEffect>
+#    include <QGroupBox>
+#    include <QHBoxLayout>
+#    include <QHeaderView>
+#    include <QIcon>
+#    include <QImageReader>
+#    include <QJsonArray>
+#    include <QJsonDocument>
+#    include <QJsonObject>
+#    include <QJsonValue>
+#    include <QKeyEvent>
+#    include <QLabel>
+#    include <QLayout>
+#    include <QLibrary>
+#    include <QLineEdit>
+#    include <QList>
+#    include <QListView>
+#    include <QListWidget>
+#    include <QMap>
+#    include <QMediaPlayer>
+#    include <QMenu>
+#    include <QMessageBox>
+#    include <QMimeData>
+#    include <QMouseEvent>
+#    include <QMutex>
+#    include <QMutexLocker>
+#    include <QNetworkAccessManager>
+#    include <QNetworkReply>
+#    include <QNetworkRequest>
+#    include <QObject>
+#    include <QPaintEvent>
+#    include <QPainter>
+#    include <QPainterPath>
+#    include <QPalette>
+#    include <QPixmap>
+#    include <QPoint>
+#    include <QProcess>
+#    include <QPropertyAnimation>
+#    include <QPushButton>
+#    include <QRadialGradient>
+#    include <QRect>
+#    include <QRegularExpression>
+#    include <QRunnable>
+#    include <QScroller>
+#    include <QShortcut>
+#    include <QSizePolicy>
+#    include <QSlider>
+#    include <QStackedLayout>
+#    include <QStandardPaths>
+#    include <QString>
+#    include <QStyle>
+#    include <QStyleOption>
+#    include <QTabWidget>
+#    include <QTextEdit>
+#    include <QThread>
+#    include <QThreadPool>
+#    include <QTime>
+#    include <QTimer>
+#    include <QUrl>
+#    include <QUuid>
+#    include <QVBoxLayout>
+#    include <QVariant>
+#    include <QVector>
+#    include <QWheelEvent>
+#    include <QWidget>
+#    include <QtCore/QVariant>
+#    include <QtGlobal>
+#    include <QtWidgets/QAction>
+#    include <QtWidgets/QApplication>
+#    include <QtWidgets/QButtonGroup>
+#    include <QtWidgets/QDialog>
+#    include <QtWidgets/QDialogButtonBox>
+#    include <QtWidgets/QFormLayout>
+#    include <QtWidgets/QHBoxLayout>
+#    include <QtWidgets/QHeaderView>
+#    include <QtWidgets/QLabel>
+#    include <QtWidgets/QLineEdit>
+#    include <QtWidgets/QPushButton>
+#    include <QtWidgets/QTabWidget>
+#    include <QtWidgets/QVBoxLayout>
+#    include <algorithm>
+#    include <boost/current_function.hpp>
+#    include <boost/foreach.hpp>
+#    include <boost/noncopyable.hpp>
+#    include <boost/optional.hpp>
+#    include <cassert>
+#    include <chrono>
+#    include <cinttypes>
+#    include <climits>
+#    include <cmath>
+#    include <cstdint>
+#    include <ctime>
+#    include <functional>
+#    include <future>
+#    include <list>
+#    include <map>
+#    include <memory>
+#    include <mutex>
+#    include <pajlada/settings/serialize.hpp>
+#    include <pajlada/settings/setting.hpp>
+#    include <pajlada/settings/settinglistener.hpp>
+#    include <pajlada/signals/connection.hpp>
+#    include <pajlada/signals/signal.hpp>
+#    include <random>
+#    include <set>
+#    include <string>
+#    include <thread>
+#    include <tuple>
+#    include <type_traits>
+#    include <unordered_map>
+#    include <unordered_set>
+#    include <vector>
 
-#ifndef UNUSED
-#define UNUSED(x) (void)(x)
-#endif
+#    ifndef UNUSED
+#        define UNUSED(x) (void)(x)
+#    endif
 
-#ifndef ATTR_UNUSED
-#ifdef Q_OS_WIN
-#define ATTR_UNUSED
-#else
-#define ATTR_UNUSED __attribute__((unused))
-#endif
-#endif
+#    ifndef ATTR_UNUSED
+#        ifdef Q_OS_WIN
+#            define ATTR_UNUSED
+#        else
+#            define ATTR_UNUSED __attribute__((unused))
+#        endif
+#    endif
 
 #endif
diff --git a/src/RunGui.cpp b/src/RunGui.cpp
index 7ed61be87..e342ca7c1 100644
--- a/src/RunGui.cpp
+++ b/src/RunGui.cpp
@@ -12,7 +12,7 @@
 #include "widgets/dialogs/LastRunCrashDialog.hpp"
 
 #ifdef C_USE_BREAKPAD
-#include <QBreakpadHandler.h>
+#    include <QBreakpadHandler.h>
 #endif
 
 // void initQt();
@@ -23,80 +23,82 @@
 
 namespace chatterino {
 namespace {
-void installCustomPalette()
-{
-    // borrowed from
-    // https://stackoverflow.com/questions/15035767/is-the-qt-5-dark-fusion-theme-available-for-windows
-    auto dark = qApp->palette();
+    void installCustomPalette()
+    {
+        // borrowed from
+        // https://stackoverflow.com/questions/15035767/is-the-qt-5-dark-fusion-theme-available-for-windows
+        auto dark = qApp->palette();
 
-    dark.setColor(QPalette::Window, QColor(22, 22, 22));
-    dark.setColor(QPalette::WindowText, Qt::white);
-    dark.setColor(QPalette::Text, Qt::white);
-    dark.setColor(QPalette::Disabled, QPalette::WindowText,
-                  QColor(127, 127, 127));
-    dark.setColor(QPalette::Base, QColor("#333"));
-    dark.setColor(QPalette::AlternateBase, QColor("#444"));
-    dark.setColor(QPalette::ToolTipBase, Qt::white);
-    dark.setColor(QPalette::ToolTipText, Qt::white);
-    dark.setColor(QPalette::Disabled, QPalette::Text, QColor(127, 127, 127));
-    dark.setColor(QPalette::Dark, QColor(35, 35, 35));
-    dark.setColor(QPalette::Shadow, QColor(20, 20, 20));
-    dark.setColor(QPalette::Button, QColor(70, 70, 70));
-    dark.setColor(QPalette::ButtonText, Qt::white);
-    dark.setColor(QPalette::Disabled, QPalette::ButtonText,
-                  QColor(127, 127, 127));
-    dark.setColor(QPalette::BrightText, Qt::red);
-    dark.setColor(QPalette::Link, QColor(42, 130, 218));
-    dark.setColor(QPalette::Highlight, QColor(42, 130, 218));
-    dark.setColor(QPalette::Disabled, QPalette::Highlight, QColor(80, 80, 80));
-    dark.setColor(QPalette::HighlightedText, Qt::white);
-    dark.setColor(QPalette::Disabled, QPalette::HighlightedText,
-                  QColor(127, 127, 127));
+        dark.setColor(QPalette::Window, QColor(22, 22, 22));
+        dark.setColor(QPalette::WindowText, Qt::white);
+        dark.setColor(QPalette::Text, Qt::white);
+        dark.setColor(QPalette::Disabled, QPalette::WindowText,
+                      QColor(127, 127, 127));
+        dark.setColor(QPalette::Base, QColor("#333"));
+        dark.setColor(QPalette::AlternateBase, QColor("#444"));
+        dark.setColor(QPalette::ToolTipBase, Qt::white);
+        dark.setColor(QPalette::ToolTipText, Qt::white);
+        dark.setColor(QPalette::Disabled, QPalette::Text,
+                      QColor(127, 127, 127));
+        dark.setColor(QPalette::Dark, QColor(35, 35, 35));
+        dark.setColor(QPalette::Shadow, QColor(20, 20, 20));
+        dark.setColor(QPalette::Button, QColor(70, 70, 70));
+        dark.setColor(QPalette::ButtonText, Qt::white);
+        dark.setColor(QPalette::Disabled, QPalette::ButtonText,
+                      QColor(127, 127, 127));
+        dark.setColor(QPalette::BrightText, Qt::red);
+        dark.setColor(QPalette::Link, QColor(42, 130, 218));
+        dark.setColor(QPalette::Highlight, QColor(42, 130, 218));
+        dark.setColor(QPalette::Disabled, QPalette::Highlight,
+                      QColor(80, 80, 80));
+        dark.setColor(QPalette::HighlightedText, Qt::white);
+        dark.setColor(QPalette::Disabled, QPalette::HighlightedText,
+                      QColor(127, 127, 127));
 
-    qApp->setPalette(dark);
-}
-
-void initQt()
-{
-    // set up the QApplication flags
-    QApplication::setAttribute(Qt::AA_Use96Dpi, true);
-#ifdef Q_OS_WIN32
-    QApplication::setAttribute(Qt::AA_DisableHighDpiScaling, true);
-#endif
-
-    QApplication::setStyle(QStyleFactory::create("Fusion"));
-
-    installCustomPalette();
-}
-
-void showLastCrashDialog()
-{
-#ifndef C_DISABLE_CRASH_DIALOG
-    LastRunCrashDialog dialog;
-
-    switch (dialog.exec()) {
-        case QDialog::Accepted: {
-        }; break;
-        default: {
-            _exit(0);
-        }
+        qApp->setPalette(dark);
     }
+
+    void initQt()
+    {
+        // set up the QApplication flags
+        QApplication::setAttribute(Qt::AA_Use96Dpi, true);
+#ifdef Q_OS_WIN32
+        QApplication::setAttribute(Qt::AA_DisableHighDpiScaling, true);
 #endif
-}
 
-void createRunningFile(const QString &path)
-{
-    QFile runningFile(path);
+        QApplication::setStyle(QStyleFactory::create("Fusion"));
 
-    runningFile.open(QIODevice::WriteOnly | QIODevice::Truncate);
-    runningFile.flush();
-    runningFile.close();
-}
+        installCustomPalette();
+    }
 
-void removeRunningFile(const QString &path)
-{
-    QFile::remove(path);
-}
+    void showLastCrashDialog()
+    {
+#ifndef C_DISABLE_CRASH_DIALOG
+        LastRunCrashDialog dialog;
+
+        switch (dialog.exec()) {
+            case QDialog::Accepted: {
+            }; break;
+            default: {
+                _exit(0);
+            }
+        }
+#endif
+    }
+
+    void createRunningFile(const QString &path)
+    {
+        QFile runningFile(path);
+
+        runningFile.open(QIODevice::WriteOnly | QIODevice::Truncate);
+        runningFile.flush();
+        runningFile.close();
+    }
+
+    void removeRunningFile(const QString &path)
+    {
+        QFile::remove(path);
+    }
 }  // namespace
 
 void runGui(QApplication &a, Paths &paths, Settings &settings)
diff --git a/src/common/Version.hpp b/src/common/Version.hpp
index 2b1b51b39..4101f3a56 100644
--- a/src/common/Version.hpp
+++ b/src/common/Version.hpp
@@ -5,9 +5,9 @@
 #define CHATTERINO_VERSION "2.0.4"
 
 #if defined(Q_OS_WIN)
-#define CHATTERINO_OS "win"
+#    define CHATTERINO_OS "win"
 #elif defined(Q_OS_MACOS)
-#define CHATTERINO_OS "macos"
+#    define CHATTERINO_OS "macos"
 #elif defined(Q_OS_LINUX)
-#define CHATTERINO_OS "linux"
+#    define CHATTERINO_OS "linux"
 #endif
diff --git a/src/controllers/highlights/HighlightBlacklistUser.hpp b/src/controllers/highlights/HighlightBlacklistUser.hpp
index 4ce8683d0..b2e3e4a06 100644
--- a/src/controllers/highlights/HighlightBlacklistUser.hpp
+++ b/src/controllers/highlights/HighlightBlacklistUser.hpp
@@ -68,37 +68,39 @@ private:
 namespace pajlada {
 namespace Settings {
 
-template <>
-struct Serialize<chatterino::HighlightBlacklistUser> {
-    static rapidjson::Value get(const chatterino::HighlightBlacklistUser &value,
-                                rapidjson::Document::AllocatorType &a)
-    {
-        rapidjson::Value ret(rapidjson::kObjectType);
+    template <>
+    struct Serialize<chatterino::HighlightBlacklistUser> {
+        static rapidjson::Value get(
+            const chatterino::HighlightBlacklistUser &value,
+            rapidjson::Document::AllocatorType &a)
+        {
+            rapidjson::Value ret(rapidjson::kObjectType);
 
-        AddMember(ret, "pattern", value.getPattern(), a);
-        AddMember(ret, "regex", value.isRegex(), a);
+            AddMember(ret, "pattern", value.getPattern(), a);
+            AddMember(ret, "regex", value.isRegex(), a);
 
-        return ret;
-    }
-};
+            return ret;
+        }
+    };
 
-template <>
-struct Deserialize<chatterino::HighlightBlacklistUser> {
-    static chatterino::HighlightBlacklistUser get(const rapidjson::Value &value)
-    {
-        QString pattern;
-        bool isRegex = false;
+    template <>
+    struct Deserialize<chatterino::HighlightBlacklistUser> {
+        static chatterino::HighlightBlacklistUser get(
+            const rapidjson::Value &value)
+        {
+            QString pattern;
+            bool isRegex = false;
+
+            if (!value.IsObject()) {
+                return chatterino::HighlightBlacklistUser(pattern, isRegex);
+            }
+
+            chatterino::rj::getSafe(value, "pattern", pattern);
+            chatterino::rj::getSafe(value, "regex", isRegex);
 
-        if (!value.IsObject()) {
             return chatterino::HighlightBlacklistUser(pattern, isRegex);
         }
-
-        chatterino::rj::getSafe(value, "pattern", pattern);
-        chatterino::rj::getSafe(value, "regex", isRegex);
-
-        return chatterino::HighlightBlacklistUser(pattern, isRegex);
-    }
-};
+    };
 
 }  // namespace Settings
 }  // namespace pajlada
diff --git a/src/controllers/highlights/HighlightPhrase.hpp b/src/controllers/highlights/HighlightPhrase.hpp
index 91abaadce..cfbee6588 100644
--- a/src/controllers/highlights/HighlightPhrase.hpp
+++ b/src/controllers/highlights/HighlightPhrase.hpp
@@ -72,43 +72,45 @@ private:
 namespace pajlada {
 namespace Settings {
 
-template <>
-struct Serialize<chatterino::HighlightPhrase> {
-    static rapidjson::Value get(const chatterino::HighlightPhrase &value,
-                                rapidjson::Document::AllocatorType &a)
-    {
-        rapidjson::Value ret(rapidjson::kObjectType);
+    template <>
+    struct Serialize<chatterino::HighlightPhrase> {
+        static rapidjson::Value get(const chatterino::HighlightPhrase &value,
+                                    rapidjson::Document::AllocatorType &a)
+        {
+            rapidjson::Value ret(rapidjson::kObjectType);
 
-        AddMember(ret, "pattern", value.getPattern(), a);
-        AddMember(ret, "alert", value.getAlert(), a);
-        AddMember(ret, "sound", value.getSound(), a);
-        AddMember(ret, "regex", value.isRegex(), a);
+            AddMember(ret, "pattern", value.getPattern(), a);
+            AddMember(ret, "alert", value.getAlert(), a);
+            AddMember(ret, "sound", value.getSound(), a);
+            AddMember(ret, "regex", value.isRegex(), a);
 
-        return ret;
-    }
-};
-
-template <>
-struct Deserialize<chatterino::HighlightPhrase> {
-    static chatterino::HighlightPhrase get(const rapidjson::Value &value)
-    {
-        if (!value.IsObject()) {
-            return chatterino::HighlightPhrase(QString(), true, false, false);
+            return ret;
         }
+    };
 
-        QString _pattern;
-        bool _alert = true;
-        bool _sound = false;
-        bool _isRegex = false;
+    template <>
+    struct Deserialize<chatterino::HighlightPhrase> {
+        static chatterino::HighlightPhrase get(const rapidjson::Value &value)
+        {
+            if (!value.IsObject()) {
+                return chatterino::HighlightPhrase(QString(), true, false,
+                                                   false);
+            }
 
-        chatterino::rj::getSafe(value, "pattern", _pattern);
-        chatterino::rj::getSafe(value, "alert", _alert);
-        chatterino::rj::getSafe(value, "sound", _sound);
-        chatterino::rj::getSafe(value, "regex", _isRegex);
+            QString _pattern;
+            bool _alert = true;
+            bool _sound = false;
+            bool _isRegex = false;
 
-        return chatterino::HighlightPhrase(_pattern, _alert, _sound, _isRegex);
-    }
-};
+            chatterino::rj::getSafe(value, "pattern", _pattern);
+            chatterino::rj::getSafe(value, "alert", _alert);
+            chatterino::rj::getSafe(value, "sound", _sound);
+            chatterino::rj::getSafe(value, "regex", _isRegex);
+
+            return chatterino::HighlightPhrase(_pattern, _alert, _sound,
+                                               _isRegex);
+        }
+    };
 
 }  // namespace Settings
 }  // namespace pajlada
diff --git a/src/controllers/ignores/IgnorePhrase.hpp b/src/controllers/ignores/IgnorePhrase.hpp
index 81eb83a87..16601708a 100644
--- a/src/controllers/ignores/IgnorePhrase.hpp
+++ b/src/controllers/ignores/IgnorePhrase.hpp
@@ -59,37 +59,37 @@ private:
 namespace pajlada {
 namespace Settings {
 
-template <>
-struct Serialize<chatterino::IgnorePhrase> {
-    static rapidjson::Value get(const chatterino::IgnorePhrase &value,
-                                rapidjson::Document::AllocatorType &a)
-    {
-        rapidjson::Value ret(rapidjson::kObjectType);
+    template <>
+    struct Serialize<chatterino::IgnorePhrase> {
+        static rapidjson::Value get(const chatterino::IgnorePhrase &value,
+                                    rapidjson::Document::AllocatorType &a)
+        {
+            rapidjson::Value ret(rapidjson::kObjectType);
 
-        AddMember(ret, "pattern", value.getPattern(), a);
-        AddMember(ret, "regex", value.isRegex(), a);
+            AddMember(ret, "pattern", value.getPattern(), a);
+            AddMember(ret, "regex", value.isRegex(), a);
 
-        return ret;
-    }
-};
-
-template <>
-struct Deserialize<chatterino::IgnorePhrase> {
-    static chatterino::IgnorePhrase get(const rapidjson::Value &value)
-    {
-        if (!value.IsObject()) {
-            return chatterino::IgnorePhrase(QString(), false);
+            return ret;
         }
+    };
 
-        QString _pattern;
-        bool _isRegex = false;
+    template <>
+    struct Deserialize<chatterino::IgnorePhrase> {
+        static chatterino::IgnorePhrase get(const rapidjson::Value &value)
+        {
+            if (!value.IsObject()) {
+                return chatterino::IgnorePhrase(QString(), false);
+            }
 
-        chatterino::rj::getSafe(value, "pattern", _pattern);
-        chatterino::rj::getSafe(value, "regex", _isRegex);
+            QString _pattern;
+            bool _isRegex = false;
 
-        return chatterino::IgnorePhrase(_pattern, _isRegex);
-    }
-};
+            chatterino::rj::getSafe(value, "pattern", _pattern);
+            chatterino::rj::getSafe(value, "regex", _isRegex);
+
+            return chatterino::IgnorePhrase(_pattern, _isRegex);
+        }
+    };
 
 }  // namespace Settings
 }  // namespace pajlada
diff --git a/src/controllers/moderationactions/ModerationAction.hpp b/src/controllers/moderationactions/ModerationAction.hpp
index 6a36157df..8dbdba93f 100644
--- a/src/controllers/moderationactions/ModerationAction.hpp
+++ b/src/controllers/moderationactions/ModerationAction.hpp
@@ -36,34 +36,34 @@ private:
 namespace pajlada {
 namespace Settings {
 
-template <>
-struct Serialize<chatterino::ModerationAction> {
-    static rapidjson::Value get(const chatterino::ModerationAction &value,
-                                rapidjson::Document::AllocatorType &a)
-    {
-        rapidjson::Value ret(rapidjson::kObjectType);
+    template <>
+    struct Serialize<chatterino::ModerationAction> {
+        static rapidjson::Value get(const chatterino::ModerationAction &value,
+                                    rapidjson::Document::AllocatorType &a)
+        {
+            rapidjson::Value ret(rapidjson::kObjectType);
 
-        AddMember(ret, "pattern", value.getAction(), a);
+            AddMember(ret, "pattern", value.getAction(), a);
 
-        return ret;
-    }
-};
-
-template <>
-struct Deserialize<chatterino::ModerationAction> {
-    static chatterino::ModerationAction get(const rapidjson::Value &value)
-    {
-        if (!value.IsObject()) {
-            return chatterino::ModerationAction(QString());
+            return ret;
         }
+    };
 
-        QString pattern;
+    template <>
+    struct Deserialize<chatterino::ModerationAction> {
+        static chatterino::ModerationAction get(const rapidjson::Value &value)
+        {
+            if (!value.IsObject()) {
+                return chatterino::ModerationAction(QString());
+            }
 
-        chatterino::rj::getSafe(value, "pattern", pattern);
+            QString pattern;
 
-        return chatterino::ModerationAction(pattern);
-    }
-};
+            chatterino::rj::getSafe(value, "pattern", pattern);
+
+            return chatterino::ModerationAction(pattern);
+        }
+    };
 
 }  // namespace Settings
 }  // namespace pajlada
diff --git a/src/messages/Image.cpp b/src/messages/Image.cpp
index b48234536..e6dcfbc8b 100644
--- a/src/messages/Image.cpp
+++ b/src/messages/Image.cpp
@@ -22,157 +22,163 @@
 
 namespace chatterino {
 namespace {
-// Frames
-Frames::Frames()
-{
-    DebugCount::increase("images");
-}
-
-Frames::Frames(const QVector<Frame<QPixmap>> &frames)
-    : items_(frames)
-{
-    assertInGuiThread();
-    DebugCount::increase("images");
-
-    if (this->animated()) {
-        DebugCount::increase("animated images");
-
-        this->gifTimerConnection_ = getApp()->emotes->gifTimer.signal.connect(
-            [this] { this->advance(); });
-    }
-}
-
-Frames::~Frames()
-{
-    assertInGuiThread();
-    DebugCount::decrease("images");
-
-    if (this->animated()) {
-        DebugCount::decrease("animated images");
+    // Frames
+    Frames::Frames()
+    {
+        DebugCount::increase("images");
     }
 
-    this->gifTimerConnection_.disconnect();
-}
+    Frames::Frames(const QVector<Frame<QPixmap>> &frames)
+        : items_(frames)
+    {
+        assertInGuiThread();
+        DebugCount::increase("images");
 
-void Frames::advance()
-{
-    this->durationOffset_ += GIF_FRAME_LENGTH;
+        if (this->animated()) {
+            DebugCount::increase("animated images");
 
-    while (true) {
-        this->index_ %= this->items_.size();
-
-        if (this->index_ >= this->items_.size()) {
-            this->index_ = this->index_;
-        }
-
-        if (this->durationOffset_ > this->items_[this->index_].duration) {
-            this->durationOffset_ -= this->items_[this->index_].duration;
-            this->index_ = (this->index_ + 1) % this->items_.size();
-        } else {
-            break;
+            this->gifTimerConnection_ =
+                getApp()->emotes->gifTimer.signal.connect(
+                    [this] { this->advance(); });
         }
     }
-}
 
-bool Frames::animated() const
-{
-    return this->items_.size() > 1;
-}
+    Frames::~Frames()
+    {
+        assertInGuiThread();
+        DebugCount::decrease("images");
 
-boost::optional<QPixmap> Frames::current() const
-{
-    if (this->items_.size() == 0) return boost::none;
-    return this->items_[this->index_].image;
-}
+        if (this->animated()) {
+            DebugCount::decrease("animated images");
+        }
 
-boost::optional<QPixmap> Frames::first() const
-{
-    if (this->items_.size() == 0) return boost::none;
-    return this->items_.front().image;
-}
+        this->gifTimerConnection_.disconnect();
+    }
 
-// functions
-QVector<Frame<QImage>> readFrames(QImageReader &reader, const Url &url)
-{
-    QVector<Frame<QImage>> frames;
+    void Frames::advance()
+    {
+        this->durationOffset_ += GIF_FRAME_LENGTH;
+
+        while (true) {
+            this->index_ %= this->items_.size();
+
+            if (this->index_ >= this->items_.size()) {
+                this->index_ = this->index_;
+            }
+
+            if (this->durationOffset_ > this->items_[this->index_].duration) {
+                this->durationOffset_ -= this->items_[this->index_].duration;
+                this->index_ = (this->index_ + 1) % this->items_.size();
+            } else {
+                break;
+            }
+        }
+    }
+
+    bool Frames::animated() const
+    {
+        return this->items_.size() > 1;
+    }
+
+    boost::optional<QPixmap> Frames::current() const
+    {
+        if (this->items_.size() == 0) return boost::none;
+        return this->items_[this->index_].image;
+    }
+
+    boost::optional<QPixmap> Frames::first() const
+    {
+        if (this->items_.size() == 0) return boost::none;
+        return this->items_.front().image;
+    }
+
+    // functions
+    QVector<Frame<QImage>> readFrames(QImageReader &reader, const Url &url)
+    {
+        QVector<Frame<QImage>> frames;
+
+        if (reader.imageCount() == 0) {
+            log("Error while reading image {}: '{}'", url.string,
+                reader.errorString());
+            return frames;
+        }
+
+        QImage image;
+        for (int index = 0; index < reader.imageCount(); ++index) {
+            if (reader.read(&image)) {
+                QPixmap::fromImage(image);
+
+                int duration = std::max(20, reader.nextImageDelay());
+                frames.push_back(Frame<QImage>{image, duration});
+            }
+        }
+
+        if (frames.size() == 0) {
+            log("Error while reading image {}: '{}'", url.string,
+                reader.errorString());
+        }
 
-    if (reader.imageCount() == 0) {
-        log("Error while reading image {}: '{}'", url.string,
-            reader.errorString());
         return frames;
     }
 
-    QImage image;
-    for (int index = 0; index < reader.imageCount(); ++index) {
-        if (reader.read(&image)) {
-            QPixmap::fromImage(image);
-
-            int duration = std::max(20, reader.nextImageDelay());
-            frames.push_back(Frame<QImage>{image, duration});
-        }
-    }
-
-    if (frames.size() == 0) {
-        log("Error while reading image {}: '{}'", url.string,
-            reader.errorString());
-    }
-
-    return frames;
-}
-
-// parsed
-template <typename Assign>
-void assignDelayed(
-    std::queue<std::pair<Assign, QVector<Frame<QPixmap>>>> &queued,
-    std::mutex &mutex, std::atomic_bool &loadedEventQueued)
-{
-    std::lock_guard<std::mutex> lock(mutex);
-    int i = 0;
-
-    while (!queued.empty()) {
-        queued.front().first(queued.front().second);
-        queued.pop();
-
-        if (++i > 50) {
-            QTimer::singleShot(
-                3, [&] { assignDelayed(queued, mutex, loadedEventQueued); });
-            return;
-        }
-    }
-
-    getApp()->windows->forceLayoutChannelViews();
-    loadedEventQueued = false;
-}
-
-template <typename Assign>
-auto makeConvertCallback(const QVector<Frame<QImage>> &parsed, Assign assign)
-{
-    return [parsed, assign] {
-        // convert to pixmap
-        auto frames = QVector<Frame<QPixmap>>();
-        std::transform(parsed.begin(), parsed.end(), std::back_inserter(frames),
-                       [](auto &frame) {
-                           return Frame<QPixmap>{
-                               QPixmap::fromImage(frame.image), frame.duration};
-                       });
-
-        // put into stack
-        static std::queue<std::pair<Assign, QVector<Frame<QPixmap>>>> queued;
-        static std::mutex mutex;
-
+    // parsed
+    template <typename Assign>
+    void assignDelayed(
+        std::queue<std::pair<Assign, QVector<Frame<QPixmap>>>> &queued,
+        std::mutex &mutex, std::atomic_bool &loadedEventQueued)
+    {
         std::lock_guard<std::mutex> lock(mutex);
-        queued.emplace(assign, frames);
+        int i = 0;
 
-        static std::atomic_bool loadedEventQueued{false};
+        while (!queued.empty()) {
+            queued.front().first(queued.front().second);
+            queued.pop();
 
-        if (!loadedEventQueued) {
-            loadedEventQueued = true;
-
-            QTimer::singleShot(
-                100, [=] { assignDelayed(queued, mutex, loadedEventQueued); });
+            if (++i > 50) {
+                QTimer::singleShot(3, [&] {
+                    assignDelayed(queued, mutex, loadedEventQueued);
+                });
+                return;
+            }
         }
-    };
-}
+
+        getApp()->windows->forceLayoutChannelViews();
+        loadedEventQueued = false;
+    }
+
+    template <typename Assign>
+    auto makeConvertCallback(const QVector<Frame<QImage>> &parsed,
+                             Assign assign)
+    {
+        return [parsed, assign] {
+            // convert to pixmap
+            auto frames = QVector<Frame<QPixmap>>();
+            std::transform(parsed.begin(), parsed.end(),
+                           std::back_inserter(frames), [](auto &frame) {
+                               return Frame<QPixmap>{
+                                   QPixmap::fromImage(frame.image),
+                                   frame.duration};
+                           });
+
+            // put into stack
+            static std::queue<std::pair<Assign, QVector<Frame<QPixmap>>>>
+                queued;
+            static std::mutex mutex;
+
+            std::lock_guard<std::mutex> lock(mutex);
+            queued.emplace(assign, frames);
+
+            static std::atomic_bool loadedEventQueued{false};
+
+            if (!loadedEventQueued) {
+                loadedEventQueued = true;
+
+                QTimer::singleShot(100, [=] {
+                    assignDelayed(queued, mutex, loadedEventQueued);
+                });
+            }
+        };
+    }
 }  // namespace
 
 // IMAGE2
diff --git a/src/messages/Image.hpp b/src/messages/Image.hpp
index 68b96392b..678af25ce 100644
--- a/src/messages/Image.hpp
+++ b/src/messages/Image.hpp
@@ -17,29 +17,29 @@
 
 namespace chatterino {
 namespace {
-template <typename Image>
-struct Frame {
-    Image image;
-    int duration;
-};
-class Frames : boost::noncopyable
-{
-public:
-    Frames();
-    Frames(const QVector<Frame<QPixmap>> &frames);
-    ~Frames();
+    template <typename Image>
+    struct Frame {
+        Image image;
+        int duration;
+    };
+    class Frames : boost::noncopyable
+    {
+    public:
+        Frames();
+        Frames(const QVector<Frame<QPixmap>> &frames);
+        ~Frames();
 
-    bool animated() const;
-    void advance();
-    boost::optional<QPixmap> current() const;
-    boost::optional<QPixmap> first() const;
+        bool animated() const;
+        void advance();
+        boost::optional<QPixmap> current() const;
+        boost::optional<QPixmap> first() const;
 
-private:
-    QVector<Frame<QPixmap>> items_;
-    int index_{0};
-    int durationOffset_{0};
-    pajlada::Signals::Connection gifTimerConnection_;
-};
+    private:
+        QVector<Frame<QPixmap>> items_;
+        int index_{0};
+        int durationOffset_{0};
+        pajlada::Signals::Connection gifTimerConnection_;
+    };
 }  // namespace
 
 class Image;
diff --git a/src/messages/MessageParseArgs.hpp b/src/messages/MessageParseArgs.hpp
index 519262dc1..471d1d648 100644
--- a/src/messages/MessageParseArgs.hpp
+++ b/src/messages/MessageParseArgs.hpp
@@ -2,5 +2,4 @@
 
 namespace chatterino {
 
-
 }  // namespace chatterino
diff --git a/src/providers/bttv/BttvEmotes.cpp b/src/providers/bttv/BttvEmotes.cpp
index cf32bd414..2efe00d64 100644
--- a/src/providers/bttv/BttvEmotes.cpp
+++ b/src/providers/bttv/BttvEmotes.cpp
@@ -13,73 +13,76 @@
 
 namespace chatterino {
 namespace {
-Url getEmoteLink(QString urlTemplate, const EmoteId &id,
-                 const QString &emoteScale)
-{
-    urlTemplate.detach();
+    Url getEmoteLink(QString urlTemplate, const EmoteId &id,
+                     const QString &emoteScale)
+    {
+        urlTemplate.detach();
 
-    return {urlTemplate.replace("{{id}}", id.string)
-                .replace("{{image}}", emoteScale)};
-}
-std::pair<Outcome, EmoteMap> parseGlobalEmotes(const QJsonObject &jsonRoot,
-                                               const EmoteMap &currentEmotes)
-{
-    auto emotes = EmoteMap();
-    auto jsonEmotes = jsonRoot.value("emotes").toArray();
-    auto urlTemplate = qS("https:") + jsonRoot.value("urlTemplate").toString();
-
-    for (auto jsonEmote : jsonEmotes) {
-        auto id = EmoteId{jsonEmote.toObject().value("id").toString()};
-        auto name = EmoteName{jsonEmote.toObject().value("code").toString()};
-
-        auto emote = Emote(
-            {name,
-             ImageSet{
-                 Image::fromUrl(getEmoteLink(urlTemplate, id, "1x"), 1),
-                 Image::fromUrl(getEmoteLink(urlTemplate, id, "2x"), 0.5),
-                 Image::fromUrl(getEmoteLink(urlTemplate, id, "3x"), 0.25)},
-             Tooltip{name.string + "<br />Global Bttv Emote"},
-             Url{"https://manage.betterttv.net/emotes/" + id.string}});
-
-        emotes[name] = cachedOrMakeEmotePtr(std::move(emote), currentEmotes);
+        return {urlTemplate.replace("{{id}}", id.string)
+                    .replace("{{image}}", emoteScale)};
     }
+    std::pair<Outcome, EmoteMap> parseGlobalEmotes(
+        const QJsonObject &jsonRoot, const EmoteMap &currentEmotes)
+    {
+        auto emotes = EmoteMap();
+        auto jsonEmotes = jsonRoot.value("emotes").toArray();
+        auto urlTemplate =
+            qS("https:") + jsonRoot.value("urlTemplate").toString();
 
-    return {Success, std::move(emotes)};
-}
-EmotePtr cachedOrMake(Emote &&emote, const EmoteId &id)
-{
-    static std::unordered_map<EmoteId, std::weak_ptr<const Emote>> cache;
-    static std::mutex mutex;
+        for (auto jsonEmote : jsonEmotes) {
+            auto id = EmoteId{jsonEmote.toObject().value("id").toString()};
+            auto name =
+                EmoteName{jsonEmote.toObject().value("code").toString()};
 
-    return cachedOrMakeEmotePtr(std::move(emote), cache, mutex, id);
-}
-std::pair<Outcome, EmoteMap> parseChannelEmotes(const QJsonObject &jsonRoot)
-{
-    auto emotes = EmoteMap();
-    auto jsonEmotes = jsonRoot.value("emotes").toArray();
-    auto urlTemplate = "https:" + jsonRoot.value("urlTemplate").toString();
+            auto emote = Emote(
+                {name,
+                 ImageSet{
+                     Image::fromUrl(getEmoteLink(urlTemplate, id, "1x"), 1),
+                     Image::fromUrl(getEmoteLink(urlTemplate, id, "2x"), 0.5),
+                     Image::fromUrl(getEmoteLink(urlTemplate, id, "3x"), 0.25)},
+                 Tooltip{name.string + "<br />Global Bttv Emote"},
+                 Url{"https://manage.betterttv.net/emotes/" + id.string}});
 
-    for (auto jsonEmote_ : jsonEmotes) {
-        auto jsonEmote = jsonEmote_.toObject();
+            emotes[name] =
+                cachedOrMakeEmotePtr(std::move(emote), currentEmotes);
+        }
 
-        auto id = EmoteId{jsonEmote.value("id").toString()};
-        auto name = EmoteName{jsonEmote.value("code").toString()};
-        // emoteObject.value("imageType").toString();
-
-        auto emote = Emote(
-            {name,
-             ImageSet{
-                 Image::fromUrl(getEmoteLink(urlTemplate, id, "1x"), 1),
-                 Image::fromUrl(getEmoteLink(urlTemplate, id, "2x"), 0.5),
-                 Image::fromUrl(getEmoteLink(urlTemplate, id, "3x"), 0.25)},
-             Tooltip{name.string + "<br />Channel Bttv Emote"},
-             Url{"https://manage.betterttv.net/emotes/" + id.string}});
-
-        emotes[name] = cachedOrMake(std::move(emote), id);
+        return {Success, std::move(emotes)};
     }
+    EmotePtr cachedOrMake(Emote &&emote, const EmoteId &id)
+    {
+        static std::unordered_map<EmoteId, std::weak_ptr<const Emote>> cache;
+        static std::mutex mutex;
 
-    return {Success, std::move(emotes)};
-}
+        return cachedOrMakeEmotePtr(std::move(emote), cache, mutex, id);
+    }
+    std::pair<Outcome, EmoteMap> parseChannelEmotes(const QJsonObject &jsonRoot)
+    {
+        auto emotes = EmoteMap();
+        auto jsonEmotes = jsonRoot.value("emotes").toArray();
+        auto urlTemplate = "https:" + jsonRoot.value("urlTemplate").toString();
+
+        for (auto jsonEmote_ : jsonEmotes) {
+            auto jsonEmote = jsonEmote_.toObject();
+
+            auto id = EmoteId{jsonEmote.value("id").toString()};
+            auto name = EmoteName{jsonEmote.value("code").toString()};
+            // emoteObject.value("imageType").toString();
+
+            auto emote = Emote(
+                {name,
+                 ImageSet{
+                     Image::fromUrl(getEmoteLink(urlTemplate, id, "1x"), 1),
+                     Image::fromUrl(getEmoteLink(urlTemplate, id, "2x"), 0.5),
+                     Image::fromUrl(getEmoteLink(urlTemplate, id, "3x"), 0.25)},
+                 Tooltip{name.string + "<br />Channel Bttv Emote"},
+                 Url{"https://manage.betterttv.net/emotes/" + id.string}});
+
+            emotes[name] = cachedOrMake(std::move(emote), id);
+        }
+
+        return {Success, std::move(emotes)};
+    }
 }  // namespace
 
 //
diff --git a/src/providers/emoji/Emojis.cpp b/src/providers/emoji/Emojis.cpp
index 5140d2fe1..809b7c3d5 100644
--- a/src/providers/emoji/Emojis.cpp
+++ b/src/providers/emoji/Emojis.cpp
@@ -13,82 +13,81 @@
 #include <memory>
 
 namespace chatterino {
-
 namespace {
+    void parseEmoji(const std::shared_ptr<EmojiData> &emojiData,
+                    const rapidjson::Value &unparsedEmoji,
+                    QString shortCode = QString())
+    {
+        static uint unicodeBytes[4];
 
-void parseEmoji(const std::shared_ptr<EmojiData> &emojiData,
-                const rapidjson::Value &unparsedEmoji,
-                QString shortCode = QString())
-{
-    static uint unicodeBytes[4];
+        struct {
+            bool apple;
+            bool google;
+            bool twitter;
+            bool emojione;
+            bool facebook;
+            bool messenger;
+        } capabilities;
 
-    struct {
-        bool apple;
-        bool google;
-        bool twitter;
-        bool emojione;
-        bool facebook;
-        bool messenger;
-    } capabilities;
-
-    if (!shortCode.isEmpty()) {
-        emojiData->shortCodes.push_back(shortCode);
-    } else {
-        const auto &shortCodes = unparsedEmoji["short_names"];
-        for (const auto &shortCode : shortCodes.GetArray()) {
-            emojiData->shortCodes.emplace_back(shortCode.GetString());
+        if (!shortCode.isEmpty()) {
+            emojiData->shortCodes.push_back(shortCode);
+        } else {
+            const auto &shortCodes = unparsedEmoji["short_names"];
+            for (const auto &shortCode : shortCodes.GetArray()) {
+                emojiData->shortCodes.emplace_back(shortCode.GetString());
+            }
         }
-    }
 
-    rj::getSafe(unparsedEmoji, "non_qualified", emojiData->nonQualifiedCode);
-    rj::getSafe(unparsedEmoji, "unified", emojiData->unifiedCode);
+        rj::getSafe(unparsedEmoji, "non_qualified",
+                    emojiData->nonQualifiedCode);
+        rj::getSafe(unparsedEmoji, "unified", emojiData->unifiedCode);
 
-    rj::getSafe(unparsedEmoji, "has_img_apple", capabilities.apple);
-    rj::getSafe(unparsedEmoji, "has_img_google", capabilities.google);
-    rj::getSafe(unparsedEmoji, "has_img_twitter", capabilities.twitter);
-    rj::getSafe(unparsedEmoji, "has_img_emojione", capabilities.emojione);
-    rj::getSafe(unparsedEmoji, "has_img_facebook", capabilities.facebook);
-    rj::getSafe(unparsedEmoji, "has_img_messenger", capabilities.messenger);
+        rj::getSafe(unparsedEmoji, "has_img_apple", capabilities.apple);
+        rj::getSafe(unparsedEmoji, "has_img_google", capabilities.google);
+        rj::getSafe(unparsedEmoji, "has_img_twitter", capabilities.twitter);
+        rj::getSafe(unparsedEmoji, "has_img_emojione", capabilities.emojione);
+        rj::getSafe(unparsedEmoji, "has_img_facebook", capabilities.facebook);
+        rj::getSafe(unparsedEmoji, "has_img_messenger", capabilities.messenger);
 
-    if (capabilities.apple) {
-        emojiData->capabilities.insert("Apple");
-    }
-    if (capabilities.google) {
-        emojiData->capabilities.insert("Google");
-    }
-    if (capabilities.twitter) {
-        emojiData->capabilities.insert("Twitter");
-    }
-    if (capabilities.emojione) {
-        emojiData->capabilities.insert("EmojiOne 3");
-    }
-    if (capabilities.facebook) {
-        emojiData->capabilities.insert("Facebook");
-    }
-    if (capabilities.messenger) {
-        emojiData->capabilities.insert("Messenger");
-    }
+        if (capabilities.apple) {
+            emojiData->capabilities.insert("Apple");
+        }
+        if (capabilities.google) {
+            emojiData->capabilities.insert("Google");
+        }
+        if (capabilities.twitter) {
+            emojiData->capabilities.insert("Twitter");
+        }
+        if (capabilities.emojione) {
+            emojiData->capabilities.insert("EmojiOne 3");
+        }
+        if (capabilities.facebook) {
+            emojiData->capabilities.insert("Facebook");
+        }
+        if (capabilities.messenger) {
+            emojiData->capabilities.insert("Messenger");
+        }
 
-    QStringList unicodeCharacters;
-    if (!emojiData->nonQualifiedCode.isEmpty()) {
-        unicodeCharacters = emojiData->nonQualifiedCode.toLower().split('-');
-    } else {
-        unicodeCharacters = emojiData->unifiedCode.toLower().split('-');
+        QStringList unicodeCharacters;
+        if (!emojiData->nonQualifiedCode.isEmpty()) {
+            unicodeCharacters =
+                emojiData->nonQualifiedCode.toLower().split('-');
+        } else {
+            unicodeCharacters = emojiData->unifiedCode.toLower().split('-');
+        }
+        if (unicodeCharacters.length() < 1) {
+            return;
+        }
+
+        int numUnicodeBytes = 0;
+
+        for (const QString &unicodeCharacter : unicodeCharacters) {
+            unicodeBytes[numUnicodeBytes++] =
+                QString(unicodeCharacter).toUInt(nullptr, 16);
+        }
+
+        emojiData->value = QString::fromUcs4(unicodeBytes, numUnicodeBytes);
     }
-    if (unicodeCharacters.length() < 1) {
-        return;
-    }
-
-    int numUnicodeBytes = 0;
-
-    for (const QString &unicodeCharacter : unicodeCharacters) {
-        unicodeBytes[numUnicodeBytes++] =
-            QString(unicodeCharacter).toUInt(nullptr, 16);
-    }
-
-    emojiData->value = QString::fromUcs4(unicodeBytes, numUnicodeBytes);
-}
-
 }  // namespace
 
 void Emojis::load()
diff --git a/src/providers/ffz/FfzEmotes.cpp b/src/providers/ffz/FfzEmotes.cpp
index f8be4baa0..eb6912ff7 100644
--- a/src/providers/ffz/FfzEmotes.cpp
+++ b/src/providers/ffz/FfzEmotes.cpp
@@ -10,99 +10,100 @@
 
 namespace chatterino {
 namespace {
-Url getEmoteLink(const QJsonObject &urls, const QString &emoteScale)
-{
-    auto emote = urls.value(emoteScale);
-    if (emote.isUndefined()) {
-        return {""};
-    }
-
-    assert(emote.isString());
-
-    return {"https:" + emote.toString()};
-}
-void fillInEmoteData(const QJsonObject &urls, const EmoteName &name,
-                     const QString &tooltip, Emote &emoteData)
-{
-    auto url1x = getEmoteLink(urls, "1");
-    auto url2x = getEmoteLink(urls, "2");
-    auto url3x = getEmoteLink(urls, "4");
-
-    //, code, tooltip
-    emoteData.name = name;
-    emoteData.images =
-        ImageSet{Image::fromUrl(url1x, 1), Image::fromUrl(url2x, 0.5),
-                 Image::fromUrl(url3x, 0.25)};
-    emoteData.tooltip = {tooltip};
-}
-EmotePtr cachedOrMake(Emote &&emote, const EmoteId &id)
-{
-    static std::unordered_map<EmoteId, std::weak_ptr<const Emote>> cache;
-    static std::mutex mutex;
-
-    return cachedOrMakeEmotePtr(std::move(emote), cache, mutex, id);
-}
-std::pair<Outcome, EmoteMap> parseGlobalEmotes(const QJsonObject &jsonRoot,
-                                               const EmoteMap &currentEmotes)
-{
-    auto jsonSets = jsonRoot.value("sets").toObject();
-    auto emotes = EmoteMap();
-
-    for (auto jsonSet : jsonSets) {
-        auto jsonEmotes = jsonSet.toObject().value("emoticons").toArray();
-
-        for (auto jsonEmoteValue : jsonEmotes) {
-            auto jsonEmote = jsonEmoteValue.toObject();
-
-            auto name = EmoteName{jsonEmote.value("name").toString()};
-            auto id = EmoteId{jsonEmote.value("id").toString()};
-            auto urls = jsonEmote.value("urls").toObject();
-
-            auto emote = Emote();
-            fillInEmoteData(urls, name, name.string + "<br/>Global FFZ Emote",
-                            emote);
-            emote.homePage =
-                Url{QString("https://www.frankerfacez.com/emoticon/%1-%2")
-                        .arg(id.string)
-                        .arg(name.string)};
-
-            emotes[name] =
-                cachedOrMakeEmotePtr(std::move(emote), currentEmotes);
+    Url getEmoteLink(const QJsonObject &urls, const QString &emoteScale)
+    {
+        auto emote = urls.value(emoteScale);
+        if (emote.isUndefined()) {
+            return {""};
         }
+
+        assert(emote.isString());
+
+        return {"https:" + emote.toString()};
     }
+    void fillInEmoteData(const QJsonObject &urls, const EmoteName &name,
+                         const QString &tooltip, Emote &emoteData)
+    {
+        auto url1x = getEmoteLink(urls, "1");
+        auto url2x = getEmoteLink(urls, "2");
+        auto url3x = getEmoteLink(urls, "4");
 
-    return {Success, std::move(emotes)};
-}
-std::pair<Outcome, EmoteMap> parseChannelEmotes(const QJsonObject &jsonRoot)
-{
-    auto jsonSets = jsonRoot.value("sets").toObject();
-    auto emotes = EmoteMap();
+        //, code, tooltip
+        emoteData.name = name;
+        emoteData.images =
+            ImageSet{Image::fromUrl(url1x, 1), Image::fromUrl(url2x, 0.5),
+                     Image::fromUrl(url3x, 0.25)};
+        emoteData.tooltip = {tooltip};
+    }
+    EmotePtr cachedOrMake(Emote &&emote, const EmoteId &id)
+    {
+        static std::unordered_map<EmoteId, std::weak_ptr<const Emote>> cache;
+        static std::mutex mutex;
 
-    for (auto jsonSet : jsonSets) {
-        auto jsonEmotes = jsonSet.toObject().value("emoticons").toArray();
+        return cachedOrMakeEmotePtr(std::move(emote), cache, mutex, id);
+    }
+    std::pair<Outcome, EmoteMap> parseGlobalEmotes(
+        const QJsonObject &jsonRoot, const EmoteMap &currentEmotes)
+    {
+        auto jsonSets = jsonRoot.value("sets").toObject();
+        auto emotes = EmoteMap();
 
-        for (auto _jsonEmote : jsonEmotes) {
-            auto jsonEmote = _jsonEmote.toObject();
+        for (auto jsonSet : jsonSets) {
+            auto jsonEmotes = jsonSet.toObject().value("emoticons").toArray();
 
-            // margins
-            auto id = EmoteId{QString::number(jsonEmote.value("id").toInt())};
-            auto name = EmoteName{jsonEmote.value("name").toString()};
-            auto urls = jsonEmote.value("urls").toObject();
+            for (auto jsonEmoteValue : jsonEmotes) {
+                auto jsonEmote = jsonEmoteValue.toObject();
 
-            Emote emote;
-            fillInEmoteData(urls, name, name.string + "<br/>Channel FFZ Emote",
-                            emote);
-            emote.homePage =
-                Url{QString("https://www.frankerfacez.com/emoticon/%1-%2")
-                        .arg(id.string)
-                        .arg(name.string)};
+                auto name = EmoteName{jsonEmote.value("name").toString()};
+                auto id = EmoteId{jsonEmote.value("id").toString()};
+                auto urls = jsonEmote.value("urls").toObject();
 
-            emotes[name] = cachedOrMake(std::move(emote), id);
+                auto emote = Emote();
+                fillInEmoteData(urls, name,
+                                name.string + "<br/>Global FFZ Emote", emote);
+                emote.homePage =
+                    Url{QString("https://www.frankerfacez.com/emoticon/%1-%2")
+                            .arg(id.string)
+                            .arg(name.string)};
+
+                emotes[name] =
+                    cachedOrMakeEmotePtr(std::move(emote), currentEmotes);
+            }
         }
-    }
 
-    return {Success, std::move(emotes)};
-}
+        return {Success, std::move(emotes)};
+    }
+    std::pair<Outcome, EmoteMap> parseChannelEmotes(const QJsonObject &jsonRoot)
+    {
+        auto jsonSets = jsonRoot.value("sets").toObject();
+        auto emotes = EmoteMap();
+
+        for (auto jsonSet : jsonSets) {
+            auto jsonEmotes = jsonSet.toObject().value("emoticons").toArray();
+
+            for (auto _jsonEmote : jsonEmotes) {
+                auto jsonEmote = _jsonEmote.toObject();
+
+                // margins
+                auto id =
+                    EmoteId{QString::number(jsonEmote.value("id").toInt())};
+                auto name = EmoteName{jsonEmote.value("name").toString()};
+                auto urls = jsonEmote.value("urls").toObject();
+
+                Emote emote;
+                fillInEmoteData(urls, name,
+                                name.string + "<br/>Channel FFZ Emote", emote);
+                emote.homePage =
+                    Url{QString("https://www.frankerfacez.com/emoticon/%1-%2")
+                            .arg(id.string)
+                            .arg(name.string)};
+
+                emotes[name] = cachedOrMake(std::move(emote), id);
+            }
+        }
+
+        return {Success, std::move(emotes)};
+    }
 }  // namespace
 
 FfzEmotes::FfzEmotes()
diff --git a/src/providers/twitch/PubsubClient.cpp b/src/providers/twitch/PubsubClient.cpp
index 7f591aebc..77b6ba1d4 100644
--- a/src/providers/twitch/PubsubClient.cpp
+++ b/src/providers/twitch/PubsubClient.cpp
@@ -24,157 +24,159 @@ static std::map<QString, std::string> sentMessages;
 
 namespace detail {
 
-PubSubClient::PubSubClient(WebsocketClient &websocketClient,
-                           WebsocketHandle handle)
-    : websocketClient_(websocketClient)
-    , handle_(handle)
-{
-}
-
-void PubSubClient::start()
-{
-    assert(!this->started_);
-
-    this->started_ = true;
-
-    this->ping();
-}
-
-void PubSubClient::stop()
-{
-    assert(this->started_);
-
-    this->started_ = false;
-}
-
-bool PubSubClient::listen(rapidjson::Document &message)
-{
-    int numRequestedListens = message["data"]["topics"].Size();
-
-    if (this->numListens_ + numRequestedListens > MAX_PUBSUB_LISTENS) {
-        // This PubSubClient is already at its peak listens
-        return false;
+    PubSubClient::PubSubClient(WebsocketClient &websocketClient,
+                               WebsocketHandle handle)
+        : websocketClient_(websocketClient)
+        , handle_(handle)
+    {
     }
 
-    this->numListens_ += numRequestedListens;
+    void PubSubClient::start()
+    {
+        assert(!this->started_);
 
-    for (const auto &topic : message["data"]["topics"].GetArray()) {
-        this->listeners_.emplace_back(
-            Listener{topic.GetString(), false, false, false});
+        this->started_ = true;
+
+        this->ping();
     }
 
-    auto uuid = CreateUUID();
+    void PubSubClient::stop()
+    {
+        assert(this->started_);
 
-    rj::set(message, "nonce", uuid);
+        this->started_ = false;
+    }
 
-    std::string payload = rj::stringify(message);
-    sentMessages[uuid] = payload;
+    bool PubSubClient::listen(rapidjson::Document &message)
+    {
+        int numRequestedListens = message["data"]["topics"].Size();
 
-    this->send(payload.c_str());
-
-    return true;
-}
-
-void PubSubClient::unlistenPrefix(const std::string &prefix)
-{
-    std::vector<std::string> topics;
-
-    for (auto it = this->listeners_.begin(); it != this->listeners_.end();) {
-        const auto &listener = *it;
-        if (listener.topic.find(prefix) == 0) {
-            topics.push_back(listener.topic);
-            it = this->listeners_.erase(it);
-        } else {
-            ++it;
+        if (this->numListens_ + numRequestedListens > MAX_PUBSUB_LISTENS) {
+            // This PubSubClient is already at its peak listens
+            return false;
         }
-    }
 
-    if (topics.empty()) {
-        return;
-    }
+        this->numListens_ += numRequestedListens;
 
-    auto message = createUnlistenMessage(topics);
-
-    auto uuid = CreateUUID();
-
-    rj::set(message, "nonce", CreateUUID());
-
-    std::string payload = rj::stringify(message);
-    sentMessages[uuid] = payload;
-
-    this->send(payload.c_str());
-}
-
-void PubSubClient::handlePong()
-{
-    assert(this->awaitingPong_);
-
-    log("Got pong!");
-
-    this->awaitingPong_ = false;
-}
-
-bool PubSubClient::isListeningToTopic(const std::string &payload)
-{
-    for (const auto &listener : this->listeners_) {
-        if (listener.topic == payload) {
-            return true;
+        for (const auto &topic : message["data"]["topics"].GetArray()) {
+            this->listeners_.emplace_back(
+                Listener{topic.GetString(), false, false, false});
         }
+
+        auto uuid = CreateUUID();
+
+        rj::set(message, "nonce", uuid);
+
+        std::string payload = rj::stringify(message);
+        sentMessages[uuid] = payload;
+
+        this->send(payload.c_str());
+
+        return true;
     }
 
-    return false;
-}
+    void PubSubClient::unlistenPrefix(const std::string &prefix)
+    {
+        std::vector<std::string> topics;
 
-void PubSubClient::ping()
-{
-    assert(this->started_);
+        for (auto it = this->listeners_.begin();
+             it != this->listeners_.end();) {
+            const auto &listener = *it;
+            if (listener.topic.find(prefix) == 0) {
+                topics.push_back(listener.topic);
+                it = this->listeners_.erase(it);
+            } else {
+                ++it;
+            }
+        }
 
-    if (!this->send(pingPayload)) {
-        return;
+        if (topics.empty()) {
+            return;
+        }
+
+        auto message = createUnlistenMessage(topics);
+
+        auto uuid = CreateUUID();
+
+        rj::set(message, "nonce", CreateUUID());
+
+        std::string payload = rj::stringify(message);
+        sentMessages[uuid] = payload;
+
+        this->send(payload.c_str());
     }
 
-    this->awaitingPong_ = true;
+    void PubSubClient::handlePong()
+    {
+        assert(this->awaitingPong_);
 
-    auto self = this->shared_from_this();
+        log("Got pong!");
 
-    runAfter(this->websocketClient_.get_io_service(), std::chrono::seconds(15),
-             [self](auto timer) {
-                 if (!self->started_) {
-                     return;
-                 }
+        this->awaitingPong_ = false;
+    }
 
-                 if (self->awaitingPong_) {
-                     log("No pong respnose, disconnect!");
-                     // TODO(pajlada): Label this connection as "disconnect me"
-                 }
-             });
-
-    runAfter(this->websocketClient_.get_io_service(), std::chrono::minutes(5),
-             [self](auto timer) {
-                 if (!self->started_) {
-                     return;
-                 }
-
-                 self->ping();  //
-             });
-}
-
-bool PubSubClient::send(const char *payload)
-{
-    WebsocketErrorCode ec;
-    this->websocketClient_.send(this->handle_, payload,
-                                websocketpp::frame::opcode::text, ec);
-
-    if (ec) {
-        log("Error sending message {}: {}", payload, ec.message());
-        // TODO(pajlada): Check which error code happened and maybe gracefully
-        // handle it
+    bool PubSubClient::isListeningToTopic(const std::string &payload)
+    {
+        for (const auto &listener : this->listeners_) {
+            if (listener.topic == payload) {
+                return true;
+            }
+        }
 
         return false;
     }
 
-    return true;
-}
+    void PubSubClient::ping()
+    {
+        assert(this->started_);
+
+        if (!this->send(pingPayload)) {
+            return;
+        }
+
+        this->awaitingPong_ = true;
+
+        auto self = this->shared_from_this();
+
+        runAfter(this->websocketClient_.get_io_service(),
+                 std::chrono::seconds(15), [self](auto timer) {
+                     if (!self->started_) {
+                         return;
+                     }
+
+                     if (self->awaitingPong_) {
+                         log("No pong respnose, disconnect!");
+                         // TODO(pajlada): Label this connection as "disconnect
+                         // me"
+                     }
+                 });
+
+        runAfter(this->websocketClient_.get_io_service(),
+                 std::chrono::minutes(5), [self](auto timer) {
+                     if (!self->started_) {
+                         return;
+                     }
+
+                     self->ping();  //
+                 });
+    }
+
+    bool PubSubClient::send(const char *payload)
+    {
+        WebsocketErrorCode ec;
+        this->websocketClient_.send(this->handle_, payload,
+                                    websocketpp::frame::opcode::text, ec);
+
+        if (ec) {
+            log("Error sending message {}: {}", payload, ec.message());
+            // TODO(pajlada): Check which error code happened and maybe
+            // gracefully handle it
+
+            return false;
+        }
+
+        return true;
+    }
 
 }  // namespace detail
 
diff --git a/src/providers/twitch/PubsubClient.hpp b/src/providers/twitch/PubsubClient.hpp
index 211502176..f3cc10f15 100644
--- a/src/providers/twitch/PubsubClient.hpp
+++ b/src/providers/twitch/PubsubClient.hpp
@@ -32,41 +32,42 @@ using WebsocketErrorCode = websocketpp::lib::error_code;
 
 namespace detail {
 
-struct Listener {
-    std::string topic;
-    bool authed;
-    bool persistent;
-    bool confirmed = false;
-};
+    struct Listener {
+        std::string topic;
+        bool authed;
+        bool persistent;
+        bool confirmed = false;
+    };
 
-class PubSubClient : public std::enable_shared_from_this<PubSubClient>
-{
-public:
-    PubSubClient(WebsocketClient &_websocketClient, WebsocketHandle _handle);
+    class PubSubClient : public std::enable_shared_from_this<PubSubClient>
+    {
+    public:
+        PubSubClient(WebsocketClient &_websocketClient,
+                     WebsocketHandle _handle);
 
-    void start();
-    void stop();
+        void start();
+        void stop();
 
-    bool listen(rapidjson::Document &message);
-    void unlistenPrefix(const std::string &prefix);
+        bool listen(rapidjson::Document &message);
+        void unlistenPrefix(const std::string &prefix);
 
-    void handlePong();
+        void handlePong();
 
-    bool isListeningToTopic(const std::string &topic);
+        bool isListeningToTopic(const std::string &topic);
 
-private:
-    void ping();
-    bool send(const char *payload);
+    private:
+        void ping();
+        bool send(const char *payload);
 
-    WebsocketClient &websocketClient_;
-    WebsocketHandle handle_;
-    uint16_t numListens_ = 0;
+        WebsocketClient &websocketClient_;
+        WebsocketHandle handle_;
+        uint16_t numListens_ = 0;
 
-    std::vector<Listener> listeners_;
+        std::vector<Listener> listeners_;
 
-    std::atomic<bool> awaitingPong_{false};
-    std::atomic<bool> started_{false};
-};
+        std::atomic<bool> awaitingPong_{false};
+        std::atomic<bool> started_{false};
+    };
 
 }  // namespace detail
 
diff --git a/src/providers/twitch/PubsubHelpers.hpp b/src/providers/twitch/PubsubHelpers.hpp
index fe7056dc8..c478ed437 100644
--- a/src/providers/twitch/PubsubHelpers.hpp
+++ b/src/providers/twitch/PubsubHelpers.hpp
@@ -1,11 +1,10 @@
 #pragma once
 
-#include "debug/Log.hpp"
-#include "util/RapidjsonHelpers.hpp"
-#include "debug/Log.hpp"
 #include <boost/asio.hpp>
 #include <boost/asio/steady_timer.hpp>
 #include <memory>
+#include "debug/Log.hpp"
+#include "util/RapidjsonHelpers.hpp"
 
 namespace chatterino {
 
diff --git a/src/providers/twitch/TwitchAccount.cpp b/src/providers/twitch/TwitchAccount.cpp
index 238d9a6be..3e7ea237d 100644
--- a/src/providers/twitch/TwitchAccount.cpp
+++ b/src/providers/twitch/TwitchAccount.cpp
@@ -15,32 +15,32 @@ namespace chatterino {
 
 namespace {
 
-EmoteName cleanUpCode(const EmoteName &dirtyEmoteCode)
-{
-    auto cleanCode = dirtyEmoteCode.string;
-    cleanCode.detach();
+    EmoteName cleanUpCode(const EmoteName &dirtyEmoteCode)
+    {
+        auto cleanCode = dirtyEmoteCode.string;
+        cleanCode.detach();
 
-    static QMap<QString, QString> emoteNameReplacements{
-        {"[oO](_|\\.)[oO]", "O_o"}, {"\\&gt\\;\\(", "&gt;("},
-        {"\\&lt\\;3", "&lt;3"},     {"\\:-?(o|O)", ":O"},
-        {"\\:-?(p|P)", ":P"},       {"\\:-?[\\\\/]", ":/"},
-        {"\\:-?[z|Z|\\|]", ":Z"},   {"\\:-?\\(", ":("},
-        {"\\:-?\\)", ":)"},         {"\\:-?D", ":D"},
-        {"\\;-?(p|P)", ";P"},       {"\\;-?\\)", ";)"},
-        {"R-?\\)", "R)"},           {"B-?\\)", "B)"},
-    };
+        static QMap<QString, QString> emoteNameReplacements{
+            {"[oO](_|\\.)[oO]", "O_o"}, {"\\&gt\\;\\(", "&gt;("},
+            {"\\&lt\\;3", "&lt;3"},     {"\\:-?(o|O)", ":O"},
+            {"\\:-?(p|P)", ":P"},       {"\\:-?[\\\\/]", ":/"},
+            {"\\:-?[z|Z|\\|]", ":Z"},   {"\\:-?\\(", ":("},
+            {"\\:-?\\)", ":)"},         {"\\:-?D", ":D"},
+            {"\\;-?(p|P)", ";P"},       {"\\;-?\\)", ";)"},
+            {"R-?\\)", "R)"},           {"B-?\\)", "B)"},
+        };
 
-    auto it = emoteNameReplacements.find(dirtyEmoteCode.string);
-    if (it != emoteNameReplacements.end()) {
-        cleanCode = it.value();
+        auto it = emoteNameReplacements.find(dirtyEmoteCode.string);
+        if (it != emoteNameReplacements.end()) {
+            cleanCode = it.value();
+        }
+
+        cleanCode.replace("&lt;", "<");
+        cleanCode.replace("&gt;", ">");
+
+        return {cleanCode};
     }
 
-    cleanCode.replace("&lt;", "<");
-    cleanCode.replace("&gt;", ">");
-
-    return {cleanCode};
-}
-
 }  // namespace
 
 TwitchAccount::TwitchAccount(const QString &username, const QString &oauthToken,
@@ -417,7 +417,7 @@ void TwitchAccount::loadEmotes()
 }
 
 AccessGuard<const TwitchAccount::TwitchAccountEmoteData>
-TwitchAccount::accessEmotes() const
+    TwitchAccount::accessEmotes() const
 {
     return this->emotes_.accessConst();
 }
diff --git a/src/providers/twitch/TwitchChannel.cpp b/src/providers/twitch/TwitchChannel.cpp
index 06ed13739..d6c55d224 100644
--- a/src/providers/twitch/TwitchChannel.cpp
+++ b/src/providers/twitch/TwitchChannel.cpp
@@ -25,48 +25,49 @@
 
 namespace chatterino {
 namespace {
-auto parseRecentMessages(const QJsonObject &jsonRoot, TwitchChannel &channel)
-{
-    QJsonArray jsonMessages = jsonRoot.value("messages").toArray();
-    std::vector<MessagePtr> messages;
+    auto parseRecentMessages(const QJsonObject &jsonRoot,
+                             TwitchChannel &channel)
+    {
+        QJsonArray jsonMessages = jsonRoot.value("messages").toArray();
+        std::vector<MessagePtr> messages;
 
-    if (jsonMessages.empty()) return messages;
+        if (jsonMessages.empty()) return messages;
 
-    for (const auto jsonMessage : jsonMessages) {
-        auto content = jsonMessage.toString().toUtf8();
-        // passing nullptr as the channel makes the message invalid but we don't
-        // check for that anyways
-        auto message = Communi::IrcMessage::fromData(content, nullptr);
-        auto privMsg = dynamic_cast<Communi::IrcPrivateMessage *>(message);
-        assert(privMsg);
+        for (const auto jsonMessage : jsonMessages) {
+            auto content = jsonMessage.toString().toUtf8();
+            // passing nullptr as the channel makes the message invalid but we
+            // don't check for that anyways
+            auto message = Communi::IrcMessage::fromData(content, nullptr);
+            auto privMsg = dynamic_cast<Communi::IrcPrivateMessage *>(message);
+            assert(privMsg);
 
-        MessageParseArgs args;
-        TwitchMessageBuilder builder(&channel, privMsg, args);
-        if (!builder.isIgnored()) {
-            messages.push_back(builder.build());
+            MessageParseArgs args;
+            TwitchMessageBuilder builder(&channel, privMsg, args);
+            if (!builder.isIgnored()) {
+                messages.push_back(builder.build());
+            }
         }
+
+        return messages;
     }
+    std::pair<Outcome, UsernameSet> parseChatters(const QJsonObject &jsonRoot)
+    {
+        static QStringList categories = {"moderators", "staff", "admins",
+                                         "global_mods", "viewers"};
 
-    return messages;
-}
-std::pair<Outcome, UsernameSet> parseChatters(const QJsonObject &jsonRoot)
-{
-    static QStringList categories = {"moderators", "staff", "admins",
-                                     "global_mods", "viewers"};
+        auto usernames = UsernameSet();
 
-    auto usernames = UsernameSet();
+        // parse json
+        QJsonObject jsonCategories = jsonRoot.value("chatters").toObject();
 
-    // parse json
-    QJsonObject jsonCategories = jsonRoot.value("chatters").toObject();
-
-    for (const auto &category : categories) {
-        for (auto jsonCategory : jsonCategories.value(category).toArray()) {
-            usernames.insert(jsonCategory.toString());
+        for (const auto &category : categories) {
+            for (auto jsonCategory : jsonCategories.value(category).toArray()) {
+                usernames.insert(jsonCategory.toString());
+            }
         }
-    }
 
-    return {Success, std::move(usernames)};
-}
+        return {Success, std::move(usernames)};
+    }
 }  // namespace
 
 TwitchChannel::TwitchChannel(const QString &name,
@@ -309,7 +310,7 @@ bool TwitchChannel::isLive() const
 }
 
 AccessGuard<const TwitchChannel::StreamStatus>
-TwitchChannel::accessStreamStatus() const
+    TwitchChannel::accessStreamStatus() const
 {
     return this->streamStatus_.accessConst();
 }
diff --git a/src/providers/twitch/TwitchParseCheerEmotes.cpp b/src/providers/twitch/TwitchParseCheerEmotes.cpp
index 47d6427f8..65eca1fa3 100644
--- a/src/providers/twitch/TwitchParseCheerEmotes.cpp
+++ b/src/providers/twitch/TwitchParseCheerEmotes.cpp
@@ -8,235 +8,235 @@ namespace chatterino {
 
 namespace {
 
-template <typename Type>
-inline bool ReadValue(const rapidjson::Value &object, const char *key,
-                      Type &out)
-{
-    if (!object.HasMember(key)) {
-        return false;
-    }
-
-    const auto &value = object[key];
-
-    if (!value.Is<Type>()) {
-        return false;
-    }
-
-    out = value.Get<Type>();
-
-    return true;
-}
-
-template <>
-inline bool ReadValue<QString>(const rapidjson::Value &object, const char *key,
-                               QString &out)
-{
-    if (!object.HasMember(key)) {
-        return false;
-    }
-
-    const auto &value = object[key];
-
-    if (!value.IsString()) {
-        return false;
-    }
-
-    out = value.GetString();
-
-    return true;
-}
-
-template <>
-inline bool ReadValue<std::vector<QString>>(const rapidjson::Value &object,
-                                            const char *key,
-                                            std::vector<QString> &out)
-{
-    if (!object.HasMember(key)) {
-        return false;
-    }
-
-    const auto &value = object[key];
-
-    if (!value.IsArray()) {
-        return false;
-    }
-
-    for (const rapidjson::Value &innerValue : value.GetArray()) {
-        if (!innerValue.IsString()) {
+    template <typename Type>
+    inline bool ReadValue(const rapidjson::Value &object, const char *key,
+                          Type &out)
+    {
+        if (!object.HasMember(key)) {
             return false;
         }
 
-        out.emplace_back(innerValue.GetString());
-    }
+        const auto &value = object[key];
 
-    return true;
-}
-
-// Parse a single cheermote set (or "action") from the twitch api
-inline bool ParseSingleCheermoteSet(JSONCheermoteSet &set,
-                                    const rapidjson::Value &action)
-{
-    if (!action.IsObject()) {
-        return false;
-    }
-
-    if (!ReadValue(action, "prefix", set.prefix)) {
-        return false;
-    }
-
-    if (!ReadValue(action, "scales", set.scales)) {
-        return false;
-    }
-
-    if (!ReadValue(action, "backgrounds", set.backgrounds)) {
-        return false;
-    }
-
-    if (!ReadValue(action, "states", set.states)) {
-        return false;
-    }
-
-    if (!ReadValue(action, "type", set.type)) {
-        return false;
-    }
-
-    if (!ReadValue(action, "updated_at", set.updatedAt)) {
-        return false;
-    }
-
-    if (!ReadValue(action, "priority", set.priority)) {
-        return false;
-    }
-
-    // Tiers
-    if (!action.HasMember("tiers")) {
-        return false;
-    }
-
-    const auto &tiersValue = action["tiers"];
-
-    if (!tiersValue.IsArray()) {
-        return false;
-    }
-
-    for (const rapidjson::Value &tierValue : tiersValue.GetArray()) {
-        JSONCheermoteSet::CheermoteTier tier;
-
-        if (!tierValue.IsObject()) {
+        if (!value.Is<Type>()) {
             return false;
         }
 
-        if (!ReadValue(tierValue, "min_bits", tier.minBits)) {
+        out = value.Get<Type>();
+
+        return true;
+    }
+
+    template <>
+    inline bool ReadValue<QString>(const rapidjson::Value &object,
+                                   const char *key, QString &out)
+    {
+        if (!object.HasMember(key)) {
             return false;
         }
 
-        if (!ReadValue(tierValue, "id", tier.id)) {
+        const auto &value = object[key];
+
+        if (!value.IsString()) {
             return false;
         }
 
-        if (!ReadValue(tierValue, "color", tier.color)) {
+        out = value.GetString();
+
+        return true;
+    }
+
+    template <>
+    inline bool ReadValue<std::vector<QString>>(const rapidjson::Value &object,
+                                                const char *key,
+                                                std::vector<QString> &out)
+    {
+        if (!object.HasMember(key)) {
             return false;
         }
 
-        // Images
-        if (!tierValue.HasMember("images")) {
+        const auto &value = object[key];
+
+        if (!value.IsArray()) {
             return false;
         }
 
-        const auto &imagesValue = tierValue["images"];
-
-        if (!imagesValue.IsObject()) {
-            return false;
-        }
-
-        // Read images object
-        for (const auto &imageBackgroundValue : imagesValue.GetObject()) {
-            QString background = imageBackgroundValue.name.GetString();
-            bool backgroundExists = false;
-            for (const auto &bg : set.backgrounds) {
-                if (background == bg) {
-                    backgroundExists = true;
-                    break;
-                }
+        for (const rapidjson::Value &innerValue : value.GetArray()) {
+            if (!innerValue.IsString()) {
+                return false;
             }
 
-            if (!backgroundExists) {
-                continue;
+            out.emplace_back(innerValue.GetString());
+        }
+
+        return true;
+    }
+
+    // Parse a single cheermote set (or "action") from the twitch api
+    inline bool ParseSingleCheermoteSet(JSONCheermoteSet &set,
+                                        const rapidjson::Value &action)
+    {
+        if (!action.IsObject()) {
+            return false;
+        }
+
+        if (!ReadValue(action, "prefix", set.prefix)) {
+            return false;
+        }
+
+        if (!ReadValue(action, "scales", set.scales)) {
+            return false;
+        }
+
+        if (!ReadValue(action, "backgrounds", set.backgrounds)) {
+            return false;
+        }
+
+        if (!ReadValue(action, "states", set.states)) {
+            return false;
+        }
+
+        if (!ReadValue(action, "type", set.type)) {
+            return false;
+        }
+
+        if (!ReadValue(action, "updated_at", set.updatedAt)) {
+            return false;
+        }
+
+        if (!ReadValue(action, "priority", set.priority)) {
+            return false;
+        }
+
+        // Tiers
+        if (!action.HasMember("tiers")) {
+            return false;
+        }
+
+        const auto &tiersValue = action["tiers"];
+
+        if (!tiersValue.IsArray()) {
+            return false;
+        }
+
+        for (const rapidjson::Value &tierValue : tiersValue.GetArray()) {
+            JSONCheermoteSet::CheermoteTier tier;
+
+            if (!tierValue.IsObject()) {
+                return false;
             }
 
-            const rapidjson::Value &imageBackgroundStates =
-                imageBackgroundValue.value;
-            if (!imageBackgroundStates.IsObject()) {
-                continue;
+            if (!ReadValue(tierValue, "min_bits", tier.minBits)) {
+                return false;
             }
 
-            // Read each key which represents a background
-            for (const auto &imageBackgroundState :
-                 imageBackgroundStates.GetObject()) {
-                QString state = imageBackgroundState.name.GetString();
-                bool stateExists = false;
-                for (const auto &_state : set.states) {
-                    if (state == _state) {
-                        stateExists = true;
+            if (!ReadValue(tierValue, "id", tier.id)) {
+                return false;
+            }
+
+            if (!ReadValue(tierValue, "color", tier.color)) {
+                return false;
+            }
+
+            // Images
+            if (!tierValue.HasMember("images")) {
+                return false;
+            }
+
+            const auto &imagesValue = tierValue["images"];
+
+            if (!imagesValue.IsObject()) {
+                return false;
+            }
+
+            // Read images object
+            for (const auto &imageBackgroundValue : imagesValue.GetObject()) {
+                QString background = imageBackgroundValue.name.GetString();
+                bool backgroundExists = false;
+                for (const auto &bg : set.backgrounds) {
+                    if (background == bg) {
+                        backgroundExists = true;
                         break;
                     }
                 }
 
-                if (!stateExists) {
+                if (!backgroundExists) {
                     continue;
                 }
 
-                const rapidjson::Value &imageScalesValue =
-                    imageBackgroundState.value;
-                if (!imageScalesValue.IsObject()) {
+                const rapidjson::Value &imageBackgroundStates =
+                    imageBackgroundValue.value;
+                if (!imageBackgroundStates.IsObject()) {
                     continue;
                 }
 
-                // Read each key which represents a scale
-                for (const auto &imageScaleValue :
-                     imageScalesValue.GetObject()) {
-                    QString scale = imageScaleValue.name.GetString();
-                    bool scaleExists = false;
-                    for (const auto &_scale : set.scales) {
-                        if (scale == _scale) {
-                            scaleExists = true;
+                // Read each key which represents a background
+                for (const auto &imageBackgroundState :
+                     imageBackgroundStates.GetObject()) {
+                    QString state = imageBackgroundState.name.GetString();
+                    bool stateExists = false;
+                    for (const auto &_state : set.states) {
+                        if (state == _state) {
+                            stateExists = true;
                             break;
                         }
                     }
 
-                    if (!scaleExists) {
+                    if (!stateExists) {
                         continue;
                     }
 
-                    const rapidjson::Value &imageScaleURLValue =
-                        imageScaleValue.value;
-                    if (!imageScaleURLValue.IsString()) {
+                    const rapidjson::Value &imageScalesValue =
+                        imageBackgroundState.value;
+                    if (!imageScalesValue.IsObject()) {
                         continue;
                     }
 
-                    QString url = imageScaleURLValue.GetString();
+                    // Read each key which represents a scale
+                    for (const auto &imageScaleValue :
+                         imageScalesValue.GetObject()) {
+                        QString scale = imageScaleValue.name.GetString();
+                        bool scaleExists = false;
+                        for (const auto &_scale : set.scales) {
+                            if (scale == _scale) {
+                                scaleExists = true;
+                                break;
+                            }
+                        }
 
-                    bool ok = false;
-                    qreal scaleNumber = scale.toFloat(&ok);
-                    if (!ok) {
-                        continue;
+                        if (!scaleExists) {
+                            continue;
+                        }
+
+                        const rapidjson::Value &imageScaleURLValue =
+                            imageScaleValue.value;
+                        if (!imageScaleURLValue.IsString()) {
+                            continue;
+                        }
+
+                        QString url = imageScaleURLValue.GetString();
+
+                        bool ok = false;
+                        qreal scaleNumber = scale.toFloat(&ok);
+                        if (!ok) {
+                            continue;
+                        }
+
+                        qreal chatterinoScale = 1 / scaleNumber;
+
+                        auto image = Image::fromUrl({url}, chatterinoScale);
+
+                        // TODO(pajlada): Fill in name and tooltip
+                        tier.images[background][state][scale] = image;
                     }
-
-                    qreal chatterinoScale = 1 / scaleNumber;
-
-                    auto image = Image::fromUrl({url}, chatterinoScale);
-
-                    // TODO(pajlada): Fill in name and tooltip
-                    tier.images[background][state][scale] = image;
                 }
             }
+
+            set.tiers.emplace_back(tier);
         }
 
-        set.tiers.emplace_back(tier);
+        return true;
     }
-
-    return true;
-}
 }  // namespace
 
 // Look through the results of
diff --git a/src/providers/twitch/TwitchUser.hpp b/src/providers/twitch/TwitchUser.hpp
index 74a9c1252..27539386d 100644
--- a/src/providers/twitch/TwitchUser.hpp
+++ b/src/providers/twitch/TwitchUser.hpp
@@ -34,43 +34,43 @@ struct TwitchUser {
 namespace pajlada {
 namespace Settings {
 
-template <>
-struct Deserialize<chatterino::TwitchUser> {
-    static chatterino::TwitchUser get(const rapidjson::Value &value,
-                                      bool *error = nullptr)
-    {
-        using namespace chatterino;
+    template <>
+    struct Deserialize<chatterino::TwitchUser> {
+        static chatterino::TwitchUser get(const rapidjson::Value &value,
+                                          bool *error = nullptr)
+        {
+            using namespace chatterino;
 
-        TwitchUser user;
+            TwitchUser user;
+
+            if (!value.IsObject()) {
+                PAJLADA_REPORT_ERROR(error)
+                PAJLADA_THROW_EXCEPTION(
+                    "Deserialized rapidjson::Value is wrong type");
+                return user;
+            }
+
+            if (!rj::getSafe(value, "_id", user.id)) {
+                PAJLADA_REPORT_ERROR(error)
+                PAJLADA_THROW_EXCEPTION("Missing ID key");
+                return user;
+            }
+
+            if (!rj::getSafe(value, "name", user.name)) {
+                PAJLADA_REPORT_ERROR(error)
+                PAJLADA_THROW_EXCEPTION("Missing name key");
+                return user;
+            }
+
+            if (!rj::getSafe(value, "display_name", user.displayName)) {
+                PAJLADA_REPORT_ERROR(error)
+                PAJLADA_THROW_EXCEPTION("Missing display name key");
+                return user;
+            }
 
-        if (!value.IsObject()) {
-            PAJLADA_REPORT_ERROR(error)
-            PAJLADA_THROW_EXCEPTION(
-                "Deserialized rapidjson::Value is wrong type");
             return user;
         }
-
-        if (!rj::getSafe(value, "_id", user.id)) {
-            PAJLADA_REPORT_ERROR(error)
-            PAJLADA_THROW_EXCEPTION("Missing ID key");
-            return user;
-        }
-
-        if (!rj::getSafe(value, "name", user.name)) {
-            PAJLADA_REPORT_ERROR(error)
-            PAJLADA_THROW_EXCEPTION("Missing name key");
-            return user;
-        }
-
-        if (!rj::getSafe(value, "display_name", user.displayName)) {
-            PAJLADA_REPORT_ERROR(error)
-            PAJLADA_THROW_EXCEPTION("Missing display name key");
-            return user;
-        }
-
-        return user;
-    }
-};
+    };
 
 }  // namespace Settings
 }  // namespace pajlada
diff --git a/src/singletons/Fonts.cpp b/src/singletons/Fonts.cpp
index cc2f00727..991646acd 100644
--- a/src/singletons/Fonts.cpp
+++ b/src/singletons/Fonts.cpp
@@ -9,16 +9,16 @@
 #include <QtGlobal>
 
 #ifdef Q_OS_WIN32
-#define DEFAULT_FONT_FAMILY "Segoe UI"
-#define DEFAULT_FONT_SIZE 10
+#    define DEFAULT_FONT_FAMILY "Segoe UI"
+#    define DEFAULT_FONT_SIZE 10
 #else
-#ifdef Q_OS_MACOS
-#define DEFAULT_FONT_FAMILY "Helvetica Neue"
-#define DEFAULT_FONT_SIZE 12
-#else
-#define DEFAULT_FONT_FAMILY "Arial"
-#define DEFAULT_FONT_SIZE 11
-#endif
+#    ifdef Q_OS_MACOS
+#        define DEFAULT_FONT_FAMILY "Helvetica Neue"
+#        define DEFAULT_FONT_SIZE 12
+#    else
+#        define DEFAULT_FONT_FAMILY "Arial"
+#        define DEFAULT_FONT_SIZE 11
+#    endif
 #endif
 
 namespace chatterino {
@@ -104,8 +104,7 @@ Fonts::FontData Fonts::createFontData(FontStyle type, float scale)
             {FontStyle::ChatMediumSmall, {0.8f, false, QFont::Normal}},
             {FontStyle::ChatMedium, {1, false, QFont::Normal}},
             {FontStyle::ChatMediumBold,
-             {1, false,
-              QFont::Weight(getSettings()->boldScale.getValue())}},
+             {1, false, QFont::Weight(getSettings()->boldScale.getValue())}},
             {FontStyle::ChatMediumItalic, {1, true, QFont::Normal}},
             {FontStyle::ChatLarge, {1.2f, false, QFont::Normal}},
             {FontStyle::ChatVeryLarge, {1.4f, false, QFont::Normal}},
diff --git a/src/singletons/NativeMessaging.cpp b/src/singletons/NativeMessaging.cpp
index cd80f8021..ed113f716 100644
--- a/src/singletons/NativeMessaging.cpp
+++ b/src/singletons/NativeMessaging.cpp
@@ -17,11 +17,11 @@
 namespace ipc = boost::interprocess;
 
 #ifdef Q_OS_WIN
-#include <QProcess>
+#    include <QProcess>
 
-#include <Windows.h>
-#include "singletons/WindowManager.hpp"
-#include "widgets/AttachedWindow.hpp"
+#    include <Windows.h>
+#    include "singletons/WindowManager.hpp"
+#    include "widgets/AttachedWindow.hpp"
 #endif
 
 #include <iostream>
diff --git a/src/singletons/Theme.cpp b/src/singletons/Theme.cpp
index c5aa16b71..e39a6c873 100644
--- a/src/singletons/Theme.cpp
+++ b/src/singletons/Theme.cpp
@@ -10,21 +10,21 @@ namespace chatterino {
 
 namespace detail {
 
-double getMultiplierByTheme(const QString &themeName)
-{
-    if (themeName == "Light") {
-        return 0.8;
-    } else if (themeName == "White") {
-        return 1.0;
-    } else if (themeName == "Black") {
-        return -1.0;
-    } else if (themeName == "Dark") {
+    double getMultiplierByTheme(const QString &themeName)
+    {
+        if (themeName == "Light") {
+            return 0.8;
+        } else if (themeName == "White") {
+            return 1.0;
+        } else if (themeName == "Black") {
+            return -1.0;
+        } else if (themeName == "Dark") {
+            return -0.8;
+        }
+
         return -0.8;
     }
 
-    return -0.8;
-}
-
 }  // namespace detail
 
 Theme::Theme()
diff --git a/src/util/FormatTime.cpp b/src/util/FormatTime.cpp
index 2eccca901..63b2e3c6b 100644
--- a/src/util/FormatTime.cpp
+++ b/src/util/FormatTime.cpp
@@ -2,11 +2,11 @@
 
 namespace chatterino {
 namespace {
-void appendDuration(int count, QChar &&order, QString &outString)
-{
-    outString.append(QString::number(count));
-    outString.append(order);
-}
+    void appendDuration(int count, QChar &&order, QString &outString)
+    {
+        outString.append(QString::number(count));
+        outString.append(order);
+    }
 }  // namespace
 
 QString formatTime(int totalSeconds)
diff --git a/src/util/InitUpdateButton.hpp b/src/util/InitUpdateButton.hpp
index 9a88382a2..c8caaf204 100644
--- a/src/util/InitUpdateButton.hpp
+++ b/src/util/InitUpdateButton.hpp
@@ -4,7 +4,7 @@
 
 namespace pajlada {
 namespace Signals {
-class SignalHolder;
+    class SignalHolder;
 }
 }  // namespace pajlada
 
diff --git a/src/util/RapidJsonSerializeQString.hpp b/src/util/RapidJsonSerializeQString.hpp
index 754cbf115..0d34a256b 100644
--- a/src/util/RapidJsonSerializeQString.hpp
+++ b/src/util/RapidJsonSerializeQString.hpp
@@ -6,38 +6,38 @@
 namespace pajlada {
 namespace Settings {
 
-template <>
-struct Serialize<QString> {
-    static rapidjson::Value get(const QString &value,
-                                rapidjson::Document::AllocatorType &a)
-    {
-        return rapidjson::Value(value.toUtf8(), a);
-    }
-};
+    template <>
+    struct Serialize<QString> {
+        static rapidjson::Value get(const QString &value,
+                                    rapidjson::Document::AllocatorType &a)
+        {
+            return rapidjson::Value(value.toUtf8(), a);
+        }
+    };
+
+    template <>
+    struct Deserialize<QString> {
+        static QString get(const rapidjson::Value &value, bool *error = nullptr)
+        {
+            if (!value.IsString()) {
+                PAJLADA_REPORT_ERROR(error)
+                PAJLADA_THROW_EXCEPTION(
+                    "Deserialized rapidjson::Value is not a string");
+                return QString{};
+            }
+
+            try {
+                return QString::fromUtf8(value.GetString(),
+                                         value.GetStringLength());
+            } catch (const std::exception &) {
+                //            int x = 5;
+            } catch (...) {
+                //            int y = 5;
+            }
 
-template <>
-struct Deserialize<QString> {
-    static QString get(const rapidjson::Value &value, bool *error = nullptr)
-    {
-        if (!value.IsString()) {
-            PAJLADA_REPORT_ERROR(error)
-            PAJLADA_THROW_EXCEPTION(
-                "Deserialized rapidjson::Value is not a string");
             return QString{};
         }
-
-        try {
-            return QString::fromUtf8(value.GetString(),
-                                     value.GetStringLength());
-        } catch (const std::exception &) {
-            //            int x = 5;
-        } catch (...) {
-            //            int y = 5;
-        }
-
-        return QString{};
-    }
-};
+    };
 
 }  // namespace Settings
 }  // namespace pajlada
diff --git a/src/util/RapidjsonHelpers.cpp b/src/util/RapidjsonHelpers.cpp
index 78256b4a2..2a9742df2 100644
--- a/src/util/RapidjsonHelpers.cpp
+++ b/src/util/RapidjsonHelpers.cpp
@@ -5,26 +5,28 @@
 namespace chatterino {
 namespace rj {
 
-void addMember(rapidjson::Value &obj, const char *key, rapidjson::Value &&value,
-               rapidjson::Document::AllocatorType &a)
-{
-    obj.AddMember(rapidjson::Value(key, a).Move(), value, a);
-}
+    void addMember(rapidjson::Value &obj, const char *key,
+                   rapidjson::Value &&value,
+                   rapidjson::Document::AllocatorType &a)
+    {
+        obj.AddMember(rapidjson::Value(key, a).Move(), value, a);
+    }
 
-void addMember(rapidjson::Value &obj, const char *key, rapidjson::Value &value,
-               rapidjson::Document::AllocatorType &a)
-{
-    obj.AddMember(rapidjson::Value(key, a).Move(), value.Move(), a);
-}
+    void addMember(rapidjson::Value &obj, const char *key,
+                   rapidjson::Value &value,
+                   rapidjson::Document::AllocatorType &a)
+    {
+        obj.AddMember(rapidjson::Value(key, a).Move(), value.Move(), a);
+    }
 
-std::string stringify(const rapidjson::Value &value)
-{
-    rapidjson::StringBuffer buffer;
-    rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
-    value.Accept(writer);
+    std::string stringify(const rapidjson::Value &value)
+    {
+        rapidjson::StringBuffer buffer;
+        rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
+        value.Accept(writer);
 
-    return std::string(buffer.GetString());
-}
+        return std::string(buffer.GetString());
+    }
 
 }  // namespace rj
 }  // namespace chatterino
diff --git a/src/util/RapidjsonHelpers.hpp b/src/util/RapidjsonHelpers.hpp
index 8dbfe07a2..d3e73e8f9 100644
--- a/src/util/RapidjsonHelpers.hpp
+++ b/src/util/RapidjsonHelpers.hpp
@@ -11,91 +11,95 @@
 namespace chatterino {
 namespace rj {
 
-void addMember(rapidjson::Value &obj, const char *key, rapidjson::Value &&value,
-               rapidjson::Document::AllocatorType &a);
-void addMember(rapidjson::Value &obj, const char *key, rapidjson::Value &value,
-               rapidjson::Document::AllocatorType &a);
+    void addMember(rapidjson::Value &obj, const char *key,
+                   rapidjson::Value &&value,
+                   rapidjson::Document::AllocatorType &a);
+    void addMember(rapidjson::Value &obj, const char *key,
+                   rapidjson::Value &value,
+                   rapidjson::Document::AllocatorType &a);
 
-template <typename Type>
-void set(rapidjson::Value &obj, const char *key, const Type &value,
-         rapidjson::Document::AllocatorType &a)
-{
-    assert(obj.IsObject());
+    template <typename Type>
+    void set(rapidjson::Value &obj, const char *key, const Type &value,
+             rapidjson::Document::AllocatorType &a)
+    {
+        assert(obj.IsObject());
 
-    addMember(obj, key, pajlada::Settings::Serialize<Type>::get(value, a), a);
-}
-
-template <>
-inline void set(rapidjson::Value &obj, const char *key,
-                const rapidjson::Value &value,
-                rapidjson::Document::AllocatorType &a)
-{
-    assert(obj.IsObject());
-
-    addMember(obj, key, const_cast<rapidjson::Value &>(value), a);
-}
-
-template <typename Type>
-void set(rapidjson::Document &obj, const char *key, const Type &value)
-{
-    assert(obj.IsObject());
-
-    auto &a = obj.GetAllocator();
-
-    addMember(obj, key, pajlada::Settings::Serialize<Type>::get(value, a), a);
-}
-
-template <>
-inline void set(rapidjson::Document &obj, const char *key,
-                const rapidjson::Value &value)
-{
-    assert(obj.IsObject());
-
-    auto &a = obj.GetAllocator();
-
-    addMember(obj, key, const_cast<rapidjson::Value &>(value), a);
-}
-
-template <typename Type>
-void add(rapidjson::Value &arr, const Type &value,
-         rapidjson::Document::AllocatorType &a)
-{
-    assert(arr.IsArray());
-
-    arr.PushBack(pajlada::Settings::Serialize<Type>::get(value, a), a);
-}
-
-template <typename Type>
-bool getSafe(const rapidjson::Value &obj, const char *key, Type &out)
-{
-    if (!obj.IsObject()) {
-        return false;
+        addMember(obj, key, pajlada::Settings::Serialize<Type>::get(value, a),
+                  a);
     }
 
-    if (!obj.HasMember(key)) {
-        return false;
+    template <>
+    inline void set(rapidjson::Value &obj, const char *key,
+                    const rapidjson::Value &value,
+                    rapidjson::Document::AllocatorType &a)
+    {
+        assert(obj.IsObject());
+
+        addMember(obj, key, const_cast<rapidjson::Value &>(value), a);
     }
 
-    if (obj.IsNull()) {
-        return false;
+    template <typename Type>
+    void set(rapidjson::Document &obj, const char *key, const Type &value)
+    {
+        assert(obj.IsObject());
+
+        auto &a = obj.GetAllocator();
+
+        addMember(obj, key, pajlada::Settings::Serialize<Type>::get(value, a),
+                  a);
     }
 
-    bool error = false;
-    out = pajlada::Settings::Deserialize<Type>::get(obj[key], &error);
+    template <>
+    inline void set(rapidjson::Document &obj, const char *key,
+                    const rapidjson::Value &value)
+    {
+        assert(obj.IsObject());
 
-    return !error;
-}
+        auto &a = obj.GetAllocator();
 
-template <typename Type>
-bool getSafe(const rapidjson::Value &value, Type &out)
-{
-    bool error = false;
-    out = pajlada::Settings::Deserialize<Type>::get(value, &error);
+        addMember(obj, key, const_cast<rapidjson::Value &>(value), a);
+    }
 
-    return !error;
-}
+    template <typename Type>
+    void add(rapidjson::Value &arr, const Type &value,
+             rapidjson::Document::AllocatorType &a)
+    {
+        assert(arr.IsArray());
 
-std::string stringify(const rapidjson::Value &value);
+        arr.PushBack(pajlada::Settings::Serialize<Type>::get(value, a), a);
+    }
+
+    template <typename Type>
+    bool getSafe(const rapidjson::Value &obj, const char *key, Type &out)
+    {
+        if (!obj.IsObject()) {
+            return false;
+        }
+
+        if (!obj.HasMember(key)) {
+            return false;
+        }
+
+        if (obj.IsNull()) {
+            return false;
+        }
+
+        bool error = false;
+        out = pajlada::Settings::Deserialize<Type>::get(obj[key], &error);
+
+        return !error;
+    }
+
+    template <typename Type>
+    bool getSafe(const rapidjson::Value &value, Type &out)
+    {
+        bool error = false;
+        out = pajlada::Settings::Deserialize<Type>::get(value, &error);
+
+        return !error;
+    }
+
+    std::string stringify(const rapidjson::Value &value);
 
 }  // namespace rj
 }  // namespace chatterino
diff --git a/src/util/StreamLink.cpp b/src/util/StreamLink.cpp
index 3cf639b6c..972c47f59 100644
--- a/src/util/StreamLink.cpp
+++ b/src/util/StreamLink.cpp
@@ -2,9 +2,9 @@
 
 #include "Application.hpp"
 #include "Helpers.hpp"
+#include "debug/Log.hpp"
 #include "singletons/Settings.hpp"
 #include "widgets/dialogs/QualityPopup.hpp"
-#include "debug/Log.hpp"
 
 #include <QErrorMessage>
 #include <QFileInfo>
@@ -16,88 +16,89 @@ namespace chatterino {
 
 namespace {
 
-const char *getBinaryName()
-{
+    const char *getBinaryName()
+    {
 #ifdef _WIN32
-    return "streamlink.exe";
+        return "streamlink.exe";
 #else
-    return "streamlink";
+        return "streamlink";
 #endif
-}
+    }
 
-const char *getDefaultBinaryPath()
-{
+    const char *getDefaultBinaryPath()
+    {
 #ifdef _WIN32
-    return "C:\\Program Files (x86)\\Streamlink\\bin\\streamlink.exe";
+        return "C:\\Program Files (x86)\\Streamlink\\bin\\streamlink.exe";
 #else
-    return "/usr/bin/streamlink";
+        return "/usr/bin/streamlink";
 #endif
-}
-
-QString getStreamlinkProgram()
-{
-    auto app = getApp();
-
-    if (getSettings()->streamlinkUseCustomPath) {
-        return getSettings()->streamlinkPath + "/" + getBinaryName();
-    } else {
-        return getBinaryName();
-    }
-}
-
-bool checkStreamlinkPath(const QString &path)
-{
-    QFileInfo fileinfo(path);
-
-    if (!fileinfo.exists()) {
-        return false;
-        // throw Exception(fS("Streamlink path ({}) is invalid, file does not
-        // exist", path));
     }
 
-    return fileinfo.isExecutable();
-}
+    QString getStreamlinkProgram()
+    {
+        auto app = getApp();
 
-void showStreamlinkNotFoundError()
-{
-    static QErrorMessage *msg = new QErrorMessage;
-
-    auto app = getApp();
-    if (getSettings()->streamlinkUseCustomPath) {
-        msg->showMessage(
-            "Unable to find Streamlink executable\nMake sure your custom path "
-            "is pointing "
-            "to the DIRECTORY where the streamlink executable is located");
-    } else {
-        msg->showMessage(
-            "Unable to find Streamlink executable.\nIf you have Streamlink "
-            "installed, you might need to enable the custom path option");
-    }
-}
-
-QProcess *createStreamlinkProcess()
-{
-    auto p = new QProcess;
-    p->setProgram(getStreamlinkProgram());
-
-    QObject::connect(p, &QProcess::errorOccurred, [=](auto err) {
-        if (err == QProcess::FailedToStart) {
-            showStreamlinkNotFoundError();
+        if (getSettings()->streamlinkUseCustomPath) {
+            return getSettings()->streamlinkPath + "/" + getBinaryName();
         } else {
-            log("Error occured {}", err);
+            return getBinaryName();
+        }
+    }
+
+    bool checkStreamlinkPath(const QString &path)
+    {
+        QFileInfo fileinfo(path);
+
+        if (!fileinfo.exists()) {
+            return false;
+            // throw Exception(fS("Streamlink path ({}) is invalid, file does
+            // not exist", path));
         }
 
-        p->deleteLater();
-    });
+        return fileinfo.isExecutable();
+    }
 
-    QObject::connect(p,
-                     static_cast<void (QProcess::*)(int)>(&QProcess::finished),
-                     [=](int res) {
-                         p->deleteLater();  //
-                     });
+    void showStreamlinkNotFoundError()
+    {
+        static QErrorMessage *msg = new QErrorMessage;
 
-    return p;
-}
+        auto app = getApp();
+        if (getSettings()->streamlinkUseCustomPath) {
+            msg->showMessage(
+                "Unable to find Streamlink executable\nMake sure your custom "
+                "path "
+                "is pointing "
+                "to the DIRECTORY where the streamlink executable is located");
+        } else {
+            msg->showMessage(
+                "Unable to find Streamlink executable.\nIf you have Streamlink "
+                "installed, you might need to enable the custom path option");
+        }
+    }
+
+    QProcess *createStreamlinkProcess()
+    {
+        auto p = new QProcess;
+        p->setProgram(getStreamlinkProgram());
+
+        QObject::connect(p, &QProcess::errorOccurred, [=](auto err) {
+            if (err == QProcess::FailedToStart) {
+                showStreamlinkNotFoundError();
+            } else {
+                log("Error occured {}", err);
+            }
+
+            p->deleteLater();
+        });
+
+        QObject::connect(
+            p, static_cast<void (QProcess::*)(int)>(&QProcess::finished),
+            [=](int res) {
+                p->deleteLater();  //
+            });
+
+        return p;
+    }
 
 }  // namespace
 
diff --git a/src/util/WindowsHelper.hpp b/src/util/WindowsHelper.hpp
index fdbafa9c2..f02bb1362 100644
--- a/src/util/WindowsHelper.hpp
+++ b/src/util/WindowsHelper.hpp
@@ -2,8 +2,8 @@
 
 #ifdef USEWINSDK
 
-#include <Windows.h>
-#include <boost/optional.hpp>
+#    include <Windows.h>
+#    include <boost/optional.hpp>
 
 namespace chatterino {
 
diff --git a/src/widgets/AttachedWindow.cpp b/src/widgets/AttachedWindow.cpp
index b247129b6..fee940591 100644
--- a/src/widgets/AttachedWindow.cpp
+++ b/src/widgets/AttachedWindow.cpp
@@ -8,12 +8,12 @@
 #include <QVBoxLayout>
 
 #ifdef USEWINSDK
-#include "util/WindowsHelper.hpp"
+#    include "util/WindowsHelper.hpp"
 
-#include "Windows.h"
+#    include "Windows.h"
 // don't even think about reordering these
-#include "Psapi.h"
-#pragma comment(lib, "Dwmapi.lib")
+#    include "Psapi.h"
+#    pragma comment(lib, "Dwmapi.lib")
 #endif
 
 namespace chatterino {
diff --git a/src/widgets/BaseWindow.cpp b/src/widgets/BaseWindow.cpp
index af97b224b..6394284e0 100644
--- a/src/widgets/BaseWindow.cpp
+++ b/src/widgets/BaseWindow.cpp
@@ -20,20 +20,20 @@
 #include <functional>
 
 #ifdef USEWINSDK
-#include <ObjIdl.h>
-#include <VersionHelpers.h>
-#include <Windows.h>
-#include <dwmapi.h>
-#include <gdiplus.h>
-#include <windowsx.h>
+#    include <ObjIdl.h>
+#    include <VersionHelpers.h>
+#    include <Windows.h>
+#    include <dwmapi.h>
+#    include <gdiplus.h>
+#    include <windowsx.h>
 
 //#include <ShellScalingApi.h>
-#pragma comment(lib, "Dwmapi.lib")
+#    pragma comment(lib, "Dwmapi.lib")
 
-#include <QHBoxLayout>
-#include <QVBoxLayout>
+#    include <QHBoxLayout>
+#    include <QVBoxLayout>
 
-#define WM_DPICHANGED 0x02E0
+#    define WM_DPICHANGED 0x02E0
 #endif
 
 #include "widgets/helper/TitlebarButton.hpp"
@@ -460,11 +460,11 @@ bool BaseWindow::nativeEvent(const QByteArray &eventType, void *message,
                              long *result)
 {
 #ifdef USEWINSDK
-#if (QT_VERSION == QT_VERSION_CHECK(5, 11, 1))
+#    if (QT_VERSION == QT_VERSION_CHECK(5, 11, 1))
     MSG *msg = *reinterpret_cast<MSG **>(message);
-#else
+#    else
     MSG *msg = reinterpret_cast<MSG *>(message);
-#endif
+#    endif
 
     bool returnValue = false;
 
diff --git a/src/widgets/Notebook.cpp b/src/widgets/Notebook.cpp
index 04ecd0840..c56fba8b5 100644
--- a/src/widgets/Notebook.cpp
+++ b/src/widgets/Notebook.cpp
@@ -433,8 +433,7 @@ void SplitNotebook::addCustomButtons()
     // settings
     auto settingsBtn = this->addCustomButton();
 
-    settingsBtn->setVisible(
-        !getSettings()->hidePreferencesButton.getValue());
+    settingsBtn->setVisible(!getSettings()->hidePreferencesButton.getValue());
 
     getSettings()->hidePreferencesButton.connect(
         [settingsBtn](bool hide, auto) { settingsBtn->setVisible(!hide); },
diff --git a/src/widgets/StreamView.cpp b/src/widgets/StreamView.cpp
index 9277ba825..f548deceb 100644
--- a/src/widgets/StreamView.cpp
+++ b/src/widgets/StreamView.cpp
@@ -7,7 +7,7 @@
 #include "widgets/splits/Split.hpp"
 
 #ifdef USEWEBENGINE
-#include <QtWebEngineWidgets>
+#    include <QtWebEngineWidgets>
 #endif
 
 namespace chatterino {
diff --git a/src/widgets/TooltipWidget.cpp b/src/widgets/TooltipWidget.cpp
index 3479826b8..084f729ac 100644
--- a/src/widgets/TooltipWidget.cpp
+++ b/src/widgets/TooltipWidget.cpp
@@ -10,7 +10,7 @@
 #include <QVBoxLayout>
 
 #ifdef USEWINSDK
-#include <Windows.h>
+#    include <Windows.h>
 #endif
 
 namespace chatterino {
diff --git a/src/widgets/dialogs/EmotePopup.cpp b/src/widgets/dialogs/EmotePopup.cpp
index 735d68f63..2fe6bb28a 100644
--- a/src/widgets/dialogs/EmotePopup.cpp
+++ b/src/widgets/dialogs/EmotePopup.cpp
@@ -16,55 +16,57 @@
 
 namespace chatterino {
 namespace {
-auto makeTitleMessage(const QString &title)
-{
-    MessageBuilder builder;
-    builder.emplace<TextElement>(title, MessageElementFlag::Text);
-    builder->flags.set(MessageFlag::Centered);
-    return builder.release();
-}
-auto makeEmoteMessage(const EmoteMap &map)
-{
-    MessageBuilder builder;
-    builder->flags.set(MessageFlag::Centered);
-    builder->flags.set(MessageFlag::DisableCompactEmotes);
-
-    for (const auto &emote : map) {
-        builder
-            .emplace<EmoteElement>(emote.second, MessageElementFlag::AlwaysShow)
-            ->setLink(Link(Link::InsertText, emote.first.string));
+    auto makeTitleMessage(const QString &title)
+    {
+        MessageBuilder builder;
+        builder.emplace<TextElement>(title, MessageElementFlag::Text);
+        builder->flags.set(MessageFlag::Centered);
+        return builder.release();
     }
-
-    return builder.release();
-}
-void addEmoteSets(std::vector<std::shared_ptr<TwitchAccount::EmoteSet>> sets,
-                  Channel &globalChannel, Channel &subChannel)
-{
-    for (const auto &set : sets) {
-        auto &channel = set->key == "0" ? globalChannel : subChannel;
-
-        // TITLE
-        auto text =
-            set->key == "0" || set->text.isEmpty() ? "Twitch" : set->text;
-        channel.addMessage(makeTitleMessage(text));
-
-        // EMOTES
+    auto makeEmoteMessage(const EmoteMap &map)
+    {
         MessageBuilder builder;
         builder->flags.set(MessageFlag::Centered);
         builder->flags.set(MessageFlag::DisableCompactEmotes);
 
-        for (const auto &emote : set->emotes) {
+        for (const auto &emote : map) {
             builder
-                .emplace<EmoteElement>(
-                    getApp()->emotes->twitch.getOrCreateEmote(emote.id,
-                                                              emote.name),
-                    MessageElementFlag::AlwaysShow)
-                ->setLink(Link(Link::InsertText, emote.name.string));
+                .emplace<EmoteElement>(emote.second,
+                                       MessageElementFlag::AlwaysShow)
+                ->setLink(Link(Link::InsertText, emote.first.string));
         }
 
-        channel.addMessage(builder.release());
+        return builder.release();
+    }
+    void addEmoteSets(
+        std::vector<std::shared_ptr<TwitchAccount::EmoteSet>> sets,
+        Channel &globalChannel, Channel &subChannel)
+    {
+        for (const auto &set : sets) {
+            auto &channel = set->key == "0" ? globalChannel : subChannel;
+
+            // TITLE
+            auto text =
+                set->key == "0" || set->text.isEmpty() ? "Twitch" : set->text;
+            channel.addMessage(makeTitleMessage(text));
+
+            // EMOTES
+            MessageBuilder builder;
+            builder->flags.set(MessageFlag::Centered);
+            builder->flags.set(MessageFlag::DisableCompactEmotes);
+
+            for (const auto &emote : set->emotes) {
+                builder
+                    .emplace<EmoteElement>(
+                        getApp()->emotes->twitch.getOrCreateEmote(emote.id,
+                                                                  emote.name),
+                        MessageElementFlag::AlwaysShow)
+                    ->setLink(Link(Link::InsertText, emote.name.string));
+            }
+
+            channel.addMessage(builder.release());
+        }
     }
-}
 }  // namespace
 
 EmotePopup::EmotePopup()
diff --git a/src/widgets/dialogs/LoginDialog.cpp b/src/widgets/dialogs/LoginDialog.cpp
index daf3c201e..35c18c7d6 100644
--- a/src/widgets/dialogs/LoginDialog.cpp
+++ b/src/widgets/dialogs/LoginDialog.cpp
@@ -7,7 +7,7 @@
 #include "providers/twitch/PartialTwitchUser.hpp"
 
 #ifdef USEWINSDK
-#include <Windows.h>
+#    include <Windows.h>
 #endif
 
 #include <QClipboard>
@@ -21,54 +21,54 @@ namespace chatterino {
 
 namespace {
 
-void LogInWithCredentials(const std::string &userID,
-                          const std::string &username,
-                          const std::string &clientID,
-                          const std::string &oauthToken)
-{
-    QStringList errors;
+    void LogInWithCredentials(const std::string &userID,
+                              const std::string &username,
+                              const std::string &clientID,
+                              const std::string &oauthToken)
+    {
+        QStringList errors;
 
-    if (userID.empty()) {
-        errors.append("Missing user ID");
+        if (userID.empty()) {
+            errors.append("Missing user ID");
+        }
+        if (username.empty()) {
+            errors.append("Missing username");
+        }
+        if (clientID.empty()) {
+            errors.append("Missing Client ID");
+        }
+        if (oauthToken.empty()) {
+            errors.append("Missing OAuth Token");
+        }
+
+        if (errors.length() > 0) {
+            QMessageBox messageBox;
+            messageBox.setIcon(QMessageBox::Critical);
+            messageBox.setText(errors.join("<br />"));
+            messageBox.setStandardButtons(QMessageBox::Ok);
+            messageBox.exec();
+            return;
+        }
+
+        //    QMessageBox messageBox;
+        //    messageBox.setIcon(QMessageBox::Information);
+        //    messageBox.setText("Successfully logged in with user <b>" +
+        //    qS(username) + "</b>!");
+        pajlada::Settings::Setting<std::string>::set(
+            "/accounts/uid" + userID + "/username", username);
+        pajlada::Settings::Setting<std::string>::set(
+            "/accounts/uid" + userID + "/userID", userID);
+        pajlada::Settings::Setting<std::string>::set(
+            "/accounts/uid" + userID + "/clientID", clientID);
+        pajlada::Settings::Setting<std::string>::set(
+            "/accounts/uid" + userID + "/oauthToken", oauthToken);
+
+        getApp()->accounts->twitch.reloadUsers();
+
+        //    messageBox.exec();
+
+        getApp()->accounts->twitch.currentUsername = username;
     }
-    if (username.empty()) {
-        errors.append("Missing username");
-    }
-    if (clientID.empty()) {
-        errors.append("Missing Client ID");
-    }
-    if (oauthToken.empty()) {
-        errors.append("Missing OAuth Token");
-    }
-
-    if (errors.length() > 0) {
-        QMessageBox messageBox;
-        messageBox.setIcon(QMessageBox::Critical);
-        messageBox.setText(errors.join("<br />"));
-        messageBox.setStandardButtons(QMessageBox::Ok);
-        messageBox.exec();
-        return;
-    }
-
-    //    QMessageBox messageBox;
-    //    messageBox.setIcon(QMessageBox::Information);
-    //    messageBox.setText("Successfully logged in with user <b>" +
-    //    qS(username) + "</b>!");
-    pajlada::Settings::Setting<std::string>::set(
-        "/accounts/uid" + userID + "/username", username);
-    pajlada::Settings::Setting<std::string>::set(
-        "/accounts/uid" + userID + "/userID", userID);
-    pajlada::Settings::Setting<std::string>::set(
-        "/accounts/uid" + userID + "/clientID", clientID);
-    pajlada::Settings::Setting<std::string>::set(
-        "/accounts/uid" + userID + "/oauthToken", oauthToken);
-
-    getApp()->accounts->twitch.reloadUsers();
-
-    //    messageBox.exec();
-
-    getApp()->accounts->twitch.currentUsername = username;
-}
 
 }  // namespace
 
diff --git a/src/widgets/helper/ChannelView.cpp b/src/widgets/helper/ChannelView.cpp
index 467d34630..18139219e 100644
--- a/src/widgets/helper/ChannelView.cpp
+++ b/src/widgets/helper/ChannelView.cpp
@@ -39,62 +39,62 @@
 
 namespace chatterino {
 namespace {
-void addEmoteContextMenuItems(const Emote &emote,
-                              MessageElementFlags creatorFlags, QMenu &menu)
-{
-    auto openAction = menu.addAction("Open");
-    auto openMenu = new QMenu;
-    openAction->setMenu(openMenu);
+    void addEmoteContextMenuItems(const Emote &emote,
+                                  MessageElementFlags creatorFlags, QMenu &menu)
+    {
+        auto openAction = menu.addAction("Open");
+        auto openMenu = new QMenu;
+        openAction->setMenu(openMenu);
 
-    auto copyAction = menu.addAction("Copy");
-    auto copyMenu = new QMenu;
-    copyAction->setMenu(copyMenu);
+        auto copyAction = menu.addAction("Copy");
+        auto copyMenu = new QMenu;
+        copyAction->setMenu(copyMenu);
 
-    // see if the QMenu actually gets destroyed
-    QObject::connect(openMenu, &QMenu::destroyed, [] {
-        QMessageBox(QMessageBox::Information, "xD", "the menu got deleted")
-            .exec();
-    });
+        // see if the QMenu actually gets destroyed
+        QObject::connect(openMenu, &QMenu::destroyed, [] {
+            QMessageBox(QMessageBox::Information, "xD", "the menu got deleted")
+                .exec();
+        });
+
+        // Add copy and open links for 1x, 2x, 3x
+        auto addImageLink = [&](const ImagePtr &image, char scale) {
+            if (!image->isEmpty()) {
+                copyMenu->addAction(
+                    QString(scale) + "x link", [url = image->url()] {
+                        QApplication::clipboard()->setText(url.string);
+                    });
+                openMenu->addAction(
+                    QString(scale) + "x link", [url = image->url()] {
+                        QDesktopServices::openUrl(QUrl(url.string));
+                    });
+            }
+        };
+
+        addImageLink(emote.images.getImage1(), '1');
+        addImageLink(emote.images.getImage2(), '2');
+        addImageLink(emote.images.getImage3(), '3');
+
+        // Copy and open emote page link
+        auto addPageLink = [&](const QString &name) {
+            copyMenu->addSeparator();
+            openMenu->addSeparator();
 
-    // Add copy and open links for 1x, 2x, 3x
-    auto addImageLink = [&](const ImagePtr &image, char scale) {
-        if (!image->isEmpty()) {
             copyMenu->addAction(
-                QString(scale) + "x link", [url = image->url()] {
-                    QApplication::clipboard()->setText(url.string);
+                "Copy " + name + " emote link", [url = emote.homePage] {
+                    QApplication::clipboard()->setText(url.string);  //
                 });
-            openMenu->addAction(QString(scale) + "x link",
-                                [url = image->url()] {
-                                    QDesktopServices::openUrl(QUrl(url.string));
-                                });
+            openMenu->addAction(
+                "Open " + name + " emote link", [url = emote.homePage] {
+                    QDesktopServices::openUrl(QUrl(url.string));  //
+                });
+        };
+
+        if (creatorFlags.has(MessageElementFlag::BttvEmote)) {
+            addPageLink("BTTV");
+        } else if (creatorFlags.has(MessageElementFlag::FfzEmote)) {
+            addPageLink("FFZ");
         }
-    };
-
-    addImageLink(emote.images.getImage1(), '1');
-    addImageLink(emote.images.getImage2(), '2');
-    addImageLink(emote.images.getImage3(), '3');
-
-    // Copy and open emote page link
-    auto addPageLink = [&](const QString &name) {
-        copyMenu->addSeparator();
-        openMenu->addSeparator();
-
-        copyMenu->addAction(
-            "Copy " + name + " emote link", [url = emote.homePage] {
-                QApplication::clipboard()->setText(url.string);  //
-            });
-        openMenu->addAction("Open " + name + " emote link",
-                            [url = emote.homePage] {
-                                QDesktopServices::openUrl(QUrl(url.string));  //
-                            });
-    };
-
-    if (creatorFlags.has(MessageElementFlag::BttvEmote)) {
-        addPageLink("BTTV");
-    } else if (creatorFlags.has(MessageElementFlag::FfzEmote)) {
-        addPageLink("FFZ");
     }
-}
 }  // namespace
 
 ChannelView::ChannelView(BaseWidget *parent)
diff --git a/src/widgets/settingspages/ExternalToolsPage.cpp b/src/widgets/settingspages/ExternalToolsPage.cpp
index bdb164e36..49204d9cb 100644
--- a/src/widgets/settingspages/ExternalToolsPage.cpp
+++ b/src/widgets/settingspages/ExternalToolsPage.cpp
@@ -9,15 +9,13 @@
     "Choose", "Source", "High", "Medium", "Low", "Audio only"
 
 namespace chatterino {
-
 namespace {
-
-QString CreateLink(const QString &url, const QString &name)
-{
-    return QString("<a href=\"" + url + "\"><span style=\"color: white;\">" +
-                   name + "</span></a>");
-}
-
+    QString createLink(const QString &url, const QString &name)
+    {
+        return QString("<a href=\"" + url +
+                       "\"><span style=\"color: white;\">" + name +
+                       "</span></a>");
+    }
 }  // namespace
 
 ExternalToolsPage::ExternalToolsPage()
@@ -41,8 +39,8 @@ ExternalToolsPage::ExternalToolsPage()
         description->setStyleSheet("color: #bbb");
 
         auto links = new QLabel(
-            CreateLink("https://streamlink.github.io/", "Website") + " " +
-            CreateLink(
+            createLink("https://streamlink.github.io/", "Website") + " " +
+            createLink(
                 "https://github.com/streamlink/streamlink/releases/latest",
                 "Download"));
         links->setTextFormat(Qt::RichText);
diff --git a/src/widgets/settingspages/IgnoresPage.cpp b/src/widgets/settingspages/IgnoresPage.cpp
index 8aa6c5c4a..6691ee625 100644
--- a/src/widgets/settingspages/IgnoresPage.cpp
+++ b/src/widgets/settingspages/IgnoresPage.cpp
@@ -69,9 +69,8 @@ void addPhrasesTab(LayoutCreator<QVBoxLayout> layout)
 void addUsersTab(IgnoresPage &page, LayoutCreator<QVBoxLayout> users,
                  QStringListModel &userModel)
 {
-    users.append(
-        page.createCheckBox("Enable twitch ignored users",
-                            getSettings()->enableTwitchIgnoredUsers));
+    users.append(page.createCheckBox("Enable twitch ignored users",
+                                     getSettings()->enableTwitchIgnoredUsers));
 
     auto anyways = users.emplace<QHBoxLayout>().withoutMargin();
     {
diff --git a/src/widgets/settingspages/LookPage.cpp b/src/widgets/settingspages/LookPage.cpp
index 5daec0464..4db671499 100644
--- a/src/widgets/settingspages/LookPage.cpp
+++ b/src/widgets/settingspages/LookPage.cpp
@@ -31,9 +31,9 @@
 // clang-format on
 
 #ifdef USEWINSDK
-#define WINDOW_TOPMOST "Window always on top"
+#    define WINDOW_TOPMOST "Window always on top"
 #else
-#define WINDOW_TOPMOST "Window always on top (requires restart)"
+#    define WINDOW_TOPMOST "Window always on top (requires restart)"
 #endif
 #define INPUT_EMPTY "Show input box when empty"
 #define LAST_MSG "Mark the last message you read"
diff --git a/src/widgets/settingspages/ModerationPage.cpp b/src/widgets/settingspages/ModerationPage.cpp
index 28e0f7419..89d6b2411 100644
--- a/src/widgets/settingspages/ModerationPage.cpp
+++ b/src/widgets/settingspages/ModerationPage.cpp
@@ -25,7 +25,7 @@
 
 namespace chatterino {
 
-inline QString CreateLink(const QString &url, bool file = false)
+inline QString createLink(const QString &url, bool file = false)
 {
     if (file) {
         return QString("<a href=\"file:///" + url +
diff --git a/src/widgets/splits/SplitHeader.cpp b/src/widgets/splits/SplitHeader.cpp
index 0c713c996..611bbaace 100644
--- a/src/widgets/splits/SplitHeader.cpp
+++ b/src/widgets/splits/SplitHeader.cpp
@@ -26,86 +26,87 @@
 #include <cmath>
 
 #ifdef USEWEBENGINE
-#include "widgets/StreamView.hpp"
+#    include "widgets/StreamView.hpp"
 #endif
 
 namespace chatterino {
 namespace {
-auto formatRoomMode(TwitchChannel &channel) -> QString
-{
-    QString text;
-
+    auto formatRoomMode(TwitchChannel &channel) -> QString
     {
-        auto modes = channel.accessRoomModes();
+        QString text;
 
-        if (modes->r9k) text += "r9k, ";
-        if (modes->slowMode)
-            text += QString("slow(%1), ").arg(QString::number(modes->slowMode));
-        if (modes->emoteOnly) text += "emote, ";
-        if (modes->submode) text += "sub, ";
+        {
+            auto modes = channel.accessRoomModes();
+
+            if (modes->r9k) text += "r9k, ";
+            if (modes->slowMode)
+                text +=
+                    QString("slow(%1), ").arg(QString::number(modes->slowMode));
+            if (modes->emoteOnly) text += "emote, ";
+            if (modes->submode) text += "sub, ";
+        }
+
+        if (text.length() > 2) {
+            text = text.mid(0, text.size() - 2);
+        }
+
+        if (!text.isEmpty()) {
+            static QRegularExpression commaReplacement("^(.+?, .+?,) (.+)$");
+
+            auto match = commaReplacement.match(text);
+            if (match.hasMatch())
+                text = match.captured(1) + '\n' + match.captured(2);
+        }
+
+        if (text.isEmpty() && channel.hasModRights()) return "none";
+
+        return text;
     }
-
-    if (text.length() > 2) {
-        text = text.mid(0, text.size() - 2);
+    auto formatTooltip(const TwitchChannel::StreamStatus &s)
+    {
+        return QStringList{"<style>.center { text-align: center; }</style>",
+                           "<p class=\"center\">",
+                           s.title,
+                           "<br><br>",
+                           s.game,
+                           "<br>",
+                           s.rerun ? "Vod-casting" : "Live",
+                           " for ",
+                           s.uptime,
+                           " with ",
+                           QString::number(s.viewerCount),
+                           " viewers",
+                           "</p>"}
+            .join("");
     }
+    auto formatTitle(const TwitchChannel::StreamStatus &s, Settings &settings)
+    {
+        auto title = QString();
 
-    if (!text.isEmpty()) {
-        static QRegularExpression commaReplacement("^(.+?, .+?,) (.+)$");
+        // live
+        if (s.rerun)
+            title += " (rerun)";
+        else if (s.streamType.isEmpty())
+            title += " (" + s.streamType + ")";
+        else
+            title += " (live)";
 
-        auto match = commaReplacement.match(text);
-        if (match.hasMatch())
-            text = match.captured(1) + '\n' + match.captured(2);
+        // description
+        if (settings.showViewerCount)
+            title += " - " + QString::number(s.viewerCount);
+        if (settings.showTitle) title += " - " + s.title;
+        if (settings.showGame) title += " - " + s.game;
+        if (settings.showUptime) title += " - " + s.uptime;
+
+        return title;
     }
+    auto distance(QPoint a, QPoint b)
+    {
+        auto x = std::abs(a.x() - b.x());
+        auto y = std::abs(a.y() - b.y());
 
-    if (text.isEmpty() && channel.hasModRights()) return "none";
-
-    return text;
-}
-auto formatTooltip(const TwitchChannel::StreamStatus &s)
-{
-    return QStringList{"<style>.center { text-align: center; }</style>",
-                       "<p class=\"center\">",
-                       s.title,
-                       "<br><br>",
-                       s.game,
-                       "<br>",
-                       s.rerun ? "Vod-casting" : "Live",
-                       " for ",
-                       s.uptime,
-                       " with ",
-                       QString::number(s.viewerCount),
-                       " viewers",
-                       "</p>"}
-        .join("");
-}
-auto formatTitle(const TwitchChannel::StreamStatus &s, Settings &settings)
-{
-    auto title = QString();
-
-    // live
-    if (s.rerun)
-        title += " (rerun)";
-    else if (s.streamType.isEmpty())
-        title += " (" + s.streamType + ")";
-    else
-        title += " (live)";
-
-    // description
-    if (settings.showViewerCount)
-        title += " - " + QString::number(s.viewerCount);
-    if (settings.showTitle) title += " - " + s.title;
-    if (settings.showGame) title += " - " + s.game;
-    if (settings.showUptime) title += " - " + s.uptime;
-
-    return title;
-}
-auto distance(QPoint a, QPoint b)
-{
-    auto x = std::abs(a.x() - b.x());
-    auto y = std::abs(a.y() - b.y());
-
-    return std::sqrt(x * x + y * y);
-}
+        return std::sqrt(x * x + y * y);
+    }
 }  // namespace
 
 SplitHeader::SplitHeader(Split *_split)

From 5068c9a64e0e1ab0e7397808123bf263e9ed9f91 Mon Sep 17 00:00:00 2001
From: fourtf <tf.four@gmail.com>
Date: Wed, 15 Aug 2018 23:48:16 +0200
Subject: [PATCH 31/44] Fixes #161

---
 src/singletons/Settings.hpp            |  2 ++
 src/singletons/helper/GifTimer.cpp     | 13 +++++++------
 src/widgets/settingspages/LookPage.cpp |  3 +++
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/singletons/Settings.hpp b/src/singletons/Settings.hpp
index 28d0e43d3..8337786dc 100644
--- a/src/singletons/Settings.hpp
+++ b/src/singletons/Settings.hpp
@@ -25,6 +25,8 @@ public:
 
     /// Appearance
     BoolSetting showTimestamps = {"/appearance/messages/showTimestamps", true};
+    BoolSetting enableAnimationsWhenFocused = {
+        "/appearance/enableAnimationsWhenFocused", false};
     QStringSetting timestampFormat = {"/appearance/messages/timestampFormat",
                                       "h:mm"};
     BoolSetting showBadges = {"/appearance/messages/showBadges", true};
diff --git a/src/singletons/helper/GifTimer.cpp b/src/singletons/helper/GifTimer.cpp
index 8ef657e7a..8f3624523 100644
--- a/src/singletons/helper/GifTimer.cpp
+++ b/src/singletons/helper/GifTimer.cpp
@@ -11,18 +11,19 @@ void GIFTimer::initialize()
     this->timer.setInterval(30);
 
     getSettings()->enableGifAnimations.connect([this](bool enabled, auto) {
-        if (enabled) {
+        if (enabled)
             this->timer.start();
-        } else {
+        else
             this->timer.stop();
-        }
     });
 
     QObject::connect(&this->timer, &QTimer::timeout, [this] {
+        if (getSettings()->enableAnimationsWhenFocused &&
+            qApp->activeWindow() == nullptr)
+            return;
+
         this->signal.invoke();
-        // fourtf:
-        auto app = getApp();
-        app->windows->repaintGifEmotes();
+        getApp()->windows->repaintGifEmotes();
     });
 }
 
diff --git a/src/widgets/settingspages/LookPage.cpp b/src/widgets/settingspages/LookPage.cpp
index 4db671499..eb2a9ff1c 100644
--- a/src/widgets/settingspages/LookPage.cpp
+++ b/src/widgets/settingspages/LookPage.cpp
@@ -218,6 +218,9 @@ void LookPage::addEmoteTab(LayoutCreator<QVBoxLayout> layout)
     */
     layout.append(
         this->createCheckBox("Animations", getSettings()->enableGifAnimations));
+    layout.append(
+        this->createCheckBox("Animations only when chatterino has focus",
+                             getSettings()->enableAnimationsWhenFocused));
 
     auto scaleBox = layout.emplace<QHBoxLayout>().withoutMargin();
     {

From 8bcc9c487bfaf9de9ffa8c037e881adcc0e27d3c Mon Sep 17 00:00:00 2001
From: fourtf <tf.four@gmail.com>
Date: Thu, 16 Aug 2018 00:16:33 +0200
Subject: [PATCH 32/44] Fixes #411, #516

---
 src/common/Common.hpp                         |  5 ++++
 src/messages/layouts/MessageLayout.cpp        |  5 ++--
 src/messages/layouts/MessageLayout.hpp        |  4 ++-
 .../layouts/MessageLayoutContainer.cpp        | 28 ++++++++++++-------
 .../layouts/MessageLayoutContainer.hpp        |  3 +-
 src/providers/twitch/TwitchMessageBuilder.cpp | 10 +++----
 src/widgets/helper/ChannelView.cpp            | 13 +++++----
 7 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/src/common/Common.hpp b/src/common/Common.hpp
index 46de4a7cb..7f22bf27d 100644
--- a/src/common/Common.hpp
+++ b/src/common/Common.hpp
@@ -41,4 +41,9 @@ std::weak_ptr<T> weakOf(T *element)
 struct Message;
 using MessagePtr = std::shared_ptr<const Message>;
 
+enum class CopyMode {
+    Everything,
+    OnlyTextAndEmotes,
+};
+
 }  // namespace chatterino
diff --git a/src/messages/layouts/MessageLayout.cpp b/src/messages/layouts/MessageLayout.cpp
index c7ff02af9..5fbbe0bfa 100644
--- a/src/messages/layouts/MessageLayout.cpp
+++ b/src/messages/layouts/MessageLayout.cpp
@@ -284,9 +284,10 @@ int MessageLayout::getSelectionIndex(QPoint position)
     return this->container_->getSelectionIndex(position);
 }
 
-void MessageLayout::addSelectionText(QString &str, int from, int to)
+void MessageLayout::addSelectionText(QString &str, int from, int to,
+                                     CopyMode copymode)
 {
-    this->container_->addSelectionText(str, from, to);
+    this->container_->addSelectionText(str, from, to, copymode);
 }
 
 }  // namespace chatterino
diff --git a/src/messages/layouts/MessageLayout.hpp b/src/messages/layouts/MessageLayout.hpp
index 2ab015856..671d30668 100644
--- a/src/messages/layouts/MessageLayout.hpp
+++ b/src/messages/layouts/MessageLayout.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "common/Common.hpp"
 #include "common/FlagsEnum.hpp"
 
 #include <QPixmap>
@@ -54,7 +55,8 @@ public:
     const MessageLayoutElement *getElementAt(QPoint point);
     int getLastCharacterIndex() const;
     int getSelectionIndex(QPoint position);
-    void addSelectionText(QString &str, int from = 0, int to = INT_MAX);
+    void addSelectionText(QString &str, int from = 0, int to = INT_MAX,
+                          CopyMode copymode = CopyMode::Everything);
 
     // Misc
     bool isDisabled() const;
diff --git a/src/messages/layouts/MessageLayoutContainer.cpp b/src/messages/layouts/MessageLayoutContainer.cpp
index 008a02d05..0aef73c6b 100644
--- a/src/messages/layouts/MessageLayoutContainer.cpp
+++ b/src/messages/layouts/MessageLayoutContainer.cpp
@@ -505,33 +505,41 @@ int MessageLayoutContainer::getLastCharacterIndex() const
     return this->lines_.back().endCharIndex;
 }
 
-void MessageLayoutContainer::addSelectionText(QString &str, int from, int to)
+void MessageLayoutContainer::addSelectionText(QString &str, int from, int to,
+                                              CopyMode copymode)
 {
     int index = 0;
     bool first = true;
 
-    for (std::unique_ptr<MessageLayoutElement> &ele : this->elements_) {
-        int c = ele->getSelectionIndexCount();
+    for (auto &element : this->elements_) {
+        if (copymode == CopyMode::OnlyTextAndEmotes) {
+            if (element->getCreator().getFlags().hasAny(
+                    {MessageElementFlag::Timestamp,
+                     MessageElementFlag::Username, MessageElementFlag::Badges}))
+                continue;
+        }
+
+        auto indexCount = element->getSelectionIndexCount();
 
         if (first) {
-            if (index + c > from) {
-                ele->addCopyTextToString(str, from - index, to - index);
+            if (index + indexCount > from) {
+                element->addCopyTextToString(str, from - index, to - index);
                 first = false;
 
-                if (index + c > to) {
+                if (index + indexCount > to) {
                     break;
                 }
             }
         } else {
-            if (index + c > to) {
-                ele->addCopyTextToString(str, 0, to - index);
+            if (index + indexCount > to) {
+                element->addCopyTextToString(str, 0, to - index);
                 break;
             } else {
-                ele->addCopyTextToString(str);
+                element->addCopyTextToString(str);
             }
         }
 
-        index += c;
+        index += indexCount;
     }
 }
 
diff --git a/src/messages/layouts/MessageLayoutContainer.hpp b/src/messages/layouts/MessageLayoutContainer.hpp
index cab849ed0..669986196 100644
--- a/src/messages/layouts/MessageLayoutContainer.hpp
+++ b/src/messages/layouts/MessageLayoutContainer.hpp
@@ -5,6 +5,7 @@
 #include <memory>
 #include <vector>
 
+#include "common/Common.hpp"
 #include "common/FlagsEnum.hpp"
 #include "messages/Selection.hpp"
 #include "messages/layouts/MessageLayoutElement.hpp"
@@ -74,7 +75,7 @@ struct MessageLayoutContainer {
     // selection
     int getSelectionIndex(QPoint point);
     int getLastCharacterIndex() const;
-    void addSelectionText(QString &str, int from, int to);
+    void addSelectionText(QString &str, int from, int to, CopyMode copymode);
 
     bool isCollapsed();
 
diff --git a/src/providers/twitch/TwitchMessageBuilder.cpp b/src/providers/twitch/TwitchMessageBuilder.cpp
index 26ea07dec..ca04e7e86 100644
--- a/src/providers/twitch/TwitchMessageBuilder.cpp
+++ b/src/providers/twitch/TwitchMessageBuilder.cpp
@@ -83,8 +83,6 @@ bool TwitchMessageBuilder::isIgnored() const
 
 MessagePtr TwitchMessageBuilder::build()
 {
-    auto app = getApp();
-
     // PARSING
     this->parseUsername();
 
@@ -437,7 +435,7 @@ void TwitchMessageBuilder::appendUsername()
         // IrcManager::getInstance().getUser().getUserName();
     } else if (this->args.isReceivedWhisper) {
         // Sender username
-        this->emplace<TextElement>(usernameText, MessageElementFlag::Text,
+        this->emplace<TextElement>(usernameText, MessageElementFlag::Username,
                                    this->usernameColor_,
                                    FontStyle::ChatMediumBold)
             ->setLink({Link::UserInfo, this->userName});
@@ -445,7 +443,7 @@ void TwitchMessageBuilder::appendUsername()
         auto currentUser = app->accounts->twitch.getCurrent();
 
         // Separator
-        this->emplace<TextElement>("->", MessageElementFlag::Text,
+        this->emplace<TextElement>("->", MessageElementFlag::Username,
                                    app->themes->messages.textColors.system,
                                    FontStyle::ChatMedium);
 
@@ -456,14 +454,14 @@ void TwitchMessageBuilder::appendUsername()
 
         // Your own username
         this->emplace<TextElement>(currentUser->getUserName() + ":",
-                                   MessageElementFlag::Text, selfColor,
+                                   MessageElementFlag::Username, selfColor,
                                    FontStyle::ChatMediumBold);
     } else {
         if (!this->action_) {
             usernameText += ":";
         }
 
-        this->emplace<TextElement>(usernameText, MessageElementFlag::Text,
+        this->emplace<TextElement>(usernameText, MessageElementFlag::Username,
                                    this->usernameColor_,
                                    FontStyle::ChatMediumBold)
             ->setLink({Link::UserInfo, this->userName});
diff --git a/src/widgets/helper/ChannelView.cpp b/src/widgets/helper/ChannelView.cpp
index 18139219e..2afc42e75 100644
--- a/src/widgets/helper/ChannelView.cpp
+++ b/src/widgets/helper/ChannelView.cpp
@@ -1088,17 +1088,18 @@ void ChannelView::addContextMenuItems(
 
     menu->addAction("Copy message", [layout] {
         QString copyString;
-        layout->addSelectionText(copyString);
+        layout->addSelectionText(copyString, 0, INT_MAX,
+                                 CopyMode::OnlyTextAndEmotes);
 
         QGuiApplication::clipboard()->setText(copyString);
     });
 
-    //        menu->addAction("Quote message", [layout] {
-    //            QString copyString;
-    //            layout->addSelectionText(copyString);
+    menu->addAction("Copy full message", [layout] {
+        QString copyString;
+        layout->addSelectionText(copyString);
 
-    //            // insert into input
-    //        });
+        QGuiApplication::clipboard()->setText(copyString);
+    });
 
     menu->popup(QCursor::pos());
     menu->raise();

From 3fc91bded5d8f899703d42206f632d4edd12a96f Mon Sep 17 00:00:00 2001
From: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
Date: Sun, 19 Aug 2018 16:18:07 +0200
Subject: [PATCH 33/44] Move some helper functions to Helpers.hpp

---
 src/util/Helpers.hpp                          | 37 +++++++++++++++++++
 .../settingspages/ExternalToolsPage.cpp       | 13 ++-----
 src/widgets/settingspages/ModerationPage.cpp  | 31 +++-------------
 3 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/src/util/Helpers.hpp b/src/util/Helpers.hpp
index 1552ae404..bb6c742a2 100644
--- a/src/util/Helpers.hpp
+++ b/src/util/Helpers.hpp
@@ -17,6 +17,43 @@ static QString CreateUUID()
     return uuid.toString();
 }
 
+static QString createLink(const QString &url, bool file = false)
+{
+    if (file) {
+        return QString("<a href=\"file:///" + url +
+                       "\"><span style=\"color: white;\">" + url +
+                       "</span></a>");
+    }
+
+    return QString("<a href=\"" + url + "\"><span style=\"color: white;\">" +
+                   url + "</span></a>");
+}
+
+static QString createNamedLink(const QString &url, const QString &name, bool file = false)
+{
+    if (file) {
+        return QString("<a href=\"file:///" + url +
+                       "\"><span style=\"color: white;\">" + name +
+                       "</span></a>");
+    }
+
+    return QString("<a href=\"" + url + "\"><span style=\"color: white;\">" +
+                   name + "</span></a>");
+}
+
+static QString shortenString(const QString &str, unsigned maxWidth = 50)
+{
+    if (str.size() <= maxWidth) {
+        return str;
+    }
+
+    QString shortenedStr = str;
+    shortenedStr.resize(47);
+    shortenedStr += "...";
+
+    return shortenedStr;
+}
+
 }  // namespace chatterino
 
 namespace fmt {
diff --git a/src/widgets/settingspages/ExternalToolsPage.cpp b/src/widgets/settingspages/ExternalToolsPage.cpp
index 49204d9cb..c57768528 100644
--- a/src/widgets/settingspages/ExternalToolsPage.cpp
+++ b/src/widgets/settingspages/ExternalToolsPage.cpp
@@ -1,6 +1,7 @@
 #include "ExternalToolsPage.hpp"
 
 #include "Application.hpp"
+#include "util/Helpers.hpp"
 #include "util/LayoutCreator.hpp"
 
 #include <QGroupBox>
@@ -9,14 +10,6 @@
     "Choose", "Source", "High", "Medium", "Low", "Audio only"
 
 namespace chatterino {
-namespace {
-    QString createLink(const QString &url, const QString &name)
-    {
-        return QString("<a href=\"" + url +
-                       "\"><span style=\"color: white;\">" + name +
-                       "</span></a>");
-    }
-}  // namespace
 
 ExternalToolsPage::ExternalToolsPage()
     : SettingsPage("External tools", "")
@@ -39,8 +32,8 @@ ExternalToolsPage::ExternalToolsPage()
         description->setStyleSheet("color: #bbb");
 
         auto links = new QLabel(
-            createLink("https://streamlink.github.io/", "Website") + " " +
-            createLink(
+            createNamedLink("https://streamlink.github.io/", "Website") + " " +
+            createNamedLink(
                 "https://github.com/streamlink/streamlink/releases/latest",
                 "Download"));
         links->setTextFormat(Qt::RichText);
diff --git a/src/widgets/settingspages/ModerationPage.cpp b/src/widgets/settingspages/ModerationPage.cpp
index 89d6b2411..e7210f5a6 100644
--- a/src/widgets/settingspages/ModerationPage.cpp
+++ b/src/widgets/settingspages/ModerationPage.cpp
@@ -7,6 +7,7 @@
 #include "controllers/taggedusers/TaggedUsersModel.hpp"
 #include "singletons/Logging.hpp"
 #include "singletons/Paths.hpp"
+#include "util/Helpers.hpp"
 #include "util/LayoutCreator.hpp"
 #include "widgets/helper/EditableModelView.hpp"
 
@@ -25,18 +26,6 @@
 
 namespace chatterino {
 
-inline QString createLink(const QString &url, bool file = false)
-{
-    if (file) {
-        return QString("<a href=\"file:///" + url +
-                       "\"><span style=\"color: white;\">" + url +
-                       "</span></a>");
-    }
-
-    return QString("<a href=\"" + url + "\"><span style=\"color: white;\">" +
-                   url + "</span></a>");
-}
-
 qint64 dirSize(QString dirPath)
 {
     qint64 size = 0;
@@ -110,20 +99,10 @@ ModerationPage::ModerationPage()
                     pathOriginal = logPath;
                 }
 
-                QString pathShortened;
-
-                if (pathOriginal.size() > 50) {
-                    pathShortened = pathOriginal;
-                    pathShortened.resize(50);
-                    pathShortened += "...";
-                } else {
-                    pathShortened = pathOriginal;
-                }
-
-                pathShortened = "Logs saved at <a href=\"file:///" +
-                                pathOriginal +
-                                "\"><span style=\"color: white;\">" +
-                                pathShortened + "</span></a>";
+                QString pathShortened =
+                    "Logs saved at <a href=\"file:///" + pathOriginal +
+                    "\"><span style=\"color: white;\">" +
+                    shortenString(pathOriginal, 50) + "</span></a>";
 
                 logsPathLabel->setText(pathShortened);
                 logsPathLabel->setToolTip(pathOriginal);

From a07255be2d781b937d8d9ca6c9b237bbb81da48b Mon Sep 17 00:00:00 2001
From: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
Date: Sun, 19 Aug 2018 16:20:14 +0200
Subject: [PATCH 34/44] Add ability to customize cache folder

Add an advanced settings page, currently only housing the "Cache" category

Fix #541
---
 chatterino.pro                             |  6 +-
 src/common/NetworkData.cpp                 |  5 +-
 src/common/NetworkRequest.cpp              |  7 +-
 src/singletons/Paths.cpp                   | 25 ++++++-
 src/singletons/Paths.hpp                   |  8 ++-
 src/singletons/Settings.hpp                |  2 +
 src/widgets/dialogs/SettingsDialog.cpp     |  2 +
 src/widgets/settingspages/AdvancedPage.cpp | 79 ++++++++++++++++++++++
 src/widgets/settingspages/AdvancedPage.hpp | 13 ++++
 9 files changed, 133 insertions(+), 14 deletions(-)
 create mode 100644 src/widgets/settingspages/AdvancedPage.cpp
 create mode 100644 src/widgets/settingspages/AdvancedPage.hpp

diff --git a/chatterino.pro b/chatterino.pro
index dd97cb271..1c9cf8f11 100644
--- a/chatterino.pro
+++ b/chatterino.pro
@@ -253,7 +253,8 @@ SOURCES += \
     src/widgets/helper/Button.cpp \
     src/messages/MessageContainer.cpp \
     src/debug/Benchmark.cpp \
-    src/common/UsernameSet.cpp
+    src/common/UsernameSet.cpp \
+    src/widgets/settingspages/AdvancedPage.cpp
 
 HEADERS  += \
     src/Application.hpp \
@@ -449,7 +450,8 @@ HEADERS  += \
     src/util/LayoutHelper.hpp \
     src/widgets/helper/Button.hpp \
     src/messages/MessageContainer.hpp \
-    src/common/UsernameSet.hpp
+    src/common/UsernameSet.hpp \
+    src/widgets/settingspages/AdvancedPage.hpp
 
 RESOURCES += \ 
     resources/resources.qrc \
diff --git a/src/common/NetworkData.cpp b/src/common/NetworkData.cpp
index d3434576e..a58ec7076 100644
--- a/src/common/NetworkData.cpp
+++ b/src/common/NetworkData.cpp
@@ -1,6 +1,5 @@
 #include "common/NetworkData.hpp"
 
-#include "Application.hpp"
 #include "singletons/Paths.hpp"
 #include "util/DebugCount.hpp"
 
@@ -42,9 +41,7 @@ QString NetworkData::getHash()
 void NetworkData::writeToCache(const QByteArray &bytes)
 {
     if (this->useQuickLoadCache_) {
-        auto app = getApp();
-
-        QFile cachedFile(getPaths()->cacheDirectory + "/" + this->getHash());
+        QFile cachedFile(getPaths()->cacheDirectory() + "/" + this->getHash());
 
         if (cachedFile.open(QIODevice::WriteOnly)) {
             cachedFile.write(bytes);
diff --git a/src/common/NetworkRequest.cpp b/src/common/NetworkRequest.cpp
index af27394de..024f11a4b 100644
--- a/src/common/NetworkRequest.cpp
+++ b/src/common/NetworkRequest.cpp
@@ -1,6 +1,5 @@
 #include "common/NetworkRequest.hpp"
 
-#include "Application.hpp"
 #include "common/NetworkData.hpp"
 #include "common/NetworkManager.hpp"
 #include "common/Outcome.hpp"
@@ -11,6 +10,7 @@
 
 #include <QFile>
 #include <QtConcurrent>
+
 #include <cassert>
 
 namespace chatterino {
@@ -145,9 +145,8 @@ void NetworkRequest::execute()
 
 Outcome NetworkRequest::tryLoadCachedFile()
 {
-    auto app = getApp();
-
-    QFile cachedFile(getPaths()->cacheDirectory + "/" + this->data->getHash());
+    QFile cachedFile(getPaths()->cacheDirectory() + "/" +
+                     this->data->getHash());
 
     if (!cachedFile.exists()) {
         // File didn't exist
diff --git a/src/singletons/Paths.cpp b/src/singletons/Paths.cpp
index 21d1f57ad..90a094e76 100644
--- a/src/singletons/Paths.cpp
+++ b/src/singletons/Paths.cpp
@@ -1,5 +1,7 @@
 #include "singletons/Paths.hpp"
 
+#include "singletons/Settings.hpp"
+
 #include <QCoreApplication>
 #include <QCryptographicHash>
 #include <QDir>
@@ -33,6 +35,27 @@ bool Paths::isPortable()
     return this->portable_.get();
 }
 
+QString Paths::cacheDirectory()
+{
+    static QStringSetting cachePathSetting = [] {
+        QStringSetting cachePathSetting("/cache/path");
+
+        cachePathSetting.connect([](const auto &newPath, auto) {
+            QDir().mkpath(newPath);  //
+        });
+
+        return cachePathSetting;
+    }();
+
+    auto path = cachePathSetting.getValue();
+
+    if (path == "") {
+        return this->cacheDirectory_;
+    }
+
+    return path;
+}
+
 void Paths::initAppFilePathHash()
 {
     this->applicationFilePathHash =
@@ -104,7 +127,7 @@ void Paths::initSubDirectories()
 
     makePath("");
     this->settingsDirectory = makePath("Settings");
-    this->cacheDirectory = makePath("Cache");
+    this->cacheDirectory_ = makePath("Cache");
     this->messageLogDirectory = makePath("Logs");
     this->miscDirectory = makePath("Misc");
 }
diff --git a/src/singletons/Paths.hpp b/src/singletons/Paths.hpp
index 70ab2642f..de67e8065 100644
--- a/src/singletons/Paths.hpp
+++ b/src/singletons/Paths.hpp
@@ -19,9 +19,6 @@ public:
     // Directory for settings files. Same as <appDataDirectory>/Settings
     QString settingsDirectory;
 
-    // Directory for cache files. Same as <appDataDirectory>/Misc
-    QString cacheDirectory;
-
     // Directory for message log files. Same as <appDataDirectory>/Misc
     QString messageLogDirectory;
 
@@ -34,6 +31,8 @@ public:
     bool createFolder(const QString &folderPath);
     bool isPortable();
 
+    QString cacheDirectory();
+
 private:
     void initAppFilePathHash();
     void initCheckPortable();
@@ -41,6 +40,9 @@ private:
     void initSubDirectories();
 
     boost::optional<bool> portable_;
+
+    // Directory for cache files. Same as <appDataDirectory>/Misc
+    QString cacheDirectory_;
 };
 
 Paths *getPaths();
diff --git a/src/singletons/Settings.hpp b/src/singletons/Settings.hpp
index 8337786dc..472c2892a 100644
--- a/src/singletons/Settings.hpp
+++ b/src/singletons/Settings.hpp
@@ -153,6 +153,8 @@ public:
     IntSetting startUpNotification = {"/misc/startUpNotification", 0};
     QStringSetting currentVersion = {"/misc/currentVersion", ""};
 
+    QStringSetting cachePath = {"/cache/path", ""};
+
     void saveSnapshot();
     void restoreSnapshot();
 
diff --git a/src/widgets/dialogs/SettingsDialog.cpp b/src/widgets/dialogs/SettingsDialog.cpp
index 1c89344f4..0bb782e30 100644
--- a/src/widgets/dialogs/SettingsDialog.cpp
+++ b/src/widgets/dialogs/SettingsDialog.cpp
@@ -5,6 +5,7 @@
 #include "widgets/helper/SettingsDialogTab.hpp"
 #include "widgets/settingspages/AboutPage.hpp"
 #include "widgets/settingspages/AccountsPage.hpp"
+#include "widgets/settingspages/AdvancedPage.hpp"
 #include "widgets/settingspages/BrowserExtensionPage.hpp"
 #include "widgets/settingspages/CommandPage.hpp"
 #include "widgets/settingspages/EmotesPage.hpp"
@@ -103,6 +104,7 @@ void SettingsDialog::addTabs()
     //    this->addTab(new SpecialChannelsPage);
     this->addTab(new BrowserExtensionPage);
     this->addTab(new ExternalToolsPage);
+    this->addTab(new AdvancedPage);
 
     this->ui_.tabContainer->addStretch(1);
     this->addTab(new AboutPage, Qt::AlignBottom);
diff --git a/src/widgets/settingspages/AdvancedPage.cpp b/src/widgets/settingspages/AdvancedPage.cpp
new file mode 100644
index 000000000..fbfa62bc6
--- /dev/null
+++ b/src/widgets/settingspages/AdvancedPage.cpp
@@ -0,0 +1,79 @@
+#include "AdvancedPage.hpp"
+
+#include "Application.hpp"
+#include "controllers/taggedusers/TaggedUsersController.hpp"
+#include "controllers/taggedusers/TaggedUsersModel.hpp"
+#include "singletons/Logging.hpp"
+#include "singletons/Paths.hpp"
+#include "util/Helpers.hpp"
+#include "util/LayoutCreator.hpp"
+
+#include <QFileDialog>
+#include <QFormLayout>
+#include <QGroupBox>
+#include <QHBoxLayout>
+#include <QHeaderView>
+#include <QLabel>
+#include <QListView>
+#include <QPushButton>
+#include <QTableView>
+#include <QTextEdit>
+#include <QVBoxLayout>
+#include <QtConcurrent/QtConcurrent>
+
+namespace chatterino {
+
+AdvancedPage::AdvancedPage()
+    : SettingsPage("Advanced", "")
+{
+    auto app = getApp();
+    LayoutCreator<AdvancedPage> layoutCreator(this);
+
+    auto tabs = layoutCreator.emplace<QTabWidget>();
+
+    {
+        auto layout = tabs.appendTab(new QVBoxLayout, "Cache");
+        auto folderLabel = layout.emplace<QLabel>();
+
+        folderLabel->setTextFormat(Qt::RichText);
+        folderLabel->setTextInteractionFlags(Qt::TextBrowserInteraction |
+                                             Qt::LinksAccessibleByKeyboard |
+                                             Qt::LinksAccessibleByKeyboard);
+        folderLabel->setOpenExternalLinks(true);
+
+        getSettings()->cachePath.connect([folderLabel](const auto &,
+                                                       auto) mutable {
+            QString newPath = getPaths()->cacheDirectory();
+
+            QString pathShortened = "Cache saved at <a href=\"file:///" +
+                                    newPath +
+                                    "\"><span style=\"color: white;\">" +
+                                    shortenString(newPath, 50) + "</span></a>";
+
+            folderLabel->setText(pathShortened);
+            folderLabel->setToolTip(newPath);
+        });
+
+        layout->addStretch(1);
+
+        auto selectDir = layout.emplace<QPushButton>("Set custom cache folder");
+
+        QObject::connect(
+            selectDir.getElement(), &QPushButton::clicked, this, [this] {
+                auto dirName = QFileDialog::getExistingDirectory(this);
+
+                getSettings()->cachePath = dirName;
+            });
+
+        auto resetDir =
+            layout.emplace<QPushButton>("Reset custom cache folder");
+        QObject::connect(resetDir.getElement(), &QPushButton::clicked, this,
+                         []() mutable {
+                             getSettings()->cachePath = "";  //
+                         });
+
+        // Logs end
+    }
+}
+
+}  // namespace chatterino
diff --git a/src/widgets/settingspages/AdvancedPage.hpp b/src/widgets/settingspages/AdvancedPage.hpp
new file mode 100644
index 000000000..ecc3d629e
--- /dev/null
+++ b/src/widgets/settingspages/AdvancedPage.hpp
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "widgets/settingspages/SettingsPage.hpp"
+
+namespace chatterino {
+
+class AdvancedPage : public SettingsPage
+{
+public:
+    AdvancedPage();
+};
+
+}  // namespace chatterino

From be4b3f1a3840cdef4caecc54f2a4311a51a44a8a Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 22 Aug 2018 01:57:44 +0300
Subject: [PATCH 35/44] Don't add empty messages to message history. (#674)

---
 src/widgets/splits/SplitInput.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/widgets/splits/SplitInput.cpp b/src/widgets/splits/SplitInput.cpp
index f6a66e7f4..d35acdf48 100644
--- a/src/widgets/splits/SplitInput.cpp
+++ b/src/widgets/splits/SplitInput.cpp
@@ -176,8 +176,9 @@ void SplitInput::installKeyPressedEvent()
             sendMessage = sendMessage.replace('\n', ' ');
 
             c->sendMessage(sendMessage);
-            // don't add duplicate messages to message history
-            if (this->prevMsg_.isEmpty() || !this->prevMsg_.endsWith(message))
+            // don't add duplicate messages and empty message to message history
+            if ((this->prevMsg_.isEmpty() || !this->prevMsg_.endsWith(message)) &&
+                !message.trimmed().isEmpty())
                 this->prevMsg_.append(message);
 
             event->accept();

From 8a1c30408a63c787f943b95e6b55ba24fed7c251 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 22 Aug 2018 16:16:19 +0300
Subject: [PATCH 36/44] Set displayName to UserInfo link as value. (#675)

---
 src/providers/twitch/TwitchMessageBuilder.cpp | 4 ++--
 src/widgets/dialogs/UserInfoPopup.cpp         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/providers/twitch/TwitchMessageBuilder.cpp b/src/providers/twitch/TwitchMessageBuilder.cpp
index ca04e7e86..b245c7664 100644
--- a/src/providers/twitch/TwitchMessageBuilder.cpp
+++ b/src/providers/twitch/TwitchMessageBuilder.cpp
@@ -438,7 +438,7 @@ void TwitchMessageBuilder::appendUsername()
         this->emplace<TextElement>(usernameText, MessageElementFlag::Username,
                                    this->usernameColor_,
                                    FontStyle::ChatMediumBold)
-            ->setLink({Link::UserInfo, this->userName});
+            ->setLink({Link::UserInfo, this->message().displayName});
 
         auto currentUser = app->accounts->twitch.getCurrent();
 
@@ -464,7 +464,7 @@ void TwitchMessageBuilder::appendUsername()
         this->emplace<TextElement>(usernameText, MessageElementFlag::Username,
                                    this->usernameColor_,
                                    FontStyle::ChatMediumBold)
-            ->setLink({Link::UserInfo, this->userName});
+            ->setLink({Link::UserInfo, this->message().displayName});
     }
 }
 
diff --git a/src/widgets/dialogs/UserInfoPopup.cpp b/src/widgets/dialogs/UserInfoPopup.cpp
index e7d3681ea..2b7f37f4a 100644
--- a/src/widgets/dialogs/UserInfoPopup.cpp
+++ b/src/widgets/dialogs/UserInfoPopup.cpp
@@ -52,7 +52,7 @@ UserInfoPopup::UserInfoPopup()
         avatar->setScaleIndependantSize(100, 100);
         QObject::connect(avatar.getElement(), &Button::clicked, [this] {
             QDesktopServices::openUrl(
-                QUrl("https://twitch.tv/" + this->userName_));
+                QUrl("https://twitch.tv/" + this->userName_.toLower()));
         });
 
         // items on the right

From fec89a4807bc33e681b82b2cdb5bec92baf1ff3c Mon Sep 17 00:00:00 2001
From: pajlada <rasmus.karlsson@pajlada.com>
Date: Wed, 22 Aug 2018 16:49:38 +0200
Subject: [PATCH 37/44] fix ssl links

this is a temporary solution
---
 BUILDING_ON_WINDOWS.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BUILDING_ON_WINDOWS.md b/BUILDING_ON_WINDOWS.md
index aaa8743c3..38b48e033 100644
--- a/BUILDING_ON_WINDOWS.md
+++ b/BUILDING_ON_WINDOWS.md
@@ -10,11 +10,11 @@
 
 ### OpenSSL
 #### For our websocket library, we need OpenSSL 1.1
-1. Download OpenSSL development library: https://slproweb.com/download/Win64OpenSSL-1_1_0h.exe
+1. Download OpenSSL development library: https://slproweb.com/download/Win64OpenSSL-1_1_0i.exe
 2. When prompted, install openssl to C:\local\openssl
 3. When prompted, copy the OpenSSL DLLs to "The OpenSSL binaries (/bin) directory"
 #### For Qt SSL, we need OpenSSL 1.0
-1. Download OpenSSL light: https://slproweb.com/download/Win64OpenSSL_Light-1_0_2o.exe
+1. Download OpenSSL light: https://slproweb.com/download/Win64OpenSSL_Light-1_0_2p.exe
 2. When prompted, install it anywhere
 3. When prompted, copy the OpenSSL DLLS to "The OpenSSL binaries (/bin) directory"
 4. Copy the OpenSSL 1.0 files from its /bin folder to C:/local/bin (You will need to create the folder)

From d6c4244b79ce22160c4e7c98427a2d8cfeb847f7 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 25 Aug 2018 11:08:10 +0300
Subject: [PATCH 38/44] Fixed double click in emote popup. (#679)

---
 src/widgets/helper/ChannelView.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/widgets/helper/ChannelView.cpp b/src/widgets/helper/ChannelView.cpp
index 2afc42e75..890356eac 100644
--- a/src/widgets/helper/ChannelView.cpp
+++ b/src/widgets/helper/ChannelView.cpp
@@ -1025,7 +1025,10 @@ void ChannelView::handleMouseClick(QMouseEvent *event,
             auto &link = hoveredElement->getLink();
             if (!getSettings()->linksDoubleClickOnly) {
                 this->handleLinkClick(event, link, layout);
+            }
 
+            // Invoke to signal from EmotePopup.
+            if (link.type == Link::InsertText) {
                 this->linkClicked.invoke(link);
             }
         } break;

From 5647c6a80c603912fa649dbd04a1eb80e4156aad Mon Sep 17 00:00:00 2001
From: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
Date: Sat, 25 Aug 2018 10:23:58 +0000
Subject: [PATCH 39/44] Fix crash when receiving a whisper

Fix #672
---
 src/providers/twitch/TwitchMessageBuilder.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/providers/twitch/TwitchMessageBuilder.cpp b/src/providers/twitch/TwitchMessageBuilder.cpp
index b245c7664..389027004 100644
--- a/src/providers/twitch/TwitchMessageBuilder.cpp
+++ b/src/providers/twitch/TwitchMessageBuilder.cpp
@@ -625,6 +625,12 @@ void TwitchMessageBuilder::appendTwitchEmote(
 
 Outcome TwitchMessageBuilder::tryAppendEmote(const EmoteName &name)
 {
+    // Special channels, like /whispers and /channels return here
+    // This means they will not render any BTTV or FFZ emotes
+    if (this->twitchChannel == nullptr) {
+        return Failure;
+    }
+
     auto flags = MessageElementFlags();
     auto emote = boost::optional<EmotePtr>{};
 

From 90e960f31947aa77cfca953bb1a2cf6f6bd69b2f Mon Sep 17 00:00:00 2001
From: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
Date: Sat, 25 Aug 2018 10:24:28 +0000
Subject: [PATCH 40/44] Remove non-existant files from chatterino.pro

---
 chatterino.pro | 2 --
 1 file changed, 2 deletions(-)

diff --git a/chatterino.pro b/chatterino.pro
index 1c9cf8f11..2e0ae0055 100644
--- a/chatterino.pro
+++ b/chatterino.pro
@@ -272,7 +272,6 @@ HEADERS  += \
     src/common/NetworkTimer.hpp \
     src/common/NetworkWorker.hpp \
     src/common/NullablePtr.hpp \
-    src/common/Property.hpp \
     src/common/ProviderId.hpp \
     src/util/RapidJsonSerializeQString.hpp \
     src/common/SignalVectorModel.hpp \
@@ -429,7 +428,6 @@ HEADERS  += \
     src/providers/twitch/PubsubClient.hpp \
     src/providers/twitch/TwitchApi.hpp \
     src/messages/Emote.hpp \
-    src/messages/EmoteCache.hpp \
     src/messages/ImageSet.hpp \
     src/common/Outcome.hpp \
     src/providers/bttv/BttvEmotes.hpp \

From c1ec0e49d432e919789430ddf7da56e8c24871cc Mon Sep 17 00:00:00 2001
From: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
Date: Sat, 25 Aug 2018 12:29:02 +0000
Subject: [PATCH 41/44] Change scaling values around to look good on my setup

Might need some DPI magic to look good on every setup, but I think this
is an improvement
---
 src/messages/ImageSet.cpp | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/messages/ImageSet.cpp b/src/messages/ImageSet.cpp
index 1019d27e9..dd4f23b97 100644
--- a/src/messages/ImageSet.cpp
+++ b/src/messages/ImageSet.cpp
@@ -1,7 +1,5 @@
-#include "ImageSet.hpp"
+#include "messages/ImageSet.hpp"
 
-#include "Application.hpp"
-#include "singletons/Resources.hpp"
 #include "singletons/Settings.hpp"
 
 namespace chatterino {
@@ -60,16 +58,12 @@ const ImagePtr &ImageSet::getImage3() const
 
 const ImagePtr &ImageSet::getImage(float scale) const
 {
-    int quality = getSettings()->preferredEmoteQuality;
+    int quality = 1;
 
-    if (!quality) {
-        if (scale > 3.999)
-            quality = 3;
-        else if (scale > 1.999)
-            quality = 2;
-        else
-            scale = 1;
-    }
+    if (scale > 2.999)
+        quality = 3;
+    else if (scale > 1.5)
+        quality = 2;
 
     if (!this->imageX3_->isEmpty() && quality == 3) {
         return this->imageX3_;

From 70199e00d2da6f2511262eb8316b9b2c3caa2957 Mon Sep 17 00:00:00 2001
From: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
Date: Sat, 25 Aug 2018 12:29:43 +0000
Subject: [PATCH 42/44] Remove unused 'preferred emote quality' setting

---
 src/singletons/Settings.hpp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/singletons/Settings.hpp b/src/singletons/Settings.hpp
index 472c2892a..45b0d069a 100644
--- a/src/singletons/Settings.hpp
+++ b/src/singletons/Settings.hpp
@@ -99,12 +99,6 @@ public:
     BoolSetting enableGifAnimations = {"/emotes/enableGifAnimations", true};
     FloatSetting emoteScale = {"/emotes/scale", 1.f};
 
-    // 0 = No preference
-    // 1 = 1x
-    // 2 = 2x
-    // 3 = 3x
-    IntSetting preferredEmoteQuality = {"/emotes/preferredEmoteQuality", 0};
-
     QStringSetting emojiSet = {"/emotes/emojiSet", "EmojiOne 2"};
 
     /// Links

From ce155299e9f967bbd4ebf38f7b490f8511b4230e Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 26 Aug 2018 11:42:00 +0300
Subject: [PATCH 43/44] Added right-click on nickname to reply on whisper.
 (#680)

---
 src/messages/Link.hpp                         |  1 +
 src/providers/twitch/TwitchMessageBuilder.cpp |  2 +-
 src/widgets/helper/ChannelView.cpp            | 15 +++++++++++----
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/messages/Link.hpp b/src/messages/Link.hpp
index a07d21cf3..38000982f 100644
--- a/src/messages/Link.hpp
+++ b/src/messages/Link.hpp
@@ -13,6 +13,7 @@ public:
         UserInfo,
         UserTimeout,
         UserBan,
+        UserWhisper,
         InsertText,
         ShowMessage,
         UserAction,
diff --git a/src/providers/twitch/TwitchMessageBuilder.cpp b/src/providers/twitch/TwitchMessageBuilder.cpp
index 389027004..a6647d88e 100644
--- a/src/providers/twitch/TwitchMessageBuilder.cpp
+++ b/src/providers/twitch/TwitchMessageBuilder.cpp
@@ -438,7 +438,7 @@ void TwitchMessageBuilder::appendUsername()
         this->emplace<TextElement>(usernameText, MessageElementFlag::Username,
                                    this->usernameColor_,
                                    FontStyle::ChatMediumBold)
-            ->setLink({Link::UserInfo, this->message().displayName});
+            ->setLink({Link::UserWhisper, this->message().displayName});
 
         auto currentUser = app->accounts->twitch.getCurrent();
 
diff --git a/src/widgets/helper/ChannelView.cpp b/src/widgets/helper/ChannelView.cpp
index 890356eac..64ccfbf4f 100644
--- a/src/widgets/helper/ChannelView.cpp
+++ b/src/widgets/helper/ChannelView.cpp
@@ -1033,12 +1033,18 @@ void ChannelView::handleMouseClick(QMouseEvent *event,
             }
         } break;
         case Qt::RightButton: {
+
+            auto insertText = [=](QString text) {
+                if (auto split = dynamic_cast<Split *>(this->parentWidget())) {
+                    split->insertTextToInput(text);
+                }
+            };
+
             auto &link = hoveredElement->getLink();
             if (link.type == Link::UserInfo) {
-                Split *split = dynamic_cast<Split *>(this->parentWidget());
-                if (split != nullptr) {
-                    split->insertTextToInput("@" + link.value + ", ");
-                }
+                insertText("@" + link.value + ", ");
+            } else if (link.type == Link::UserWhisper) {
+                insertText("/w " + link.value + " ");
             } else {
                 this->addContextMenuItems(hoveredElement, layout);
             }
@@ -1155,6 +1161,7 @@ void ChannelView::handleLinkClick(QMouseEvent *event, const Link &link,
     }
 
     switch (link.type) {
+        case Link::UserWhisper:
         case Link::UserInfo: {
             auto user = link.value;
 

From 113cfd69b0f791ce80cdf45293d151a824b36286 Mon Sep 17 00:00:00 2001
From: hemirt <hemirt@email.cz>
Date: Tue, 28 Aug 2018 19:25:15 +0200
Subject: [PATCH 44/44] Fix emote copying (#687)

* Fix emote copying

* Fix (i.e. no longer add) blank spaces instead of badges

I.e. badges' names do not get copied
---
 src/messages/layouts/MessageLayoutElement.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/messages/layouts/MessageLayoutElement.cpp b/src/messages/layouts/MessageLayoutElement.cpp
index 385451141..8a683a391 100644
--- a/src/messages/layouts/MessageLayoutElement.cpp
+++ b/src/messages/layouts/MessageLayoutElement.cpp
@@ -1,6 +1,7 @@
 #include "messages/layouts/MessageLayoutElement.hpp"
 
 #include "Application.hpp"
+#include "messages/Emote.hpp"
 #include "messages/Image.hpp"
 #include "messages/MessageElement.hpp"
 #include "singletons/Theme.hpp"
@@ -77,11 +78,12 @@ ImageLayoutElement::ImageLayoutElement(MessageElement &creator, ImagePtr image,
 void ImageLayoutElement::addCopyTextToString(QString &str, int from,
                                              int to) const
 {
-    //    str += this->image_->getCopyString();
-    str += "not implemented";
-
-    if (this->hasTrailingSpace()) {
-        str += " ";
+    const auto *emoteElement = dynamic_cast<EmoteElement *>(&this->getCreator());
+    if (emoteElement) {
+        str += emoteElement->getEmote()->getCopyString();
+        if (this->hasTrailingSpace()) {
+            str += " ";
+        }
     }
 }