diff --git a/amiga/Makefile.defaults b/amiga/Makefile.defaults
index 35c35ae76..43b42b22c 100644
--- a/amiga/Makefile.defaults
+++ b/amiga/Makefile.defaults
@@ -2,41 +2,41 @@
 # Amiga-specific options
 # ----------------------------------------------------------------------------
 
-  # Force using glibc internal iconv implementation instead of external libiconv
-  # Valid options: YES, NO
-  NETSURF_USE_LIBICONV_PLUG := YES
+# Force using glibc internal iconv implementation instead of external libiconv
+# Valid options: YES, NO
+NETSURF_USE_LIBICONV_PLUG := YES
 
-  # Enable NetSurf's use of librosprite for displaying RISC OS Sprites
-  # Valid options: YES, NO, AUTO
-  NETSURF_USE_ROSPRITE := NO
+# Enable NetSurf's use of librosprite for displaying RISC OS Sprites
+# Valid options: YES, NO, AUTO
+NETSURF_USE_ROSPRITE := NO
 
-  # Enable NetSurf's use of libwebp for displaying WebPs
-  # Valid options: YES, NO
-  NETSURF_USE_WEBP := NO
+# Enable NetSurf's use of libwebp for displaying WebPs
+# Valid options: YES, NO
+NETSURF_USE_WEBP := NO
 
-  # Enable NetSurf to display Amiga icons 
-  # Valid options: YES, NO                 (recommended)
-  NETSURF_USE_AMIGA_ICON := YES
+# Enable NetSurf to display Amiga icons
+# Valid options: YES, NO                 (recommended)
+NETSURF_USE_AMIGA_ICON := YES
 
-  # Enable NetSurf's use of DataTypes for unknown filetypes
-  # Valid options: YES, NO
-  NETSURF_USE_AMIGA_DATATYPES := YES
+# Enable NetSurf's use of DataTypes for unknown filetypes
+# Valid options: YES, NO
+NETSURF_USE_AMIGA_DATATYPES := YES
 
-  # Enable NetSurf's use of libsvgtiny for displaying SVGs
-  # Valid options: YES, NO
-  NETSURF_USE_NSSVG := YES
+# Enable NetSurf's use of libsvgtiny for displaying SVGs
+# Valid options: YES, NO
+NETSURF_USE_NSSVG := YES
 
-  # Enable NetSurf's use of libcairo for some plotter functions
-  # This will also link NetSurf with shared objects, and
-  # requires AmigaOS 4.1 or higher to run the resulting executable
-  # Valid options: YES, NO, AUTO
-  NETSURF_USE_AMIGA_CAIRO := AUTO
+# Enable NetSurf's use of libcairo for some plotter functions
+# This will also link NetSurf with shared objects, and
+# requires AmigaOS 4.1 or higher to run the resulting executable
+# Valid options: YES, NO, AUTO
+NETSURF_USE_AMIGA_CAIRO := AUTO
 
-  # Enable NetSurf's use of Spidermonkey 1.80+
-  # Only here to stop the build complaining;
-  # enable NETSURF_USE_MOZJS instead for JavaScript support
-  # Valid options: NO 
-  NETSURF_USE_JS := NO
-  
-  # Optimisation levels
-  CFLAGS += -O2 -gstabs
+# Enable NetSurf's use of Spidermonkey 1.80+
+# Only here to stop the build complaining;
+# enable NETSURF_USE_MOZJS instead for JavaScript support
+# Valid options: NO
+NETSURF_USE_JS := NO
+
+# Optimisation levels
+CFLAGS += -O2 -gstabs
diff --git a/atari/Makefile.defaults b/atari/Makefile.defaults
index d4ef0232b..dcdc1d661 100644
--- a/atari/Makefile.defaults
+++ b/atari/Makefile.defaults
@@ -2,57 +2,56 @@
 # Atari-specific options
 # ----------------------------------------------------------------------------
 
-  # Force using glibc internal iconv implementation instead of external libiconv
-  # Valid options: YES, NO
-  NETSURF_USE_LIBICONV_PLUG := NO
+# Force using glibc internal iconv implementation instead of external libiconv
+# Valid options: YES, NO
+NETSURF_USE_LIBICONV_PLUG := NO
 
