-VERSION = 0.8.9
-
-CC ?= gcc
-LIBS = -lm -lxcb -lxcb-icccm -lxcb-ewmh -lxcb-randr -lxcb-xinerama
-CFLAGS += -std=c99 -pedantic -Wall -Wextra -I$(PREFIX)/include
-CFLAGS += -D_POSIX_C_SOURCE=200112L -DVERSION=\"$(VERSION)\"
-LDFLAGS += -L$(PREFIX)/lib
-
-PREFIX ?= /usr/local
-BINPREFIX = $(PREFIX)/bin
-MANPREFIX = $(PREFIX)/share/man
-BASHCPL = $(PREFIX)/share/bash-completion/completions
-ZSHCPL = $(PREFIX)/share/zsh/site-functions
-DOCPREFIX = $(PREFIX)/share/doc/bspwm
-
-MD_DOCS = doc/CONTRIBUTING.md doc/INSTALL.md doc/MISC.md doc/TODO.md
-
-WM_SRC = bspwm.c helpers.c settings.c monitor.c desktop.c tree.c stack.c history.c \
- events.c pointer.c window.c messages.c query.c restore.c rule.c ewmh.c subscribe.c
-WM_OBJ = $(WM_SRC:.c=.o)
-CL_SRC = bspc.c helpers.c
-CL_OBJ = $(CL_SRC:.c=.o)
-
-all: CFLAGS += -Os
-all: LDFLAGS += -s
+VERCMD ?= git describe --tags 2> /dev/null
+VERSION := $(shell $(VERCMD) || cat VERSION)
+
+CPPFLAGS += -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\"
+CFLAGS += -std=c99 -pedantic -Wall -Wextra -DJSMN_STRICT
+LDFLAGS ?=
+LDLIBS = $(LDFLAGS) -lm -lxcb -lxcb-util -lxcb-keysyms -lxcb-icccm -lxcb-ewmh -lxcb-randr -lxcb-xinerama -lxcb-shape
+
+PREFIX ?= /usr/local
+BINPREFIX ?= $(PREFIX)/bin
+MANPREFIX ?= $(PREFIX)/share/man
+DOCPREFIX ?= $(PREFIX)/share/doc/bspwm
+BASHCPL ?= $(PREFIX)/share/bash-completion/completions
+FISHCPL ?= $(PREFIX)/share/fish/vendor_completions.d
+ZSHCPL ?= $(PREFIX)/share/zsh/site-functions
+
+MD_DOCS = README.md doc/CHANGELOG.md doc/CONTRIBUTING.md doc/INSTALL.md doc/MISC.md doc/TODO.md
+XSESSIONS ?= $(PREFIX)/share/xsessions
+
+WM_SRC = bspwm.c helpers.c geometry.c jsmn.c settings.c monitor.c desktop.c tree.c stack.c history.c \
+ events.c pointer.c window.c messages.c parse.c query.c restore.c rule.c ewmh.c subscribe.c
+WM_OBJ := $(WM_SRC:.c=.o)
+CLI_SRC = bspc.c helpers.c
+CLI_OBJ := $(CLI_SRC:.c=.o)
+