diff --git a/.gitmodules b/.gitmodules
index 2ff033dd..7b983e84 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "lib/libcommuni"]
 	path = lib/libcommuni
-	url = https://github.com/communi/libcommuni
+	url = https://github.com/hemirt/libcommuni
diff --git a/chatterino.pro b/chatterino.pro
index 3c8488cf..6f622828 100644
--- a/chatterino.pro
+++ b/chatterino.pro
@@ -9,6 +9,7 @@ CONFIG  += communi
 COMMUNI += core model util
 CONFIG  += c++14
 
+DEFINES += IRC_NAMESPACE=Communi
 include(lib/libcommuni/src/src.pri)
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
@@ -17,13 +18,16 @@ TARGET   = chatterino
 TEMPLATE = app
 
 DEFINES += QT_DEPRECATED_WARNINGS
-DEFINES += IRC_NAMESPACE=Communi
 
 # Define warning flags for Chatterino
-QMAKE_CXXFLAGS_WARN_ON = -Wall
-QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-function
-QMAKE_CXXFLAGS_WARN_ON += -Wno-switch
-QMAKE_CXXFLAGS_WARN_ON += -Wno-deprecated-declarations
+win32-msvc* {
+    QMAKE_CXXFLAGS_WARN_ON = -W4
+} else {
+    QMAKE_CXXFLAGS_WARN_ON = -Wall
+    QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-function
+    QMAKE_CXXFLAGS_WARN_ON += -Wno-switch
+    QMAKE_CXXFLAGS_WARN_ON += -Wno-deprecated-declarations
+}
 
 # do not use windows min/max macros
 win32 {
diff --git a/lib/libcommuni b/lib/libcommuni
index 1c7ebef1..a31ffb03 160000
--- a/lib/libcommuni
+++ b/lib/libcommuni
@@ -1 +1 @@
-Subproject commit 1c7ebef19662ba5b09a78e01fc77dd901e302947
+Subproject commit a31ffb037eadac65dba73ad2b2da6dafe31e3bf7