-  # Enable NetSurf's use of librosprite for displaying RISC OS Sprites
-  # Valid options: YES, NO, AUTO
-  NETSURF_USE_ROSPRITE := NO
+# Enable NetSurf's use of librosprite for displaying RISC OS Sprites
+# Valid options: YES, NO, AUTO
+NETSURF_USE_ROSPRITE := NO
 
-  # Enable NetSurf's use of libwebp for displaying WebPs
-  # Valid options: YES, NO
-  NETSURF_USE_WEBP := NO
+# Enable NetSurf's use of libwebp for displaying WebPs
+# Valid options: YES, NO
+NETSURF_USE_WEBP := NO
 
-  # Enable NetSurf's use of librsvg in conjunction with Cairo to display SVGs
-  # Valid options: YES, NO, AUTO
-  NETSURF_USE_RSVG := AUTO
+# Enable NetSurf's use of librsvg in conjunction with Cairo to display SVGs
+# Valid options: YES, NO, AUTO
+NETSURF_USE_RSVG := AUTO
 
-  # Enable NetSurf's use of libsvgtiny for displaying SVGs
-  # Valid options: YES, NO, AUTO
-  NETSURF_USE_NSSVG := AUTO
+# Enable NetSurf's use of libsvgtiny for displaying SVGs
+# Valid options: YES, NO, AUTO
+NETSURF_USE_NSSVG := AUTO
 
-  # Enable Spidermonkey JavaScript engine
-  # Valid options: YES, NO
-  NETSURF_USE_MOZJS := NO
+# Enable Spidermonkey JavaScript engine
+# Valid options: YES, NO
+NETSURF_USE_MOZJS := NO
 
-  # enable true type fonts via freetype2
-  # Valid options: YES, NO
-  NETSURF_USE_ATARI_FREETYPE_FONT := YES
+# enable true type fonts via freetype2
+# Valid options: YES, NO
+NETSURF_USE_ATARI_FREETYPE_FONT := YES
 
-  # Enable use of netsurf embedded font
-  # Valid options: YES, NO
-  NETSURF_USE_ATARI_NETSURF_FONT := YES
+# Enable use of netsurf embedded font
+# Valid options: YES, NO
+NETSURF_USE_ATARI_NETSURF_FONT := YES
 
-  # Enable VDI Font rendering
-  # Valid options: YES, NO
-  NETSURF_USE_ATARI_VDI_FONT := NO
+# Enable VDI Font rendering
+# Valid options: YES, NO
+NETSURF_USE_ATARI_VDI_FONT := NO
 
-  # Configure support for screen drivers with no true colour mode
-  # Valid options: YES, NO
-  NETSURF_USE_ATARI_8BPP_SUPPORT := NO
+# Configure support for screen drivers with no true colour mode
+# Valid options: YES, NO
+NETSURF_USE_ATARI_8BPP_SUPPORT := NO
 
-  # Configure the CPU target
-  # Valid options: 68000, 68020-60, 5475 (coldfire)
-  ATARIARCH = 68020-60
+# Configure the CPU target
+# Valid options: 68000, 68020-60, 5475 (coldfire)
+ATARIARCH = 68020-60
 
-  # enable optimizations
-  # -O2 is currently broken with m68000 / m68020-60 builds 
-  CFLAGS += -O3
+# enable optimizations
+# -O2 is currently broken with m68000 / m68020-60 builds
+CFLAGS += -O3
 
-  # override warning flags removing -Wall
-  WARNFLAGS = -W -Wundef -Wpointer-arith \
+# override warning flags removing -Wall
+WARNFLAGS = -W -Wundef -Wpointer-arith \
 		-Wcast-align -Wwrite-strings -Wstrict-prototypes \
 		-Wmissing-prototypes -Wmissing-declarations -Wredundant-decls \
 		-Wnested-externs -Wuninitialized -Wl,-t
-
diff --git a/beos/Makefile.defaults b/beos/Makefile.defaults
index d5bf6b396..303414d8b 100644
--- a/beos/Makefile.defaults
+++ b/beos/Makefile.defaults
@@ -2,31 +2,29 @@
 # BeOS-specific options
 # ----------------------------------------------------------------------------
 
+# Where to install the netsurf binary
+NETSURF_BEOS_BIN := /boot/apps/netsurf/
 
