diff --git a/INSTALL.md b/INSTALL.md
index 8633b93..88b87a9 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -14,7 +14,7 @@
 | [Tox Core](https://github.com/irungentoo/toxcore)    | BASE                       | *None*           |
 | [NCurses](https://www.gnu.org/software/ncurses)      | BASE                       | libncursesw5-dev |
 | [LibConfig](http://www.hyperrealm.com/libconfig)     | BASE                       | libconfig-dev    |
-| [GNUmake](http://www.gnu.org/software/make/)         | BASE                       | make             |
+| [GNUmake](https://www.gnu.org/software/make)         | BASE                       | make             |
 | [Tox Core AV](https://github.com/irungentoo/toxcore) | AUDIO                      | *None*           |
 | [OpenAL](http://openal.org)                          | AUDIO, SOUND NOTIFICATIONS | libopenal-dev    |
 | [OpenALUT](http://openal.org)                        | SOUND NOTIFICATIONS        | libalut-dev      |
diff --git a/build/Makefile b/build/Makefile
index 6f4ec4c..9d4b45d 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -19,31 +19,31 @@ OBJ += group_commands.o term_mplex.o
 # Check on wich system we are running
 UNAME_S = $(shell uname -s)
 ifeq ($(UNAME_S), Linux)
-	-include $(CFG_DIR)/systems/Linux.mk
+    -include $(CFG_DIR)/systems/Linux.mk
 endif
 ifeq ($(UNAME_S), FreeBSD)
-	-include $(CFG_DIR)/systems/FreeBSD.mk
+    -include $(CFG_DIR)/systems/FreeBSD.mk
 endif
 ifeq ($(UNAME_S), OpenBSD)
     -include $(CFG_DIR)/systems/FreeBSD.mk
 endif
 ifeq ($(UNAME_S), Darwin)
-	-include $(CFG_DIR)/systems/Darwin.mk
+    -include $(CFG_DIR)/systems/Darwin.mk
 endif
 ifeq ($(UNAME_S), Solaris)
-	-include $(CFG_DIR)/systems/Solaris.mk
+    -include $(CFG_DIR)/systems/Solaris.mk
 endif
 
 # Check on which platform we are running
 UNAME_M = $(shell uname -m)
 ifeq ($(UNAME_M), x86_64)
-	-include $(CFG_DIR)/platforms/x86_64.mk
+    -include $(CFG_DIR)/platforms/x86_64.mk
 endif
 ifneq ($(filter %86, $(UNAME_M)),)
-	-include $(CFG_DIR)/platforms/x86.mk
+    -include $(CFG_DIR)/platforms/x86.mk
 endif
 ifneq ($(filter arm%, $(UNAME_M)),)
-	-include $(CFG_DIR)/platforms/arm.mk
+    -include $(CFG_DIR)/platforms/arm.mk
 endif
 
 # Include all needed checks
diff --git a/cfg/checks/av.mk b/cfg/checks/av.mk
index 54d93ed..4d3837e 100644
--- a/cfg/checks/av.mk
+++ b/cfg/checks/av.mk
@@ -2,22 +2,20 @@
 AUDIO_LIBS = libtoxav openal
 AUDIO_CFLAGS = -DAUDIO
 ifneq (, $(findstring device.o, $(OBJ)))
-	AUDIO_OBJ = audio_call.o
+    AUDIO_OBJ = audio_call.o
 else
-	AUDIO_OBJ = audio_call.o device.o
+    AUDIO_OBJ = audio_call.o device.o
 endif
 
 # Check if we can build audio support
 CHECK_AUDIO_LIBS = $(shell pkg-config --exists $(AUDIO_LIBS) || echo -n "error")
 ifneq ($(CHECK_AUDIO_LIBS), error)
-	LIBS += $(AUDIO_LIBS)
-	CFLAGS += $(AUDIO_CFLAGS)
-	OBJ += $(AUDIO_OBJ)
-else
-ifneq ($(MAKECMDGOALS), clean)
-MISSING_AUDIO_LIBS = $(shell for lib in $(AUDIO_LIBS) ; do if ! pkg-config --exists $$lib ; then echo $$lib ; fi ; done)
-$(warning WARNING -- Toxic will be compiled without audio support)
-$(warning WARNING -- You need these libraries for audio support)
-$(warning WARNING -- $(MISSING_AUDIO_LIBS))
-endif
+    LIBS += $(AUDIO_LIBS)
+    CFLAGS += $(AUDIO_CFLAGS)
+    OBJ += $(AUDIO_OBJ)
+else ifneq ($(MAKECMDGOALS), clean)
+    MISSING_AUDIO_LIBS = $(shell for lib in $(AUDIO_LIBS) ; do if ! pkg-config --exists $$lib ; then echo $$lib ; fi ; done)
+    $(warning WARNING -- Toxic will be compiled without audio support)
+    $(warning WARNING -- You need these libraries for audio support)
+    $(warning WARNING -- $(MISSING_AUDIO_LIBS))
 endif
diff --git a/cfg/checks/check_features.mk b/cfg/checks/check_features.mk
index 33c937b..430d1af 100644
--- a/cfg/checks/check_features.mk
+++ b/cfg/checks/check_features.mk
@@ -3,38 +3,36 @@ CHECKS_DIR = $(CFG_DIR)/checks
 # Check if we want build X11 support
 X11 = $(shell if [ -z "$(DISABLE_X11)" ] || [ "$(DISABLE_X11)" = "0" ] ; then echo enabled ; else echo disabled ; fi)
 ifneq ($(X11), disabled)
-	-include $(CHECKS_DIR)/x11.mk
+    -include $(CHECKS_DIR)/x11.mk
 endif
 
 # Check if we want build audio support
 AUDIO = $(shell if [ -z "$(DISABLE_AV)" ] || [ "$(DISABLE_AV)" = "0" ] ; then echo enabled ; else echo disabled ; fi)
 ifneq ($(AUDIO), disabled)
-	-include $(CHECKS_DIR)/av.mk
+    -include $(CHECKS_DIR)/av.mk
 endif
 
 # Check if we want build sound notifications support
 SND_NOTIFY = $(shell if [ -z "$(DISABLE_SOUND_NOTIFY)" ] || [ "$(DISABLE_SOUND_NOTIFY)" = "0" ] ; then echo enabled ; else echo disabled ; fi)
 ifneq ($(SND_NOTIFY), disabled)
-	-include $(CHECKS_DIR)/sound_notifications.mk
+    -include $(CHECKS_DIR)/sound_notifications.mk
 endif
 
 # Check if we want build desktop notifications support
 DESK_NOTIFY = $(shell if [ -z "$(DISABLE_DESKTOP_NOTIFY)" ] || [ "$(DISABLE_DESKTOP_NOTIFY)" = "0" ] ; then echo enabled ; else echo disabled ; fi)
 ifneq ($(DESK_NOTIFY), disabled)
-	-include $(CHECKS_DIR)/desktop_notifications.mk
+    -include $(CHECKS_DIR)/desktop_notifications.mk
 endif
 
 # Check if we can build Toxic
 CHECK_LIBS = $(shell pkg-config --exists $(LIBS) || echo -n "error")
 ifneq ($(CHECK_LIBS), error)
-	CFLAGS += $(shell pkg-config --cflags $(LIBS))
-	LDFLAGS += $(shell pkg-config --libs $(LIBS))
-else
-ifneq ($(MAKECMDGOALS), clean)
-MISSING_LIBS = $(shell for lib in $(LIBS) ; do if ! pkg-config --exists $$lib ; then echo $$lib ; fi ; done)
-$(warning ERROR -- Cannot compile Toxic)
-$(warning ERROR -- You need these libraries)
-$(warning ERROR -- $(MISSING_LIBS))
-$(error ERROR)
-endif
+    CFLAGS += $(shell pkg-config --cflags $(LIBS))
+    LDFLAGS += $(shell pkg-config --libs $(LIBS))
+else ifneq ($(MAKECMDGOALS), clean)
+    MISSING_LIBS = $(shell for lib in $(LIBS) ; do if ! pkg-config --exists $$lib ; then echo $$lib ; fi ; done)
+    $(warning ERROR -- Cannot compile Toxic)
+    $(warning ERROR -- You need these libraries)
+    $(warning ERROR -- $(MISSING_LIBS))
+    $(error ERROR)
 endif
diff --git a/cfg/checks/desktop_notifications.mk b/cfg/checks/desktop_notifications.mk
index 7901207..97d2531 100644
--- a/cfg/checks/desktop_notifications.mk
+++ b/cfg/checks/desktop_notifications.mk
@@ -5,13 +5,11 @@ DESK_NOTIFY_CFLAGS = -DBOX_NOTIFY
 # Check if we can build desktop notifications support
 CHECK_DESK_NOTIFY_LIBS = $(shell pkg-config --exists $(DESK_NOTIFY_LIBS) || echo -n "error")
 ifneq ($(CHECK_DESK_NOTIFY_LIBS), error)
-	LIBS += $(DESK_NOTIFY_LIBS)
-	CFLAGS += $(DESK_NOTIFY_CFLAGS)
-else
-ifneq ($(MAKECMDGOALS), clean)
-MISSING_DESK_NOTIFY_LIBS = $(shell for lib in $(DESK_NOTIFY_LIBS) ; do if ! pkg-config --exists $$lib ; then echo $$lib ; fi ; done)
-$(warning WARNING -- Toxic will be compiled without desktop notifications support)
-$(warning WARNING -- You need these libraries for desktop notifications support)
-$(warning WARNING -- $(MISSING_DESK_NOTIFY_LIBS))
-endif
+    LIBS += $(DESK_NOTIFY_LIBS)
+    CFLAGS += $(DESK_NOTIFY_CFLAGS)
+else ifneq ($(MAKECMDGOALS), clean)
+    MISSING_DESK_NOTIFY_LIBS = $(shell for lib in $(DESK_NOTIFY_LIBS) ; do if ! pkg-config --exists $$lib ; then echo $$lib ; fi ; done)
+    $(warning WARNING -- Toxic will be compiled without desktop notifications support)
+    $(warning WARNING -- You need these libraries for desktop notifications support)
+    $(warning WARNING -- $(MISSING_DESK_NOTIFY_LIBS))
 endif
diff --git a/cfg/checks/sound_notifications.mk b/cfg/checks/sound_notifications.mk
index 1413651..e8dc699 100644
--- a/cfg/checks/sound_notifications.mk
+++ b/cfg/checks/sound_notifications.mk
@@ -2,22 +2,20 @@
 SND_NOTIFY_LIBS = openal freealut
 SND_NOTIFY_CFLAGS = -DSOUND_NOTIFY
 ifneq (, $(findstring device.o, $(OBJ)))
-	SND_NOTIFY_OBJ =
+    SND_NOTIFY_OBJ =
 else
-	SND_NOTIFY_OBJ = device.o
+    SND_NOTIFY_OBJ = device.o
 endif
 
 # Check if we can build sound notifications support
 CHECK_SND_NOTIFY_LIBS = $(shell pkg-config --exists $(SND_NOTIFY_LIBS) || echo -n "error")
 ifneq ($(CHECK_SND_NOTIFY_LIBS), error)
-	LIBS += $(SND_NOTIFY_LIBS)
-	CFLAGS += $(SND_NOTIFY_CFLAGS)
-	OBJ += $(SND_NOTIFY_OBJ)
-else
-ifneq ($(MAKECMDGOALS), clean)
-MISSING_SND_NOTIFY_LIBS = $(shell for lib in $(SND_NOTIFY_LIBS) ; do if ! pkg-config --exists $$lib ; then echo $$lib ; fi ; done)
-$(warning WARNING -- Toxic will be compiled without sound notifications support)
-$(warning WARNING -- You need these libraries for sound notifications support)
-$(warning WARNING -- $(MISSING_SND_NOTIFY_LIBS))
-endif
+    LIBS += $(SND_NOTIFY_LIBS)
+    CFLAGS += $(SND_NOTIFY_CFLAGS)
+    OBJ += $(SND_NOTIFY_OBJ)
+else ifneq ($(MAKECMDGOALS), clean)
+    MISSING_SND_NOTIFY_LIBS = $(shell for lib in $(SND_NOTIFY_LIBS) ; do if ! pkg-config --exists $$lib ; then echo $$lib ; fi ; done)
+    $(warning WARNING -- Toxic will be compiled without sound notifications support)
+    $(warning WARNING -- You need these libraries for sound notifications support)
+    $(warning WARNING -- $(MISSING_SND_NOTIFY_LIBS))
 endif
diff --git a/cfg/checks/x11.mk b/cfg/checks/x11.mk
index f7c5c07..94c2f97 100644
--- a/cfg/checks/x11.mk
+++ b/cfg/checks/x11.mk
@@ -6,14 +6,12 @@ X11_OBJ = xtra.o
 # Check if we can build X11 support
 CHECK_X11_LIBS = $(shell pkg-config --exists $(X11_LIBS) || echo -n "error")
 ifneq ($(CHECK_X11_LIBS), error)
-       LIBS += $(X11_LIBS)
-       CFLAGS += $(X11_CFLAGS)
-       OBJ += $(X11_OBJ)
-else
-ifneq ($(MAKECMDGOALS), clean)
-MISSING_X11_LIBS = $(shell for lib in $(X11_LIBS) ; do if ! pkg-config --exists $$lib ; then echo $$lib ; fi ; done)
-$(warning WARNING -- Toxic will be compiled without x11 support (needed for focus tracking and drag&drop support))
-$(warning WARNING -- You need these libraries for x11 support)
-$(warning WARNING -- $(MISSING_X11_LIBS))
-endif
+    LIBS += $(X11_LIBS)
+    CFLAGS += $(X11_CFLAGS)
+    OBJ += $(X11_OBJ)
+else ifneq ($(MAKECMDGOALS), clean)
+    MISSING_X11_LIBS = $(shell for lib in $(X11_LIBS) ; do if ! pkg-config --exists $$lib ; then echo $$lib ; fi ; done)
+    $(warning WARNING -- Toxic will be compiled without x11 support (needed for focus tracking and drag&drop support))
+    $(warning WARNING -- You need these libraries for x11 support)
+    $(warning WARNING -- $(MISSING_X11_LIBS))
 endif
diff --git a/cfg/global_vars.mk b/cfg/global_vars.mk
index 9c70dfe..832ad49 100644
--- a/cfg/global_vars.mk
+++ b/cfg/global_vars.mk
@@ -2,9 +2,9 @@
 TOXIC_VERSION = 0.5.2
 REV = $(shell git rev-list HEAD --count 2>/dev/null || echo -n "error")
 ifneq (, $(findstring error, $(REV)))
-	VERSION = $(TOXIC_VERSION)
+    VERSION = $(TOXIC_VERSION)
 else
-	VERSION = $(TOXIC_VERSION)_r$(REV)
+    VERSION = $(TOXIC_VERSION)_r$(REV)
 endif
 
 # Project directories
diff --git a/cfg/targets/install.mk b/cfg/targets/install.mk
index ff992df..49155b2 100644
--- a/cfg/targets/install.mk
+++ b/cfg/targets/install.mk
@@ -3,11 +3,11 @@ install: toxic
 	@echo "Installing toxic executable"
 	@mkdir -p $(abspath $(DESTDIR)/$(BINDIR))
 	@install -m 0755 toxic $(abspath $(DESTDIR)/$(BINDIR)/toxic)
-
+	
 	@echo "Installing desktop file"
 	@mkdir -p $(abspath $(DESTDIR)/$(APPDIR))
 	@install -m 0644 $(MISC_DIR)/$(DESKFILE) $(abspath $(DESTDIR)/$(APPDIR)/$(DESKFILE))
-
+	
 	@echo "Installing data files"
 	@mkdir -p $(abspath $(DESTDIR)/$(DATADIR))
 	@for f in $(DATAFILES) ; do \
@@ -19,7 +19,7 @@ install: toxic
 	@for f in $(SNDFILES) ; do \
 		install -m 0644 $(SND_DIR)/$$f $(abspath $(DESTDIR)/$(DATADIR)/sounds/$$f) ;\
 	done
-
+	
 	@echo "Installing man pages"
 	@mkdir -p $(abspath $(DESTDIR)/$(MANDIR))
 	@for f in $(MANFILES) ; do \