diff --git a/chatterino.pro b/chatterino.pro
index 2a2d597f..895b3735 100644
--- a/chatterino.pro
+++ b/chatterino.pro
@@ -51,7 +51,7 @@ SOURCES += main.cpp\
     messages/word.cpp \
     messages/wordpart.cpp \
     resources.cpp \
-    settings/settings.cpp \
+    settings.cpp \
     widgets/chatwidget.cpp \
     widgets/chatwidgetheader.cpp \
     widgets/chatwidgetheaderbutton.cpp \
@@ -87,8 +87,8 @@ HEADERS  += account.h \
     messages/word.h \
     messages/wordpart.h \
     resources.h \
-    settings/setting.h \
-    settings/settings.h \
+    setting.h \
+    settings.h \
     twitchemotevalue.h \
     widgets/chatwidget.h \
     widgets/chatwidgetheader.h \
diff --git a/main.cpp b/main.cpp
index 09e8c016..c04ee88b 100644
--- a/main.cpp
+++ b/main.cpp
@@ -3,7 +3,7 @@
 #include "emojis.h"
 #include "ircmanager.h"
 #include "resources.h"
-#include "settings/settings.h"
+#include "settings.h"
 #include "widgets/mainwindow.h"
 #include "windows.h"
 
@@ -18,7 +18,7 @@ main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
 
-    settings::Settings::getInstance().load();
+    Settings::getInstance().load();
     Resources::load();
     Emojis::loadEmojis();
 
@@ -31,7 +31,7 @@ main(int argc, char *argv[])
 
     int ret = a.exec();
 
-    settings::Settings::getInstance().save();
+    Settings::getInstance().save();
 
     return ret;
 }
diff --git a/messages/message.cpp b/messages/message.cpp
index 541f4031..050757d5 100644
--- a/messages/message.cpp
+++ b/messages/message.cpp
@@ -7,7 +7,7 @@
 #include "messages/link.h"
 #include "qcolor.h"
 #include "resources.h"
-#include "settings/settings.h"
+#include "settings.h"
 
 #include <QStringList>
 #include <ctime>
@@ -405,7 +405,7 @@ Message::Message(const IrcPrivateMessage &ircMessage, const Channel &channel,
 bool
 Message::layout(int width, bool enableEmoteMargins)
 {
-    auto &settings = settings::Settings::getInstance();
+    auto &settings = Settings::getInstance();
 
     width = width - (width % 2);
 
@@ -475,7 +475,7 @@ Message::layout(int width, bool enableEmoteMargins)
         }
     };
 
-    uint32_t flags = settings::Settings::getInstance().getWordTypeMask();
+    uint32_t flags = Settings::getInstance().getWordTypeMask();
 
     for (auto it = this->words.begin(); it != this->words.end(); ++it) {
         Word &word = *it;
diff --git a/settings/setting.h b/setting.h
similarity index 97%
rename from settings/setting.h
rename to setting.h
index 98f95d18..b3027275 100644
--- a/settings/setting.h
+++ b/setting.h
@@ -6,7 +6,6 @@
 #include <boost/signals2.hpp>
 
 namespace chatterino {
-namespace settings {
 
 class BaseSetting
 {
@@ -79,7 +78,6 @@ private:
     T value;
 };
 
-}  // namespace settings
 }  // namespace chatterino
 
 #endif  // SETTING_H
diff --git a/settings/settings.cpp b/settings.cpp
similarity index 98%
rename from settings/settings.cpp
rename to settings.cpp
index 2bf638ff..0efefdc8 100644
--- a/settings/settings.cpp
+++ b/settings.cpp
@@ -1,11 +1,10 @@
-#include "settings/settings.h"
+#include "settings.h"
 
 #include <QDebug>
 #include <QDir>
 #include <QStandardPaths>
 
 namespace chatterino {
-namespace settings {
 
 Settings Settings::instance;
 
@@ -120,5 +119,4 @@ Settings::updateWordTypeMask()
     //    }
 }
 
-}  // namespace settings
 }  // namespace chatterino
diff --git a/settings/settings.h b/settings.h
similarity index 96%
rename from settings/settings.h
rename to settings.h
index e8f3a211..4fe370dc 100644
--- a/settings/settings.h
+++ b/settings.h
@@ -2,12 +2,11 @@
 #define APPSETTINGS_H
 
 #include "messages/word.h"
-#include "settings/setting.h"
+#include "setting.h"
 
 #include <QSettings>
 
 namespace chatterino {
-namespace settings {
 
 class Settings : public QObject
 {
@@ -98,7 +97,6 @@ public:
     Setting<bool> hideTabX;
 };
 
-}  // namespace settings
 }  // namespace chatterino
 
 #endif  // APPSETTINGS_H