-  # Where to install the netsurf binary
-  NETSURF_BEOS_BIN := /boot/apps/netsurf/
+# TODO:HAIKU -- not sure if ~/.netsurf applies in beos
+# Where to search for NetSurf's resources after looking in ~/.netsurf and
+# $NETSURFRES.  It must have a trailing /
+NETSURF_BEOS_RESOURCES := /boot/apps/netsurf/res/
 
-  # TODO:HAIKU -- not sure if ~/.netsurf applies in beos
-  # Where to search for NetSurf's resources after looking in ~/.netsurf and
-  # $NETSURFRES.  It must have a trailing /
-  NETSURF_BEOS_RESOURCES := /boot/apps/netsurf/res/
+# Enable NetSurf's use of libsvgtiny for displaying SVGs
+# Valid options: YES, NO, AUTO
+NETSURF_USE_NSSVG := YES
 
-  # Enable NetSurf's use of libsvgtiny for displaying SVGs
-  # Valid options: YES, NO, AUTO
-  NETSURF_USE_NSSVG := YES
+# Enable NetSurf's use of librosprite for displaying RISC OS Sprites
+# Valid options: YES, NO, AUTO
+NETSURF_USE_ROSPRITE := AUTO
 
-  # Enable NetSurf's use of librosprite for displaying RISC OS Sprites
-  # Valid options: YES, NO, AUTO
-  NETSURF_USE_ROSPRITE := AUTO
+# Enable NetSurf's use of libharu for PDF export.
+# Valid options: YES, NO
+NETSURF_USE_HARU_PDF := NO
 
-  # Enable NetSurf's use of libharu for PDF export.
-  # Valid options: YES, NO
-  NETSURF_USE_HARU_PDF := NO
-
-  # Force using glibc internal iconv implementation instead of external libiconv
-  # Valid options: YES, NO
-  NETSURF_USE_LIBICONV_PLUG := NO
-
-  # Optimisation levels
-  CFLAGS += -O2
+# Force using glibc internal iconv implementation instead of external libiconv
+# Valid options: YES, NO
+NETSURF_USE_LIBICONV_PLUG := NO
 
+# Optimisation levels
+CFLAGS += -O2
diff --git a/cocoa/Makefile.defaults b/cocoa/Makefile.defaults
index 24517490c..501d17585 100644
--- a/cocoa/Makefile.defaults
+++ b/cocoa/Makefile.defaults
@@ -2,35 +2,35 @@
 # Cocoa-specific options
 # ----------------------------------------------------------------------------
 
-  # Force using glibc internal iconv implementation instead of external libiconv
-  # Valid options: YES, NO
-  NETSURF_USE_LIBICONV_PLUG := NO
+# Force using glibc internal iconv implementation instead of external libiconv
+# Valid options: YES, NO
+NETSURF_USE_LIBICONV_PLUG := NO
 
-  # Enable NetSurf's use of librosprite for displaying RISC OS Sprites
-  # Valid options: YES, NO, AUTO
-  NETSURF_USE_ROSPRITE := NO
+# Enable NetSurf's use of librosprite for displaying RISC OS Sprites
+# Valid options: YES, NO, AUTO
+NETSURF_USE_ROSPRITE := NO
 
-  # Enable NetSurf's use of libwebp for displaying WebPs
-  # Valid options: YES, NO
-  NETSURF_USE_WEBP := NO
+# Enable NetSurf's use of libwebp for displaying WebPs
+# Valid options: YES, NO
+NETSURF_USE_WEBP := NO
 
-  # Enable NetSurf's use of librsvg in conjunction with Cairo to display SVGs
-  # Valid options: YES, NO, AUTO
-  NETSURF_USE_RSVG := AUTO
+# Enable NetSurf's use of librsvg in conjunction with Cairo to display SVGs
+# Valid options: YES, NO, AUTO
+NETSURF_USE_RSVG := AUTO
 
-  # Enable NetSurf's use of libsvgtiny for displaying SVGs
-  # Valid options: YES, NO, AUTO
-  NETSURF_USE_NSSVG := AUTO
+# Enable NetSurf's use of libsvgtiny for displaying SVGs
+# Valid options: YES, NO, AUTO
+NETSURF_USE_NSSVG := AUTO
 
