diff --git a/chatterino.pro b/chatterino.pro
index 9331902d2..4fd0e6377 100644
--- a/chatterino.pro
+++ b/chatterino.pro
@@ -11,6 +11,8 @@ COMMUNI += core model util
 win32:LIBS += -LC:/OpenSSL-Win32/lib/openssl.lib
 INCLUDEPATH += C:/OpenSSL-Win32/include
 
+CONFIG += c++11
+
 include(lib/libcommuni/src/src.pri)
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
diff --git a/emojis.cpp b/emojis.cpp
index 18bc37680..8218c17f4 100644
--- a/emojis.cpp
+++ b/emojis.cpp
@@ -20,7 +20,7 @@ ConcurrentMap<QString, LazyLoadedImage *> *Emojis::imageCache =
 QString
 Emojis::replaceShortCodes(const QString &text)
 {
-#pragma message WARN("xD")
+    // TODO: Implement this xD
     return text;
 }
 
diff --git a/emotes.cpp b/emotes.cpp
index 5509592cd..0490cfc2f 100644
--- a/emotes.cpp
+++ b/emotes.cpp
@@ -42,7 +42,7 @@ Emotes::getTwitchEmoteLink(long id, qreal &scale)
 LazyLoadedImage *
 Emotes::getCheerImage(long long amount, bool animated)
 {
-#pragma message WARN("xD")
+    // TODO: fix this xD
     return getCheerBadge(amount);
 }
 
diff --git a/ircmanager.cpp b/ircmanager.cpp
index 68aa157bf..3ad2b5cee 100644
--- a/ircmanager.cpp
+++ b/ircmanager.cpp
@@ -219,7 +219,7 @@ IrcManager::addIgnoredUser(QString const &username)
 {
     QString errorMessage;
     if (!tryAddIgnoredUser(username, errorMessage)) {
-#pragma message WARN("Implement IrcManager::addIgnoredUser")
+        // TODO: Implement IrcManager::addIgnoredUser
     }
 }
 
@@ -253,6 +253,6 @@ IrcManager::removeIgnoredUser(QString const &username)
 {
     QString errorMessage;
     if (!tryRemoveIgnoredUser(username, errorMessage)) {
-#pragma message WARN("TODO: Implement IrcManager::removeIgnoredUser")
+        // TODO: Implement IrcManager::removeIgnoredUser
     }
 }
diff --git a/message.cpp b/message.cpp
index b76433999..85f04bf3d 100644
--- a/message.cpp
+++ b/message.cpp
@@ -105,7 +105,7 @@ Message::Message(const IrcPrivateMessage &ircMessage, const Channel &channel,
                                      Word::BadgeGlobalMod, QString(),
                                      QString("Global Moderator")));
             } else if (badge == "moderator/1") {
-#pragma message WARN("xD")
+                // TODO: implement this xD
                 words.push_back(Word(
                     Resources::badgeTurbo(), Word::BadgeModerator, QString(),
                     QString("Channel Moderator")));  // custom badge
@@ -183,7 +183,7 @@ Message::Message(const IrcPrivateMessage &ircMessage, const Channel &channel,
                          userDisplayString, QString()));
 
 // highlights
-#pragma message WARN("xD")
+                // TODO: implement this xD
 
     // bits
     QString bits = "";
@@ -353,7 +353,7 @@ Message::Message(const IrcPrivateMessage &ircMessage, const Channel &channel,
                 // bttv / ffz emotes
                 LazyLoadedImage *bttvEmote;
 
-#pragma message WARN("ignored emotes")
+                // TODO: Implement this (ignored emotes)
                 if (Emotes::bttvEmotes().tryGet(string, bttvEmote) ||
                     channel.bttvChannelEmotes().tryGet(string, bttvEmote) ||
                     Emotes::ffzEmotes().tryGet(string, bttvEmote) ||
@@ -388,7 +388,7 @@ Message::Message(const IrcPrivateMessage &ircMessage, const Channel &channel,
 
     this->m_words = words;
 
-#pragma message WARN("xD")
+    // TODO: Implement this xD
     //    if (!isReceivedWhisper &&
     //    AppSettings.HighlightIgnoredUsers.ContainsKey(Username))
     //    {
@@ -593,6 +593,6 @@ Message::sortTwitchEmotes(const std::pair<long int, LazyLoadedImage *> &a,
 QString
 Message::matchLink(const QString &string)
 {
-#pragma message WARN("xD")
+    // TODO: Implement this xD
     return QString();
 }