diff --git a/widgets/chatwidget.cpp b/widgets/chatwidget.cpp
index 493b41d2..2e24375e 100644
--- a/widgets/chatwidget.cpp
+++ b/widgets/chatwidget.cpp
@@ -1,7 +1,7 @@
 #include "widgets/chatwidget.h"
 #include "channels.h"
 #include "colorscheme.h"
-#include "settings/settings.h"
+#include "settings.h"
 #include "widgets/textinputdialog.h"
 
 #include <QFont>
diff --git a/widgets/chatwidgetinput.cpp b/widgets/chatwidgetinput.cpp
index 3263b6a7..687a8cb8 100644
--- a/widgets/chatwidgetinput.cpp
+++ b/widgets/chatwidgetinput.cpp
@@ -1,6 +1,6 @@
 #include "widgets/chatwidgetinput.h"
 #include "colorscheme.h"
-#include "settings/settings.h"
+#include "settings.h"
 
 #include <QPainter>
 
@@ -41,11 +41,11 @@ ChatWidgetInput::ChatWidgetInput()
     this->refreshTheme();
 
     this->setMessageLengthVisisble(
-        settings::Settings::getInstance().showMessageLength.get());
+        Settings::getInstance().showMessageLength.get());
 
     /* XXX(pajlada): FIX THIS
-    QObject::connect(&settings::Settings::getInstance().showMessageLength,
-                     &settings::BoolSetting::valueChanged, this,
+    QObject::connect(&Settings::getInstance().showMessageLength,
+                     &BoolSetting::valueChanged, this,
                      &ChatWidgetInput::setMessageLengthVisisble);
                      */
 }
@@ -54,8 +54,8 @@ ChatWidgetInput::~ChatWidgetInput()
 {
     /* XXX(pajlada): FIX THIS
     QObject::disconnect(
-        &settings::Settings::getInstance().getShowMessageLength(),
-        &settings::BoolSetting::valueChanged, this,
+        &Settings::getInstance().getShowMessageLength(),
+        &BoolSetting::valueChanged, this,
         &ChatWidgetInput::setMessageLengthVisisble);
         */
 }
diff --git a/widgets/chatwidgetview.cpp b/widgets/chatwidgetview.cpp
index 0f92fc51..6e0bc004 100644
--- a/widgets/chatwidgetview.cpp
+++ b/widgets/chatwidgetview.cpp
@@ -3,7 +3,7 @@
 #include "colorscheme.h"
 #include "messages/message.h"
 #include "messages/wordpart.h"
-#include "settings/settings.h"
+#include "settings.h"
 #include "widgets/chatwidget.h"
 
 #include <math.h>
@@ -23,15 +23,14 @@ ChatWidgetView::ChatWidgetView(ChatWidget *parent)
 
     scroll->scrollTo(QPointF(0, 100));
 