-  NETSURF_USE_BMP := NO
-  NETSURF_USE_GIF := NO
-  NETSURF_USE_PNG := NO
-  NETSURF_USE_JPEG := NO
-  NETSURF_USE_IMAGEIO := YES
+NETSURF_USE_BMP := NO
+NETSURF_USE_GIF := NO
+NETSURF_USE_PNG := NO
+NETSURF_USE_JPEG := NO
+NETSURF_USE_IMAGEIO := YES
 
-  DEVELOPER_PATH := /Developer
-  MACOSX_VERSION := 10.5
-  SDK_VERSION := $(MACOSX_VERSION)
+DEVELOPER_PATH := /Developer
+MACOSX_VERSION := 10.5
+SDK_VERSION := $(MACOSX_VERSION)
 
-  # Optimisation levels
-  CFLAGS += -O2
+# Optimisation levels
+CFLAGS += -O2
diff --git a/cocoa/Makefile.target b/cocoa/Makefile.target
index 40e8d432a..e6292c1f7 100644
--- a/cocoa/Makefile.target
+++ b/cocoa/Makefile.target
@@ -2,67 +2,66 @@
 # Mac OS X target setup
 # ----------------------------------------------------------------------------
 
-  POSTEXES += NetSurf.app
+POSTEXES += NetSurf.app
 
-  LDFLAGS += -L/usr/lib
-  LDFLAGS += $(shell $(PKG_CONFIG) --libs libhubbub libcss libdom)
-  LDFLAGS += -L/usr/X11/lib
-  LDFLAGS += -lm -lcurl -liconv
-  LDFLAGS += -lssl -lcrypto
+LDFLAGS += -L/usr/lib
+LDFLAGS += $(shell $(PKG_CONFIG) --libs libhubbub libcss libdom)
+LDFLAGS += -L/usr/X11/lib
+LDFLAGS += -lm -lcurl -liconv
+LDFLAGS += -lssl -lcrypto
 
-  CFLAGS += -O $(WARNFLAGS) -Dnscocoa		\
-		-D_BSD_SOURCE -D_POSIX_C_SOURCE		\
+CFLAGS += -O $(WARNFLAGS) -Dnscocoa -D_BSD_SOURCE -D_POSIX_C_SOURCE \
 		-std=c99 -g -Os
 
-  CFLAGS += $(shell $(PKG_CONFIG) --cflags libhubbub libcss libdom)
+CFLAGS += $(shell $(PKG_CONFIG) --cflags libhubbub libcss libdom)
 
-  # shut up zconf.h and zlib.h
-  #CFLAGS += -D_LARGEFILE64_SOURCE=1
+# shut up zconf.h and zlib.h
+#CFLAGS += -D_LARGEFILE64_SOURCE=1
 
 ifneq ($(WITH_MACPORTS),)
   LDFLAGS += -L/opt/local/lib
   CFLAGS += -I/opt/local/include
 endif
 
-  # for timerisset()
-  CFLAGS += -D_DARWIN_C_SOURCE
+# for timerisset()
+CFLAGS += -D_DARWIN_C_SOURCE
 
-  MACOSX_VERSION ?= 10.5
-  SDK_VERSION ?= $(MACOSX_VERSION)
-  SDK_PATH ?= $(DEVELOPER_PATH)/SDKs/MacOSX$(SDK_VERSION).sdk
-  SDK_FLAGS := -isysroot $(SDK_PATH) -mmacosx-version-min=$(MACOSX_VERSION) 
-  CFLAGS :=  $(SDK_FLAGS) $(CFLAGS)
-  LDFLAGS :=  $(SDK_FLAGS) -Wl,-syslibroot,$(SDK_PATH) $(LDFLAGS)
-  CXXFLAGS :=  $(SDK_FLAGS) $(CXXFLAGS)
+MACOSX_VERSION ?= 10.5
+SDK_VERSION ?= $(MACOSX_VERSION)
+SDK_PATH ?= $(DEVELOPER_PATH)/SDKs/MacOSX$(SDK_VERSION).sdk
+SDK_FLAGS := -isysroot $(SDK_PATH) -mmacosx-version-min=$(MACOSX_VERSION)
+CFLAGS :=  $(SDK_FLAGS) $(CFLAGS)
+LDFLAGS :=  $(SDK_FLAGS) -Wl,-syslibroot,$(SDK_PATH) $(LDFLAGS)
+CXXFLAGS :=  $(SDK_FLAGS) $(CXXFLAGS)
 
