diff --git a/dist/Gentoo/nheko-9999.ebuild b/dist/Gentoo/nheko-9999.ebuild
index 4683aee49923600a264a1a99a702f05bd74dd2e7..c024c6ae052dfce0283eb83cc753840c6323d321 100644
--- a/dist/Gentoo/nheko-9999.ebuild
+++ b/dist/Gentoo/nheko-9999.ebuild
@@ -9,8 +9,8 @@ HOMEPAGE="https://github.com/mujx/nheko"
 inherit git-r3 eutils cmake-utils
 
 if [[ ${PV} == "9999" ]]; then
-	SRC_URI=""
-	EGIT_REPO_URI="git://github.com/mujx/nheko.git"
+    SRC_URI=""
+    EGIT_REPO_URI="git://github.com/mujx/nheko.git"
 fi
 
 LICENSE="GPL-3"
@@ -18,26 +18,26 @@ SLOT="0"
 IUSE=""
 
 DEPEND=">=dev-qt/qtgui-5.7.1
-		media-libs/fontconfig"
+        media-libs/fontconfig"
 RDEPEND="${DEPEND}"
 
 src_configure() {
-	cmake-utils_src_configure
+    cmake-utils_src_configure
 }
 
 src_compile() {
-	emake DESTDIR="${D}"
+    emake DESTDIR="${D}"
 }
 
 src_install() {
-	local icon_size
+    local icon_size
     for icon_size in 16 32 48 64 128 256 512; do
         newicon -s "${icon_size}" \
-			"${S}/resources/nheko-${icon_size}.png" \
-			nheko.png
+            "${S}/resources/nheko-${icon_size}.png" \
+            nheko.png
     done
 
-	domenu ${S}/resources/nheko.desktop
+    domenu ${S}/resources/nheko.desktop
 
-	dobin ${S}/build/nheko
+    dobin ${S}/build/nheko
 }
diff --git a/include/Versions.h b/include/Versions.h
index 9d7f1eb4e4728fc011bb12a822230e4f9929aa1b..d751fd9a6d12cd6efc0d9f42fd499373f326f8b9 100644
--- a/include/Versions.h
+++ b/include/Versions.h
@@ -22,7 +22,6 @@
 
 #include "Deserializable.h"
 
-
 class VersionsResponse : public Deserializable
 {
 public:
@@ -38,5 +37,4 @@ private:
 	};
 
 	QVector<Version_> supported_versions_;
-
 };
diff --git a/src/LoginPage.cc b/src/LoginPage.cc
index e3f5148408d4b482ce10d52a4efd0ccf0e581328..24bfd1431dea7e7a2e51cb7ce6e80a5f4e5bec8b 100644
--- a/src/LoginPage.cc
+++ b/src/LoginPage.cc
@@ -21,9 +21,9 @@
 #include "LoginPage.h"
 
 LoginPage::LoginPage(QSharedPointer<MatrixClient> client, QWidget *parent)
-	: QWidget(parent)
-	, inferredServerAddress_()
-	, client_{client}
+    : QWidget(parent)
+    , inferredServerAddress_()
+    , client_{client}
 {
 	setStyleSheet("background-color: #f9f9f9");
 
@@ -212,7 +212,7 @@ void LoginPage::versionError(QString error)
 	QString mxidAddress = matrixid_input_->text().split(":").at(1);
 	if (currentServer.host() == inferredServerAddress_ && !currentServer.host().startsWith("matrix")) {
 		error_label_->setText("");
-		currentServer.setHost(QString("matrix.")+currentServer.host());
+		currentServer.setHost(QString("matrix.") + currentServer.host());
 		serverInput_->setText(currentServer.host());
 		client_->setServer(currentServer.host());
 		client_->versions();
diff --git a/src/Versions.cc b/src/Versions.cc
index 48895645fc9465f6c4d923e83b07ed3339600497..3d7c16d8c030e0b55acdb32bb039866f27824a1d 100644
--- a/src/Versions.cc
+++ b/src/Versions.cc
@@ -35,7 +35,7 @@ void VersionsResponse::deserialize(const QJsonDocument &data)
 		throw DeserializationException("Versions: missing version list");
 
 	auto versions = object.value("versions").toArray();
-	for (auto const &elem: versions) {
+	for (auto const &elem : versions) {
 		QString str = elem.toString();
 		QRegExp rx("r(\\d+)\\.(\\d+)\\.(\\d+)");
 
@@ -53,7 +53,7 @@ void VersionsResponse::deserialize(const QJsonDocument &data)
 
 bool VersionsResponse::isVersionSupported(unsigned int major, unsigned int minor, unsigned int patch)
 {
-	for (auto &v: supported_versions_) {
+	for (auto &v : supported_versions_) {
 		if (v.major_ == major && v.minor_ == minor && v.patch_ >= patch)
 			return true;
 	}