-    QObject::connect(&settings::Settings::getInstance(),
-                     &settings::Settings::wordTypeMaskChanged, this,
-                     &ChatWidgetView::wordTypeMaskChanged);
+    QObject::connect(&Settings::getInstance(), &Settings::wordTypeMaskChanged,
+                     this, &ChatWidgetView::wordTypeMaskChanged);
 }
 
 ChatWidgetView::~ChatWidgetView()
 {
-    QObject::disconnect(&settings::Settings::getInstance(),
-                        &settings::Settings::wordTypeMaskChanged, this,
+    QObject::disconnect(&Settings::getInstance(),
+                        &Settings::wordTypeMaskChanged, this,
                         &ChatWidgetView::wordTypeMaskChanged);
 }
 
diff --git a/widgets/notebooktab.cpp b/widgets/notebooktab.cpp
index 8d2d8e20..e4bded37 100644
--- a/widgets/notebooktab.cpp
+++ b/widgets/notebooktab.cpp
@@ -1,6 +1,6 @@
 #include "widgets/notebooktab.h"
 #include "colorscheme.h"
-#include "settings/settings.h"
+#include "settings.h"
 #include "widgets/notebook.h"
 
 #include <QPainter>
@@ -25,8 +25,8 @@ NotebookTab::NotebookTab(Notebook *notebook)
     this->setAcceptDrops(true);
 
     /* XXX(pajlada): Fix this
-    QObject::connect(&settings::Settings::getInstance().getHideTabX(),
-                     &settings::BoolSetting::valueChanged, this,
+    QObject::connect(&Settings::getInstance().getHideTabX(),
+                     &BoolSetting::valueChanged, this,
                      &NotebookTab::hideTabXChanged);
                      */
 
@@ -36,8 +36,8 @@ NotebookTab::NotebookTab(Notebook *notebook)
 NotebookTab::~NotebookTab()
 {
     /* XXX(pajlada): Fix this
-    QObject::disconnect(&settings::Settings::getInstance().getHideTabX(),
-                        &settings::BoolSetting::valueChanged, this,
+    QObject::disconnect(&Settings::getInstance().getHideTabX(),
+                        &BoolSetting::valueChanged, this,
                         &NotebookTab::hideTabXChanged);
                      */
 }
@@ -45,7 +45,7 @@ NotebookTab::~NotebookTab()
 void
 NotebookTab::calcSize()
 {
-    if (settings::Settings::getInstance().hideTabX.get()) {
+    if (Settings::getInstance().hideTabX.get()) {
         this->resize(this->fontMetrics().width(this->text) + 8, 24);
     } else {
         this->resize(this->fontMetrics().width(this->text) + 8 + 24, 24);
@@ -103,14 +103,13 @@ NotebookTab::paintEvent(QPaintEvent *)
 
     painter.setPen(fg);
 
-    QRect rect(
-        0, 0,
-        width() - (settings::Settings::getInstance().hideTabX.get() ? 0 : 16),
-        height());
+    QRect rect(0, 0,
+               width() - (Settings::getInstance().hideTabX.get() ? 0 : 16),
+               height());
 
     painter.drawText(rect, this->text, QTextOption(Qt::AlignCenter));
 
-    if (!settings::Settings::getInstance().hideTabX.get() &&
+    if (!Settings::getInstance().hideTabX.get() &&
         (this->mouseOver || this->selected)) {
         if (this->mouseOverX) {
             painter.fillRect(this->getXRect(), QColor(0, 0, 0, 64));
@@ -143,7 +142,7 @@ NotebookTab::mouseReleaseEvent(QMouseEvent *event)
 {
     this->mouseDown = false;
 
-    if (this->mouseDownX) {
+    if (this->mouseDownX && this->getXRect().contains(event->pos())) {
         this->mouseDownX = false;
 
         this->notebook->removePage(this->page);
@@ -169,7 +168,7 @@ NotebookTab::leaveEvent(QEvent *)
 }
 
 void
-NotebookTab::dragEnterEvent(QDragEnterEvent *event)
+NotebookTab::dragEnterEvent(QDragEnterEvent *)
 {
     this->notebook->select(page);
 }
diff --git a/widgets/resizingtextedit.h b/widgets/resizingtextedit.h
index 6445e1a0..e471ce83 100644
--- a/widgets/resizingtextedit.h
+++ b/widgets/resizingtextedit.h
@@ -13,7 +13,8 @@ public:
         sizePolicy.setVerticalPolicy(QSizePolicy::Preferred);
         this->setSizePolicy(sizePolicy);
 
-        QObject::connect(this, &QTextEdit::textChanged, this, &QWidget::updateGeometry);
+        QObject::connect(this, &QTextEdit::textChanged, this,
+                         &QWidget::updateGeometry);
     }
 
     QSize
@@ -30,21 +31,12 @@ public:
 
 protected:
     int
-    heightForWidth(int w) const override
+    heightForWidth(int) const override
     {
         auto margins = this->contentsMargins();
 
-        int documentWidth;
-
-        if (w >= margins.left() + margins.right()) {
-            documentWidth = w - margins.left() - margins.right();
-        } else {
-            documentWidth = 0;
-        }
-
-        auto document = this->document()->clone();
-
-        return margins.top() + document->size().height() + margins.bottom() + 5;
+        return margins.top() + document()->size().height() + margins.bottom() +
+               5;
     }
 };
 
diff --git a/widgets/settingsdialog.cpp b/widgets/settingsdialog.cpp
index 3f20dda3..01d12bbf 100644
--- a/widgets/settingsdialog.cpp
+++ b/widgets/settingsdialog.cpp
@@ -54,7 +54,7 @@ SettingsDialog::SettingsDialog()
 void
 SettingsDialog::addTabs()
 {
-    settings::Settings &settings = settings::Settings::getInstance();
+    Settings &settings = Settings::getInstance();
 
     QVBoxLayout *vbox;
 
@@ -227,7 +227,7 @@ SettingsDialog::select(SettingsDialogTab *tab)
 /// Widget creation helpers
 QCheckBox *
 SettingsDialog::createCheckbox(const QString &title,
-                               settings::Setting<bool> &setting)
+                               Setting<bool> &setting)
 {
     auto checkbox = new QCheckBox(title);
 
diff --git a/widgets/settingsdialog.h b/widgets/settingsdialog.h
index 30001f96..52a57fbc 100644
--- a/widgets/settingsdialog.h
+++ b/widgets/settingsdialog.h
@@ -1,7 +1,7 @@
 #ifndef SETTINGSDIALOG_H
 #define SETTINGSDIALOG_H
 
-#include "settings/settings.h"
+#include "settings.h"
 #include "widgets/settingsdialogtab.h"
 
 #include <QButtonGroup>
@@ -42,7 +42,7 @@ private:
 
     /// Widget creation helpers
     QCheckBox *createCheckbox(const QString &title,
-                              settings::Setting<bool> &setting);
+                              Setting<bool> &setting);
 };
 
 }  // namespace widgets