-  CFLAGS += -I/usr/X11/include
-  CFLAGS += -include cocoa/Prefix.pch
+CFLAGS += -I/usr/X11/include
+CFLAGS += -include cocoa/Prefix.pch
 
 #  VERSION_FULL := $(shell sed -n '/\"/{s/.*"\(.*\)\".*/\1/;p;}' desktop/version.c)
 # TODO: this needs fixing properly everywhere
-  VERSION_FULL := "3.0 (Dev)"
-  VERSION_MAJ := $(shell sed -n '/_major/{s/.* = \([0-9]*\).*/\1/;p;}' desktop/version.c)
-  VERSION_MIN := $(shell sed -n '/_minor/{s/.* = \([0-9]*\).*/\1/;p;}' desktop/version.c)
+VERSION_FULL := "3.0 (Dev)"
+VERSION_MAJ := $(shell sed -n '/_major/{s/.* = \([0-9]*\).*/\1/;p;}' desktop/version.c)
+VERSION_MIN := $(shell sed -n '/_minor/{s/.* = \([0-9]*\).*/\1/;p;}' desktop/version.c)
 
-  LDFLAGS += -Wl,-framework,Cocoa -Wl,-framework,Carbon $(NETLDFLAGS)
+LDFLAGS += -Wl,-framework,Cocoa -Wl,-framework,Carbon $(NETLDFLAGS)
 
-  NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP
-  NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF
-  NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG
-  NETSURF_FEATURE_NSSVG_CFLAGS := -DWITH_NS_SVG
+NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP
+NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF
+NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG
+NETSURF_FEATURE_NSSVG_CFLAGS := -DWITH_NS_SVG
 
-  $(eval $(call pkg_config_find_and_add_enabled,BMP,libnsbmp,BMP))
-  $(eval $(call pkg_config_find_and_add_enabled,GIF,libnsgif,GIF))
-  $(eval $(call pkg_config_find_and_add_enabled,PNG,libpng,PNG))
-  $(eval $(call pkg_config_find_and_add_enabled,NSSVG,libsvgtiny,SVG))
-  $(eval $(call feature_enabled,IMAGEIO,-DWITH_APPLE_IMAGE,,Apple ImageIO       ))
+$(eval $(call pkg_config_find_and_add_enabled,BMP,libnsbmp,BMP))
+$(eval $(call pkg_config_find_and_add_enabled,GIF,libnsgif,GIF))
+$(eval $(call pkg_config_find_and_add_enabled,PNG,libpng,PNG))
+$(eval $(call pkg_config_find_and_add_enabled,NSSVG,libsvgtiny,SVG))
+$(eval $(call feature_enabled,IMAGEIO,-DWITH_APPLE_IMAGE,,Apple ImageIO       ))
 
-  ifneq ($(UNIVERSAL),)
+ifneq ($(UNIVERSAL),)
     UNIVERSAL_FLAGS := $(foreach arch,$(UNIVERSAL),-arch $(arch) )
     CFLAGS += $(UNIVERSAL_FLAGS)
 	LDFLAGS += $(UNIVERSAL_FLAGS)
 	CXXFLAGS += $(UNIVERSAL_FLAGS)
-  endif
+endif
 
 # ----------------------------------------------------------------------------
 # Source file setup
@@ -240,4 +239,3 @@ clean-package-cocoa:
 	$(Q)$(RM) NetSurf.dmg 
 	$(VQ)echo "   CLEAN: NetSurf.app"
 	$(Q)$(RM) -r NetSurf.app 
-
diff --git a/framebuffer/Makefile.defaults b/framebuffer/Makefile.defaults
index 6e2a3d159..5fe8e2c40 100644
--- a/framebuffer/Makefile.defaults
+++ b/framebuffer/Makefile.defaults
@@ -2,46 +2,46 @@
 # Framebuffer-target-specific options
 # ----------------------------------------------------------------------------
 
-  # Optimisation levels
-  CFLAGS += -O2
+# Optimisation levels
+CFLAGS += -O2
 
-  # Framebuffer default surface provider.
-  # Valid values are: x, sdl, linux, vnc, able, 
-  NETSURF_FB_FRONTEND := sdl
+# Framebuffer default surface provider.
+# Valid values are: x, sdl, linux, vnc, able,
+NETSURF_FB_FRONTEND := sdl
 
-  # Use libharu to enable PDF export and GTK printing support.
-  # Valid options: YES, NO
-  NETSURF_USE_HARU_PDF := NO
+# Use libharu to enable PDF export and GTK printing support.
+# Valid options: YES, NO
+NETSURF_USE_HARU_PDF := NO
 
-  # Enable NetSurf's use of librosprite for displaying RISC OS Sprites
-  # Valid options: YES, NO, AUTO
-  NETSURF_USE_ROSPRITE := AUTO
+# Enable NetSurf's use of librosprite for displaying RISC OS Sprites
+# Valid options: YES, NO, AUTO
+NETSURF_USE_ROSPRITE := AUTO
 
-  # Library to use for font plotting 
-  # Valid options: internal, freetype
-  NETSURF_FB_FONTLIB := internal
+# Library to use for font plotting
+# Valid options: internal, freetype
+NETSURF_FB_FONTLIB := internal
 
-  # Default freetype font files
-  NETSURF_FB_FONT_SANS_SERIF := DejaVuSans.ttf
-  NETSURF_FB_FONT_SANS_SERIF_BOLD := DejaVuSans-Bold.ttf
-  NETSURF_FB_FONT_SANS_SERIF_ITALIC := DejaVuSans-Oblique.ttf
-  NETSURF_FB_FONT_SANS_SERIF_ITALIC_BOLD := DejaVuSans-BoldOblique.ttf
-  NETSURF_FB_FONT_SERIF := DejaVuSerif.ttf
-  NETSURF_FB_FONT_SERIF_BOLD := DejaVuSerif-Bold.ttf
-  NETSURF_FB_FONT_MONOSPACE := DejaVuSansMono.ttf
-  NETSURF_FB_FONT_MONOSPACE_BOLD := DejaVuSansMono-Bold.ttf
-  NETSURF_FB_FONT_CURSIVE := Comic_Sans_MS.ttf
-  NETSURF_FB_FONT_FANTASY := Impact.ttf
+# Default freetype font files
+NETSURF_FB_FONT_SANS_SERIF := DejaVuSans.ttf
+NETSURF_FB_FONT_SANS_SERIF_BOLD := DejaVuSans-Bold.ttf
+NETSURF_FB_FONT_SANS_SERIF_ITALIC := DejaVuSans-Oblique.ttf
+NETSURF_FB_FONT_SANS_SERIF_ITALIC_BOLD := DejaVuSans-BoldOblique.ttf
+NETSURF_FB_FONT_SERIF := DejaVuSerif.ttf
+NETSURF_FB_FONT_SERIF_BOLD := DejaVuSerif-Bold.ttf
+NETSURF_FB_FONT_MONOSPACE := DejaVuSansMono.ttf
+NETSURF_FB_FONT_MONOSPACE_BOLD := DejaVuSansMono-Bold.ttf
+NETSURF_FB_FONT_CURSIVE := Comic_Sans_MS.ttf
+NETSURF_FB_FONT_FANTASY := Impact.ttf
 
-  # Default binary install path
-  NETSURF_FRAMEBUFFER_BIN := $(PREFIX)/bin/
+# Default binary install path
+NETSURF_FRAMEBUFFER_BIN := $(PREFIX)/bin/
 
-  # Default resource install path
-  NETSURF_FRAMEBUFFER_RESOURCES := $(PREFIX)/share/netsurf/
+# Default resource install path
+NETSURF_FRAMEBUFFER_RESOURCES := $(PREFIX)/share/netsurf/
 
-  # Default framebuffer search path
-  NETSURF_FB_RESPATH := $${HOME}/.netsurf/:$${NETSURFRES}:$(NETSURF_FRAMEBUFFER_RESOURCES):./framebuffer/res
+# Default framebuffer search path
+NETSURF_FB_RESPATH := $${HOME}/.netsurf/:$${NETSURFRES}:$(NETSURF_FRAMEBUFFER_RESOURCES):./framebuffer/res
 
-  # freetype compiled in font serch path
-  NETSURF_FB_FONTPATH := /usr/share/fonts/truetype/ttf-dejavu:/usr/share/fonts/truetype/msttcorefonts
+# freetype compiled in font serch path
+NETSURF_FB_FONTPATH := /usr/share/fonts/truetype/ttf-dejavu:/usr/share/fonts/truetype/msttcorefonts
 
diff --git a/gtk/Makefile.defaults b/gtk/Makefile.defaults
index 23d4c1749..6c48b0cff 100644
--- a/gtk/Makefile.defaults
+++ b/gtk/Makefile.defaults
@@ -2,33 +2,33 @@
 # GTK-specific options
 # ----------------------------------------------------------------------------
 
-  # Where to search for NetSurf's resources after looking in ~/.netsurf and
-  # $NETSURFRES.  It must have a trailing /
-  NETSURF_GTK_RESOURCES := $(PREFIX)/share/netsurf/
+# Where to search for NetSurf's resources after looking in ~/.netsurf and
+# $NETSURFRES.  It must have a trailing /
+NETSURF_GTK_RESOURCES := $(PREFIX)/share/netsurf/
 
-  # Where to install the netsurf binary
-  NETSURF_GTK_BIN := $(PREFIX)/bin/
+# Where to install the netsurf binary
+NETSURF_GTK_BIN := $(PREFIX)/bin/
 
-  # Enable NetSurf's use of librsvg in conjunction with Cairo to display SVGs
-  # Valid options: YES, NO, AUTO
-  NETSURF_USE_RSVG := AUTO
+# Enable NetSurf's use of librsvg in conjunction with Cairo to display SVGs
+# Valid options: YES, NO, AUTO
+NETSURF_USE_RSVG := AUTO
 
-  # Enable NetSurf's use of libsvgtiny for displaying SVGs
-  # Valid options: YES, NO, AUTO
-  NETSURF_USE_NSSVG := AUTO
+# Enable NetSurf's use of libsvgtiny for displaying SVGs
+# Valid options: YES, NO, AUTO
+NETSURF_USE_NSSVG := AUTO
 
-  # Enable NetSurf's use of librosprite for displaying RISC OS Sprites
-  # Valid options: YES, NO, AUTO
-  NETSURF_USE_ROSPRITE := AUTO
+# Enable NetSurf's use of librosprite for displaying RISC OS Sprites
+# Valid options: YES, NO, AUTO
+NETSURF_USE_ROSPRITE := AUTO
 
-  # Configuration overrides for Mac OS X
-  ifeq ($(HOST),macosx)
+# Configuration overrides for Mac OS X
+ifeq ($(HOST),macosx)
     NETSURF_USE_LIBICONV_PLUG := NO
     NETSURF_USE_HARU_PDF := NO
-  endif
+endif
 
-  # Set default GTK version to build for (2 or 3)
-  NETSURF_GTK_MAJOR := 2
+# Set default GTK version to build for (2 or 3)
+NETSURF_GTK_MAJOR := 2
 
-  # Optimisation levels
-  CFLAGS += -O2
+# Optimisation levels
+CFLAGS += -O2
diff --git a/monkey/Makefile.defaults b/monkey/Makefile.defaults
index 659c1e336..bbe4c6cf1 100644
--- a/monkey/Makefile.defaults
+++ b/monkey/Makefile.defaults
@@ -2,12 +2,13 @@
 # Monkey-specific options
 # ----------------------------------------------------------------------------
 
-  # How did I get mixed up with this fucking monkey anyhow?
-  NETSURF_MONKEY_RESOURCES := $(PREFIX)/share/netsurf/
-  NETSURF_MONKEY_BIN := $(PREFIX)/bin/
-  NETSURF_USE_RSVG := NO
-  NETSURF_USE_NSSVG := NO
-  NETSURF_USE_ROSPRITE := NO
-  NETSURF_USE_HARU_PDF := NO
-  NETSURF_USE_LIBICONV_PLUG := NO
-  CFLAGS += -O2
+# How did I get mixed up with this fucking monkey anyhow?
+NETSURF_MONKEY_RESOURCES := $(PREFIX)/share/netsurf/
+NETSURF_MONKEY_BIN := $(PREFIX)/bin/
+NETSURF_USE_RSVG := NO
+NETSURF_USE_NSSVG := NO
+NETSURF_USE_ROSPRITE := NO
+NETSURF_USE_HARU_PDF := NO
+NETSURF_USE_LIBICONV_PLUG := NO
+
+CFLAGS += -O2
diff --git a/riscos/Makefile.defaults b/riscos/Makefile.defaults
index f48024f5a..8081e5c1a 100644
--- a/riscos/Makefile.defaults
+++ b/riscos/Makefile.defaults
@@ -2,30 +2,29 @@
 # RISC OS-specific options
 # ----------------------------------------------------------------------------
 
- # Enable NetSurf's use of libsvgtiny for displaying SVGs
-  # Valid options: YES, NO
-  NETSURF_USE_NSSVG := YES
+# Enable NetSurf's use of libsvgtiny for displaying SVGs
+# Valid options: YES, NO
+NETSURF_USE_NSSVG := YES
 
-  # Enable NetSurf's support for displaying RISC OS Draw files
-  # Valid options: YES, NO
-  NETSURF_USE_DRAW := YES
+# Enable NetSurf's support for displaying RISC OS Draw files
+# Valid options: YES, NO
+NETSURF_USE_DRAW := YES
 
-  # Enable NetSurf's support for displaying RISC OS Sprites
-  # Valid options: YES, NO
-  NETSURF_USE_SPRITE := YES
+# Enable NetSurf's support for displaying RISC OS Sprites
+# Valid options: YES, NO
+NETSURF_USE_SPRITE := YES
 
-  # Enable NetSurf's use of AWRender for displaying ArtWorks files
-  # Valid options: YES, NO
-  NETSURF_USE_ARTWORKS := YES
+# Enable NetSurf's use of AWRender for displaying ArtWorks files
+# Valid options: YES, NO
+NETSURF_USE_ARTWORKS := YES
 
-  # Enable NetSurf's support for the Acorn plugin protocol
-  # Valid options: YES, NO
-  NETSURF_USE_PLUGINS := NO
+# Enable NetSurf's support for the Acorn plugin protocol
+# Valid options: YES, NO
+NETSURF_USE_PLUGINS := NO
 
-  # Enable NetSurf's use of pencil for Drawfile export
-  # Valid options: YES, NO
-  NETSURF_USE_DRAW_EXPORT := YES
-
-  # Optimisation levels
-  CFLAGS += -O2
+# Enable NetSurf's use of pencil for Drawfile export
+# Valid options: YES, NO
+NETSURF_USE_DRAW_EXPORT := YES
 
+# Optimisation levels
+CFLAGS += -O2
diff --git a/windows/Makefile.defaults b/windows/Makefile.defaults
index 10c9abbf7..85472ba11 100644
--- a/windows/Makefile.defaults
+++ b/windows/Makefile.defaults
@@ -2,20 +2,20 @@
 # windows-specific options
 # ----------------------------------------------------------------------------
 
-  # Enable NetSurf's use of librosprite for displaying RISC OS Sprites
-  # Valid options: YES, NO, AUTO
-  NETSURF_USE_ROSPRITE := NO
+# Enable NetSurf's use of librosprite for displaying RISC OS Sprites
+# Valid options: YES, NO, AUTO
+NETSURF_USE_ROSPRITE := NO
 
-  # Enable NetSurf's use of libsvgtiny for displaying SVGs
-  # Valid options: YES, NO
-  NETSURF_USE_NSSVG := NO
+# Enable NetSurf's use of libsvgtiny for displaying SVGs
+# Valid options: YES, NO
+NETSURF_USE_NSSVG := NO
 
-  # Force using glibc internal iconv implementation instead of external libiconv
-  # Valid options: YES, NO
-  NETSURF_USE_LIBICONV_PLUG := NO
+# Force using glibc internal iconv implementation instead of external libiconv
+# Valid options: YES, NO
+NETSURF_USE_LIBICONV_PLUG := NO
 
-  # no pdf support
-  NETSURF_USE_HARU_PDF := NO
+# no pdf support
+NETSURF_USE_HARU_PDF := NO
 
-  # Optimisation levels
-  CFLAGS += -O2
+# Optimisation levels
+CFLAGS += -O2